From efe3095e6568be7103267d847da8a03651b947a7 Mon Sep 17 00:00:00 2001 From: Kalix Bot Date: Tue, 23 Jan 2024 09:44:50 +0000 Subject: [PATCH 1/2] bump: Kalix Runtime to 1.1.30 --- codegen/js-gen-cli/src/it/resources/application.conf | 2 +- .../create-kalix-entity/template/base-common/docker-compose.yml | 2 +- samples/js/js-customer-registry-quickstart/docker-compose.yml | 2 +- samples/js/js-customer-registry/docker-compose.yml | 2 +- samples/js/js-doc-snippets/docker-compose.yml | 2 +- samples/js/js-eventsourced-shopping-cart/docker-compose.yml | 2 +- samples/js/js-replicated-entity-example/docker-compose.yml | 2 +- .../js/js-replicated-entity-shopping-cart/docker-compose.yml | 2 +- samples/js/js-shopping-cart-quickstart/docker-compose.yml | 2 +- samples/js/js-valueentity-shopping-cart/docker-compose.yml | 2 +- samples/js/js-views-example/docker-compose.yml | 2 +- samples/js/valueentity-counter/docker-compose.yml | 2 +- samples/ts/ts-customer-registry-quickstart/docker-compose.yml | 2 +- samples/ts/ts-customer-registry/docker-compose.yml | 2 +- samples/ts/ts-eventsourced-shopping-cart/docker-compose.yml | 2 +- samples/ts/ts-replicated-entity-example/docker-compose.yml | 2 +- .../ts/ts-replicated-entity-shopping-cart/docker-compose.yml | 2 +- samples/ts/ts-shopping-cart-quickstart/docker-compose.yml | 2 +- samples/ts/ts-valueentity-counter/docker-compose.yml | 2 +- samples/ts/ts-valueentity-shopping-cart/docker-compose.yml | 2 +- samples/ts/ts-views-example/docker-compose.yml | 2 +- sdk/config.json | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/codegen/js-gen-cli/src/it/resources/application.conf b/codegen/js-gen-cli/src/it/resources/application.conf index 18966d21..d4c189b2 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-runtime:1.1.29" + image = "gcr.io/kalix-public/kalix-runtime:1.1.30" } 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 3477e687..aac5c7fb 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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 7806e298..1d24bb53 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-runtime: - image: gcr.io/kalix-public/kalix-runtime:1.1.29 + image: gcr.io/kalix-public/kalix-runtime:1.1.30 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/sdk/config.json b/sdk/config.json index 765f967d..e3d0d910 100644 --- a/sdk/config.json +++ b/sdk/config.json @@ -1,3 +1,3 @@ { - "frameworkVersion": "1.1.29" + "frameworkVersion": "1.1.30" } From eed98d5ab703e95b779d9460f7e4d8c294385ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Thu, 25 Jan 2024 11:51:53 +0100 Subject: [PATCH 2/2] Maybe the timing of the startup log changed? --- testkit/src/integration-testkit.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testkit/src/integration-testkit.ts b/testkit/src/integration-testkit.ts index dde336a4..7eb16d20 100644 --- a/testkit/src/integration-testkit.ts +++ b/testkit/src/integration-testkit.ts @@ -175,7 +175,7 @@ export class IntegrationTestkit { 'VERSION_CHECK_ON_STARTUP', process.env.VERSION_CHECK_ON_STARTUP || 'true', ) - .withWaitStrategy(Wait.forLogMessage('Starting Kalix ')) + .withWaitStrategy(Wait.forLogMessage('Connecting to ')) .start(); this.proxyPort = proxyContainer.getMappedPort(9000); // sdk needs to know how to call itself for cross component calls,