Merge pull request #32506 from vespa-engine/revert-32496-revert-32494…

…-revert-32490-lesters/inject-asm-secret-store Revert "Revert "Revert "Inject AsmSecretStore""" MERGEOK
vespa-engine · Oct 2, 2024 · e07a459 · e07a459
2 parents 11a528a + ccc07f1
commit e07a459
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 40 deletions.
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudAsmSecrets.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudAsmSecrets.java
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -315,7 +315,6 @@ private void addSecrets(ApplicationContainerCluster cluster, Element spec, Deplo
                 secretsConfig.addSecret(key, name, vault);
             }
             cluster.addComponent(secretsConfig);
-            cluster.addComponent(new CloudAsmSecrets(deployState.getProperties().ztsUrl()));
         }
     }
 

diff --git a/container-disc/src/main/java/ai/vespa/secret/config/aws/package-info.java b/container-disc/src/main/java/ai/vespa/secret/config/aws/package-info.java
diff --git a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretStore.java b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretStore.java
@@ -1,6 +1,5 @@
 package ai.vespa.secret.aws;
 
-import ai.vespa.secret.config.aws.AsmSecretConfig;
 import ai.vespa.secret.internal.TypedSecretStore;
 import ai.vespa.secret.model.Key;
 import ai.vespa.secret.model.Role;

diff --git a/...esources/configdefinitions/asm-secret.def → ...esources/configdefinitions/asm-secret.def b/...esources/configdefinitions/asm-secret.def → ...esources/configdefinitions/asm-secret.def
@@ -1,5 +1,5 @@
 # Config for AsmSecretStore
 
-package=ai.vespa.secret.config.aws
+package=ai.vespa.secret.aws
 
 ztsUri string
-Original file line number
+Diff line change
@@ Expand Up @@
                     secretsConfig.addSecret(key, name, vault);
                 }
                 cluster.addComponent(secretsConfig);
-                cluster.addComponent(new CloudAsmSecrets(deployState.getProperties().ztsUrl()));
             }
         }
@@ Expand Down @@