fix(schema): re-generate schema

trinnylondon · Feb 25, 2022 · 58dc56b · 58dc56b
1 parent b8ebac0
commit 58dc56b
Show file tree

Hide file tree

Showing 26 changed files with 180 additions and 42 deletions.
diff --git a/cloudformation/ec2/aws-ec2-instance_privatednsnameoptions.go b/cloudformation/ec2/aws-ec2-instance_privatednsnameoptions.go
@@ -1,7 +1,7 @@
 package ec2
 
 import (
-	"github.com/awslabs/goformation/v5/cloudformation/policies"
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
 )
 
 // Instance_PrivateDnsNameOptions AWS CloudFormation Resource (AWS::EC2::Instance.PrivateDnsNameOptions)

diff --git a/cloudformation/ecr/aws-ecr-pullthroughcacherule.go b/cloudformation/ecr/aws-ecr-pullthroughcacherule.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v5/cloudformation/policies"
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
 )
 
 // PullThroughCacheRule AWS CloudFormation Resource (AWS::ECR::PullThroughCacheRule)

diff --git a/cloudformation/kendra/aws-kendra-datasource_customdocumentenrichmentconfiguration.go b/cloudformation/kendra/aws-kendra-datasource_customdocumentenrichmentconfiguration.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v5/cloudformation/policies"
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
 )
 
 // DataSource_CustomDocumentEnrichmentConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.CustomDocumentEnrichmentConfiguration)

diff --git a/cloudformation/kendra/aws-kendra-datasource_documentattributecondition.go b/cloudformation/kendra/aws-kendra-datasource_documentattributecondition.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v5/cloudformation/policies"
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
 )
 
 // DataSource_DocumentAttributeCondition AWS CloudFormation Resource (AWS::Kendra::DataSource.DocumentAttributeCondition)

diff --git a/cloudformation/kendra/aws-kendra-datasource_documentattributetarget.go b/cloudformation/kendra/aws-kendra-datasource_documentattributetarget.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v5/cloudformation/policies"
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
 )
 
 // DataSource_DocumentAttributeTarget AWS CloudFormation Resource (AWS::Kendra::DataSource.DocumentAttributeTarget)

diff --git a/cloudformation/kendra/aws-kendra-datasource_documentattributevalue.go b/cloudformation/kendra/aws-kendra-datasource_documentattributevalue.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v5/cloudformation/policies"
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
 )
 
 // DataSource_DocumentAttributeValue AWS CloudFormation Resource (AWS::Kendra::DataSource.DocumentAttributeValue)

diff --git a/cloudformation/kendra/aws-kendra-datasource_hookconfiguration.go b/cloudformation/kendra/aws-kendra-datasource_hookconfiguration.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v5/cloudformation/policies"
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
 )
 
 // DataSource_HookConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.HookConfiguration)

diff --git a/cloudformation/kendra/aws-kendra-datasource_inlinecustomdocumentenrichmentconfiguration.go b/cloudformation/kendra/aws-kendra-datasource_inlinecustomdocumentenrichmentconfiguration.go
@@ -1,7 +1,7 @@
 package kendra
 
 import (
-	"github.com/awslabs/goformation/v5/cloudformation/policies"
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
 )
 
 // DataSource_InlineCustomDocumentEnrichmentConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.InlineCustomDocumentEnrichmentConfiguration)

diff --git a/cloudformation/lambda/aws-lambda-eventsourcemapping_filter.go b/cloudformation/lambda/aws-lambda-eventsourcemapping_filter.go
@@ -1,7 +1,7 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v5/cloudformation/policies"
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
 )
 
 // EventSourceMapping_Filter AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.Filter)

diff --git a/cloudformation/lambda/aws-lambda-eventsourcemapping_filtercriteria.go b/cloudformation/lambda/aws-lambda-eventsourcemapping_filtercriteria.go
@@ -1,7 +1,7 @@
 package lambda
 
 import (
-	"github.com/awslabs/goformation/v5/cloudformation/policies"
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
 )
 
 // EventSourceMapping_FilterCriteria AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.FilterCriteria)

