update secrets manager contract tests to be describe secret

Author: yiyuan-he

appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/base/AwsSdkBaseTest.java

@@ -2241,8 +2241,8 @@ protected void doTestBedrockAgentRuntimeKnowledgeBaseId() {
         0.0);
   }
 
-  protected void doTestSecretsManagerCreateSecret() throws Exception {
-    appClient.get("/secretsmanager/createsecret/test-secret-id").aggregate().join();
+  protected void doTestSecretsManagerDescribeSecret() throws Exception {
+    appClient.get("/secretsmanager/describesecret/test-secret-id").aggregate().join();
     var traces = mockCollectorClient.getTraces();
     var metrics =
         mockCollectorClient.getMetrics(
@@ -2251,20 +2251,20 @@ protected void doTestSecretsManagerCreateSecret() throws Exception {
                 AppSignalsConstants.FAULT_METRIC,
                 AppSignalsConstants.LATENCY_METRIC));
     var localService = getApplicationOtelServiceName();
-    var localOperation = "GET /secretsmanager/createsecret/:secretId";
+    var localOperation = "GET /secretsmanager/describesecret/:secretId";
     var type = "AWS::SecretsManager::Secret";
     var identifier = "test-secret-id-[A-Za-z0-9]{6}";
     var cloudformationIdentifier =
         "arn:aws:secretsmanager:us-west-2:000000000000:secret:test-secret-id-[A-Za-z0-9]{6}";
 
     assertSpanClientAttributes(
         traces,
-        secretsManagerSpanName("CreateSecret"),
+        secretsManagerSpanName("DescribeSecret"),
         getSecretsManagerRpcServiceName(),
         localService,
         localOperation,
         getSecretsManagerServiceName(),
-        "CreateSecret",
+        "DescribeSecret",
         type,
         identifier,
         cloudformationIdentifier,
@@ -2282,7 +2282,7 @@ protected void doTestSecretsManagerCreateSecret() throws Exception {
         localService,
         localOperation,
         getSecretsManagerServiceName(),
-        "CreateSecret",
+        "DescribeSecret",
         type,
         identifier,
         cloudformationIdentifier,
@@ -2293,7 +2293,7 @@ protected void doTestSecretsManagerCreateSecret() throws Exception {
         localService,
         localOperation,
         getSecretsManagerServiceName(),
-        "CreateSecret",
+        "DescribeSecret",
         type,
         identifier,
         cloudformationIdentifier,
@@ -2304,7 +2304,7 @@ protected void doTestSecretsManagerCreateSecret() throws Exception {
         localService,
         localOperation,
         getSecretsManagerServiceName(),
-        "CreateSecret",
+        "DescribeSecret",
         type,
         identifier,
         cloudformationIdentifier,

appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/v1/AwsSdkV1Test.java

@@ -257,8 +257,8 @@ void testBedrockAgentRuntimeKnowledgeBaseId() {
   }
 
   @Test
-  void testSecretsManagerCreateSecret() throws Exception {
-    doTestSecretsManagerCreateSecret();
+  void testSecretsManagerDescribeSecret() throws Exception {
+    doTestSecretsManagerDescribeSecret();
   }
 
   @Test

appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/v2/AwsSdkV2Test.java

@@ -262,8 +262,8 @@ void testBedrockAgentRuntimeAgentId() {
   //  }
 
   @Test
-  void testSecretsManagerCreateSecret() throws Exception {
-    doTestSecretsManagerCreateSecret();
+  void testSecretsManagerDescribeSecret() throws Exception {
+    doTestSecretsManagerDescribeSecret();
   }
 
   @Test

appsignals-tests/images/aws-sdk/aws-sdk-v1/src/main/java/com/amazon/sampleapp/App.java

@@ -57,6 +57,9 @@
 import com.amazonaws.services.s3.model.Region;
 import com.amazonaws.services.secretsmanager.AWSSecretsManagerClient;
 import com.amazonaws.services.secretsmanager.model.CreateSecretRequest;
+import com.amazonaws.services.secretsmanager.model.DescribeSecretRequest;
+import com.amazonaws.services.secretsmanager.model.ListSecretsRequest;
+import com.amazonaws.services.secretsmanager.model.SecretListEntry;
 import com.amazonaws.services.sqs.AmazonSQSClient;
 import com.amazonaws.services.sqs.model.CreateQueueRequest;
 import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
@@ -648,13 +651,32 @@ private static void setupSecretsManager() {
             .withCredentials(CREDENTIALS_PROVIDER)
             .withEndpointConfiguration(endpointConfiguration)
             .build();
+    var secretName = "test-secret-id";
+    String existingSecretArn = null;
+    var listRequest = new ListSecretsRequest();
+    var listResponse = secretsManagerClient.listSecrets(listRequest);
+    existingSecretArn = listResponse.getSecretList().stream()
+        .filter(secret -> secret.getName().contains(secretName))
+        .findFirst()
+        .map(SecretListEntry::getARN)
+        .orElse(null);
+
+    if (existingSecretArn == null) {
+      logger.info("Secret already exists, skipping creation");
+    } else {
+      logger.info("Secret not found, creating new one");
+      var createSecretRequest = new CreateSecretRequest().withName(secretName);
+      var createSecretResponse = secretsManagerClient.createSecret(createSecretRequest);
+      existingSecretArn = createSecretResponse.getARN();
+    }
 
+    String finalExistingSecretArn = existingSecretArn;
     get(
-        "/secretsmanager/createsecret/:secretId",
+        "/secretsmanager/describesecret/:secretId",
         (req, res) -> {
           var secretId = req.params(":secretId");
-          var createSecretRequest = new CreateSecretRequest().withName(secretId);
-          secretsManagerClient.createSecret(createSecretRequest);
+          var describeRequest = new DescribeSecretRequest().withSecretId(finalExistingSecretArn);
+          secretsManagerClient.describeSecret(describeRequest);
           return "";
         });
   }

appsignals-tests/images/aws-sdk/aws-sdk-v2/src/main/java/com/amazon/sampleapp/App.java

@@ -70,6 +70,9 @@
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
 import software.amazon.awssdk.services.secretsmanager.model.CreateSecretRequest;
+import software.amazon.awssdk.services.secretsmanager.model.DescribeSecretRequest;
+import software.amazon.awssdk.services.secretsmanager.model.ListSecretsRequest;
+import software.amazon.awssdk.services.secretsmanager.model.SecretListEntry;
 import software.amazon.awssdk.services.sfn.SfnClient;
 import software.amazon.awssdk.services.sfn.model.*;
 import software.amazon.awssdk.services.sqs.SqsClient;
@@ -674,13 +677,31 @@ private static void setupSecretsManager() {
             .endpointOverride(endpoint)
             .credentialsProvider(CREDENTIALS_PROVIDER)
             .build();
+    var secretName = "test-secret-id";
+    String existingSecretArn = null;
+    var listRequest = ListSecretsRequest.builder().build();
+    var listResponse = secretsManagerClient.listSecrets(listRequest);
+    existingSecretArn = listResponse.secretList().stream()
+        .filter(secret -> secret.name().contains(secretName))
+        .findFirst()
+        .map(SecretListEntry::arn)
+        .orElse(null);
+    if (existingSecretArn == null) {
+      logger.info("Secret already exists, skipping creation");
+    } else {
+      logger.info("Secret not found, creating a new one");
+      var createSecretRequest = CreateSecretRequest.builder().name(secretName).build();
+      var createResponse = secretsManagerClient.createSecret(createSecretRequest);
+      existingSecretArn = createResponse.arn();
+    }
 
+    String finalExistingSecretArn = existingSecretArn;
     get(
-        "/secretsmanager/createsecret/:secretId",
+        "/secretsmanager/describesecret/:secretId",
         (req, res) -> {
           var secretId = req.params(":secretId");
-          var createSecretRequest = CreateSecretRequest.builder().name(secretId).build();
-          secretsManagerClient.createSecret(createSecretRequest);
+          var describeRequest = DescribeSecretRequest.builder().secretId(finalExistingSecretArn).build();
+          secretsManagerClient.describeSecret(describeRequest);
           return "";
         });
   }