Fix terraform provisioner

kylecarbs · kylecarbs · commit ace6248a07da · 2022-01-29T15:44:57.000Z
diff --git a/provisioner/terraform/parse.go b/provisioner/terraform/parse.go
@@ -37,7 +37,7 @@ func convertVariableToParameter(variable *tfconfig.Variable) (*proto.ParameterSc
 	schema := &proto.ParameterSchema{
 		Name:                variable.Name,
 		Description:         variable.Description,
-		Sensitive:           variable.Sensitive,
+		RedisplayValue:      variable.Sensitive,
 		ValidationValueType: variable.Type,
 	}
 
@@ -46,7 +46,14 @@ func convertVariableToParameter(variable *tfconfig.Variable) (*proto.ParameterSc
 		if err != nil {
 			return nil, xerrors.Errorf("parse variable %q default: %w", variable.Name, err)
 		}
-		schema.DefaultValue = string(defaultData)
+		schema.DefaultSource = &proto.ParameterSource{
+			Scheme: proto.ParameterSource_DATA,
+			Value:  string(defaultData),
+		}
+		schema.DefaultDestination = &proto.ParameterDestination{
+			Scheme: proto.ParameterDestination_PROVISIONER_VARIABLE,
+			Value:  variable.Name,
+		}
 	}
 
 	if len(variable.Validations) > 0 && variable.Validations[0].Condition != nil {
diff --git a/provisioner/terraform/parse_test.go b/provisioner/terraform/parse_test.go
@@ -63,8 +63,15 @@ func TestParse(t *testing.T) {
 		},
 		Response: &proto.Parse_Response{
 			ParameterSchemas: []*proto.ParameterSchema{{
-				Name:         "A",
-				DefaultValue: "\"wow\"",
+				Name: "A",
+				DefaultSource: &proto.ParameterSource{
+					Scheme: proto.ParameterSource_DATA,
+					Value:  "\"wow\"",
+				},
+				DefaultDestination: &proto.ParameterDestination{
+					Scheme: proto.ParameterDestination_PROVISIONER_VARIABLE,
+					Value:  "A",
+				},
 			}},
 		},
 	}, {
diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go
@@ -37,10 +37,23 @@ func (t *terraform) Provision(ctx context.Context, request *proto.Provision_Requ
 		return nil, xerrors.Errorf("initialize terraform: %w", err)
 	}
 
+	env := map[string]string{}
 	options := make([]tfexec.ApplyOption, 0)
-	for _, params := range request.ParameterValues {
-		options = append(options, tfexec.Var(fmt.Sprintf("%s=%s", params.Name, params.Value)))
+	for _, param := range request.ParameterValues {
+		switch param.DestinationScheme {
+		case proto.ParameterDestination_ENVIRONMENT_VARIABLE:
+			env[param.Name] = param.Value
+		case proto.ParameterDestination_PROVISIONER_VARIABLE:
+			options = append(options, tfexec.Var(fmt.Sprintf("%s=%s", param.Name, param.Value)))
+		default:
+			return nil, xerrors.Errorf("unsupported parameter type %q for %q", param.DestinationScheme, param.Name)
+		}
+	}
+	err = terraform.SetEnv(env)
+	if err != nil {
+		return nil, xerrors.Errorf("apply environment variables: %w", err)
 	}
+
 	err = terraform.Apply(ctx, options...)
 	if err != nil {
 		return nil, xerrors.Errorf("apply terraform: %w", err)
diff --git a/provisioner/terraform/provision_test.go b/provisioner/terraform/provision_test.go
@@ -63,8 +63,9 @@ func TestProvision(t *testing.T) {
 		},
 		Request: &proto.Provision_Request{
 			ParameterValues: []*proto.ParameterValue{{
-				Name:  "A",
-				Value: "example",
+				DestinationScheme: proto.ParameterDestination_PROVISIONER_VARIABLE,
+				Name:              "A",
+				Value:             "example",
 			}},
 		},
 		Response: &proto.Provision_Response{},
