feat(classic): support aws credential services endpoint

Author: Kirdock

pkg/api/endpoints.go

@@ -46,6 +46,7 @@ const (
 	ApplicationMobile                    = "application-mobile"
 	AppDetectionRule                     = "app-detection-rule"
 	AwsCredentials                       = "aws-credentials"
+	AwsCredentialsServices               = "aws-credentials-services"
 	KubernetesCredentials                = "kubernetes-credentials" // #nosec G101
 	AzureCredentials                     = "azure-credentials"      // #nosec G101
 	RequestAttributes                    = "request-attributes"
@@ -109,6 +110,12 @@ func NewAPIs() APIs {
 			PropertyNameOfGetAllResponse: "dashboards",
 			NonUniqueName:                true,
 		}
+		var awsCredentialsAPI = API{
+			ID:                           AwsCredentials,
+			URLPath:                      "/api/config/v1/aws/credentials",
+			PropertyNameOfGetAllResponse: StandardApiPropertyNameOfGetAllResponse,
+			SkipDownload:                 true,
+		}
 
 		// ApplicationWeb has KeyUserActionsWeb as a child API and so is defined here explicitly
 		var applicationWebAPI = API{
@@ -241,11 +248,20 @@ func NewAPIs() APIs {
 				PropertyNameOfGetAllResponse: StandardApiPropertyNameOfGetAllResponse,
 				DeprecatedBy:                 "builtin:rum.web.app-detection",
 			},
+			awsCredentialsAPI,
 			{
-				ID:                           AwsCredentials,
-				URLPath:                      "/api/config/v1/aws/credentials",
-				PropertyNameOfGetAllResponse: StandardApiPropertyNameOfGetAllResponse,
-				SkipDownload:                 true,
+				ID:                  AwsCredentialsServices,
+				URLPath:             "/api/config/v1/aws/credentials/{SCOPE}/services",
+				Parent:              &awsCredentialsAPI,
+				SingleConfiguration: true,
+				NonDeletable:        true,
+				// References can't be resolved because we don't download the credentials.
+				// Therefore, we are also ignoring this config
+				SkipDownload: true,
+				// Deploy doesn't accept metadata
+				TweakResponseFunc: func(m map[string]any) {
+					delete(m, "metadata")
+				},
 			},
 			// Early adopter API !
 			{

pkg/delete/delete.go

@@ -50,11 +50,7 @@ func Configs(ctx context.Context, clients client.ClientSet, entriesToDelete Dele
 
 	remainingEntriesToDelete, errCount := deleteAutomationConfigs(ctx, deleters, entriesToDelete)
 
-	//  Dashboard share settings cannot be deleted
-	if _, ok := remainingEntriesToDelete[api.DashboardShareSettings]; ok {
-		log.WarnContext(ctx, "Classic config of type %s cannot be deleted. Note, that they can be removed by deleting the associated dashboard.", api.DashboardShareSettings)
-		delete(remainingEntriesToDelete, api.DashboardShareSettings)
-	}
+	removeNonDeletableClassicAPIs(ctx, remainingEntriesToDelete)
 
 	// Delete rest of config types
 	for t, entries := range remainingEntriesToDelete {
@@ -70,6 +66,21 @@ func Configs(ctx context.Context, clients client.ClientSet, entriesToDelete Dele
 	return nil
 }
 
+func removeNonDeletableClassicAPIs(ctx context.Context, remainingEntriesToDelete DeleteEntries) {
+	for _, classicApi := range api.NewAPIs() {
+		if !classicApi.NonDeletable {
+			continue
+		}
+
+		if classicApi.Parent == nil {
+			log.WarnContext(ctx, "Classic config of type %s cannot be deleted.", classicApi.ID)
+		} else {
+			log.WarnContext(ctx, "Classic config of type %s cannot be deleted. Note, that they can be removed by deleting the associated '%s' type.", classicApi.ID, classicApi.Parent.ID)
+		}
+		delete(remainingEntriesToDelete, classicApi.ID)
+	}
+}
+
 func deleteAutomationConfigs(ctx context.Context, deleters Deleters, allEntries DeleteEntries) (DeleteEntries, int) {
 	remainingDeleteEntries := maps.Clone(allEntries)
 	errCount := 0

test/commands/testdata/integration-all-configs/project/aws-credentials-service/config.yaml

@@ -0,0 +1,13 @@
+configs:
+  - id: aws-credentials-services
+    config:
+      name: AWS credentials service config
+      template: settings.json
+    type:
+      api:
+        name: aws-credentials-services #monaco-test:no-replace
+        scope:
+          configId: credentials
+          configType: aws-credentials
+          property: id
+          type: reference

test/commands/testdata/integration-all-configs/project/aws-credentials-service/settings.json

@@ -0,0 +1,40 @@
+{
+    "services": [
+        {
+            "name": "lambda_builtin",
+            "monitoredMetrics": null
+        },
+        {
+            "name": "ebs_builtin",
+            "monitoredMetrics": null
+        },
+        {
+            "name": "ELB_builtin",
+            "monitoredMetrics": null
+        },
+        {
+            "name": "loadbalancer_builtin",
+            "monitoredMetrics": null
+        },
+        {
+            "name": "s3_builtin",
+            "monitoredMetrics": null
+        },
+        {
+            "name": "dynamodb_builtin",
+            "monitoredMetrics": null
+        },
+        {
+            "name": "ec2_builtin",
+            "monitoredMetrics": null
+        },
+        {
+            "name": "asg_builtin",
+            "monitoredMetrics": null
+        },
+        {
+            "name": "rds_builtin",
+            "monitoredMetrics": null
+        }
+    ]
+}