Merge pull request #32463 from vespa-engine/revert-32460-move-secret-…

…impl-to-open-source_pt2_try2 Revert "Move secret impl to open source pt2 try2" MERGEOK
vespa-engine · Sep 24, 2024 · e1a8e2c · e1a8e2c
2 parents 255ff3f + f3263ff
commit e1a8e2c
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 928 deletions.
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudSecrets.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudSecrets.java
@@ -14,8 +14,8 @@
  */
 public class CloudSecrets extends SimpleComponent implements SecretsConfig.Producer {
 
-    private static final String CLASS = "ai.vespa.secret.aws.SecretsImpl";
-    private static final String BUNDLE = "jdisc-cloud-aws";
+    private static final String CLASS = "ai.vespa.secret.cloud.SecretsImpl";
+    private static final String BUNDLE = "cloud-common";
 
     private final List<SecretConfig> secrets = new ArrayList<>();
 

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SecretsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SecretsTest.java
@@ -23,7 +23,7 @@
  */
 public class SecretsTest extends ContainerModelBuilderTestBase {
 
-    private static String IMPL_ID = "ai.vespa.secret.aws.SecretsImpl";
+    private static String IMPL_ID = "ai.vespa.secret.cloud.SecretsImpl";
 
     @Test
     void testCloudSecretsNeedHosted() {

diff --git a/container-disc/src/main/java/ai/vespa/secret/internal/TypedSecretStore.java b/container-disc/src/main/java/ai/vespa/secret/internal/TypedSecretStore.java
diff --git a/container-disc/src/main/java/ai/vespa/secret/internal/package-info.java b/container-disc/src/main/java/ai/vespa/secret/internal/package-info.java
diff --git a/container-disc/src/test/java/ai/vespa/secret/model/KeyTest.java b/container-disc/src/test/java/ai/vespa/secret/model/KeyTest.java
diff --git a/container-disc/src/test/java/ai/vespa/secret/model/SecretNameTest.java b/container-disc/src/test/java/ai/vespa/secret/model/SecretNameTest.java
diff --git a/container-disc/src/test/java/ai/vespa/secret/model/SecretTest.java b/container-disc/src/test/java/ai/vespa/secret/model/SecretTest.java
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
@@ -78,7 +78,6 @@
                  find zkfacade/src/main/java/org/apache/curator -name package-info.java | \
                      xargs perl -pi -e 's/major = [0-9]+, minor = [0-9]+, micro = [0-9]+/major = 5, minor = 3, micro = 0/g'
         -->
-        <aws-sdk2.vespa.version>2.27.4</aws-sdk2.vespa.version>
         <bouncycastle.vespa.version>1.78.1</bouncycastle.vespa.version>
         <byte-buddy.vespa.version>1.14.18</byte-buddy.vespa.version>
         <checker-qual.vespa.version>3.38.0</checker-qual.vespa.version>

diff --git a/jdisc-cloud-aws/CMakeLists.txt b/jdisc-cloud-aws/CMakeLists.txt
@@ -1,3 +1,3 @@
 # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_configserver_component(jdisc-cloud-aws)
+install_jar(jdisc-cloud-aws-jar-with-dependencies.jar)
 install_config_definitions()
diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml
@@ -14,6 +14,7 @@
     <artifactId>jdisc-cloud-aws</artifactId>
     <version>8-SNAPSHOT</version>
     <packaging>container-plugin</packaging>
+    <name>${project.artifactId}</name>
 
     <dependencies>
         <dependency>
@@ -28,12 +29,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>vespa-athenz</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-core</artifactId>
@@ -56,22 +51,6 @@
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-ssm</artifactId>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>secretsmanager</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -92,17 +71,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <!-- Exclude config defs, as they are already installed in the configserver's serverdb  -->
-            <resource>
-                <directory>src/main/resources</directory>
-                <excludes>
-                    <exclude>configdefinitions/*</exclude>
-                </excludes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>