Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-06-19 11:44:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

cli: remove ctx parameter from rollbackOnError to prevent wrong use

Browse source
This commit is contained in:
Thomas Tendyck 2023-03-19 16:05:01 +01:00 • committed by Thomas Tendyck
parent 4d618a4b99
commit 43fbb06426
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cli/internal/cloudcmd/create.go
View file

@ -130,7 +130,7 @@ func (c *Creator) createAWS(ctx context.Context, cl terraformClient, config *con
return clusterid.File{}, err return clusterid.File{}, err
} }
defer rollbackOnError(context.Background(), c.out, &retErr, &rollbackerTerraform{client: cl}) defer rollbackOnError(c.out, &retErr, &rollbackerTerraform{client: cl})
tfOutput, err := cl.CreateCluster(ctx) tfOutput, err := cl.CreateCluster(ctx)
if err != nil { if err != nil {
return clusterid.File{}, err return clusterid.File{}, err
@ -168,7 +168,7 @@ func (c *Creator) createGCP(ctx context.Context, cl terraformClient, config *con
return clusterid.File{}, err return clusterid.File{}, err
} }
defer rollbackOnError(context.Background(), c.out, &retErr, &rollbackerTerraform{client: cl}) defer rollbackOnError(c.out, &retErr, &rollbackerTerraform{client: cl})
tfOutput, err := cl.CreateCluster(ctx) tfOutput, err := cl.CreateCluster(ctx)
if err != nil { if err != nil {
return clusterid.File{}, err return clusterid.File{}, err
@ -209,7 +209,7 @@ func (c *Creator) createAzure(ctx context.Context, cl terraformClient, config *c
return clusterid.File{}, err return clusterid.File{}, err
} }
defer rollbackOnError(context.Background(), c.out, &retErr, &rollbackerTerraform{client: cl}) defer rollbackOnError(c.out, &retErr, &rollbackerTerraform{client: cl})
tfOutput, err := cl.CreateCluster(ctx) tfOutput, err := cl.CreateCluster(ctx)
if err != nil { if err != nil {
return clusterid.File{}, err return clusterid.File{}, err
@ -288,7 +288,7 @@ func (c *Creator) createOpenStack(ctx context.Context, cl terraformClient, confi
return clusterid.File{}, err return clusterid.File{}, err
} }
defer rollbackOnError(context.Background(), c.out, &retErr, &rollbackerTerraform{client: cl}) defer rollbackOnError(c.out, &retErr, &rollbackerTerraform{client: cl})
tfOutput, err := cl.CreateCluster(ctx) tfOutput, err := cl.CreateCluster(ctx)
if err != nil { if err != nil {
return clusterid.File{}, err return clusterid.File{}, err
@ -306,7 +306,7 @@ func (c *Creator) createQEMU(ctx context.Context, cl terraformClient, lv libvirt
controlPlaneCount, workerCount int, source string, controlPlaneCount, workerCount int, source string,
) (idFile clusterid.File, retErr error) { ) (idFile clusterid.File, retErr error) {
qemuRollbacker := &rollbackerQEMU{client: cl, libvirt: lv, createdWorkspace: false} qemuRollbacker := &rollbackerQEMU{client: cl, libvirt: lv, createdWorkspace: false}
defer rollbackOnError(context.Background(), c.out, &retErr, qemuRollbacker) defer rollbackOnError(c.out, &retErr, qemuRollbacker)
// TODO: render progress bar // TODO: render progress bar
downloader := c.newRawDownloader() downloader := c.newRawDownloader()

6
cli/internal/cloudcmd/iam.go
View file

@ -152,7 +152,7 @@ func (c *IAMCreator) Create(ctx context.Context, provider cloudprovider.Provider
// createGCP creates the IAM configuration on GCP. // createGCP creates the IAM configuration on GCP.
func (c *IAMCreator) createGCP(ctx context.Context, cl terraformClient, iamConfig *IAMConfig) (retFile iamid.File, retErr error) { func (c *IAMCreator) createGCP(ctx context.Context, cl terraformClient, iamConfig *IAMConfig) (retFile iamid.File, retErr error) {
defer rollbackOnError(context.Background(), c.out, &retErr, &rollbackerTerraform{client: cl}) defer rollbackOnError(c.out, &retErr, &rollbackerTerraform{client: cl})
vars := terraform.GCPIAMVariables{ vars := terraform.GCPIAMVariables{
ServiceAccountID: iamConfig.GCP.ServiceAccountID, ServiceAccountID: iamConfig.GCP.ServiceAccountID,
@ -180,7 +180,7 @@ func (c *IAMCreator) createGCP(ctx context.Context, cl terraformClient, iamConfi
// createAzure creates the IAM configuration on Azure. // createAzure creates the IAM configuration on Azure.
func (c *IAMCreator) createAzure(ctx context.Context, cl terraformClient, iamConfig *IAMConfig) (retFile iamid.File, retErr error) { func (c *IAMCreator) createAzure(ctx context.Context, cl terraformClient, iamConfig *IAMConfig) (retFile iamid.File, retErr error) {
defer rollbackOnError(context.Background(), c.out, &retErr, &rollbackerTerraform{client: cl}) defer rollbackOnError(c.out, &retErr, &rollbackerTerraform{client: cl})
vars := terraform.AzureIAMVariables{ vars := terraform.AzureIAMVariables{
Region: iamConfig.Azure.Region, Region: iamConfig.Azure.Region,
@ -211,7 +211,7 @@ func (c *IAMCreator) createAzure(ctx context.Context, cl terraformClient, iamCon
// createAWS creates the IAM configuration on AWS. // createAWS creates the IAM configuration on AWS.
func (c *IAMCreator) createAWS(ctx context.Context, cl terraformClient, iamConfig *IAMConfig) (retFile iamid.File, retErr error) { func (c *IAMCreator) createAWS(ctx context.Context, cl terraformClient, iamConfig *IAMConfig) (retFile iamid.File, retErr error) {
defer rollbackOnError(context.Background(), c.out, &retErr, &rollbackerTerraform{client: cl}) defer rollbackOnError(c.out, &retErr, &rollbackerTerraform{client: cl})
vars := terraform.AWSIAMVariables{ vars := terraform.AWSIAMVariables{
Region: iamConfig.AWS.Region, Region: iamConfig.AWS.Region,

4
cli/internal/cloudcmd/rollback.go
View file

@ -20,13 +20,13 @@ type rollbacker interface {
// rollbackOnError calls rollback on the rollbacker if the handed error is not nil, // rollbackOnError calls rollback on the rollbacker if the handed error is not nil,
// and writes logs to the writer w. // and writes logs to the writer w.
func rollbackOnError(ctx context.Context, w io.Writer, onErr *error, roll rollbacker) { func rollbackOnError(w io.Writer, onErr *error, roll rollbacker) {
if *onErr == nil { if *onErr == nil {
return return
} }
fmt.Fprintf(w, "An error occurred: %s\n", *onErr) fmt.Fprintf(w, "An error occurred: %s\n", *onErr)
fmt.Fprintln(w, "Attempting to roll back.") fmt.Fprintln(w, "Attempting to roll back.")
if err := roll.rollback(ctx); err != nil { if err := roll.rollback(context.Background()); err != nil {
*onErr = errors.Join(*onErr, fmt.Errorf("on rollback: %w", err)) // TODO: print the error, or return it? *onErr = errors.Join(*onErr, fmt.Errorf("on rollback: %w", err)) // TODO: print the error, or return it?
return return
} }