@@ -53,13 +53,6 @@ func (t *terraform) Provision(stream proto.DRPCProvisioner_ProvisionStream) erro
5353}
5454}()
5555start := request .GetStart ()
56- statefilePath := filepath .Join (start .Directory ,"terraform.tfstate" )
57- if len (start .State )> 0 {
58- err := os .WriteFile (statefilePath ,start .State ,0600 )
59- if err != nil {
60- return xerrors .Errorf ("write statefile %q: %w" ,statefilePath ,err )
61- }
62- }
6356
6457terraform ,err := tfexec .NewTerraform (start .Directory ,t .binaryPath )
6558if err != nil {
@@ -244,14 +237,18 @@ func (t *terraform) Provision(stream proto.DRPCProvisioner_ProvisionStream) erro
244237errorMessage := err .Error ()
245238// Terraform can fail and apply and still need to store it's state.
246239// In this case, we return Complete with an explicit error message.
247- statefileContent ,err := os .ReadFile (statefilePath )
240+ state ,err := terraform .Show (stream .Context ())
241+ if err != nil {
242+ return xerrors .Errorf ("show state: %w" ,err )
243+ }
244+ stateData ,err := json .Marshal (state )
248245if err != nil {
249- return xerrors .Errorf ("read file %q : %w" , statefilePath ,err )
246+ return xerrors .Errorf ("marshal state : %w" ,err )
250247}
251248return stream .Send (& proto.Provision_Response {
252249Type :& proto.Provision_Response_Complete {
253250Complete :& proto.Provision_Complete {
254- State :statefileContent ,
251+ State :stateData ,
255252Error :errorMessage ,
256253},
257254},
@@ -264,7 +261,7 @@ func (t *terraform) Provision(stream proto.DRPCProvisioner_ProvisionStream) erro
264261if start .DryRun {
265262resp ,err = parseTerraformPlan (stream .Context (),terraform ,planfilePath )
266263}else {
267- resp ,err = parseTerraformApply (stream .Context (),terraform , statefilePath )
264+ resp ,err = parseTerraformApply (stream .Context (),terraform )
268265}
269266if err != nil {
270267return err
@@ -358,14 +355,10 @@ func parseTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, planfi
358355},nil
359356}
360357
361- func parseTerraformApply (ctx context.Context ,terraform * tfexec.Terraform , statefilePath string ) (* proto.Provision_Response ,error ) {
362- statefileContent ,err := os . ReadFile ( statefilePath )
358+ func parseTerraformApply (ctx context.Context ,terraform * tfexec.Terraform ) (* proto.Provision_Response ,error ) {
359+ state ,err := terraform . Show ( ctx )
363360if err != nil {
364- return nil ,xerrors .Errorf ("read file %q: %w" ,statefilePath ,err )
365- }
366- state ,err := terraform .ShowStateFile (ctx ,statefilePath )
367- if err != nil {
368- return nil ,xerrors .Errorf ("show state file %q: %w" ,statefilePath ,err )
361+ return nil ,xerrors .Errorf ("show state file: %w" ,err )
369362}
370363resources := make ([]* proto.Resource ,0 )
371364if state .Values != nil {
@@ -498,6 +491,11 @@ func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, state
498491}
499492}
500493
494+ statefileContent ,err := json .Marshal (state )
495+ if err != nil {
496+ return nil ,xerrors .Errorf ("marshal state: %w" ,err )
497+ }
498+
501499return & proto.Provision_Response {
502500Type :& proto.Provision_Response_Complete {
503501Complete :& proto.Provision_Complete {