add diag on invalid enum

pulumi · Dec 1, 2022 · 5cb5aba · 5cb5aba
1 parent 7afac76
commit 5cb5aba
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/...0221201--programgen--improve-error-message-for-invalid-enum-values-on-pulumi-convert.yaml b/...0221201--programgen--improve-error-message-for-invalid-enum-values-on-pulumi-convert.yaml
@@ -0,0 +1,4 @@
+changes:
+- type: chore
+  scope: programgen
+  description: Improve error message for invalid enum values on `pulumi convert`.
diff --git a/pkg/codegen/dotnet/gen_program_expressions.go b/pkg/codegen/dotnet/gen_program_expressions.go
@@ -337,7 +337,7 @@ func (g *generator) genIntrensic(w io.Writer, from model.Expression, to model.Ty
 		} else {
 			pcl.GenEnum(to, from, g.genSafeEnum(w, to), func(from model.Expression) {
 				g.Fgenf(w, "%s(%v)", convertFn, from)
-			})
+			}, &g.diagnostics)
 		}
 	default:
 		g.Fgenf(w, "%.v", from) // <- probably wrong w.r.t. precedence

diff --git a/pkg/codegen/go/gen_program_expressions.go b/pkg/codegen/go/gen_program_expressions.go
@@ -207,7 +207,7 @@ func (g *generator) GenFunctionCallExpression(w io.Writer, expr *model.FunctionC
 			}
 			pcl.GenEnum(to, from, g.genSafeEnum(w, to), func(from model.Expression) {
 				g.Fgenf(w, "%s(%v)", enumTag, from)
-			})
+			}, &g.diagnostics)
 			return
 		}
 		switch arg := from.(type) {

diff --git a/pkg/codegen/nodejs/gen_program_expressions.go b/pkg/codegen/nodejs/gen_program_expressions.go
@@ -342,7 +342,7 @@ func (g *generator) GenFunctionCallExpression(w io.Writer, expr *model.FunctionC
 						g.Fgenf(w, "%s.%s", enum, memberTag)
 					}, func(from model.Expression) {
 						g.Fgenf(w, "%s[%.v]", enum, from)
-					})
+					}, &g.diagnostics)
 				}
 			} else {
 				g.Fgenf(w, "%v", from)

diff --git a/pkg/codegen/pcl/binder_schema.go b/pkg/codegen/pcl/binder_schema.go
@@ -549,6 +549,7 @@ func GenEnum(
 	from model.Expression,
 	safeEnum func(member *schema.Enum),
 	unsafeEnum func(from model.Expression),
+	diags *hcl.Diagnostics,
 ) {
 	known := cty.NilVal
 	if from, ok := from.(*model.TemplateExpression); ok && len(from.Parts) == 1 {
@@ -566,7 +567,15 @@ func GenEnum(
 		contract.Assertf(ok,
 			"We have determined %s is a safe enum, which we define as "+
 				"being able to calculate a member for", t)
-		safeEnum(member)
+		if member != nil {
+			safeEnum(member)
+		} else {
+			unsafeEnum(from)
+			*diags = append(*diags, &hcl.Diagnostic{
+				Severity: hcl.DiagError,
+				Summary:  fmt.Sprintf("\"%v\" is an invalid enum value.", known.AsString()),
+			})
+		}
 	} else {
 		unsafeEnum(from)
 	}

diff --git a/pkg/codegen/python/gen_program_expressions.go b/pkg/codegen/python/gen_program_expressions.go
@@ -257,7 +257,7 @@ func (g *generator) GenFunctionCallExpression(w io.Writer, expr *model.FunctionC
 					g.Fgenf(w, "%s.%s.%s", pkg, enumName, tag)
 				}, func(from model.Expression) {
 					g.Fgenf(w, "%s.%s(%.v)", pkg, enumName, from)
-				})
+				}, &g.diagnostics)
 			}
 		default:
 			switch arg := from.(type) {