Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/env/terraform_env.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func (e *TerraformEnvPrinter) GenerateTerraformArgs(projectPath, modulePath stri
return nil, fmt.Errorf("error generating backend config args for env: %w", err)
}

initArgs := []string{"-backend=true"}
initArgs := []string{"-backend=true", "-force-copy"}
initArgs = append(initArgs, backendConfigArgs...)

planArgs := []string{fmt.Sprintf("-out=%s", tfPlanPath)}
Expand All @@ -172,7 +172,7 @@ func (e *TerraformEnvPrinter) GenerateTerraformArgs(projectPath, modulePath stri

terraformVars := make(map[string]string)
terraformVars["TF_DATA_DIR"] = strings.TrimSpace(tfDataDir)
terraformVars["TF_CLI_ARGS_init"] = strings.TrimSpace(fmt.Sprintf("-backend=true %s", strings.Join(backendConfigArgsForEnv, " ")))
terraformVars["TF_CLI_ARGS_init"] = strings.TrimSpace(fmt.Sprintf("-backend=true -force-copy %s", strings.Join(backendConfigArgsForEnv, " ")))
terraformVars["TF_CLI_ARGS_plan"] = strings.TrimSpace(fmt.Sprintf("-out=\"%s\" %s", tfPlanPath, strings.Join(varFileArgsForEnv, " ")))
terraformVars["TF_CLI_ARGS_apply"] = strings.TrimSpace(fmt.Sprintf("\"%s\"", tfPlanPath))
terraformVars["TF_CLI_ARGS_refresh"] = strings.TrimSpace(strings.Join(varFileArgsForEnv, " "))
Expand Down
6 changes: 3 additions & 3 deletions pkg/env/terraform_env_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func TestTerraformEnv_GetEnvVars(t *testing.T) {

expectedEnvVars := map[string]string{
"TF_DATA_DIR": filepath.ToSlash(filepath.Join(configRoot, ".terraform/project/path")),
"TF_CLI_ARGS_init": fmt.Sprintf(`-backend=true -backend-config="path=%s"`, filepath.ToSlash(filepath.Join(configRoot, ".tfstate/project/path/terraform.tfstate"))),
"TF_CLI_ARGS_init": fmt.Sprintf(`-backend=true -force-copy -backend-config="path=%s"`, filepath.ToSlash(filepath.Join(configRoot, ".tfstate/project/path/terraform.tfstate"))),
"TF_CLI_ARGS_plan": fmt.Sprintf(`-out="%s" -var-file="%s" -var-file="%s"`,
filepath.ToSlash(filepath.Join(configRoot, ".terraform/project/path/terraform.tfplan")),
filepath.ToSlash(filepath.Join(configRoot, "terraform/project/path.tfvars")),
Expand Down Expand Up @@ -310,7 +310,7 @@ func TestTerraformEnv_GetEnvVars(t *testing.T) {
// And environment variables should be set correctly
expectedEnvVars := map[string]string{
"TF_DATA_DIR": filepath.ToSlash(filepath.Join(configRoot, ".terraform/project/path")),
"TF_CLI_ARGS_init": fmt.Sprintf(`-backend=true -backend-config="path=%s"`, filepath.ToSlash(filepath.Join(configRoot, ".tfstate/project/path/terraform.tfstate"))),
"TF_CLI_ARGS_init": fmt.Sprintf(`-backend=true -force-copy -backend-config="path=%s"`, filepath.ToSlash(filepath.Join(configRoot, ".tfstate/project/path/terraform.tfstate"))),
"TF_CLI_ARGS_plan": fmt.Sprintf(`-out="%s" -var-file="%s" -var-file="%s"`,
filepath.ToSlash(filepath.Join(configRoot, ".terraform/project/path/terraform.tfplan")),
filepath.ToSlash(filepath.Join(configRoot, "terraform/project/path.tfvars")),
Expand Down Expand Up @@ -473,7 +473,7 @@ func TestTerraformEnv_Print(t *testing.T) {

expectedEnvVars := map[string]string{
"TF_DATA_DIR": filepath.Join(configRoot, ".terraform/project/path"),
"TF_CLI_ARGS_init": fmt.Sprintf(`-backend=true -backend-config="path=%s"`, filepath.Join(configRoot, ".tfstate/project/path/terraform.tfstate")),
"TF_CLI_ARGS_init": fmt.Sprintf(`-backend=true -force-copy -backend-config="path=%s"`, filepath.Join(configRoot, ".tfstate/project/path/terraform.tfstate")),
"TF_CLI_ARGS_plan": fmt.Sprintf(`-out="%s" -var-file="%s" -var-file="%s"`,
filepath.Join(configRoot, ".terraform/project/path/terraform.tfplan"),
filepath.Join(configRoot, "terraform/project/path.tfvars"),
Expand Down
Loading