aboutsummaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorMorten Tokle <mortent@yahooinc.com>2023-04-28 11:09:10 +0200
committerMorten Tokle <mortent@yahooinc.com>2023-04-28 11:09:10 +0200
commit80bbdbafd88add026685a863929ec4a13a9c3fc1 (patch)
tree264154abdd1e1732979a8230a10f12b205240755 /node-admin
parent5396a7c1aad6c471f16be1e555dd752009053858 (diff)
Add application and version dimensions
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
index 3ab1fdf211b..d5b48bc2609 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
@@ -363,8 +363,13 @@ public class AthenzCredentialsMaintainer implements CredentialsMaintainer {
Get the document version to ask for
*/
private int documentVersion(NodeAgentContext context) {
+ var version = context.node().currentVespaVersion()
+ .orElse(context.node().wantedVespaVersion().orElse(Version.emptyVersion));
+ var appId = context.node().owner().orElse(ApplicationId.defaultId());
return useNewIdentityDocumentLayout
.with(FetchVector.Dimension.HOSTNAME, context.hostname().value())
+ .with(FetchVector.Dimension.VESPA_VERSION, version.toFullString())
+ .with(FetchVector.Dimension.APPLICATION_ID, appId.serializedForm())
.value()
? SignedIdentityDocument.DEFAULT_DOCUMENT_VERSION
: SignedIdentityDocument.LEGACY_DEFAULT_DOCUMENT_VERSION;