Merge 85c6e23 into 3b7d78c

pulumi · Sep 14, 2021 · ef0d228 · ef0d228
2 parents 3b7d78c + 85c6e23
commit ef0d228
Show file tree

Hide file tree

Showing 33 changed files with 245 additions and 191 deletions.
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
@@ -8,5 +8,8 @@
 
 ### Bug Fixes
 
+- [codegen/schema] - Correct validation for Package
+  [#7896](https://github.com/pulumi/pulumi/pull/7896)
+
 - [cli] Use json.Unmarshal instead of custom parser
   [#7954](https://github.com/pulumi/pulumi/pull/7954)
diff --git a/pkg/cmd/pulumi/schema_check.go b/pkg/cmd/pulumi/schema_check.go
@@ -22,6 +22,7 @@ import (
 	"path/filepath"
 
 	"github.com/hashicorp/hcl/v2"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
 
@@ -71,6 +72,9 @@ func newSchemaCheckCommand() *cobra.Command {
 			diagWriter := hcl.NewDiagnosticTextWriter(os.Stderr, nil, 0, true)
 			wrErr := diagWriter.WriteDiagnostics(diags)
 			contract.IgnoreError(wrErr)
+			if err == nil && len(diags) != 0 {
+				return errors.New("schema validation failed")
+			}
 			return err
 		}),
 	}

diff --git a/pkg/codegen/docs/gen_test.go b/pkg/codegen/docs/gen_test.go
@@ -60,6 +60,7 @@ func initTestPackageSpec(t *testing.T) {
 	}
 	testPackageSpec = schema.PackageSpec{
 		Name:        providerPackage,
+		Version:     "0.0.1",
 		Description: "A fake provider package used for testing.",
 		Meta: &schema.MetadataSpec{
 			ModuleFormat: "(.*)(?:/[^/]*)",

diff --git a/pkg/codegen/dotnet/doc_test.go b/pkg/codegen/dotnet/doc_test.go
@@ -25,6 +25,7 @@ import (
 
 var testPackageSpec = schema.PackageSpec{
 	Name:        "aws",
+	Version:     "0.0.1",
 	Description: "A fake provider package used for testing.",
 	Meta: &schema.MetadataSpec{
 		ModuleFormat: "(.*)(?:/[^/]*)",

diff --git a/pkg/codegen/go/doc_test.go b/pkg/codegen/go/doc_test.go
@@ -28,6 +28,7 @@ import (
 
 var testPackageSpec = schema.PackageSpec{
 	Name:        "aws",
+	Version:     "0.0.1",
 	Description: "A fake provider package used for testing.",
 	Meta: &schema.MetadataSpec{
 		ModuleFormat: "(.*)(?:/[^/]*)",

diff --git a/pkg/codegen/internal/test/testdata/output-funcs/funcWithAllOptionalInputs.json b/pkg/codegen/internal/test/testdata/output-funcs/funcWithAllOptionalInputs.json
@@ -1,4 +1,6 @@
 {
+  "name": "py_tests",
+  "version": "0.0.1",
   "functions": {
     "madeup-package:codegentest:funcWithAllOptionalInputs": {
       "description": "Check codegen of functions with all optional inputs.",
@@ -22,9 +24,7 @@
           }
         },
         "type": "object",
-        "required": [
-          "r"
-        ]
+        "required": ["r"]
       }
     }
   }

diff --git a/pkg/codegen/internal/test/testdata/output-funcs/funcWithConstInput.json b/pkg/codegen/internal/test/testdata/output-funcs/funcWithConstInput.json
@@ -1,16 +1,18 @@
 {
-    "functions": {
-        "madeup-package:codegentest:funcWithConstInput": {
-            "description": "Codegen demo with const inputs",
-            "inputs": {
-                "type": "object",
-                "properties": {
-                    "plainInput": {
-                        "type": "string",
-                        "const": "fixed"
-                    }
-                }
-            }
+  "name": "py_tests",
+  "version": "0.0.1",
+  "functions": {
+    "madeup-package:codegentest:funcWithConstInput": {
+      "description": "Codegen demo with const inputs",
+      "inputs": {
+        "type": "object",
+        "properties": {
+          "plainInput": {
+            "type": "string",
+            "const": "fixed"
+          }
         }
+      }
     }
+  }
 }
diff --git a/pkg/codegen/internal/test/testdata/output-funcs/funcWithDefaultValue.json b/pkg/codegen/internal/test/testdata/output-funcs/funcWithDefaultValue.json
@@ -1,12 +1,12 @@
 {
+  "name": "py_tests",
+  "version": "0.0.1",
   "functions": {
     "madeup-package:codegentest:funcWithDefaultValue": {
       "description": "Check codegen of functions with default values.",
       "inputs": {
         "type": "object",
-        "required": [
-          "a"
-        ],
+        "required": ["a"],
         "properties": {
           "a": {
             "type": "string"
@@ -24,9 +24,7 @@
           }
         },
         "type": "object",
-        "required": [
-          "r"
-        ]
+        "required": ["r"]
       }
     }
   }

diff --git a/pkg/codegen/internal/test/testdata/output-funcs/funcWithDictParam.json b/pkg/codegen/internal/test/testdata/output-funcs/funcWithDictParam.json
@@ -1,4 +1,6 @@
 {
+  "name": "py_tests",
+  "version": "0.0.1",
   "functions": {
     "madeup-package:codegentest:funcWithDictParam": {
       "description": "Check codegen of functions with a Dict<str,str> parameter.",
@@ -23,9 +25,7 @@
           }
         },
         "type": "object",
-        "required": [
-          "r"
-        ]
+        "required": ["r"]
       }
     }
   }

diff --git a/pkg/codegen/internal/test/testdata/output-funcs/funcWithListParam.json b/pkg/codegen/internal/test/testdata/output-funcs/funcWithListParam.json
@@ -1,15 +1,17 @@
 {
+  "name": "py_tests",
+  "version": "0.0.1",
   "functions": {
     "madeup-package:codegentest:funcWithListParam": {
       "description": "Check codegen of functions with a List parameter.",
       "inputs": {
         "type": "object",
         "properties": {
           "a": {
-              "type": "array",
-              "items": {
-                  "type": "string"
-              }
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           },
           "b": {
             "type": "string"
@@ -23,9 +25,7 @@
           }
         },
         "type": "object",
-        "required": [
-          "r"
-        ]
+        "required": ["r"]
       }
     }
   }

diff --git a/pkg/codegen/internal/test/testdata/output-funcs/getClientConfig.json b/pkg/codegen/internal/test/testdata/output-funcs/getClientConfig.json
@@ -1,4 +1,6 @@
 {
+  "name": "py_tests",
+  "version": "0.0.1",
   "functions": {
     "azure-native:codegentest:getClientConfig": {
       "description": "Use this function to access the current configuration of the native Azure provider.",

diff --git a/pkg/codegen/internal/test/testdata/output-funcs/getIntegrationRuntimeObjectMetadatum.json b/pkg/codegen/internal/test/testdata/output-funcs/getIntegrationRuntimeObjectMetadatum.json
@@ -1,4 +1,6 @@
 {
+  "name": "py_tests",
+  "version": "0.0.1",
   "functions": {
     "azure-native:codegentest:getIntegrationRuntimeObjectMetadatum": {
       "description": "A list of SSIS object metadata.\nAPI Version: 2018-06-01.",
@@ -108,9 +110,7 @@
         }
       },
       "type": "object",
-      "required": [
-        "type"
-      ]
+      "required": ["type"]
     },
     "azure-native:codegentest:SsisFolderResponse": {
       "description": "Ssis folder.",
@@ -134,9 +134,7 @@
         }
       },
       "type": "object",
-      "required": [
-        "type"
-      ]
+      "required": ["type"]
     },
     "azure-native:codegentest:SsisPackageResponse": {
       "description": "Ssis Package.",
@@ -180,9 +178,7 @@
         }
       },
       "type": "object",
-      "required": [
-        "type"
-      ]
+      "required": ["type"]
     },
     "azure-native:codegentest:SsisProjectResponse": {
       "description": "Ssis project.",
@@ -230,9 +226,7 @@
         }
       },
       "type": "object",
-      "required": [
-        "type"
-      ]
+      "required": ["type"]
     },
     "azure-native:codegentest:SsisEnvironmentReferenceResponse": {
       "description": "Ssis environment reference.",

diff --git a/pkg/codegen/internal/test/testdata/output-funcs/listStorageAccountKeys.json b/pkg/codegen/internal/test/testdata/output-funcs/listStorageAccountKeys.json
@@ -1,4 +1,6 @@
 {
+  "name": "py_tests",
+  "version": "0.0.1",
   "functions": {
     "azure-native:codegentest:listStorageAccountKeys": {
       "description": "The response from the ListKeys operation.\nAPI Version: 2021-02-01.",

diff --git a/pkg/codegen/internal/test/testdata/plain-schema-gh6957/docs/_index.md b/pkg/codegen/internal/test/testdata/plain-schema-gh6957/docs/_index.md
@@ -24,5 +24,7 @@ menu:
 	<dd><a href=""></a></dd>
 	<dt>License</dt>
 	<dd></dd>
+	<dt>Version</dt>
+	<dd>0.0.1</dd>
 </dl>
 
diff --git a/pkg/codegen/internal/test/testdata/plain-schema-gh6957/schema.json b/pkg/codegen/internal/test/testdata/plain-schema-gh6957/schema.json
@@ -1,5 +1,6 @@
 {
     "name": "xyz",
+    "version": "0.0.1",
     "types": {
         "example:index:Foo": {
           "properties": {

diff --git a/pkg/codegen/internal/test/testdata/schema/bad-enum-1.json b/pkg/codegen/internal/test/testdata/schema/bad-enum-1.json
@@ -1,4 +1,6 @@
 {
+  "name": "bad-enum-1",
+  "version": "0.0.1",
   "types": {
     "fake-provider:module1:BadEnum": {
       "type": "string",

diff --git a/pkg/codegen/internal/test/testdata/schema/bad-enum-2.json b/pkg/codegen/internal/test/testdata/schema/bad-enum-2.json
@@ -1,4 +1,6 @@
 {
+  "name": "bad-enum-2",
+  "version": "0.0.1",
   "types": {
     "fake-provider:module1:BadEnum": {
       "type": "string",

diff --git a/pkg/codegen/internal/test/testdata/schema/bad-enum-3.json b/pkg/codegen/internal/test/testdata/schema/bad-enum-3.json
@@ -1,4 +1,6 @@
 {
+  "name": "bad-enum-3",
+  "version": "0.0.1",
   "types": {
     "fake-provider:module1:BadEnum": {
       "type": "integer",

diff --git a/pkg/codegen/internal/test/testdata/schema/bad-enum-4.json b/pkg/codegen/internal/test/testdata/schema/bad-enum-4.json
@@ -1,4 +1,6 @@
 {
+  "name": "bad-enum-4",
+  "version": "0.0.1",
   "types": {
     "fake-provider:module1:BadEnum": {
       "type": "boolean",

diff --git a/pkg/codegen/internal/test/testdata/schema/bad-methods-1.json b/pkg/codegen/internal/test/testdata/schema/bad-methods-1.json
@@ -1,9 +1,11 @@
 {
-    "resources": {
-        "xyz:index:Foo": {
-            "methods": {
-                "bar": "xyz:index:Foo/bar"
-            }
-        }
+  "name": "bad-methods-1",
+  "version": "0.0.1",
+  "resources": {
+    "xyz:index:Foo": {
+      "methods": {
+        "bar": "xyz:index:Foo/bar"
+      }
     }
+  }
 }
diff --git a/pkg/codegen/internal/test/testdata/schema/bad-methods-2.json b/pkg/codegen/internal/test/testdata/schema/bad-methods-2.json
@@ -1,28 +1,30 @@
 {
-    "resources": {
-        "xyz:index:Foo": {
-            "methods": {
-                "bar": "xyz:index:Foo/bar",
-                "baz": "xyz:index:Foo/bar"
-            }
+  "name": "bad-methods-2",
+  "version": "0.0.1",
+  "resources": {
+    "xyz:index:Foo": {
+      "methods": {
+        "bar": "xyz:index:Foo/bar",
+        "baz": "xyz:index:Foo/bar"
+      }
+    }
+  },
+  "functions": {
+    "xyz:index:Foo/bar": {
+      "inputs": {
+        "properties": {
+          "__self__": {
+            "$ref": "#/resources/xyz:index:Foo"
+          }
         }
-    },
-    "functions": {
-        "xyz:index:Foo/bar": {
-            "inputs": {
-                "properties": {
-                    "__self__": {
-                        "$ref": "#/resources/xyz:index:Foo"
-                    }
-                }
-            },
-            "outputs": {
-                "properties": {
-                    "someValue": {
-                        "type": "string"
-                    }
-                }
-            }
+      },
+      "outputs": {
+        "properties": {
+          "someValue": {
+            "type": "string"
+          }
         }
+      }
     }
+  }
 }