Validate Name, Version and Enviroment

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)

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
 		}),
 	}

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: "(.*)(?:/[^/]*)",

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: "(.*)(?:/[^/]*)",

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: "(.*)(?:/[^/]*)",

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.",

pkg/codegen/internal/test/testdata/output-funcs/funcWithConstInput.json

@@ -1,4 +1,6 @@
 {
+  "name": "py_tests",
+  "version": "0.0.1",
     "functions": {
         "madeup-package:codegentest:funcWithConstInput": {
             "description": "Codegen demo with const inputs",

pkg/codegen/internal/test/testdata/output-funcs/funcWithDefaultValue.json

@@ -1,4 +1,6 @@
 {
+  "name": "py_tests",
+  "version": "0.0.1",
   "functions": {
     "madeup-package:codegentest:funcWithDefaultValue": {
       "description": "Check codegen of functions with default values.",

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.",

pkg/codegen/internal/test/testdata/output-funcs/funcWithListParam.json

@@ -1,4 +1,6 @@
 {
+  "name": "py_tests",
+  "version": "0.0.1",
   "functions": {
     "madeup-package:codegentest:funcWithListParam": {
       "description": "Check codegen of functions with a List parameter.",

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.",

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.",

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.",

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>
 

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": {

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",

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",

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",

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",

pkg/codegen/internal/test/testdata/schema/bad-methods-1.json

@@ -1,4 +1,6 @@
 {
+    "name": "bad-methods-1",
+    "version": "0.0.1",
     "resources": {
         "xyz:index:Foo": {
             "methods": {

pkg/codegen/internal/test/testdata/schema/bad-methods-2.json

@@ -1,4 +1,6 @@
 {
+    "name": "bad-methods-2",
+    "version": "0.0.1",
     "resources": {
         "xyz:index:Foo": {
             "methods": {

pkg/codegen/internal/test/testdata/schema/bad-methods-3.json

@@ -1,4 +1,6 @@
 {
+    "name": "bad-methods-3",
+    "version": "0.0.1",
     "resources": {
         "xyz:index:Foo": {
             "methods": {

pkg/codegen/internal/test/testdata/schema/bad-methods-4.json

@@ -1,4 +1,6 @@
 {
+    "name": "bad-methods-4",
+    "version": "0.0.1",
     "resources": {
         "xyz:index:Foo": {
             "methods": {

pkg/codegen/internal/test/testdata/schema/bad-methods-5.json

@@ -1,4 +1,6 @@
 {
+    "name": "bad-methods-5",
+    "version": "0.0.1",
     "resources": {
         "xyz:index:Foo": {
             "methods": {

pkg/codegen/internal/test/testdata/schema/bad-methods-6.json

@@ -1,4 +1,6 @@
 {
+    "name": "bad-methods-6",
+    "version": "0.0.1",
     "resources": {
         "xyz:index:Foo": {
             "methods": {

pkg/codegen/internal/test/testdata/schema/good-enum-1.json

@@ -1,4 +1,6 @@
 {
+  "name": "good-enum-1",
+  "version": "0.0.1",
   "types": {
     "fake-provider:module1:Color": {
       "type": "string",

pkg/codegen/internal/test/testdata/schema/good-enum-2.json

@@ -1,4 +1,6 @@
 {
+  "name": "good-enum-2",
+  "version": "0.0.1",
   "types": {
     "fake-provider:module1:Number": {
       "type": "integer",

pkg/codegen/internal/test/testdata/schema/good-enum-3.json

@@ -1,4 +1,6 @@
 {
+  "name": "good-enum-3",
+  "version": "0.0.1",
   "types": {
     "fake-provider:module1:Boolean": {
       "type": "boolean",

pkg/codegen/internal/test/testdata/schema/good-enum-4.json

@@ -1,4 +1,6 @@
 {
+  "name": "good-enum-4",
+  "version": "0.0.1",
   "types": {
     "fake-provider:module1:Number2": {
       "type": "number",

pkg/codegen/internal/test/testdata/schema/good-methods-1.json

@@ -1,4 +1,6 @@
 {
+    "name": "good-methods-1",
+    "version": "0.0.1",
     "resources": {
         "xyz:index:Foo": {
             "methods": {

pkg/codegen/nodejs/doc_test.go

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

pkg/codegen/python/gen_resource_mappings_test.go

@@ -18,6 +18,7 @@ func TestGenResourceMappingsIsDeterministic(t *testing.T) {
 	minimalSchema := `
         {
             "name": "aws",
+			"version": "0.0.1",
             "meta": {
                 "moduleFormat": "(.*)(?:/[^/]*)"
             },

pkg/codegen/schema/schema.go

@@ -1520,6 +1520,11 @@ func errorf(path, message string, args ...interface{}) *hcl.Diagnostic {
 func bindSpec(spec PackageSpec, languages map[string]Language, loader Loader) (*Package, hcl.Diagnostics, error) {
 	var diags hcl.Diagnostics
 
+	// Validate that there is a name
+	if spec.Name == "" {
+		diags = diags.Append(errorf("#/name", "no name provided"))
+	}
+
 	// Parse the version, if any.
 	var version *semver.Version
 	if spec.Version != "" {
@@ -1990,6 +1995,9 @@ func (t *types) bindType(path string, spec TypeSpec, inputShape bool) (result Ty
 		var discriminator string
 		var mapping map[string]string
 		if spec.Discriminator != nil {
+			if spec.Discriminator.PropertyName == "" {
+				diags = diags.Append(errorf(path, "discriminator must provide a property name"))
+			}
 			discriminator = spec.Discriminator.PropertyName
 			mapping = spec.Discriminator.Mapping
 		}
@@ -2135,6 +2143,9 @@ func bindDefaultValue(path string, value interface{}, spec *DefaultSpec, typ Typ
 		for name, raw := range spec.Language {
 			language[name] = json.RawMessage(raw)
 		}
+		if len(spec.Environment) == 0 {
+			diags = diags.Append(errorf(path, "Default must specify an environment"))
+		}
 
 		dv.Environment, dv.Language = spec.Environment, language
 	}