Infra Providers: add ctx to DestroyBootstrap

Adds a context to the DestroyBootstrap function in the infrastructure
providers interface. The CAPI installer needs this if it restarts
the CAPI control plane for the destroy bootstrap command.

Author: patrickdillon

pkg/destroy/bootstrap/bootstrap.go

@@ -84,7 +84,7 @@ func Destroy(ctx context.Context, dir string) (err error) {
 		return fmt.Errorf("error getting infrastructure provider: %w", err)
 	}
 
-	if err := provider.DestroyBootstrap(dir); err != nil {
+	if err := provider.DestroyBootstrap(ctx, dir); err != nil {
 		return fmt.Errorf("error destroying bootstrap resources %w", err)
 	}
 

pkg/infrastructure/aws/sdk/aws.go

@@ -303,7 +303,7 @@ func (a InfraProvider) Provision(ctx context.Context, dir string, parents asset.
 }
 
 // DestroyBootstrap destroys the temporary bootstrap resources.
-func (a InfraProvider) DestroyBootstrap(dir string) error {
+func (a InfraProvider) DestroyBootstrap(ctx context.Context, dir string) error {
 	// Unmarshall input from tf variables, so we can use it along with
 	// installConfig and other assets as the contractual input regardless of
 	// the implementation.
@@ -341,7 +341,7 @@ func (a InfraProvider) DestroyBootstrap(dir string) error {
 		Fn:   request.MakeAddToUserAgentHandler("OpenShift/4.x Destroyer", version.Raw),
 	})
 
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Minute)
+	ctx, cancel := context.WithTimeout(ctx, 30*time.Minute)
 	defer cancel()
 
 	logger := logrus.StandardLogger()

pkg/infrastructure/baremetal/baremetal.go

@@ -33,7 +33,7 @@ func (a Provider) Provision(ctx context.Context, dir string, parents asset.Paren
 }
 
 // DestroyBootstrap destroys the temporary bootstrap resources.
-func (a Provider) DestroyBootstrap(dir string) error {
+func (a Provider) DestroyBootstrap(ctx context.Context, dir string) error {
 	config, err := getConfig(dir)
 	if err != nil {
 		return fmt.Errorf("failed to get baremetal platform config: %w", err)

pkg/infrastructure/clusterapi/clusterapi.go

@@ -362,7 +362,7 @@ func (i *InfraProvider) Provision(ctx context.Context, dir string, parents asset
 }
 
 // DestroyBootstrap destroys the temporary bootstrap resources.
-func (i *InfraProvider) DestroyBootstrap(dir string) error {
+func (i *InfraProvider) DestroyBootstrap(ctx context.Context, dir string) error {
 	metadata, err := metadata.Load(dir)
 	if err != nil {
 		return err

pkg/infrastructure/provider.go

@@ -18,7 +18,7 @@ type Provider interface {
 	Provision(ctx context.Context, dir string, parents asset.Parents) ([]*asset.File, error)
 
 	// DestroyBootstrap destroys the temporary bootstrap resources.
-	DestroyBootstrap(dir string) error
+	DestroyBootstrap(ctx context.Context, dir string) error
 
 	// ExtractHostAddresses extracts the IPs of the bootstrap and control plane machines.
 	ExtractHostAddresses(dir string, config *types.InstallConfig, ha *HostAddresses) error

pkg/terraform/terraform.go

@@ -81,7 +81,7 @@ func (p *Provider) Provision(_ context.Context, dir string, parents asset.Parent
 // DestroyBootstrap implements pkg/infrastructure/provider.DestroyBootstrap.
 // DestroyBootstrap iterates through each stage, and will run the destroy
 // command when defined on a stage.
-func (p *Provider) DestroyBootstrap(dir string) error {
+func (p *Provider) DestroyBootstrap(ctx context.Context, dir string) error {
 	varFiles := []string{tfVarsFileName, tfPlatformVarsFileName}
 	for _, stage := range p.stages {
 		varFiles = append(varFiles, stage.OutputsFilename())