Skip to content

Commit

Permalink
Merge pull request #103 from akka/main
Browse files Browse the repository at this point in the history
docs: publish changes
  • Loading branch information
ennru authored Dec 17, 2024
2 parents 9fe7c12 + 2ec5f11 commit 604ad30
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 87 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion akka-javasdk-maven/akka-javasdk-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<!-- These are dependent on runtime environment and cannot be customized by users -->
<maven.compiler.release>21</maven.compiler.release>
<kalix-runtime.version>1.2.2</kalix-runtime.version>
<kalix-runtime.version>1.2.5</kalix-runtime.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skip.docker>false</skip.docker>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ public SpiSettings getSettings() {
proxyPort,
settings.aclEnabled,
false,
settings.serviceName,
settings.serviceName + "-IT-" + System.currentTimeMillis(),
eventingSettings,
mockedEventingSettings,
true);
Expand Down
8 changes: 5 additions & 3 deletions akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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) =>
Expand Down Expand Up @@ -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) =
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions docs/src/modules/reference/pages/release-notes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions docs/supplemental_ui/js/vendor/js.cookie.min.js

This file was deleted.

78 changes: 1 addition & 77 deletions docs/supplemental_ui/partials/footer-scripts-supplemental.hbs
Original file line number Diff line number Diff line change
@@ -1,77 +1 @@
<script src="{{uiRootPath}}/js/vendor/js.cookie.min.js" ></script>
<script type="text/plain" class="optanon-category-3">
(function(apiKey){
(function(p,e,n,d,o){var v,w,x,y,z;o=p[d]=p[d]||{};o._q=o._q||[];
v=['initialize','identify','updateOptions','pageLoad','track'];for(w=0,x=v.length;w<x;++w)(function(m){
o[m]=o[m]||function(){o._q[m===v[0]?'unshift':'push']([m].concat([].slice.call(arguments,0)));};})(v[w]);
y=e.createElement(n);y.async=!0;y.src='https://content.pa.lightbend.com/agent/static/'+apiKey+'/pendo.js';
z=e.getElementsByTagName(n)[0];z.parentNode.insertBefore(y,z);})(window,document,'script','pendo');
const getEnv = () => {
const { hostname } = window.location;
switch (hostname) {
case "localhost":
return "localhost";
case "doc.akka.io":
return "prod";
default:
if (hostname.includes("akka.work")) {
return "workbench";
}
return "unknown";
}
};
// NOTE: doc https://support.pendo.io/hc/en-us/articles/360037760572-Tracking-Anonymous-Visitors-Across-Subdomains
const getCookieDomain = () => {
const { hostname } = window.location;
switch (hostname) {
case "localhost":
return "localhost";
case "doc.akka.io":
return ".akka.io";
default:
if (hostname.includes("akka.work")) {
return ".akka.work";
}
return "unknown";
}
};
const saveCookie = (userId) => {
Cookies.set('_track_pv', userId.replace("users/", ""), { domain: getCookieDomain(), expires: 35 });
};
// read userId from cookie
const userId = Cookies.get('_track_pv');
if (userId && userId !== "undefined") {
pendo.initialize({
visitor: {
id: userId.startsWith("_PENDO_T_") ? userId : "users/" + userId,
environment: getEnv()
},
cookieDomain: getCookieDomain()
});
// save cookie to update cookie expiration date
saveCookie(userId);
} else {
pendo.initialize({
visitor: {
environment: getEnv()
},
cookieDomain: getCookieDomain()
});
// save visitorId to cookie
setTimeout(() => {
const visitorId = pendo.visitorId
if (visitorId) {
saveCookie(visitorId);
}
}, 1000);
}
})('244586c2-5138-4af9-6ec1-a39cdd9d974d');
</script>
{{!-- add supplemental scripts as needed --}}
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 604ad30

Please sign in to comment.