Use USER_SERVICE_ instead of USER_FUNCTION_ (#541)

lightbend · Jan 19, 2024 · 58761d4 · 58761d4
1 parent 9614db0
commit 58761d4
Show file tree

Hide file tree

Showing 25 changed files with 45 additions and 45 deletions.
diff --git a/samples/js/js-customer-registry-quickstart/docker-compose.yml b/samples/js/js-customer-registry-quickstart/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/js/js-customer-registry/README.md b/samples/js/js-customer-registry/README.md
@@ -19,7 +19,7 @@ npm start
 Start the Kalix Runtime:
 
 ```shell
-docker run --rm -e USER_FUNCTION_HOST=host.docker.internal -p 9000:9000 gcr.io/kalix-public/kalix-runtime
+docker run --rm -e USER_SERVICE_HOST=host.docker.internal -p 9000:9000 gcr.io/kalix-public/kalix-runtime
 ```
 
 Create a customer:

diff --git a/samples/js/js-customer-registry/docker-compose.yml b/samples/js/js-customer-registry/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/js/js-doc-snippets/docker-compose.yml b/samples/js/js-doc-snippets/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/js/js-eventsourced-shopping-cart/docker-compose.yml b/samples/js/js-eventsourced-shopping-cart/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/js/js-replicated-entity-example/docker-compose.yml b/samples/js/js-replicated-entity-example/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/js/js-replicated-entity-shopping-cart/README.md b/samples/js/js-replicated-entity-shopping-cart/README.md
@@ -48,7 +48,7 @@ docker compose up
 ```
 
 > On Linux this requires Docker 20.10 or later (https://github.com/moby/moby/pull/40007),
-> or for a `USER_FUNCTION_HOST` environment variable to be set manually.
+> or for a `USER_SERVICE_HOST` environment variable to be set manually.
 
 To start the application locally, use the following commands:
 

diff --git a/samples/js/js-replicated-entity-shopping-cart/docker-compose.yml b/samples/js/js-replicated-entity-shopping-cart/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/js/js-shopping-cart-quickstart/docker-compose.yml b/samples/js/js-shopping-cart-quickstart/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/js/js-valueentity-shopping-cart/docker-compose.yml b/samples/js/js-valueentity-shopping-cart/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/js/js-views-example/docker-compose.yml b/samples/js/js-views-example/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/js/valueentity-counter/docker-compose.yml b/samples/js/valueentity-counter/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/ts/ts-customer-registry-quickstart/docker-compose.yml b/samples/ts/ts-customer-registry-quickstart/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/ts/ts-customer-registry/README.md b/samples/ts/ts-customer-registry/README.md
@@ -19,7 +19,7 @@ npm start
 Start the Kalix Runtime:
 
 ```shell
-docker run --rm -e USER_FUNCTION_HOST=host.docker.internal -p 9000:9000 gcr.io/kalix-public/kalix-runtime
+docker run --rm -e USER_SERVICE_HOST=host.docker.internal -p 9000:9000 gcr.io/kalix-public/kalix-runtime
 ```
 
 Create a customer:

diff --git a/samples/ts/ts-customer-registry/docker-compose.yml b/samples/ts/ts-customer-registry/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/ts/ts-eventsourced-shopping-cart/docker-compose.yml b/samples/ts/ts-eventsourced-shopping-cart/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/ts/ts-replicated-entity-example/docker-compose.yml b/samples/ts/ts-replicated-entity-example/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/ts/ts-replicated-entity-shopping-cart/README.md b/samples/ts/ts-replicated-entity-shopping-cart/README.md
@@ -49,7 +49,7 @@ docker compose up
 ```
 
 > On Linux this requires Docker 20.10 or later (https://github.com/moby/moby/pull/40007),
-> or for a `USER_FUNCTION_HOST` environment variable to be set manually.
+> or for a `USER_SERVICE_HOST` environment variable to be set manually.
 
 To start the application locally, use the following commands:
 

diff --git a/samples/ts/ts-replicated-entity-shopping-cart/docker-compose.yml b/samples/ts/ts-replicated-entity-shopping-cart/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/ts/ts-shopping-cart-quickstart/docker-compose.yml b/samples/ts/ts-shopping-cart-quickstart/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/ts/ts-valueentity-counter/README.md b/samples/ts/ts-valueentity-counter/README.md
@@ -46,7 +46,7 @@ npm run integration-test
 
 ## Running Locally
 
-In order to run your application locally, you must run the Kalix Runtime. The included `docker-compose` file contains the configuration required to run the proxy for a locally running application.
+In order to run your application locally, you must run the Kalix Runtime. The included `docker-compose` file contains the configuration required to run the Kalix Runtime for a locally running application.
 It also contains the configuration to start a local Google Pub/Sub emulator that the Kalix Runtime will connect to.
 
 To start the Kalix Runtime, run the following command from this directory:

diff --git a/samples/ts/ts-valueentity-counter/docker-compose.yml b/samples/ts/ts-valueentity-counter/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/ts/ts-valueentity-shopping-cart/docker-compose.yml b/samples/ts/ts-valueentity-shopping-cart/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/samples/ts/ts-views-example/docker-compose.yml b/samples/ts/ts-views-example/docker-compose.yml
@@ -8,8 +8,8 @@ services:
  extra_hosts:
  - "host.docker.internal:host-gateway"
  environment:
- USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
- USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
+ USER_SERVICE_HOST: ${USER_SERVICE_HOST:-host.docker.internal}
+ USER_SERVICE_PORT: ${USER_SERVICE_PORT:-8080}
  PUBSUB_EMULATOR_HOST: gcloud-pubsub-emulator
  # Comment to enable ACL check in dev-mode
  # see https://docs.kalix.io/services/using-acls.html#_local_development_with_acls

diff --git a/sdk/bin/prepare.sh b/sdk/bin/prepare.sh
@@ -24,11 +24,11 @@ else
  if [ -n "$RUNTIME_SNAPSHOT_DIRECTORY" ]; then
  # Use local runtime and sdk sources, useful for development, point RUNTIME_SNAPSHOT_DIRECTORY to the local
  # runtime project source directory
- echo "Using snapshot of proxy and sdk protocols from '$RUNTIME_SNAPSHOT_DIRECTORY'"
+ echo "Using snapshot of Kalix Runtime and SDK protocols from '$RUNTIME_SNAPSHOT_DIRECTORY'"
  cp -rf $RUNTIME_SNAPSHOT_DIRECTORY/protocols/proxy/src/main/protobuf/* ./proto/
  cp -rf $RUNTIME_SNAPSHOT_DIRECTORY/protocols/sdk/src/main/protobuf/* ./proto/
  else
- # Download and unzip the proxy and SDK protocols to the proto directory
+ # Download and unzip the Runtime and SDK protocols to the proto directory
  download_protocol proxy
  download_protocol sdk
  fi