Don't emit missing var errors for const vars

We test that consts behave correctly by omitting them from an example and assigning from the omitted value.
pulumi · Nov 22, 2022 · 3d27c75 · 3d27c75
1 parent 45dddd8
commit 3d27c75
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 11 deletions.
diff --git a/pkg/codegen/hcl2/model/type_const.go b/pkg/codegen/hcl2/model/type_const.go
@@ -98,3 +98,20 @@ func (t *ConstType) unify(other Type) (Type, ConversionKind) {
 }
 
 func (*ConstType) isType() {}
+
+func IsConstType(t Type) bool {
+	switch t := t.(type) {
+	case *ConstType:
+		return true
+	case *UnionType:
+		for _, t := range t.ElementTypes {
+			_, ok := t.(*ConstType)
+			if !ok {
+				return false
+			}
+		}
+		return true
+	default:
+		return false
+	}
+}
diff --git a/pkg/codegen/pcl/binder_resource.go b/pkg/codegen/pcl/binder_resource.go
@@ -382,9 +382,16 @@ func (b *binder) bindResourceBody(node *Resource) hcl.Diagnostics {
 		}
 
 		for _, k := range codegen.SortedKeys(objectType.Properties) {
-			if !model.IsOptionalType(objectType.Properties[k]) && !attrNames.Has(k) {
-				diag(missingRequiredAttribute(k, block.Body.Syntax.MissingItemRange()))
+			typ := objectType.Properties[k]
+			if model.IsOptionalType(typ) || attrNames.Has(k) {
+				// The type is present or optional. No error.
+				continue
+			}
+			if model.IsConstType(objectType.Properties[k]) {
+				// The type is const, so the value is implied. No error.
+				continue
 			}
+			diag(missingRequiredAttribute(k, block.Body.Syntax.MissingItemRange()))
 		}
 	}
 

diff --git a/pkg/codegen/testing/test/program_driver.go b/pkg/codegen/testing/test/program_driver.go
@@ -292,9 +292,6 @@ var PulumiPulumiYAMLProgramTests = []ProgramTest{
 		Directory:   transpiled("kubernetes"),
 		Description: "Kubernetes",
 		Skip:        codegen.NewStringSet("go"),
-		// PCL resource attribute type checking doesn't handle missing `const` attributes.
-		//
-		BindOptions: []pcl.BindOption{pcl.SkipResourceTypechecking},
 	},
 	{
 		Directory:   transpiled("pulumi-variable"),

diff --git a/pkg/codegen/testing/test/testdata/kubernetes-pod-pp/dotnet/kubernetes-pod.cs b/pkg/codegen/testing/test/testdata/kubernetes-pod-pp/dotnet/kubernetes-pod.cs
@@ -7,7 +7,6 @@
     var bar = new Kubernetes.Core.V1.Pod("bar", new()
     {
         ApiVersion = "v1",
-        Kind = "Pod",
         Metadata = new Kubernetes.Types.Inputs.Meta.V1.ObjectMetaArgs
         {
             Namespace = "foo",
@@ -41,5 +40,7 @@
         },
     });
 
+    var kind = bar.Kind;
+
 });
 
diff --git a/pkg/codegen/testing/test/testdata/kubernetes-pod-pp/go/kubernetes-pod.go b/pkg/codegen/testing/test/testdata/kubernetes-pod-pp/go/kubernetes-pod.go
@@ -8,9 +8,8 @@ import (
 
 func main() {
 	pulumi.Run(func(ctx *pulumi.Context) error {
-		_, err := corev1.NewPod(ctx, "bar", &corev1.PodArgs{
+		bar, err := corev1.NewPod(ctx, "bar", &corev1.PodArgs{
 			ApiVersion: pulumi.String("v1"),
-			Kind:       pulumi.String("Pod"),
 			Metadata: &metav1.ObjectMetaArgs{
 				Namespace: pulumi.String("foo"),
 				Name:      pulumi.String("bar"),
@@ -38,6 +37,7 @@ func main() {
 		if err != nil {
 			return err
 		}
+		_ := bar.Kind
 		return nil
 	})
 }
diff --git a/pkg/codegen/testing/test/testdata/kubernetes-pod-pp/kubernetes-pod.pp b/pkg/codegen/testing/test/testdata/kubernetes-pod-pp/kubernetes-pod.pp
@@ -1,6 +1,5 @@
 resource bar "kubernetes:core/v1:Pod" {
     apiVersion = "v1"
-    kind = "Pod"
     metadata = {
         namespace = "foo"
         name = "bar"
@@ -21,3 +20,6 @@
         ]
     }
 }
+
+// Test that we can assign from a constant without type errors
+kind = bar.kind
diff --git a/pkg/codegen/testing/test/testdata/kubernetes-pod-pp/nodejs/kubernetes-pod.ts b/pkg/codegen/testing/test/testdata/kubernetes-pod-pp/nodejs/kubernetes-pod.ts
@@ -3,7 +3,6 @@ import * as kubernetes from "@pulumi/kubernetes";
 
 const bar = new kubernetes.core.v1.Pod("bar", {
     apiVersion: "v1",
-    kind: "Pod",
     metadata: {
         namespace: "foo",
         name: "bar",
@@ -24,3 +23,4 @@ const bar = new kubernetes.core.v1.Pod("bar", {
         }],
     },
 });
+const kind = bar.kind;
diff --git a/pkg/codegen/testing/test/testdata/kubernetes-pod-pp/python/kubernetes-pod.py b/pkg/codegen/testing/test/testdata/kubernetes-pod-pp/python/kubernetes-pod.py
@@ -3,7 +3,6 @@
 
 bar = kubernetes.core.v1.Pod("bar",
     api_version="v1",
-    kind="Pod",
     metadata=kubernetes.meta.v1.ObjectMetaArgs(
         namespace="foo",
         name="bar",
@@ -23,3 +22,4 @@
             ),
         )],
     ))
+kind = bar.kind