Skip to content

Commit 72f723e

Browse files
committed
Cleanup
1 parent fd47d05 commit 72f723e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

provisioner/terraform/provision.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ func (s *server) Provision(stream proto.DRPCProvisioner_ProvisionStream) error {
6565
switch {
6666
case rc == nil:
6767
case rc.GetForce():
68+
// Likely not needed, but this ensures
69+
// cancel happens before kill.
70+
cancel()
6871
kill()
6972
return
7073
default:
@@ -78,20 +81,17 @@ func (s *server) Provision(stream proto.DRPCProvisioner_ProvisionStream) error {
7881
logr := streamLogger{stream: stream}
7982
start := request.GetStart()
8083

81-
if err != nil {
82-
return xerrors.Errorf("create new terraform executor: %w", err)
83-
}
8484
e := s.executor(start.Directory)
85-
if err := e.checkMinVersion(stream.Context()); err != nil {
85+
if err = e.checkMinVersion(stream.Context()); err != nil {
8686
return err
8787
}
88-
if err := logTerraformEnvVars(logr); err != nil {
88+
if err = logTerraformEnvVars(logr); err != nil {
8989
return err
9090
}
9191

9292
statefilePath := filepath.Join(start.Directory, "terraform.tfstate")
9393
if len(start.State) > 0 {
94-
err := os.WriteFile(statefilePath, start.State, 0600)
94+
err = os.WriteFile(statefilePath, start.State, 0o600)
9595
if err != nil {
9696
return xerrors.Errorf("write statefile %q: %w", statefilePath, err)
9797
}

0 commit comments

Comments
 (0)