Merge pull request openshift#7671 from patrickdillon/ocpbugs-22772-tfstate

openshift-merge-bot[bot] · web-flow · commit e7b2f51096cd · 2023-11-07T00:33:49.000Z
OCPBUGS-22772: return Terraform statefile on error
diff --git a/pkg/terraform/terraform.go b/pkg/terraform/terraform.go
@@ -280,12 +280,12 @@ func applyTerraform(tmpDir string, platform string, stage Stage, terraformDir st
 	}
 
 	if applyErr != nil {
-		return nil, nil, fmt.Errorf("error applying Terraform configs: %w", applyErr)
+		return nil, stateFile, fmt.Errorf("error applying Terraform configs: %w", applyErr)
 	}
 
 	outputs, err := Outputs(tmpDir, terraformDir)
 	if err != nil {
-		return nil, nil, errors.Wrapf(err, "could not get outputs from stage %q", stage.Name())
+		return nil, stateFile, errors.Wrapf(err, "could not get outputs from stage %q", stage.Name())
 	}
 
 	outputsFile = &asset.File{

Original file line number	Diff line number	Diff line change
`@@ -280,12 +280,12 @@ func applyTerraform(tmpDir string, platform string, stage Stage, terraformDir st`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`if applyErr != nil {`
`283`		`- return nil, nil, fmt.Errorf("error applying Terraform configs: %w", applyErr)`
	`283`	`+ return nil, stateFile, fmt.Errorf("error applying Terraform configs: %w", applyErr)`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`outputs, err := Outputs(tmpDir, terraformDir)`
`287`	`287`	`if err != nil {`
`288`		`- return nil, nil, errors.Wrapf(err, "could not get outputs from stage %q", stage.Name())`
	`288`	`+ return nil, stateFile, errors.Wrapf(err, "could not get outputs from stage %q", stage.Name())`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`outputsFile = &asset.File{`