File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -65,6 +65,9 @@ func (s *server) Provision(stream proto.DRPCProvisioner_ProvisionStream) error {
65
65
switch {
66
66
case rc == nil :
67
67
case rc .GetForce ():
68
+ // Likely not needed, but this ensures
69
+ // cancel happens before kill.
70
+ cancel ()
68
71
kill ()
69
72
return
70
73
default :
@@ -78,20 +81,17 @@ func (s *server) Provision(stream proto.DRPCProvisioner_ProvisionStream) error {
78
81
logr := streamLogger {stream : stream }
79
82
start := request .GetStart ()
80
83
81
- if err != nil {
82
- return xerrors .Errorf ("create new terraform executor: %w" , err )
83
- }
84
84
e := s .executor (start .Directory )
85
- if err : = e .checkMinVersion (stream .Context ()); err != nil {
85
+ if err = e .checkMinVersion (stream .Context ()); err != nil {
86
86
return err
87
87
}
88
- if err : = logTerraformEnvVars (logr ); err != nil {
88
+ if err = logTerraformEnvVars (logr ); err != nil {
89
89
return err
90
90
}
91
91
92
92
statefilePath := filepath .Join (start .Directory , "terraform.tfstate" )
93
93
if len (start .State ) > 0 {
94
- err : = os .WriteFile (statefilePath , start .State , 0600 )
94
+ err = os .WriteFile (statefilePath , start .State , 0o600 )
95
95
if err != nil {
96
96
return xerrors .Errorf ("write statefile %q: %w" , statefilePath , err )
97
97
}
You can’t perform that action at this time.
0 commit comments