Skip to content

Commit

Permalink
Adapt Runtime startup log expectation
Browse files Browse the repository at this point in the history
  • Loading branch information
ennru committed Dec 7, 2023
1 parent a642f01 commit 1b6b60c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions bin/create-local-dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#!/usr/bin/env bash
## This script sets the dependencies for the `samples` so you can
## modify in local the SDK and test it on a sample.
## It can also include your local kalix-proxy if PROXY_SNAPSHOT_DIRECTORY is set
## It can also include your local kalix-runtime if PROXY_SNAPSHOT_DIRECTORY is set

if [[ "${PROXY_SNAPSHOT_DIRECTORY}" ]]; then
echo "PROXY_SNAPSHOT_DIRECTORY is set to [${PROXY_SNAPSHOT_DIRECTORY}]"
echo "using your local kalix-proxy project to generate the SDK"
echo "using your local kalix-runtime project to generate the SDK"
else
echo "PROXY_SNAPSHOT_DIRECTORY is not set"
echo "when set you can use your local kalix-proxy project to generate the SDK"
echo "when set you can use your local kalix-runtime project to generate the SDK"
cd sdk && framework_version=$(node --print 'require("./config.json").frameworkVersion') && cd ..
echo "you are downloading kalix-proxy [${framework_version}] to generate the SDK"
echo "you are downloading kalix-runtime [${framework_version}] to generate the SDK"
fi

export KALIXJSSDK=${PWD}
Expand Down
2 changes: 1 addition & 1 deletion codegen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ components may break as a result of changes made to codegen. Therefore, the inte
are provided as a tool to understand in advance what may break.

To be able to truly validate generated code, each language has a full integration test to generate and test the result in a dockerised environment.
These tests spin up a generated entity alongside the Kalix proxy in a Docker network, and then validate against the published service. These tests can take several minutes to run due to the overhead of installing dependencies in a containerised environment, so will only be run when necessary.
These tests spin up a generated entity alongside the Kalix Runtime in a Docker network, and then validate against the published service. These tests can take several minutes to run due to the overhead of installing dependencies in a containerised environment, so will only be run when necessary.

These tests are invoked with the `it:test` SBT task, either on the root project or within one of the subprojects that implements an integration test.
2 changes: 1 addition & 1 deletion docs/src/modules/javascript/pages/value-entity.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ include::example$valueentity-counter/proto/counter_api.proto[]

The following code creates the Value Entity with the link:{attachmentsdir}/api/classes/ValueEntity.html[`ValueEntity`{tab-icon}, window="new"] class. It passes in:

* The protobuf files, `counter_api.proto` and `counter_domain.proto`, define the service and the domain protocol. Kalix uses the service protobuf file to load and read the service. It uses the definitions in `counter_domain.proto` to serialize state it receives from the https://docs.kalix.io/reference/glossary.html#proxy[proxy].
* The protobuf files, `counter_api.proto` and `counter_domain.proto`, define the service and the domain protocol. Kalix uses the service protobuf file to load and read the service. It uses the definitions in `counter_domain.proto` to serialize state it receives from the https://docs.kalix.io/reference/glossary.html#runtime[Runtime].

* The fully qualified name of the service the Value Entity implements, `com.example.CounterService`. The `entityType` is used to namespace the state in the journal.

Expand Down
6 changes: 3 additions & 3 deletions testkit/src/integration-testkit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export class IntegrationTestkit {
const boundPort = await this.kalix.start({ port: 0 });

await TestContainers.exposeHostPorts(boundPort);
console.log('Starting Kalix Proxy');
console.log('Starting Kalix Runtime');
const proxyContainer = await new GenericContainer(this.options.dockerImage!)
.withExposedPorts(9000)
.withEnv('USER_FUNCTION_HOST', 'host.testcontainers.internal')
Expand All @@ -175,7 +175,7 @@ export class IntegrationTestkit {
'VERSION_CHECK_ON_STARTUP',
process.env.VERSION_CHECK_ON_STARTUP || 'true',
)
.withWaitStrategy(Wait.forLogMessage('Starting Kalix Proxy'))
.withWaitStrategy(Wait.forLogMessage('Kalix Runtime started'))
.start();
this.proxyPort = proxyContainer.getMappedPort(9000);
// sdk needs to know how to call itself for cross component calls,
Expand All @@ -185,7 +185,7 @@ export class IntegrationTestkit {
this.proxyContainer = proxyContainer;

// wait for discovery to complete
console.log('Proxy started, waiting for discovery to complete');
console.log('Kalix Runtime started, waiting for discovery to complete');
while (!this.kalix.discoveryCompleted) {
await new Promise((resolve) => setTimeout(resolve, 300));
}
Expand Down

0 comments on commit 1b6b60c

Please sign in to comment.