From 5d818861ba73e653307d817d0a898d03f2694b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Fri, 1 Apr 2022 12:39:52 +0200 Subject: [PATCH] Proxy 1.0.0-M2 and new type_url for primitives (#279) --- codegen/build.sbt | 2 +- .../src/it/resources/application.conf | 2 +- .../template/base/docker-compose.yml | 2 +- samples/js/js-doc-snippets/docker-compose.yml | 2 +- .../docker-compose.yml | 2 +- .../docker-compose.yml | 2 +- .../docker-compose.yml | 2 +- .../js/valueentity-counter/docker-compose.yml | 2 +- .../docker-compose.yml | 2 +- .../docker-compose.yml | 2 +- .../ts-valueentity-counter/docker-compose.yml | 2 +- .../docker-compose.yml | 2 +- sdk/config.json | 2 +- sdk/src/protobuf-any.js | 2 +- .../{akkaserverless.test.ts => kalix.test.ts} | 4 ++-- sdk/test/protobuf-any-test.js | 24 +++++++++---------- 16 files changed, 28 insertions(+), 28 deletions(-) rename sdk/test/{akkaserverless.test.ts => kalix.test.ts} (98%) diff --git a/codegen/build.sbt b/codegen/build.sbt index 3b22ad76..59208cd0 100644 --- a/codegen/build.sbt +++ b/codegen/build.sbt @@ -101,7 +101,7 @@ lazy val `kalix-codegen-js-cli` = lazy val library = new { object Version { - val kalix = "0.10.0-M4" + val kalix = "1.0.0-M2" val commonsIo = "2.8.0" val kiama = "2.4.0" val logback = "1.2.3" diff --git a/codegen/js-gen-cli/src/it/resources/application.conf b/codegen/js-gen-cli/src/it/resources/application.conf index 41193888..32287975 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:0.10.0-M4" + image = "gcr.io/kalix-public/kalix-proxy:1.0.0-M2" } diff --git a/npm-js/create-kalix-entity/template/base/docker-compose.yml b/npm-js/create-kalix-entity/template/base/docker-compose.yml index 3fb02e7f..d3dcb4eb 100644 --- a/npm-js/create-kalix-entity/template/base/docker-compose.yml +++ b/npm-js/create-kalix-entity/template/base/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: kalix-proxy: - image: gcr.io/kalix-public/kalix-proxy:0.10.0-M4 + image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.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 d761a236..60a97d90 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:0.10.0-M4 + image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2 command: -Dconfig.resource=dev-mode.conf -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 d761a236..60a97d90 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:0.10.0-M4 + image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2 command: -Dconfig.resource=dev-mode.conf -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 640ab00e..495ad060 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:0.10.0-M4 + image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.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 d761a236..60a97d90 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:0.10.0-M4 + image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2 command: -Dconfig.resource=dev-mode.conf -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 d761a236..60a97d90 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:0.10.0-M4 + image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2 command: -Dconfig.resource=dev-mode.conf -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 640ab00e..495ad060 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:0.10.0-M4 + image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.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 640ab00e..495ad060 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:0.10.0-M4 + image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.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 640ab00e..495ad060 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:0.10.0-M4 + image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.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 640ab00e..495ad060 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:0.10.0-M4 + image: gcr.io/kalix-public/kalix-proxy:1.0.0-M2 command: -Dconfig.resource=dev-mode.conf -Dakkaserverless.proxy.eventing.support=google-pubsub-emulator ports: - "9000:9000" diff --git a/sdk/config.json b/sdk/config.json index 198e1e39..e1f4f281 100644 --- a/sdk/config.json +++ b/sdk/config.json @@ -1,3 +1,3 @@ { - "frameworkVersion": "0.10.0-M4" + "frameworkVersion": "1.0.0-M2" } diff --git a/sdk/src/protobuf-any.js b/sdk/src/protobuf-any.js index 2662ba55..b95ad826 100644 --- a/sdk/src/protobuf-any.js +++ b/sdk/src/protobuf-any.js @@ -26,7 +26,7 @@ const Any = protobufHelper.moduleRoot.google.protobuf.Any; // To allow primitive types to be stored, Kalix defines a number of primitive type URLs, based on protobuf types. // The serialized values are valid protobuf messages that contain a value of that type as their single field at index // 15. -const KalixPrimitive = 'p.kalix.io/'; +const KalixPrimitive = 'type.kalix.io/'; // Chosen because it reduces the likelihood of clashing with something else. const KalixPrimitiveFieldNumber = 1; const KalixPrimitiveFieldNumberEncoded = KalixPrimitiveFieldNumber << 3; // 8 diff --git a/sdk/test/akkaserverless.test.ts b/sdk/test/kalix.test.ts similarity index 98% rename from sdk/test/akkaserverless.test.ts rename to sdk/test/kalix.test.ts index e806da36..7b5e9b7b 100644 --- a/sdk/test/akkaserverless.test.ts +++ b/sdk/test/kalix.test.ts @@ -139,8 +139,8 @@ At package.test.json:2:4: // Assert result.getProto().should.equal(''); result.getComponentsList().length.should.equal(0); - serviceInfo?.getProtocolMajorVersion().should.equal(0); - serviceInfo?.getProtocolMinorVersion().should.equal(10); + serviceInfo?.getProtocolMajorVersion().should.equal(1); + serviceInfo?.getProtocolMinorVersion().should.equal(0); serviceInfo?.getServiceName().should.equal('my-service'); serviceInfo?.getServiceVersion().should.equal('1.2.3'); serviceInfo?.getServiceRuntime().should.contains('node v'); diff --git a/sdk/test/protobuf-any-test.js b/sdk/test/protobuf-any-test.js index ac1f50e3..d2b20720 100644 --- a/sdk/test/protobuf-any-test.js +++ b/sdk/test/protobuf-any-test.js @@ -29,13 +29,13 @@ const PrimitiveLike = root.lookupType('com.example.PrimitiveLike'); describe('AnySupport', () => { it('should support serializing strings', () => { const serialized = AnySupport.serialize('foo', true, false); - serialized.type_url.should.equal('p.kalix.io/string'); + serialized.type_url.should.equal('type.kalix.io/string'); anySupport.deserialize(serialized).should.equal('foo'); }); it('should support serializing empty string (default)', () => { const serialized = AnySupport.serialize('', true, false); - serialized.type_url.should.equal('p.kalix.io/string'); + serialized.type_url.should.equal('type.kalix.io/string'); serialized.value.should.have.lengthOf(0); // empty bytes anySupport.deserialize(serialized).should.equal(''); }); @@ -43,13 +43,13 @@ describe('AnySupport', () => { it('should support serializing long', () => { const value = Long.fromNumber(2789); const serialized = AnySupport.serialize(value, true, false); - serialized.type_url.should.equal('p.kalix.io/int64'); + serialized.type_url.should.equal('type.kalix.io/int64'); anySupport.deserialize(serialized).should.eql(value); }); it('should support serializing zero long (default)', () => { const serialized = AnySupport.serialize(Long.fromNumber(0), true, false); - serialized.type_url.should.equal('p.kalix.io/int64'); + serialized.type_url.should.equal('type.kalix.io/int64'); serialized.value.should.have.lengthOf(0); // empty bytes anySupport.deserialize(serialized).should.eql(Long.ZERO); }); @@ -57,40 +57,40 @@ describe('AnySupport', () => { it('should support serializing bytes', () => { const bytes = Buffer.from('foo'); const serialized = AnySupport.serialize(bytes, true, false); - serialized.type_url.should.equal('p.kalix.io/bytes'); + serialized.type_url.should.equal('type.kalix.io/bytes'); anySupport.deserialize(serialized).should.eql(bytes); }); it('should support serializing empty bytes (default)', () => { const bytes = Buffer.alloc(0); const serialized = AnySupport.serialize(bytes, true, false); - serialized.type_url.should.equal('p.kalix.io/bytes'); + serialized.type_url.should.equal('type.kalix.io/bytes'); serialized.value.should.have.lengthOf(0); // empty bytes anySupport.deserialize(serialized).should.eql(bytes); }); it('should support serializing booleans', () => { const serialized = AnySupport.serialize(true, true, false); - serialized.type_url.should.equal('p.kalix.io/bool'); + serialized.type_url.should.equal('type.kalix.io/bool'); anySupport.deserialize(serialized).should.equal(true); }); it('should support serializing false booleans (default)', () => { const serialized = AnySupport.serialize(false, true, false); - serialized.type_url.should.equal('p.kalix.io/bool'); + serialized.type_url.should.equal('type.kalix.io/bool'); serialized.value.should.have.lengthOf(0); // empty bytes anySupport.deserialize(serialized).should.equal(false); }); it('should support serializing numbers', () => { const serialized = AnySupport.serialize(1.2345, true, false); - serialized.type_url.should.equal('p.kalix.io/double'); + serialized.type_url.should.equal('type.kalix.io/double'); anySupport.deserialize(serialized).should.equal(1.2345); }); it('should support serializing zero numbers (default)', () => { const serialized = AnySupport.serialize(0, true, false); - serialized.type_url.should.equal('p.kalix.io/double'); + serialized.type_url.should.equal('type.kalix.io/double'); serialized.value.should.have.lengthOf(0); // empty bytes anySupport.deserialize(serialized).should.equal(0); }); @@ -126,7 +126,7 @@ describe('AnySupport', () => { it('should support deserializing primitives when the field in not present', () => { anySupport .deserialize({ - type_url: 'p.kalix.io/string', + type_url: 'type.kalix.io/string', value: PrimitiveLike.encode({}).finish(), }) .should.equal(''); @@ -135,7 +135,7 @@ describe('AnySupport', () => { it('should support deserializing primitives when other fields are present', () => { anySupport .deserialize({ - type_url: 'p.kalix.io/string', + type_url: 'type.kalix.io/string', value: PrimitiveLike.encode({ field1: 'one', field2: 'two',