diff --git a/cloudformation/serverless/api_cors.go b/cloudformation/serverless/api_cors.go
@@ -1,7 +1,9 @@
 package serverless
 
 import (
+	"bytes"
 	"encoding/json"
+	"io"
 	"sort"
 
 	"github.com/awslabs/goformation/v6/cloudformation/utils"
@@ -54,7 +56,15 @@ func (r *Api_Cors) UnmarshalJSON(b []byte) error {
 	case map[string]interface{}:
 		val = val // This ensures val is used to stop an error
 
-		json.Unmarshal(b, &r.CorsConfiguration)
+		reader := bytes.NewReader(b)
+		decoder := json.NewDecoder(reader)
+		decoder.DisallowUnknownFields()
+		reader.Seek(0, io.SeekStart)
+
+		if err := decoder.Decode(&r.CorsConfiguration); err != nil {
+			r.CorsConfiguration = nil
+		}
+		reader.Seek(0, io.SeekStart)
 
 	case []interface{}:
 

diff --git a/cloudformation/serverless/api_definitionuri.go b/cloudformation/serverless/api_definitionuri.go
@@ -1,7 +1,9 @@
 package serverless
 
 import (
+	"bytes"
 	"encoding/json"
+	"io"
 	"sort"
 
 	"github.com/awslabs/goformation/v6/cloudformation/utils"
@@ -54,7 +56,15 @@ func (r *Api_DefinitionUri) UnmarshalJSON(b []byte) error {
 	case map[string]interface{}:
 		val = val // This ensures val is used to stop an error
 
-		json.Unmarshal(b, &r.S3Location)
+		reader := bytes.NewReader(b)
+		decoder := json.NewDecoder(reader)
+		decoder.DisallowUnknownFields()
+		reader.Seek(0, io.SeekStart)
+
+		if err := decoder.Decode(&r.S3Location); err != nil {
+			r.S3Location = nil
+		}
+		reader.Seek(0, io.SeekStart)
 
 	case []interface{}:
 

diff --git a/cloudformation/serverless/application_location.go b/cloudformation/serverless/application_location.go
@@ -1,7 +1,9 @@
 package serverless
 
 import (
+	"bytes"
 	"encoding/json"
+	"io"
 	"sort"
 
 	"github.com/awslabs/goformation/v6/cloudformation/utils"
@@ -54,7 +56,15 @@ func (r *Application_Location) UnmarshalJSON(b []byte) error {
 	case map[string]interface{}:
 		val = val // This ensures val is used to stop an error
 
-		json.Unmarshal(b, &r.ApplicationLocation)
+		reader := bytes.NewReader(b)
+		decoder := json.NewDecoder(reader)
+		decoder.DisallowUnknownFields()
+		reader.Seek(0, io.SeekStart)
+
+		if err := decoder.Decode(&r.ApplicationLocation); err != nil {
+			r.ApplicationLocation = nil
+		}
+		reader.Seek(0, io.SeekStart)
 
 	case []interface{}:
 

diff --git a/cloudformation/serverless/function_codeuri.go b/cloudformation/serverless/function_codeuri.go
@@ -1,7 +1,9 @@
 package serverless
 
 import (
+	"bytes"
 	"encoding/json"
+	"io"
 	"sort"
 
 	"github.com/awslabs/goformation/v6/cloudformation/utils"
@@ -54,7 +56,15 @@ func (r *Function_CodeUri) UnmarshalJSON(b []byte) error {
 	case map[string]interface{}:
 		val = val // This ensures val is used to stop an error
 
-		json.Unmarshal(b, &r.S3Location)
+		reader := bytes.NewReader(b)
+		decoder := json.NewDecoder(reader)
+		decoder.DisallowUnknownFields()
+		reader.Seek(0, io.SeekStart)
+
+		if err := decoder.Decode(&r.S3Location); err != nil {
+			r.S3Location = nil
+		}
+		reader.Seek(0, io.SeekStart)
 
 	case []interface{}:
 

diff --git a/cloudformation/serverless/function_events.go b/cloudformation/serverless/function_events.go
@@ -1,7 +1,9 @@
 package serverless
 
 import (
+	"bytes"
 	"encoding/json"
+	"io"
 	"sort"
 
 	"github.com/awslabs/goformation/v6/cloudformation/utils"
@@ -57,6 +59,11 @@ func (r *Function_Events) UnmarshalJSON(b []byte) error {
 	case map[string]interface{}:
 		val = val // This ensures val is used to stop an error
 
+		reader := bytes.NewReader(b)
+		decoder := json.NewDecoder(reader)
+		decoder.DisallowUnknownFields()
+		reader.Seek(0, io.SeekStart)
+
 	case []interface{}:
 
 		json.Unmarshal(b, &r.StringArray)

diff --git a/cloudformation/serverless/function_policies.go b/cloudformation/serverless/function_policies.go
@@ -1,7 +1,9 @@
 package serverless
 
 import (
+	"bytes"
 	"encoding/json"
+	"io"
 	"sort"
 
 	"github.com/awslabs/goformation/v6/cloudformation/utils"
@@ -74,7 +76,15 @@ func (r *Function_Policies) UnmarshalJSON(b []byte) error {
 	case map[string]interface{}:
 		val = val // This ensures val is used to stop an error
 
-		json.Unmarshal(b, &r.IAMPolicyDocument)
+		reader := bytes.NewReader(b)
+		decoder := json.NewDecoder(reader)
+		decoder.DisallowUnknownFields()
+		reader.Seek(0, io.SeekStart)
+
+		if err := decoder.Decode(&r.IAMPolicyDocument); err != nil {
+			r.IAMPolicyDocument = nil
+		}
+		reader.Seek(0, io.SeekStart)
 
 	case []interface{}:
 

diff --git a/cloudformation/serverless/function_properties.go b/cloudformation/serverless/function_properties.go
@@ -79,7 +79,6 @@ func (r Function_Properties) value() interface{} {
 	sort.Sort(utils.ByJSONLength(ret)) // Heuristic to select best attribute
 	if len(ret) > 0 {
 		return ret[0]
-		// log.Fatalf("FunctionProperties matched more than one property. This is a bug. %+v", r)
 	}
 
 	return nil
@@ -106,65 +105,67 @@ func (r *Function_Properties) UnmarshalJSON(b []byte) error {
 		reader := bytes.NewReader(b)
 		decoder := json.NewDecoder(reader)
 		decoder.DisallowUnknownFields()
+		reader.Seek(0, io.SeekStart)
 
 		if err := decoder.Decode(&r.S3Event); err != nil {
 			r.S3Event = nil
 		}
-
 		reader.Seek(0, io.SeekStart)
+
 		if err := decoder.Decode(&r.SNSEvent); err != nil {
 			r.SNSEvent = nil
 		}
-
 		reader.Seek(0, io.SeekStart)
+
 		if err := decoder.Decode(&r.SQSEvent); err != nil {
 			r.SQSEvent = nil
 		}
-
 		reader.Seek(0, io.SeekStart)
+
 		if err := decoder.Decode(&r.KinesisEvent); err != nil {
 			r.KinesisEvent = nil
 		}
-
 		reader.Seek(0, io.SeekStart)
+
 		if err := decoder.Decode(&r.DynamoDBEvent); err != nil {
 			r.DynamoDBEvent = nil
 		}
-
 		reader.Seek(0, io.SeekStart)
+
 		if err := decoder.Decode(&r.ApiEvent); err != nil {
 			r.ApiEvent = nil
 		}
-
 		reader.Seek(0, io.SeekStart)
+
 		if err := decoder.Decode(&r.ScheduleEvent); err != nil {
 			r.ScheduleEvent = nil
 		}
-
 		reader.Seek(0, io.SeekStart)
+
 		if err := decoder.Decode(&r.CloudWatchEventEvent); err != nil {
 			r.CloudWatchEventEvent = nil
 		}
-
 		reader.Seek(0, io.SeekStart)
+
 		if err := decoder.Decode(&r.CloudWatchLogsEvent); err != nil {
 			r.CloudWatchLogsEvent = nil
 		}
-
 		reader.Seek(0, io.SeekStart)
+
 		if err := decoder.Decode(&r.IoTRuleEvent); err != nil {
 			r.IoTRuleEvent = nil
 		}
-
 		reader.Seek(0, io.SeekStart)
+
 		if err := decoder.Decode(&r.AlexaSkillEvent); err != nil {
 			r.AlexaSkillEvent = nil
 		}
-
 		reader.Seek(0, io.SeekStart)
+
 		if err := decoder.Decode(&r.EventBridgeRuleEvent); err != nil {
 			r.EventBridgeRuleEvent = nil
 		}
+		reader.Seek(0, io.SeekStart)
 
 	case []interface{}:
 

diff --git a/cloudformation/serverless/httpapi_corsconfiguration.go b/cloudformation/serverless/httpapi_corsconfiguration.go
@@ -1,7 +1,9 @@
 package serverless
 
 import (
+	"bytes"
 	"encoding/json"
+	"io"
 	"sort"
 
 	"github.com/awslabs/goformation/v6/cloudformation/utils"
@@ -54,7 +56,15 @@ func (r *HttpApi_CorsConfiguration) UnmarshalJSON(b []byte) error {
 	case map[string]interface{}:
 		val = val // This ensures val is used to stop an error
 
-		json.Unmarshal(b, &r.CorsConfigurationObject)
+		reader := bytes.NewReader(b)
+		decoder := json.NewDecoder(reader)
+		decoder.DisallowUnknownFields()
+		reader.Seek(0, io.SeekStart)
+
+		if err := decoder.Decode(&r.CorsConfigurationObject); err != nil {
+			r.CorsConfigurationObject = nil
+		}
+		reader.Seek(0, io.SeekStart)
 
 	case []interface{}:
 

diff --git a/cloudformation/serverless/httpapi_definitionuri.go b/cloudformation/serverless/httpapi_definitionuri.go
@@ -1,7 +1,9 @@
 package serverless
 
 import (
+	"bytes"
 	"encoding/json"
+	"io"
 	"sort"
 
 	"github.com/awslabs/goformation/v6/cloudformation/utils"
@@ -54,7 +56,15 @@ func (r *HttpApi_DefinitionUri) UnmarshalJSON(b []byte) error {
 	case map[string]interface{}:
 		val = val // This ensures val is used to stop an error
 
-		json.Unmarshal(b, &r.S3Location)
+		reader := bytes.NewReader(b)
+		decoder := json.NewDecoder(reader)
+		decoder.DisallowUnknownFields()
+		reader.Seek(0, io.SeekStart)
+
+		if err := decoder.Decode(&r.S3Location); err != nil {
+			r.S3Location = nil
+		}
+		reader.Seek(0, io.SeekStart)
 
 	case []interface{}: