provisioner/terraform tests pass!

ammario · ammario · commit 2931de727607 · 2022-11-11T21:48:58.000Z
diff --git a/provisioner/terraform/executor.go b/provisioner/terraform/executor.go
@@ -77,6 +77,10 @@ func (e executor) execWriteOutput(ctx, killCtx context.Context, args, env []stri
 	// #nosec
 	cmd := exec.CommandContext(killCtx, e.binaryPath, args...)
 	cmd.Dir = e.workdir
+	if env == nil {
+		// We don't want to passthrough host env when unset.
+		env = []string{}
+	}
 	cmd.Env = env
 
 	// We want logs to be written in the correct order, so we wrap all logging
@@ -299,7 +303,7 @@ func (e executor) graph(ctx, killCtx context.Context) (string, error) {
 
 // revive:disable-next-line:flag-parameter
 func (e executor) apply(
-	ctx, killCtx context.Context, plan []byte, logr logSink,
+	ctx, killCtx context.Context, plan []byte, env []string, logr logSink,
 ) (*proto.Provision_Response, error) {
 	planFile, err := ioutil.TempFile("", "coder-terrafrom-plan")
 	if err != nil {
@@ -329,7 +333,7 @@ func (e executor) apply(
 		<-doneErr
 	}()
 
-	err = e.execWriteOutput(ctx, killCtx, args, nil, outWriter, errWriter)
+	err = e.execWriteOutput(ctx, killCtx, args, env, outWriter, errWriter)
 	if err != nil {
 		return nil, xerrors.Errorf("terraform apply: %w", err)
 	}
diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go
@@ -138,13 +138,13 @@ func (s *server) Provision(stream proto.DRPCProvisioner_ProvisionStream) error {
 	}
 	s.logger.Debug(ctx, "ran initialization")
 
+	env, err := provisionEnv(config, request.GetPlan().GetParameterValues())
+	if err != nil {
+		return err
+	}
+
 	var resp *proto.Provision_Response
 	if planRequest != nil {
-		env, err := planEnv(planRequest)
-		if err != nil {
-			return err
-		}
-
 		vars, err := planVars(planRequest)
 		if err != nil {
 			return err
@@ -170,7 +170,7 @@ func (s *server) Provision(stream proto.DRPCProvisioner_ProvisionStream) error {
 	}
 	// Must be apply
 	resp, err = e.apply(
-		ctx, killCtx, applyRequest.Plan, sink,
+		ctx, killCtx, applyRequest.Plan, env, sink,
 	)
 	if err != nil {
 		errorMessage := err.Error()
@@ -204,21 +204,21 @@ func planVars(plan *proto.Provision_Plan) ([]string, error) {
 	return vars, nil
 }
 
-func planEnv(plan *proto.Provision_Plan) ([]string, error) {
+func provisionEnv(config *proto.Provision_Config, params []*proto.ParameterValue) ([]string, error) {
 	env := safeEnviron()
 	env = append(env,
-		"CODER_AGENT_URL="+plan.Config.Metadata.CoderUrl,
-		"CODER_WORKSPACE_TRANSITION="+strings.ToLower(plan.Config.Metadata.WorkspaceTransition.String()),
-		"CODER_WORKSPACE_NAME="+plan.Config.Metadata.WorkspaceName,
-		"CODER_WORKSPACE_OWNER="+plan.Config.Metadata.WorkspaceOwner,
-		"CODER_WORKSPACE_OWNER_EMAIL="+plan.Config.Metadata.WorkspaceOwnerEmail,
-		"CODER_WORKSPACE_ID="+plan.Config.Metadata.WorkspaceId,
-		"CODER_WORKSPACE_OWNER_ID="+plan.Config.Metadata.WorkspaceOwnerId,
+		"CODER_AGENT_URL="+config.Metadata.CoderUrl,
+		"CODER_WORKSPACE_TRANSITION="+strings.ToLower(config.Metadata.WorkspaceTransition.String()),
+		"CODER_WORKSPACE_NAME="+config.Metadata.WorkspaceName,
+		"CODER_WORKSPACE_OWNER="+config.Metadata.WorkspaceOwner,
+		"CODER_WORKSPACE_OWNER_EMAIL="+config.Metadata.WorkspaceOwnerEmail,
+		"CODER_WORKSPACE_ID="+config.Metadata.WorkspaceId,
+		"CODER_WORKSPACE_OWNER_ID="+config.Metadata.WorkspaceOwnerId,
 	)
 	for key, value := range provisionersdk.AgentScriptEnv() {
 		env = append(env, key+"="+value)
 	}
-	for _, param := range plan.ParameterValues {
+	for _, param := range params {
 		switch param.DestinationScheme {
 		case proto.ParameterDestination_ENVIRONMENT_VARIABLE:
 			env = append(env, fmt.Sprintf("%s=%s", param.Name, param.Value))
diff --git a/provisioner/terraform/provision_test.go b/provisioner/terraform/provision_test.go
