Merge pull request #3975 from stevekuznetsov/skuznets/cleanup-job

HOSTEDCP-1402: cmd/infra/aws/destroy: allow using component credentials
openshift · Jun 12, 2024 · 1f16f14 · 1f16f14
2 parents eea912a + 2ef1ac1
commit 1f16f14
Show file tree

Hide file tree

Showing 7 changed files with 1,234 additions and 89 deletions.
diff --git a/Makefile b/Makefile
@@ -138,14 +138,18 @@ api-docs: $(GENAPIDOCS)
 	hack/gen-api-docs.sh $(GENAPIDOCS) $(DIR)
 
 .PHONY: clients
-clients:
+clients: delegating_client
 	GO=GO111MODULE=on GOFLAGS=-mod=readonly hack/update-codegen.sh
 
-
 .PHONY: release
 release:
 	go run ./hack/tools/release/notes.go --from=${FROM} --to=${TO} --token=${TOKEN}
 
+.PHONY: delegating_client
+delegating_client:
+	go run ./cmd/infra/aws/delegatingclientgenerator/main.go > ./cmd/infra/aws/delegating_client.txt
+	mv ./cmd/infra/aws/delegating_client.{txt,go}
+
 .PHONY: app-sre-saas-template
 app-sre-saas-template: hypershift
 	bin/hypershift install \

diff --git a/cmd/cluster/aws/destroy.go b/cmd/cluster/aws/destroy.go
@@ -75,7 +75,7 @@ func destroyPlatformSpecifics(ctx context.Context, o *core.DestroyOptions) error
 	destroyInfraOpts := awsinfra.DestroyInfraOptions{
 		Region:                region,
 		InfraID:               infraID,
-		AWSCredentialsOpts:    o.AWSPlatform.AWSCredentialsOpts,
+		AWSCredentialsOpts:    &awsinfra.DelegatedAWSCredentialOptions{AWSCredentialsOpts: &o.AWSPlatform.AWSCredentialsOpts},
 		Name:                  o.Name,
 		BaseDomain:            baseDomain,
 		BaseDomainPrefix:      baseDomainPrefix,

diff --git a/cmd/infra/aws/delegating_client.go b/cmd/infra/aws/delegating_client.go