NotificationsYou must be signed in to change notification settings
Fork928
Star10.1k

Commitd139a16

authored

fix: Allow remote state to be used with Terraform (#1242)

The Terraform Provisioner depended on the statefile contentbeing at a specific path, which disallowed the use of externalstate providers. This fixes it!

1 parentaaf6aee commitd139a16Copy full SHA for d139a16

File tree

2 files changed

+25

-19

lines changed

provisioner/terraform
- provision.go
- provision_test.go

2 files changed

+25

-19

lines changed

`‎provisioner/terraform/provision.go`

Lines changed: 16 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,13 +53,6 @@ func (t *terraform) Provision(stream proto.DRPCProvisioner_ProvisionStream) erro`
`53`	`53`	`}`
`54`	`54`	`}()`
`55`	`55`	`start:=request.GetStart()`
`56`		`-statefilePath:=filepath.Join(start.Directory,"terraform.tfstate")`
`57`		`-iflen(start.State)>0 {`
`58`		`-err:=os.WriteFile(statefilePath,start.State,0600)`
`59`		`-iferr!=nil {`
`60`		`-returnxerrors.Errorf("write statefile %q: %w",statefilePath,err)`
`61`		`-}`
`62`		`-}`
`63`	`56`
`64`	`57`	`terraform,err:=tfexec.NewTerraform(start.Directory,t.binaryPath)`
`65`	`58`	`iferr!=nil {`
`@@ -246,14 +239,18 @@ func (t *terraform) Provision(stream proto.DRPCProvisioner_ProvisionStream) erro`
`246`	`239`	`errorMessage:=err.Error()`
`247`	`240`	`// Terraform can fail and apply and still need to store it's state.`
`248`	`241`	`// In this case, we return Complete with an explicit error message.`
`249`		`-statefileContent,err:=os.ReadFile(statefilePath)`
	`242`	`+state,err:=terraform.Show(stream.Context())`
	`243`	`+iferr!=nil {`
	`244`	`+returnxerrors.Errorf("show state: %w",err)`
	`245`	`+}`
	`246`	`+stateData,err:=json.Marshal(state)`
`250`	`247`	`iferr!=nil {`
`251`		`-returnxerrors.Errorf("read file %q: %w",statefilePath,err)`
	`248`	`+returnxerrors.Errorf("marshal state: %w",err)`
`252`	`249`	`}`
`253`	`250`	`returnstream.Send(&proto.Provision_Response{`
`254`	`251`	`Type:&proto.Provision_Response_Complete{`
`255`	`252`	`Complete:&proto.Provision_Complete{`
`256`		`-State:statefileContent,`
	`253`	`+State:stateData,`
`257`	`254`	`Error:errorMessage,`
`258`	`255`	`},`
`259`	`256`	`},`
`@@ -266,7 +263,7 @@ func (t *terraform) Provision(stream proto.DRPCProvisioner_ProvisionStream) erro`
`266`	`263`	`ifstart.DryRun {`
`267`	`264`	`resp,err=parseTerraformPlan(stream.Context(),terraform,planfilePath)`
`268`	`265`	`}else {`
`269`		`-resp,err=parseTerraformApply(stream.Context(),terraform,statefilePath)`
	`266`	`+resp,err=parseTerraformApply(stream.Context(),terraform)`
`270`	`267`	`}`
`271`	`268`	`iferr!=nil {`
`272`	`269`	`returnerr`
`@@ -366,14 +363,10 @@ func parseTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, planfi`
`366`	`363`	`},nil`
`367`	`364`	`}`
`368`	`365`
`369`		`-funcparseTerraformApply(ctx context.Context,terraformtfexec.Terraform,statefilePathstring) (proto.Provision_Response,error) {`
`370`		`-statefileContent,err:=os.ReadFile(statefilePath)`
	`366`	`+funcparseTerraformApply(ctx context.Context,terraformtfexec.Terraform) (proto.Provision_Response,error) {`
	`367`	`+state,err:=terraform.Show(ctx)`
`371`	`368`	`iferr!=nil {`
`372`		`-returnnil,xerrors.Errorf("read file %q: %w",statefilePath,err)`
`373`		`-}`
`374`		`-state,err:=terraform.ShowStateFile(ctx,statefilePath)`
`375`		`-iferr!=nil {`
`376`		`-returnnil,xerrors.Errorf("show state file %q: %w",statefilePath,err)`
	`369`	`+returnnil,xerrors.Errorf("show state file: %w",err)`
`377`	`370`	`}`
`378`	`371`	`resources:=make([]*proto.Resource,0)`
`379`	`372`	`ifstate.Values!=nil {`
`@@ -508,6 +501,11 @@ func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, state`
`508`	`501`	`}`
`509`	`502`	`}`
`510`	`503`
	`504`	`+statefileContent,err:=json.Marshal(state)`
	`505`	`+iferr!=nil {`
	`506`	`+returnnil,xerrors.Errorf("marshal state: %w",err)`
	`507`	`+}`
	`508`	`+`
`511`	`509`	`return&proto.Provision_Response{`
`512`	`510`	`Type:&proto.Provision_Response_Complete{`
`513`	`511`	`Complete:&proto.Provision_Complete{`

`‎provisioner/terraform/provision_test.go`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,13 @@ provider "coder" {`
`91`	`91`	"main.tf":`variable "A" {
`92`	`92`	}`,
`93`	`93`	`},`
`94`		`-Error:true,`
	`94`	`+Response:&proto.Provision_Response{`
	`95`	`+Type:&proto.Provision_Response_Complete{`
	`96`	`+Complete:&proto.Provision_Complete{`
	`97`	`+Error:"exit status 1",`
	`98`	`+},`
	`99`	`+},`
	`100`	`+},`
`95`	`101`	`}, {`
`96`	`102`	`Name:"single-resource",`
`97`	`103`	`Files:map[string]string{`
`@@ -499,6 +505,8 @@ provider "coder" {`
`499`	`505`	`resourcesWant,err:=json.Marshal(testCase.Response.GetComplete().Resources)`
`500`	`506`	`require.NoError(t,err)`
`501`	`507`
	`508`	`+require.Equal(t,testCase.Response.GetComplete().Error,msg.GetComplete().Error)`
	`509`	`+`
`502`	`510`	`require.Equal(t,string(resourcesWant),string(resourcesGot))`
`503`	`511`	`break`
`504`	`512`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd139a16

File tree

2 files changed

2 files changed

`‎provisioner/terraform/provision.go`

`‎provisioner/terraform/provision_test.go`

0 commit comments