fix(generator): update the generation making it easier to fix CF sche…

…ma errors to generate (awslabs#285)

* Generation script updates

* go generate

cloudformation/accessanalyzer/aws-accessanalyzer-analyzer.go

@@ -36,6 +36,9 @@ type Analyzer struct {
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
 	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
 	AWSCloudFormationDependsOn []string `json:"-"`
 
@@ -56,19 +59,21 @@ func (r *Analyzer) AWSCloudFormationType() string {
 func (r Analyzer) MarshalJSON() ([]byte, error) {
 	type Properties Analyzer
 	return json.Marshal(&struct {
-		Type           string
-		Properties     Properties
-		DependsOn      []string                `json:"DependsOn,omitempty"`
-		Metadata       map[string]interface{}  `json:"Metadata,omitempty"`
-		DeletionPolicy policies.DeletionPolicy `json:"DeletionPolicy,omitempty"`
-		Condition      string                  `json:"Condition,omitempty"`
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
 	}{
-		Type:           r.AWSCloudFormationType(),
-		Properties:     (Properties)(r),
-		DependsOn:      r.AWSCloudFormationDependsOn,
-		Metadata:       r.AWSCloudFormationMetadata,
-		DeletionPolicy: r.AWSCloudFormationDeletionPolicy,
-		Condition:      r.AWSCloudFormationCondition,
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
 	})
 }
 
@@ -77,12 +82,13 @@ func (r Analyzer) MarshalJSON() ([]byte, error) {
 func (r *Analyzer) UnmarshalJSON(b []byte) error {
 	type Properties Analyzer
 	res := &struct {
-		Type           string
-		Properties     *Properties
-		DependsOn      []string
-		Metadata       map[string]interface{}
-		DeletionPolicy string
-		Condition      string
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
 	}{}
 
 	dec := json.NewDecoder(bytes.NewReader(b))
@@ -106,6 +112,9 @@ func (r *Analyzer) UnmarshalJSON(b []byte) error {
 	if res.DeletionPolicy != "" {
 		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
 	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
 	if res.Condition != "" {
 		r.AWSCloudFormationCondition = res.Condition
 	}

cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_archiverule.go

@@ -21,6 +21,9 @@ type Analyzer_ArchiveRule struct {
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
 	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
 	AWSCloudFormationDependsOn []string `json:"-"`
 

cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_filter.go

@@ -36,6 +36,9 @@ type Analyzer_Filter struct {
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
 	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
 	AWSCloudFormationDependsOn []string `json:"-"`
 

cloudformation/acmpca/aws-acmpca-certificate.go

@@ -40,6 +40,9 @@ type Certificate struct {
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
 	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
 	AWSCloudFormationDependsOn []string `json:"-"`
 
@@ -60,19 +63,21 @@ func (r *Certificate) AWSCloudFormationType() string {
 func (r Certificate) MarshalJSON() ([]byte, error) {
 	type Properties Certificate
 	return json.Marshal(&struct {
-		Type           string
-		Properties     Properties
-		DependsOn      []string                `json:"DependsOn,omitempty"`
-		Metadata       map[string]interface{}  `json:"Metadata,omitempty"`
-		DeletionPolicy policies.DeletionPolicy `json:"DeletionPolicy,omitempty"`
-		Condition      string                  `json:"Condition,omitempty"`
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
 	}{
-		Type:           r.AWSCloudFormationType(),
-		Properties:     (Properties)(r),
-		DependsOn:      r.AWSCloudFormationDependsOn,
-		Metadata:       r.AWSCloudFormationMetadata,
-		DeletionPolicy: r.AWSCloudFormationDeletionPolicy,
-		Condition:      r.AWSCloudFormationCondition,
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
 	})
 }
 
@@ -81,12 +86,13 @@ func (r Certificate) MarshalJSON() ([]byte, error) {
 func (r *Certificate) UnmarshalJSON(b []byte) error {
 	type Properties Certificate
 	res := &struct {
-		Type           string
-		Properties     *Properties
-		DependsOn      []string
-		Metadata       map[string]interface{}
-		DeletionPolicy string
-		Condition      string
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
 	}{}
 
 	dec := json.NewDecoder(bytes.NewReader(b))
@@ -110,6 +116,9 @@ func (r *Certificate) UnmarshalJSON(b []byte) error {
 	if res.DeletionPolicy != "" {
 		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
 	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
 	if res.Condition != "" {
 		r.AWSCloudFormationCondition = res.Condition
 	}

cloudformation/acmpca/aws-acmpca-certificate_validity.go

@@ -21,6 +21,9 @@ type Certificate_Validity struct {
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
 	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
 	AWSCloudFormationDependsOn []string `json:"-"`
 

cloudformation/acmpca/aws-acmpca-certificateauthority.go

@@ -46,6 +46,9 @@ type CertificateAuthority struct {
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
 	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
 	AWSCloudFormationDependsOn []string `json:"-"`
 
@@ -66,19 +69,21 @@ func (r *CertificateAuthority) AWSCloudFormationType() string {
 func (r CertificateAuthority) MarshalJSON() ([]byte, error) {
 	type Properties CertificateAuthority
 	return json.Marshal(&struct {
-		Type           string
-		Properties     Properties
-		DependsOn      []string                `json:"DependsOn,omitempty"`
-		Metadata       map[string]interface{}  `json:"Metadata,omitempty"`
-		DeletionPolicy policies.DeletionPolicy `json:"DeletionPolicy,omitempty"`
-		Condition      string                  `json:"Condition,omitempty"`
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
 	}{
-		Type:           r.AWSCloudFormationType(),
-		Properties:     (Properties)(r),
-		DependsOn:      r.AWSCloudFormationDependsOn,
-		Metadata:       r.AWSCloudFormationMetadata,
-		DeletionPolicy: r.AWSCloudFormationDeletionPolicy,
-		Condition:      r.AWSCloudFormationCondition,
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
 	})
 }
 
@@ -87,12 +92,13 @@ func (r CertificateAuthority) MarshalJSON() ([]byte, error) {
 func (r *CertificateAuthority) UnmarshalJSON(b []byte) error {
 	type Properties CertificateAuthority
 	res := &struct {
-		Type           string
-		Properties     *Properties
-		DependsOn      []string
-		Metadata       map[string]interface{}
-		DeletionPolicy string
-		Condition      string
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
 	}{}
 
 	dec := json.NewDecoder(bytes.NewReader(b))
@@ -116,6 +122,9 @@ func (r *CertificateAuthority) UnmarshalJSON(b []byte) error {
 	if res.DeletionPolicy != "" {
 		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
 	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
 	if res.Condition != "" {
 		r.AWSCloudFormationCondition = res.Condition
 	}

cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go

@@ -31,6 +31,9 @@ type CertificateAuthority_CrlConfiguration struct {
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
 	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
 	AWSCloudFormationDependsOn []string `json:"-"`
 

cloudformation/acmpca/aws-acmpca-certificateauthority_revocationconfiguration.go

@@ -16,6 +16,9 @@ type CertificateAuthority_RevocationConfiguration struct {
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
 	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
 	AWSCloudFormationDependsOn []string `json:"-"`
 

cloudformation/acmpca/aws-acmpca-certificateauthority_subject.go

@@ -81,6 +81,9 @@ type CertificateAuthority_Subject struct {
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
 	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
 	AWSCloudFormationDependsOn []string `json:"-"`
 

cloudformation/acmpca/aws-acmpca-certificateauthorityactivation.go

@@ -35,6 +35,9 @@ type CertificateAuthorityActivation struct {
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
 	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
 	AWSCloudFormationDependsOn []string `json:"-"`
 
@@ -55,19 +58,21 @@ func (r *CertificateAuthorityActivation) AWSCloudFormationType() string {
 func (r CertificateAuthorityActivation) MarshalJSON() ([]byte, error) {
 	type Properties CertificateAuthorityActivation
 	return json.Marshal(&struct {
-		Type           string
-		Properties     Properties
-		DependsOn      []string                `json:"DependsOn,omitempty"`
-		Metadata       map[string]interface{}  `json:"Metadata,omitempty"`
-		DeletionPolicy policies.DeletionPolicy `json:"DeletionPolicy,omitempty"`
-		Condition      string                  `json:"Condition,omitempty"`
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
 	}{
-		Type:           r.AWSCloudFormationType(),
-		Properties:     (Properties)(r),
-		DependsOn:      r.AWSCloudFormationDependsOn,
-		Metadata:       r.AWSCloudFormationMetadata,
-		DeletionPolicy: r.AWSCloudFormationDeletionPolicy,
-		Condition:      r.AWSCloudFormationCondition,
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
 	})
 }
 
@@ -76,12 +81,13 @@ func (r CertificateAuthorityActivation) MarshalJSON() ([]byte, error) {
 func (r *CertificateAuthorityActivation) UnmarshalJSON(b []byte) error {
 	type Properties CertificateAuthorityActivation
 	res := &struct {
-		Type           string
-		Properties     *Properties
-		DependsOn      []string
-		Metadata       map[string]interface{}
-		DeletionPolicy string
-		Condition      string
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
 	}{}
 
 	dec := json.NewDecoder(bytes.NewReader(b))
@@ -105,6 +111,9 @@ func (r *CertificateAuthorityActivation) UnmarshalJSON(b []byte) error {
 	if res.DeletionPolicy != "" {
 		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
 	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
 	if res.Condition != "" {
 		r.AWSCloudFormationCondition = res.Condition
 	}