From e30f49eb50f11c1b95fc7342f8e1f3fcb7604264 Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Fri, 13 Dec 2024 09:22:02 +0100 Subject: [PATCH 1/4] Revert "add pendo back" --- .../js/vendor/js.cookie.min.js | 2 - .../partials/footer-scripts-supplemental.hbs | 78 +------------------ 2 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 docs/supplemental_ui/js/vendor/js.cookie.min.js diff --git a/docs/supplemental_ui/js/vendor/js.cookie.min.js b/docs/supplemental_ui/js/vendor/js.cookie.min.js deleted file mode 100644 index 90a767223..000000000 --- a/docs/supplemental_ui/js/vendor/js.cookie.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! js-cookie v3.0.1 | MIT */ -!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self,function(){var n=e.Cookies,o=e.Cookies=t();o.noConflict=function(){return e.Cookies=n,o}}())}(this,(function(){"use strict";function e(e){for(var t=1;t - \ No newline at end of file +{{!-- add supplemental scripts as needed --}} \ No newline at end of file From 898ec6f98d8fb7ed8709cf5e88b2e35db9da1613 Mon Sep 17 00:00:00 2001 From: Eduardo Pinto Date: Mon, 16 Dec 2024 10:00:59 +0000 Subject: [PATCH 2/4] chore: allow running service and integration tests (#95) --- .../src/main/java/akka/javasdk/testkit/TestKit.java | 2 +- .../src/main/scala/akka/javasdk/impl/SdkRunner.scala | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/akka-javasdk-testkit/src/main/java/akka/javasdk/testkit/TestKit.java b/akka-javasdk-testkit/src/main/java/akka/javasdk/testkit/TestKit.java index 17072d564..0579f48fb 100644 --- a/akka-javasdk-testkit/src/main/java/akka/javasdk/testkit/TestKit.java +++ b/akka-javasdk-testkit/src/main/java/akka/javasdk/testkit/TestKit.java @@ -461,7 +461,7 @@ public SpiSettings getSettings() { proxyPort, settings.aclEnabled, false, - settings.serviceName, + settings.serviceName + "-IT-" + System.currentTimeMillis(), eventingSettings, mockedEventingSettings, true); diff --git a/akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala b/akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala index 172ef9880..186e05af4 100644 --- a/akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala +++ b/akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala @@ -149,7 +149,8 @@ class SdkRunner private (dependencyProvider: Option[DependencyProvider]) extends startContext.remoteIdentification, startContext.tracerFactory, dependencyProvider, - startedPromise) + startedPromise, + getSettings.devMode.map(_.serviceName)) Future.successful(app.spiEndpoints) } catch { case NonFatal(ex) => @@ -261,7 +262,8 @@ private final class Sdk( remoteIdentification: Option[RemoteIdentification], tracerFactory: String => Tracer, dependencyProviderOverride: Option[DependencyProvider], - startedPromise: Promise[StartupContext]) { + startedPromise: Promise[StartupContext], + serviceNameOverride: Option[String]) { private val logger = LoggerFactory.getLogger(getClass) private val messageCodec = new JsonMessageCodec private val ComponentLocator.LocatedClasses(componentClasses, maybeServiceClass) = @@ -442,7 +444,7 @@ private final class Sdk( case _ => None } - val devModeServiceName = sdkSettings.devModeSettings.map(_.serviceName) + val devModeServiceName = serviceNameOverride.orElse(sdkSettings.devModeSettings.map(_.serviceName)) val discoveryEndpoint = new DiscoveryImpl( classicSystem, From 05d658c5c4bec4b4c80e73177fb578b41fee5338 Mon Sep 17 00:00:00 2001 From: Eduardo Pinto Date: Tue, 17 Dec 2024 12:28:11 +0000 Subject: [PATCH 3/4] bump: runtime version to 1.2.5 (#101) --- akka-javasdk-maven/akka-javasdk-parent/pom.xml | 2 +- project/Dependencies.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-javasdk-maven/akka-javasdk-parent/pom.xml b/akka-javasdk-maven/akka-javasdk-parent/pom.xml index ac8ea2f5f..23c03ec0a 100644 --- a/akka-javasdk-maven/akka-javasdk-parent/pom.xml +++ b/akka-javasdk-maven/akka-javasdk-parent/pom.xml @@ -38,7 +38,7 @@ 21 - 1.2.2 + 1.2.5 UTF-8 false diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9e8ccfb18..9c1e30f3f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ object Dependencies { val ProtocolVersionMinor = 1 val RuntimeImage = "gcr.io/kalix-public/kalix-runtime" // Remember to bump kalix-runtime.version in akka-javasdk-maven/akka-javasdk-parent if bumping this - val RuntimeVersion = sys.props.getOrElse("kalix-runtime.version", "1.2.2") + val RuntimeVersion = sys.props.getOrElse("kalix-runtime.version", "1.2.5") } // NOTE: embedded SDK should have the AkkaVersion aligned, when updating RuntimeVersion, make sure to check // if AkkaVersion and AkkaHttpVersion are aligned From 2ec5f117206d37a2ee8e6affe75660059f17d38c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:52:13 +0100 Subject: [PATCH 4/4] docs: akka CLI docs (#102) --- Makefile | 2 +- .../reference/pages/cli/akka-cli/akka_auth_tokens_create.adoc | 3 ++- docs/src/modules/reference/pages/release-notes.adoc | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a21360a34..93d0c8da7 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ attributes: prepare > "${managed_partials}/attributes.adoc" docs/bin/version.sh | xargs -0 printf ":akka-javasdk-version: %s" \ > "${managed_partials}/attributes.adoc" - echo ":akka-cli-version: 3.0.7" >> "${managed_partials}/attributes.adoc" + echo ":akka-cli-version: 3.0.8" >> "${managed_partials}/attributes.adoc" echo ":akka-cli-min-version: 3.0.4" >> "${managed_partials}/attributes.adoc" # see https://adoptium.net/marketplace/ echo ":java-version: 21" \ diff --git a/docs/src/modules/reference/pages/cli/akka-cli/akka_auth_tokens_create.adoc b/docs/src/modules/reference/pages/cli/akka-cli/akka_auth_tokens_create.adoc index d85ff5870..bf7f58614 100644 --- a/docs/src/modules/reference/pages/cli/akka-cli/akka_auth_tokens_create.adoc +++ b/docs/src/modules/reference/pages/cli/akka-cli/akka_auth_tokens_create.adoc @@ -23,7 +23,8 @@ Token created: 0123456789abcdef0123456789abcdef0123456789abcdef ---- --description string A description of the token. If the token is a refresh token, this will be stored with the token for reference. -h, --help help for create - --scopes stringArray The scopes for the token. Valid scopes are: all, container_registry, execution, organizations, projects, user (default [execution]) + --scopes stringArray The scopes for the token. Valid scopes are: all, container_registry, execution, organizations, projects, user. Only applies to refresh tokens. (default [execution]) + --type string The type of token to create, either access or refresh (default "refresh") ---- == Options inherited from parent commands diff --git a/docs/src/modules/reference/pages/release-notes.adoc b/docs/src/modules/reference/pages/release-notes.adoc index 0bd8bdcd6..2d60cdf59 100644 --- a/docs/src/modules/reference/pages/release-notes.adoc +++ b/docs/src/modules/reference/pages/release-notes.adoc @@ -12,6 +12,9 @@ Current versions == December 2024 +* Akka CLI 3.0.8 + - Updates to configure SSO integrations + * https://github.com/akka/akka-sdk/releases/tag/v3.0.2[Akka SDK 3.0.2] - Integration Tests are now bound to `mvn integration-test` and not a specific profile