forked from awslabs/goformation
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(schema): CloudFormation Updates (awslabs#375)
Co-authored-by: Paul Maddox <paul.maddox@gmail.com>
- Loading branch information
1 parent
703460b
commit 5d0d4f2
Showing
15 changed files
with
969 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| package cur | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "encoding/json" | ||
| "fmt" | ||
|
|
||
| "github.com/awslabs/goformation/v4/cloudformation/policies" | ||
| ) | ||
|
|
||
| // ReportDefinition AWS CloudFormation Resource (AWS::CUR::ReportDefinition) | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html | ||
| type ReportDefinition struct { | ||
|
|
||
| // AdditionalArtifacts AWS CloudFormation Property | ||
| // Required: false | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-additionalartifacts | ||
| AdditionalArtifacts []string `json:"AdditionalArtifacts,omitempty"` | ||
|
|
||
| // AdditionalSchemaElements AWS CloudFormation Property | ||
| // Required: false | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-additionalschemaelements | ||
| AdditionalSchemaElements []string `json:"AdditionalSchemaElements,omitempty"` | ||
|
|
||
| // BillingViewArn AWS CloudFormation Property | ||
| // Required: false | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-billingviewarn | ||
| BillingViewArn string `json:"BillingViewArn,omitempty"` | ||
|
|
||
| // Compression AWS CloudFormation Property | ||
| // Required: true | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-compression | ||
| Compression string `json:"Compression,omitempty"` | ||
|
|
||
| // Format AWS CloudFormation Property | ||
| // Required: true | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-format | ||
| Format string `json:"Format,omitempty"` | ||
|
|
||
| // RefreshClosedReports AWS CloudFormation Property | ||
| // Required: true | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-refreshclosedreports | ||
| RefreshClosedReports bool `json:"RefreshClosedReports"` | ||
|
|
||
| // ReportName AWS CloudFormation Property | ||
| // Required: true | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-reportname | ||
| ReportName string `json:"ReportName,omitempty"` | ||
|
|
||
| // ReportVersioning AWS CloudFormation Property | ||
| // Required: true | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-reportversioning | ||
| ReportVersioning string `json:"ReportVersioning,omitempty"` | ||
|
|
||
| // S3Bucket AWS CloudFormation Property | ||
| // Required: true | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-s3bucket | ||
| S3Bucket string `json:"S3Bucket,omitempty"` | ||
|
|
||
| // S3Prefix AWS CloudFormation Property | ||
| // Required: true | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-s3prefix | ||
| S3Prefix string `json:"S3Prefix,omitempty"` | ||
|
|
||
| // S3Region AWS CloudFormation Property | ||
| // Required: true | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-s3region | ||
| S3Region string `json:"S3Region,omitempty"` | ||
|
|
||
| // TimeUnit AWS CloudFormation Property | ||
| // Required: true | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-timeunit | ||
| TimeUnit string `json:"TimeUnit,omitempty"` | ||
|
|
||
| // 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:"-"` | ||
|
|
||
| // AWSCloudFormationMetadata stores structured data associated with this resource | ||
| AWSCloudFormationMetadata map[string]interface{} `json:"-"` | ||
|
|
||
| // AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created | ||
| AWSCloudFormationCondition string `json:"-"` | ||
| } | ||
|
|
||
| // AWSCloudFormationType returns the AWS CloudFormation resource type | ||
| func (r *ReportDefinition) AWSCloudFormationType() string { | ||
| return "AWS::CUR::ReportDefinition" | ||
| } | ||
|
|
||
| // MarshalJSON is a custom JSON marshalling hook that embeds this object into | ||
| // an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'. | ||
| func (r ReportDefinition) MarshalJSON() ([]byte, error) { | ||
| type Properties ReportDefinition | ||
| 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"` | ||
| 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, | ||
| UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy, | ||
| Condition: r.AWSCloudFormationCondition, | ||
| }) | ||
| } | ||
|
|
||
| // UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer | ||
| // AWS CloudFormation resource object, and just keeps the 'Properties' field. | ||
| func (r *ReportDefinition) UnmarshalJSON(b []byte) error { | ||
| type Properties ReportDefinition | ||
| res := &struct { | ||
| Type string | ||
| Properties *Properties | ||
| DependsOn []string | ||
| Metadata map[string]interface{} | ||
| DeletionPolicy string | ||
| UpdateReplacePolicy string | ||
| Condition string | ||
| }{} | ||
|
|
||
| dec := json.NewDecoder(bytes.NewReader(b)) | ||
| dec.DisallowUnknownFields() // Force error if unknown field is found | ||
|
|
||
| if err := dec.Decode(&res); err != nil { | ||
| fmt.Printf("ERROR: %s\n", err) | ||
| return err | ||
| } | ||
|
|
||
| // If the resource has no Properties set, it could be nil | ||
| if res.Properties != nil { | ||
| *r = ReportDefinition(*res.Properties) | ||
| } | ||
| if res.DependsOn != nil { | ||
| r.AWSCloudFormationDependsOn = res.DependsOn | ||
| } | ||
| if res.Metadata != nil { | ||
| r.AWSCloudFormationMetadata = res.Metadata | ||
| } | ||
| 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 | ||
| } | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
cloudformation/ecr/aws-ecr-repository_encryptionconfiguration.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package ecr | ||
|
|
||
| import ( | ||
| "github.com/awslabs/goformation/v4/cloudformation/policies" | ||
| ) | ||
|
|
||
| // Repository_EncryptionConfiguration AWS CloudFormation Resource (AWS::ECR::Repository.EncryptionConfiguration) | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-encryptionconfiguration.html | ||
| type Repository_EncryptionConfiguration struct { | ||
|
|
||
| // EncryptionType AWS CloudFormation Property | ||
| // Required: true | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-encryptionconfiguration.html#cfn-ecr-repository-encryptionconfiguration-encryptiontype | ||
| EncryptionType string `json:"EncryptionType,omitempty"` | ||
|
|
||
| // KmsKey AWS CloudFormation Property | ||
| // Required: false | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-encryptionconfiguration.html#cfn-ecr-repository-encryptionconfiguration-kmskey | ||
| KmsKey string `json:"KmsKey,omitempty"` | ||
|
|
||
| // 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:"-"` | ||
|
|
||
| // AWSCloudFormationMetadata stores structured data associated with this resource | ||
| AWSCloudFormationMetadata map[string]interface{} `json:"-"` | ||
|
|
||
| // AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created | ||
| AWSCloudFormationCondition string `json:"-"` | ||
| } | ||
|
|
||
| // AWSCloudFormationType returns the AWS CloudFormation resource type | ||
| func (r *Repository_EncryptionConfiguration) AWSCloudFormationType() string { | ||
| return "AWS::ECR::Repository.EncryptionConfiguration" | ||
| } |
35 changes: 35 additions & 0 deletions
35
cloudformation/ecr/aws-ecr-repository_imagescanningconfiguration.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package ecr | ||
|
|
||
| import ( | ||
| "github.com/awslabs/goformation/v4/cloudformation/policies" | ||
| ) | ||
|
|
||
| // Repository_ImageScanningConfiguration AWS CloudFormation Resource (AWS::ECR::Repository.ImageScanningConfiguration) | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-imagescanningconfiguration.html | ||
| type Repository_ImageScanningConfiguration struct { | ||
|
|
||
| // ScanOnPush AWS CloudFormation Property | ||
| // Required: false | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-imagescanningconfiguration.html#cfn-ecr-repository-imagescanningconfiguration-scanonpush | ||
| ScanOnPush bool `json:"ScanOnPush,omitempty"` | ||
|
|
||
| // 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:"-"` | ||
|
|
||
| // AWSCloudFormationMetadata stores structured data associated with this resource | ||
| AWSCloudFormationMetadata map[string]interface{} `json:"-"` | ||
|
|
||
| // AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created | ||
| AWSCloudFormationCondition string `json:"-"` | ||
| } | ||
|
|
||
| // AWSCloudFormationType returns the AWS CloudFormation resource type | ||
| func (r *Repository_ImageScanningConfiguration) AWSCloudFormationType() string { | ||
| return "AWS::ECR::Repository.ImageScanningConfiguration" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
cloudformation/frauddetector/aws-frauddetector-detector_model.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package frauddetector | ||
|
|
||
| import ( | ||
| "github.com/awslabs/goformation/v4/cloudformation/policies" | ||
| ) | ||
|
|
||
| // Detector_Model AWS CloudFormation Resource (AWS::FraudDetector::Detector.Model) | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-model.html | ||
| type Detector_Model struct { | ||
|
|
||
| // Arn AWS CloudFormation Property | ||
| // Required: false | ||
| // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-model.html#cfn-frauddetector-detector-model-arn | ||
| Arn string `json:"Arn,omitempty"` | ||
|
|
||
| // 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:"-"` | ||
|
|
||
| // AWSCloudFormationMetadata stores structured data associated with this resource | ||
| AWSCloudFormationMetadata map[string]interface{} `json:"-"` | ||
|
|
||
| // AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created | ||
| AWSCloudFormationCondition string `json:"-"` | ||
| } | ||
|
|
||
| // AWSCloudFormationType returns the AWS CloudFormation resource type | ||
| func (r *Detector_Model) AWSCloudFormationType() string { | ||
| return "AWS::FraudDetector::Detector.Model" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.