Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into add-like #547

Closed
wants to merge 41 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
8105271
Put errors back into the receive queue (#498)
dwwoelfel Nov 19, 2024
218e712
[client][strong-init] use schema to help our attr generation (#499)
stopachka Nov 19, 2024
ceebdf7
[admin-sdk][strong-init] throw on missing attrs (#500)
stopachka Nov 20, 2024
1ec215b
[client] bump to v0.15.3 (#501)
stopachka Nov 20, 2024
1cebc0b
[cli] Hoist up `noAppIdErrorMessage` (#502)
stopachka Nov 20, 2024
e03fdd1
[client] bump to 0.15.4 (#504)
stopachka Nov 20, 2024
9480d32
[CLI] Add version to help screen, move down the docs links (#503)
stopachka Nov 20, 2024
e20e9dd
[cli] support global options (#505)
stopachka Nov 20, 2024
bb19496
[cli] Add styling to subheading in help (#506)
stopachka Nov 20, 2024
321a37b
[cli] single push / pull command (#507)
stopachka Nov 20, 2024
191ede4
[sm] remove stray `opts` argument (#508)
stopachka Nov 20, 2024
7bead5d
[client] bump to 0.15.5 (#509)
stopachka Nov 20, 2024
88888e7
Move refinery to its own environment (#510)
dwwoelfel Nov 21, 2024
96ed5d6
fix github action for deploy
dwwoelfel Nov 21, 2024
4f99e6a
trigger server build
dwwoelfel Nov 21, 2024
f5dc81f
[cli][docs] Update docs for cli push and pull (#513)
stopachka Nov 21, 2024
6c872a8
New elastic beanstalk environment (#514)
dwwoelfel Nov 21, 2024
7e0dfbb
[cli] improve error messages (#515)
stopachka Nov 21, 2024
0567cab
[bugfix][cli] remove null && (#517)
stopachka Nov 21, 2024
6bed51a
[small] make missing instant module an error rather than a warning (#…
stopachka Nov 21, 2024
30090a3
[cli] if no instant module found in package.json, prompt to install o…
stopachka Nov 21, 2024
81ffbff
Populate checked data types on attrs when schema is passed in (#520)
dwwoelfel Nov 21, 2024
3e2e605
bump to 0.15.6 (#521)
stopachka Nov 21, 2024
7f9d164
Fix instaql with reverse references (#522)
dwwoelfel Nov 22, 2024
1be3683
Enforce the type `Query` on InstaQLEntity and InstaQLResult (#524)
stopachka Nov 22, 2024
1b5de12
Add some debug info on refresh timeout/failure (#523)
dwwoelfel Nov 22, 2024
987a261
Distinguish between etypes on permission checks (#526)
dwwoelfel Nov 22, 2024
4f68ade
[strong-init][experimental] Expand (#525)
stopachka Nov 22, 2024
a5395fc
[client] bump to 0.15.7 (#527)
stopachka Nov 22, 2024
67ae4f7
[cli] Handle existing apps in `instant-cli init` (#528)
stopachka Nov 22, 2024
3566205
[cli] init: detect the app id if possible (#530)
stopachka Nov 22, 2024
8567e59
[cli] prompt for an app selector rather than pasting an id (#532)
stopachka Nov 22, 2024
9e4d3bb
Comparison operators on indexed+checked attrs (#531)
dwwoelfel Nov 25, 2024
d9fce4c
[cli] add a `-a` flag to init (#534)
stopachka Nov 25, 2024
4d2d691
[cli] detect _or_ create apps in push/pull commands (#535)
stopachka Nov 25, 2024
adcdbb2
Fix data.ref with checked types (#537)
dwwoelfel Nov 25, 2024
bb004fe
[cli] Make sure `instant-cli` login responds to `deny` (#538)
stopachka Nov 25, 2024
97f30e3
[cli][small] fix grammar + use terminalLink for dashboard (#536)
stopachka Nov 25, 2024
0a080b8
[sm][cli] remove unused code (#540)
stopachka Nov 25, 2024
8f17596
[cli] use prettier to autoformat our exported files (#541)
stopachka Nov 25, 2024
857e850
Merge branch 'main' of github.com:instantdb/instant into add-like-ind…
dwwoelfel Nov 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 60 additions & 10 deletions .github/workflows/clojure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
echo "did_change=False" >> $GITHUB_OUTPUT
for file in ${changeArr[*]}
do
if echo $file | grep -E '^server/'; then
if echo $file | grep -E '^server/' | grep -E -v '^server/refinery/'; then
echo "did_change=True" >> $GITHUB_OUTPUT
break
fi
Expand Down Expand Up @@ -246,19 +246,69 @@ jobs:
sed -i "s|IMAGE_REPLACE_ME|597134865416.dkr.ecr.us-east-1.amazonaws.com/instant-prod-ecr:${IMAGE_TAG}|g" docker-compose.yml
cat docker-compose.yml

- name: Update logdna.sh
working-directory: server
env:
SHA: ${{ github.sha }}
run: |
sed -i "s|SHA_REPLACE_ME|${SHA}|g" .platform/hooks/prebuild/logdna.sh
cat .platform/hooks/prebuild/logdna.sh

- name: Create eb application version
uses: "./.github/actions/elastic-beanstalk"
with:
working-directory: "server"
files: '["docker-compose.yml", ".platform/hooks/prebuild/logdna.sh", "refinery/config.yaml", "refinery/config-redis.yaml", "refinery/rules.yaml", "refinery/.env"]'
files: '["docker-compose.yml", ".ebextensions/resources.config"]'
aws-region: "us-east-1"
bucket: "elasticbeanstalk-us-east-1-597134865416"
application-name: "instant-docker-prod"

detect_refinery:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/main'
outputs:
did_change: ${{ steps.detect-change.outputs.did_change }}
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: ${{ github.event_name == 'pull_request' && 2 || 0 }}
- name: Get changed files
id: changed-files
run: |
if ${{ github.event_name == 'pull_request' || github.event.before == '0000000000000000000000000000000000000000' }}; then
echo "changed_files=$(git diff --name-only -r HEAD^1 HEAD | xargs)" >> $GITHUB_OUTPUT
else
echo "changed_files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | xargs)" >> $GITHUB_OUTPUT
fi
- name: Detect refinery changes
id: detect-change
run: |
changeArr=($(echo ${{ steps.changed-files.outputs.changed_files }}))
echo "did_change=False" >> $GITHUB_OUTPUT
for file in ${changeArr[*]}
do
if echo $file | grep -E '^server/refinery/'; then
echo "did_change=True" >> $GITHUB_OUTPUT
break
fi
done

publish-refinery-eb:
runs-on: ubuntu-latest
if: needs.detect_refinery.outputs.did_change == 'True'
needs:
- detect_refinery
permissions:
id-token: write
contents: read
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: arn:aws:iam::597134865416:role/aws-credentials-for-github-actions-Role-x0lUbtwJNb7G
aws-region: us-east-1

- name: Create eb application version
uses: "./.github/actions/elastic-beanstalk"
with:
working-directory: "server/refinery/"
files: '["docker-compose.yml", "config.yaml", "config-redis.yaml", "rules.yaml", "refinery.env", ".ebextensions/resources.config"]'
aws-region: "us-east-1"
bucket: "elasticbeanstalk-us-east-1-597134865416"
application-name: "refinery"
2 changes: 1 addition & 1 deletion client/packages/admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@instantdb/admin",
"version": "v0.15.2",
"version": "v0.15.7",
"description": "Admin SDK for Instant DB",
"main": "dist/index.js",
"module": "dist/module/index.js",
Expand Down
11 changes: 9 additions & 2 deletions client/packages/admin/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ import {
type ValueTypes,
type InstantSchemaDef,
type InstantUnknownSchema,
type InstaQLEntity,
type InstaQLResult,
} from "@instantdb/core";

import version from "./version";
Expand Down Expand Up @@ -757,7 +759,7 @@ class InstantAdminDatabase<Schema extends InstantSchemaDef<any, any, any>> {
headers: authorizedHeaders(this.config, this.impersonationOpts),
body: JSON.stringify({
query: query,
"inference?": true,
"inference?": !!this.config.schema,
}),
});
};
Expand Down Expand Up @@ -793,7 +795,10 @@ class InstantAdminDatabase<Schema extends InstantSchemaDef<any, any, any>> {
return jsonFetch(`${this.config.apiURI}/admin/transact`, {
method: "POST",
headers: authorizedHeaders(this.config, this.impersonationOpts),
body: JSON.stringify({ steps: steps }),
body: JSON.stringify({
steps: steps,
"throw-on-missing-attrs?": !!this.config.schema,
}),
});
};

Expand Down Expand Up @@ -923,4 +928,6 @@ export {
type ValueTypes,
type InstantSchemaDef,
type InstantUnknownSchema,
type InstaQLEntity,
type InstaQLResult,
};
2 changes: 1 addition & 1 deletion client/packages/admin/src/version.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Autogenerated by publish_packages.clj
const version = "v0.15.2-dev";
const version = "v0.15.7-dev";

export default version;
Loading
Loading