Block pushing templates with legacy parameters

mtojek · mtojek · commit 0ed1bad2aadb · 2023-05-25T14:09:34.000+02:00
diff --git a/provisioner/terraform/parse.go b/provisioner/terraform/parse.go
@@ -75,6 +75,8 @@ func (s *server) Parse(request *proto.Parse_Request, stream proto.DRPCProvisione
 			}
 			templateVariables = append(templateVariables, mv)
 		}
+	} else if len(variables) > 0 {
+		return xerrors.Errorf("legacy parameters are not supported anymore, use %q flag to enable managed Terraform variables", featureUseManagedVariables)
 	}
 	return stream.Send(&proto.Parse_Response{
 		Type: &proto.Parse_Response_Complete{
diff --git a/provisioner/terraform/parse_test.go b/provisioner/terraform/parse_test.go
@@ -31,11 +31,21 @@ func TestParse(t *testing.T) {
 			Files: map[string]string{
 				"main.tf": `variable "A" {
 				description = "Testing!"
-			}`,
+			}
+
+			provider "coder" { feature_use_managed_variables = "true" }`,
 			},
 			Response: &proto.Parse_Response{
 				Type: &proto.Parse_Response_Complete{
-					Complete: &proto.Parse_Complete{},
+					Complete: &proto.Parse_Complete{
+						TemplateVariables: []*proto.TemplateVariable{
+							{
+								Name:        "A",
+								Description: "Testing!",
+								Required:    true,
+							},
+						},
+					},
 				},
 			},
 		},
@@ -44,11 +54,20 @@ func TestParse(t *testing.T) {
 			Files: map[string]string{
 				"main.tf": `variable "A" {
 				default = "wow"
-			}`,
+			}
+
+			provider "coder" { feature_use_managed_variables = "true" }`,
 			},
 			Response: &proto.Parse_Response{
 				Type: &proto.Parse_Response_Complete{
-					Complete: &proto.Parse_Complete{},
+					Complete: &proto.Parse_Complete{
+						TemplateVariables: []*proto.TemplateVariable{
+							{
+								Name:         "A",
+								DefaultValue: "wow",
+							},
+						},
+					},
 				},
 			},
 		},
@@ -59,11 +78,20 @@ func TestParse(t *testing.T) {
 				validation {
 					condition = var.A == "value"
 				}
-			}`,
+			}
+
+			provider "coder" { feature_use_managed_variables = "true" }`,
 			},
 			Response: &proto.Parse_Response{
 				Type: &proto.Parse_Response_Complete{
-					Complete: &proto.Parse_Complete{},
+					Complete: &proto.Parse_Complete{
+						TemplateVariables: []*proto.TemplateVariable{
+							{
+								Name:     "A",
+								Required: true,
+							},
+						},
+					},
 				},
 			},
 		},
@@ -78,13 +106,34 @@ func TestParse(t *testing.T) {
 			Name: "multiple-variables",
 			Files: map[string]string{
 				"main1.tf": `variable "foo" { }
-				variable "bar" { }`,
+				variable "bar" { }
+
+				provider "coder" { feature_use_managed_variables = "true" }`,
 				"main2.tf": `variable "baz" { }
 				variable "quux" { }`,
 			},
 			Response: &proto.Parse_Response{
 				Type: &proto.Parse_Response_Complete{
-					Complete: &proto.Parse_Complete{},
+					Complete: &proto.Parse_Complete{
+						TemplateVariables: []*proto.TemplateVariable{
+							{
+								Name:     "foo",
+								Required: true,
+							},
+							{
+								Name:     "bar",
+								Required: true,
+							},
+							{
+								Name:     "baz",
+								Required: true,
+							},
+							{
+								Name:     "quux",
+								Required: true,
+							},
+						},
+					},
 				},
 			},
 		},

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,8 @@ func (s server) Parse(request proto.Parse_Request, stream proto.DRPCProvisione`
`75`	`75`	`}`
`76`	`76`	`templateVariables = append(templateVariables, mv)`
`77`	`77`	`}`
	`78`	`+ } else if len(variables) > 0 {`
	`79`	`+ return xerrors.Errorf("legacy parameters are not supported anymore, use %q flag to enable managed Terraform variables", featureUseManagedVariables)`
`78`	`80`	`}`
`79`	`81`	`return stream.Send(&proto.Parse_Response{`
`80`	`82`	`Type: &proto.Parse_Response_Complete{`