diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e280558..c0694ef5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -919,7 +919,7 @@ jobs: command: | source /opt/circleci/.nvm/nvm.sh nvm install v18 - # Run proxy in background + # Run Kalix Runtime in background sed -i docker-compose.yml -e "s/environment:/environment:\n VERSION_CHECK_ON_STARTUP: \"false\"/" docker-compose up -d # Run the service in background diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md index 8745dbe7..3c80e93e 100644 --- a/.github/ISSUE_TEMPLATE/---bug-report.md +++ b/.github/ISSUE_TEMPLATE/---bug-report.md @@ -1,5 +1,5 @@ --- name: "\U0001F41B Bug report" about: Create a report to help us improve -labels: kalix-proxy, bug +labels: kalix-runtime, bug --- diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md index 084c1b3f..51ed7132 100644 --- a/.github/ISSUE_TEMPLATE/---feature-request.md +++ b/.github/ISSUE_TEMPLATE/---feature-request.md @@ -1,5 +1,5 @@ --- name: "\U0001F389 Feature request" about: Suggest an idea for this project -labels: kalix-proxy +labels: kalix-runtime --- diff --git a/.github/release-issue-template.md b/.github/release-issue-template.md index adb77337..3be2bf7d 100644 --- a/.github/release-issue-template.md +++ b/.github/release-issue-template.md @@ -2,9 +2,9 @@ - [ ] Make sure all important PRs have been merged - [ ] Check that the [latest build](https://app.circleci.com/pipelines/github/lightbend/kalix-javascript-sdk) successfully finished -- [ ] Make sure a version of the proxy that supports the protocol version the SDK expects has been deployed to production +- [ ] Make sure a version of the Kalix Runtime that supports the protocol version the SDK expects has been deployed to production -You can see the proxy version on prod [on grafana](https://lightbendcloud.grafana.net/d/nRHj4uwnk/prod-kalix-operations-dashboard?orgId=1) or using [various other methods](https://github.com/lightbend/kalix/wiki/Versioning-and-how-to-determine-what-version-is-running). +You can see the Runtime version on prod [on grafana](https://lightbendcloud.grafana.net/d/nRHj4uwnk/prod-kalix-operations-dashboard?orgId=1) or using [various other methods](https://github.com/lightbend/kalix/wiki/Versioning-and-how-to-determine-what-version-is-running). ### Cutting the release diff --git a/RELEASING.md b/RELEASING.md index 04b86f83..54a1d163 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -3,7 +3,7 @@ Create a release issue (using the [GitHub CLI](https://cli.github.com/)) ``` -gh issue create --title 'Release Kalix JavaScript SDK' --label kalix-proxy --body-file .github/release-issue-template.md -w +gh issue create --title 'Release Kalix JavaScript SDK' --label kalix-runtime --body-file .github/release-issue-template.md -w ```` and follow the instructions. diff --git a/bin/update-proxy-versions.sh b/bin/update-proxy-versions.sh index 2a571d27..92779aa8 100755 --- a/bin/update-proxy-versions.sh +++ b/bin/update-proxy-versions.sh @@ -1,32 +1,4 @@ #!/usr/bin/env bash +# delegating from the old script name -# USAGE: -# > PROXY_VERSION=1.0.31 ./update-proxy-versions.sh - -# this script is meant to be used after a new Proxy version is out -# to facilitate the update of all the places where we usually depend on the latest version - -# provide the new proxy version you want the project to be updated to -if [[ -z "$PROXY_VERSION" ]]; then - echo "Must provide PROXY_VERSION in environment" 1>&2 - exit 1 -fi - -cd .. - -echo ">>> Updating docker image versions to $PROXY_VERSION" -PROJS=$(find . -type f -name "docker-compose.yml") -for i in ${PROJS[@]} -do - echo "Updating Dockerfile for: $i" - sed -i.bak "s/gcr.io\/kalix-public\/kalix-proxy:\(.*\)/gcr.io\/kalix-public\/kalix-proxy:$PROXY_VERSION/" $i - rm $i.bak -done - -echo ">>> Updating application.conf" -sed -i.bak "s/gcr.io\/kalix-public\/kalix-proxy:\(.*\)\"/gcr.io\/kalix-public\/kalix-proxy:$PROXY_VERSION\"/" ./codegen/js-gen-cli/src/it/resources/application.conf -rm ./codegen/js-gen-cli/src/it/resources/application.conf.bak - -echo ">>> Updating config.json" -sed -i.bak "s/\"frameworkVersion\": \"\(.*\)\"/\"frameworkVersion\": \"$PROXY_VERSION\"/" ./sdk/config.json -rm ./sdk/config.json.bak +$pwd/update-runtime-versions.sh diff --git a/bin/update-runtime-versions.sh b/bin/update-runtime-versions.sh new file mode 100755 index 00000000..2d8f9230 --- /dev/null +++ b/bin/update-runtime-versions.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +# USAGE: +# > RUNTIME_VERSION=1.0.31 ./update-runtime-versions.sh + +# this script is meant to be used after a new Runtime version is out +# to facilitate the update of all the places where we usually depend on the latest version + +# provide the new Runtime version you want the project to be updated to +if [[ -z "${RUNTIME_VERSION}" ]]; then + echo "Must provide RUNTIME_VERSION in environment" 1>&2 + exit 1 +fi + +cd .. + +echo ">>> Updating docker image versions to ${RUNTIME_VERSION}" +PROJS=$(find . -type f -name "docker-compose.yml") +for i in ${PROJS[@]} +do + echo "Updating Dockerfile for: $i" + sed -i.bak "s/gcr.io\/kalix-public\/kalix-runtime:\(.*\)/gcr.io\/kalix-public\/kalix-runtime:${RUNTIME_VERSION}/" $i + rm $i.bak +done + +echo ">>> Updating application.conf" +sed -i.bak "s/gcr.io\/kalix-public\/kalix-runtime:\(.*\)\"/gcr.io\/kalix-public\/kalix-runtime:${RUNTIME_VERSION}\"/" ./codegen/js-gen-cli/src/it/resources/application.conf +rm ./codegen/js-gen-cli/src/it/resources/application.conf.bak + +echo ">>> Updating config.json" +sed -i.bak "s/\"frameworkVersion\": \"\(.*\)\"/\"frameworkVersion\": \"${RUNTIME_VERSION}\"/" ./sdk/config.json +rm ./sdk/config.json.bak diff --git a/codegen/js-gen-cli/src/it/resources/application.conf b/codegen/js-gen-cli/src/it/resources/application.conf index 67a90f25..c40e0bfe 100644 --- a/codegen/js-gen-cli/src/it/resources/application.conf +++ b/codegen/js-gen-cli/src/it/resources/application.conf @@ -4,5 +4,5 @@ kalix-npm-js { } kalix-proxy { - image = "gcr.io/kalix-public/kalix-proxy:1.1.25" + image = "gcr.io/kalix-public/kalix-runtime:1.1.25" } diff --git a/docs/src/modules/javascript/pages/running-locally.adoc b/docs/src/modules/javascript/pages/running-locally.adoc index 9e1f775c..7b0c34f8 100644 --- a/docs/src/modules/javascript/pages/running-locally.adoc +++ b/docs/src/modules/javascript/pages/running-locally.adoc @@ -173,7 +173,7 @@ To update the docker compose file to run multiple proxy instances, add the snipp [source, yaml] ---- kalix-proxy: <1> - image: gcr.io/kalix-public/kalix-proxy:latest + image: gcr.io/kalix-public/kalix-runtime:latest ports: - "900x:900x" <2> JAVA_TOOL_OPTIONS: > diff --git a/npm-js/create-kalix-entity/template/base-common/docker-compose.yml b/npm-js/create-kalix-entity/template/base-common/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/npm-js/create-kalix-entity/template/base-common/docker-compose.yml +++ b/npm-js/create-kalix-entity/template/base-common/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/js/js-customer-registry-quickstart/docker-compose.yml b/samples/js/js-customer-registry-quickstart/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/js/js-customer-registry-quickstart/docker-compose.yml +++ b/samples/js/js-customer-registry-quickstart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/js/js-customer-registry/docker-compose.yml b/samples/js/js-customer-registry/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/js/js-customer-registry/docker-compose.yml +++ b/samples/js/js-customer-registry/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/js/js-doc-snippets/docker-compose.yml b/samples/js/js-doc-snippets/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/js/js-doc-snippets/docker-compose.yml +++ b/samples/js/js-doc-snippets/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/js/js-eventsourced-shopping-cart/docker-compose.yml b/samples/js/js-eventsourced-shopping-cart/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/js/js-eventsourced-shopping-cart/docker-compose.yml +++ b/samples/js/js-eventsourced-shopping-cart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/js/js-replicated-entity-example/docker-compose.yml b/samples/js/js-replicated-entity-example/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/js/js-replicated-entity-example/docker-compose.yml +++ b/samples/js/js-replicated-entity-example/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/js/js-replicated-entity-shopping-cart/docker-compose.yml b/samples/js/js-replicated-entity-shopping-cart/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/js/js-replicated-entity-shopping-cart/docker-compose.yml +++ b/samples/js/js-replicated-entity-shopping-cart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/js/js-shopping-cart-quickstart/docker-compose.yml b/samples/js/js-shopping-cart-quickstart/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/js/js-shopping-cart-quickstart/docker-compose.yml +++ b/samples/js/js-shopping-cart-quickstart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/js/js-valueentity-shopping-cart/docker-compose.yml b/samples/js/js-valueentity-shopping-cart/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/js/js-valueentity-shopping-cart/docker-compose.yml +++ b/samples/js/js-valueentity-shopping-cart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/js/js-views-example/docker-compose.yml b/samples/js/js-views-example/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/js/js-views-example/docker-compose.yml +++ b/samples/js/js-views-example/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/js/valueentity-counter/docker-compose.yml b/samples/js/valueentity-counter/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/js/valueentity-counter/docker-compose.yml +++ b/samples/js/valueentity-counter/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/ts/ts-customer-registry-quickstart/docker-compose.yml b/samples/ts/ts-customer-registry-quickstart/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/ts/ts-customer-registry-quickstart/docker-compose.yml +++ b/samples/ts/ts-customer-registry-quickstart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/ts/ts-customer-registry/docker-compose.yml b/samples/ts/ts-customer-registry/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/ts/ts-customer-registry/docker-compose.yml +++ b/samples/ts/ts-customer-registry/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/ts/ts-eventsourced-shopping-cart/docker-compose.yml b/samples/ts/ts-eventsourced-shopping-cart/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/ts/ts-eventsourced-shopping-cart/docker-compose.yml +++ b/samples/ts/ts-eventsourced-shopping-cart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/ts/ts-replicated-entity-example/docker-compose.yml b/samples/ts/ts-replicated-entity-example/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/ts/ts-replicated-entity-example/docker-compose.yml +++ b/samples/ts/ts-replicated-entity-example/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/ts/ts-replicated-entity-shopping-cart/docker-compose.yml b/samples/ts/ts-replicated-entity-shopping-cart/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/ts/ts-replicated-entity-shopping-cart/docker-compose.yml +++ b/samples/ts/ts-replicated-entity-shopping-cart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/ts/ts-shopping-cart-quickstart/docker-compose.yml b/samples/ts/ts-shopping-cart-quickstart/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/ts/ts-shopping-cart-quickstart/docker-compose.yml +++ b/samples/ts/ts-shopping-cart-quickstart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/ts/ts-valueentity-counter/docker-compose.yml b/samples/ts/ts-valueentity-counter/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/ts/ts-valueentity-counter/docker-compose.yml +++ b/samples/ts/ts-valueentity-counter/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/ts/ts-valueentity-shopping-cart/docker-compose.yml b/samples/ts/ts-valueentity-shopping-cart/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/ts/ts-valueentity-shopping-cart/docker-compose.yml +++ b/samples/ts/ts-valueentity-shopping-cart/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/samples/ts/ts-views-example/docker-compose.yml b/samples/ts/ts-views-example/docker-compose.yml index 77d5c864..60ef3683 100644 --- a/samples/ts/ts-views-example/docker-compose.yml +++ b/samples/ts/ts-views-example/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:1.1.25 + image: gcr.io/kalix-public/kalix-runtime:1.1.25 command: -Dconfig.resource=dev-mode.conf -Dlogback.configurationFile=logback-dev-mode.xml -Dkalix.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/testkit/src/integration-testkit.ts b/testkit/src/integration-testkit.ts index e2841dae..f40620d1 100644 --- a/testkit/src/integration-testkit.ts +++ b/testkit/src/integration-testkit.ts @@ -27,7 +27,7 @@ import { } from '@kalix-io/kalix-javascript-sdk'; import { GenericContainer, TestContainers, Wait } from 'testcontainers'; -const defaultDockerImage = `gcr.io/kalix-public/kalix-proxy:${settings.frameworkVersion.replace( +const defaultDockerImage = `gcr.io/kalix-public/kalix-runtime:${settings.frameworkVersion.replace( '-SNAPSHOT', '', )}`;