From 25e2ea4445d58bf0a44c2b6f738338bfd6f2d0a5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Oct 2022 08:00:57 +0200 Subject: [PATCH] fix(schema): CloudFormation Updates (#510) --- .../aws-budgets-budget_autoadjustdata.go | 42 ++++++++++++ .../budgets/aws-budgets-budget_budgetdata.go | 5 ++ .../aws-budgets-budget_historicaloptions.go | 37 ++++++++++ cloudformation/rds/aws-rds-dbcluster.go | 15 ++++ cloudformation/rds/aws-rds-dbinstance.go | 5 ++ .../redshift/aws-redshift-endpointaccess.go | 10 +++ .../aws-rekognition-streamprocessor.go | 2 +- .../aws-rekognition-streamprocessor_point.go | 4 +- schema/cdk.go | 68 ++++++++++++++----- schema/cdk.schema.json | 68 ++++++++++++++----- schema/cloudformation.go | 68 ++++++++++++++----- schema/cloudformation.schema.json | 68 ++++++++++++++----- schema/sam.go | 68 ++++++++++++++----- schema/sam.schema.json | 68 ++++++++++++++----- 14 files changed, 429 insertions(+), 99 deletions(-) create mode 100644 cloudformation/budgets/aws-budgets-budget_autoadjustdata.go create mode 100644 cloudformation/budgets/aws-budgets-budget_historicaloptions.go diff --git a/cloudformation/budgets/aws-budgets-budget_autoadjustdata.go b/cloudformation/budgets/aws-budgets-budget_autoadjustdata.go new file mode 100644 index 0000000000..9fa67de4b2 --- /dev/null +++ b/cloudformation/budgets/aws-budgets-budget_autoadjustdata.go @@ -0,0 +1,42 @@ +// Code generated by "go generate". Please don't change this file directly. + +package budgets + +import ( + "github.com/awslabs/goformation/v7/cloudformation/policies" +) + +// Budget_AutoAdjustData AWS CloudFormation Resource (AWS::Budgets::Budget.AutoAdjustData) +// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-autoadjustdata.html +type Budget_AutoAdjustData struct { + + // AutoAdjustType AWS CloudFormation Property + // Required: true + // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-autoadjustdata.html#cfn-budgets-budget-autoadjustdata-autoadjusttype + AutoAdjustType string `json:"AutoAdjustType"` + + // HistoricalOptions AWS CloudFormation Property + // Required: false + // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-autoadjustdata.html#cfn-budgets-budget-autoadjustdata-historicaloptions + HistoricalOptions *Budget_HistoricalOptions `json:"HistoricalOptions,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 *Budget_AutoAdjustData) AWSCloudFormationType() string { + return "AWS::Budgets::Budget.AutoAdjustData" +} diff --git a/cloudformation/budgets/aws-budgets-budget_budgetdata.go b/cloudformation/budgets/aws-budgets-budget_budgetdata.go index dbad9b00cd..84caa5df87 100644 --- a/cloudformation/budgets/aws-budgets-budget_budgetdata.go +++ b/cloudformation/budgets/aws-budgets-budget_budgetdata.go @@ -10,6 +10,11 @@ import ( // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html type Budget_BudgetData struct { + // AutoAdjustData AWS CloudFormation Property + // Required: false + // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html#cfn-budgets-budget-budgetdata-autoadjustdata + AutoAdjustData *Budget_AutoAdjustData `json:"AutoAdjustData,omitempty"` + // BudgetLimit AWS CloudFormation Property // Required: false // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html#cfn-budgets-budget-budgetdata-budgetlimit diff --git a/cloudformation/budgets/aws-budgets-budget_historicaloptions.go b/cloudformation/budgets/aws-budgets-budget_historicaloptions.go new file mode 100644 index 0000000000..cf63033d45 --- /dev/null +++ b/cloudformation/budgets/aws-budgets-budget_historicaloptions.go @@ -0,0 +1,37 @@ +// Code generated by "go generate". Please don't change this file directly. + +package budgets + +import ( + "github.com/awslabs/goformation/v7/cloudformation/policies" +) + +// Budget_HistoricalOptions AWS CloudFormation Resource (AWS::Budgets::Budget.HistoricalOptions) +// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-historicaloptions.html +type Budget_HistoricalOptions struct { + + // BudgetAdjustmentPeriod AWS CloudFormation Property + // Required: true + // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-historicaloptions.html#cfn-budgets-budget-historicaloptions-budgetadjustmentperiod + BudgetAdjustmentPeriod int `json:"BudgetAdjustmentPeriod"` + + // 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 *Budget_HistoricalOptions) AWSCloudFormationType() string { + return "AWS::Budgets::Budget.HistoricalOptions" +} diff --git a/cloudformation/rds/aws-rds-dbcluster.go b/cloudformation/rds/aws-rds-dbcluster.go index 684070308c..0ddd26c608 100644 --- a/cloudformation/rds/aws-rds-dbcluster.go +++ b/cloudformation/rds/aws-rds-dbcluster.go @@ -84,6 +84,16 @@ type DBCluster struct { // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-deletionprotection DeletionProtection *bool `json:"DeletionProtection,omitempty"` + // Domain AWS CloudFormation Property + // Required: false + // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-domain + Domain *string `json:"Domain,omitempty"` + + // DomainIAMRoleName AWS CloudFormation Property + // Required: false + // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-domainiamrolename + DomainIAMRoleName *string `json:"DomainIAMRoleName,omitempty"` + // EnableCloudwatchLogsExports AWS CloudFormation Property // Required: false // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-enablecloudwatchlogsexports @@ -149,6 +159,11 @@ type DBCluster struct { // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-monitoringrolearn MonitoringRoleArn *string `json:"MonitoringRoleArn,omitempty"` + // NetworkType AWS CloudFormation Property + // Required: false + // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-networktype + NetworkType *string `json:"NetworkType,omitempty"` + // PerformanceInsightsEnabled AWS CloudFormation Property // Required: false // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-performanceinsightsenabled diff --git a/cloudformation/rds/aws-rds-dbinstance.go b/cloudformation/rds/aws-rds-dbinstance.go index 1a70449fb4..813b511063 100644 --- a/cloudformation/rds/aws-rds-dbinstance.go +++ b/cloudformation/rds/aws-rds-dbinstance.go @@ -199,6 +199,11 @@ type DBInstance struct { // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-ncharcharactersetname NcharCharacterSetName *string `json:"NcharCharacterSetName,omitempty"` + // NetworkType AWS CloudFormation Property + // Required: false + // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-networktype + NetworkType *string `json:"NetworkType,omitempty"` + // OptionGroupName AWS CloudFormation Property // Required: false // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-optiongroupname diff --git a/cloudformation/redshift/aws-redshift-endpointaccess.go b/cloudformation/redshift/aws-redshift-endpointaccess.go index 9011be8d21..1751676aae 100644 --- a/cloudformation/redshift/aws-redshift-endpointaccess.go +++ b/cloudformation/redshift/aws-redshift-endpointaccess.go @@ -33,11 +33,21 @@ type EndpointAccess struct { // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html#cfn-redshift-endpointaccess-subnetgroupname SubnetGroupName string `json:"SubnetGroupName"` + // VpcEndpoint AWS CloudFormation Property + // Required: false + // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html#cfn-redshift-endpointaccess-vpcendpoint + VpcEndpoint interface{} `json:"VpcEndpoint,omitempty"` + // VpcSecurityGroupIds AWS CloudFormation Property // Required: true // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html#cfn-redshift-endpointaccess-vpcsecuritygroupids VpcSecurityGroupIds []string `json:"VpcSecurityGroupIds"` + // VpcSecurityGroups AWS CloudFormation Property + // Required: false + // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html#cfn-redshift-endpointaccess-vpcsecuritygroups + VpcSecurityGroups []EndpointAccess_VpcSecurityGroup `json:"VpcSecurityGroups,omitempty"` + // AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"` diff --git a/cloudformation/rekognition/aws-rekognition-streamprocessor.go b/cloudformation/rekognition/aws-rekognition-streamprocessor.go index 7f8bce736a..7bde5d33e9 100644 --- a/cloudformation/rekognition/aws-rekognition-streamprocessor.go +++ b/cloudformation/rekognition/aws-rekognition-streamprocessor.go @@ -62,7 +62,7 @@ type StreamProcessor struct { // PolygonRegionsOfInterest AWS CloudFormation Property // Required: false // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rekognition-streamprocessor.html#cfn-rekognition-streamprocessor-polygonregionsofinterest - PolygonRegionsOfInterest []StreamProcessor_Polygon `json:"PolygonRegionsOfInterest,omitempty"` + PolygonRegionsOfInterest []interface{} `json:"PolygonRegionsOfInterest,omitempty"` // RoleArn AWS CloudFormation Property // Required: true diff --git a/cloudformation/rekognition/aws-rekognition-streamprocessor_point.go b/cloudformation/rekognition/aws-rekognition-streamprocessor_point.go index d4c7a45e15..770bd97eb5 100644 --- a/cloudformation/rekognition/aws-rekognition-streamprocessor_point.go +++ b/cloudformation/rekognition/aws-rekognition-streamprocessor_point.go @@ -12,12 +12,12 @@ type StreamProcessor_Point struct { // X AWS CloudFormation Property // Required: true - // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rekognition-streamprocessor-point.html#cfn-rekognition-streamprocessor-x + // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rekognition-streamprocessor-point.html#cfn-rekognition-streamprocessor-point-x X float64 `json:"X"` // Y AWS CloudFormation Property // Required: true - // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rekognition-streamprocessor-point.html#cfn-rekognition-streamprocessor-y + // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rekognition-streamprocessor-point.html#cfn-rekognition-streamprocessor-point-y Y float64 `json:"Y"` // AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy diff --git a/schema/cdk.go b/schema/cdk.go index 7372f6f570..fddf40e4f5 100644 --- a/schema/cdk.go +++ b/schema/cdk.go @@ -19635,9 +19635,27 @@ var CdkSchema = `{ ], "type": "object" }, + "AWS::Budgets::Budget.AutoAdjustData": { + "additionalProperties": false, + "properties": { + "AutoAdjustType": { + "type": "string" + }, + "HistoricalOptions": { + "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions" + } + }, + "required": [ + "AutoAdjustType" + ], + "type": "object" + }, "AWS::Budgets::Budget.BudgetData": { "additionalProperties": false, "properties": { + "AutoAdjustData": { + "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData" + }, "BudgetLimit": { "$ref": "#/definitions/AWS::Budgets::Budget.Spend" }, @@ -19708,6 +19726,18 @@ var CdkSchema = `{ }, "type": "object" }, + "AWS::Budgets::Budget.HistoricalOptions": { + "additionalProperties": false, + "properties": { + "BudgetAdjustmentPeriod": { + "type": "number" + } + }, + "required": [ + "BudgetAdjustmentPeriod" + ], + "type": "object" + }, "AWS::Budgets::Budget.Notification": { "additionalProperties": false, "properties": { @@ -116011,6 +116041,12 @@ var CdkSchema = `{ "DeletionProtection": { "type": "boolean" }, + "Domain": { + "type": "string" + }, + "DomainIAMRoleName": { + "type": "string" + }, "EnableCloudwatchLogsExports": { "items": { "type": "string" @@ -116053,6 +116089,9 @@ var CdkSchema = `{ "MonitoringRoleArn": { "type": "string" }, + "NetworkType": { + "type": "string" + }, "PerformanceInsightsEnabled": { "type": "boolean" }, @@ -116431,6 +116470,9 @@ var CdkSchema = `{ "NcharCharacterSetName": { "type": "string" }, + "NetworkType": { + "type": "string" + }, "OptionGroupName": { "type": "string" }, @@ -118284,11 +118326,20 @@ var CdkSchema = `{ "SubnetGroupName": { "type": "string" }, + "VpcEndpoint": { + "type": "object" + }, "VpcSecurityGroupIds": { "items": { "type": "string" }, "type": "array" + }, + "VpcSecurityGroups": { + "items": { + "$ref": "#/definitions/AWS::Redshift::EndpointAccess.VpcSecurityGroup" + }, + "type": "array" } }, "required": [ @@ -119482,7 +119533,7 @@ var CdkSchema = `{ }, "PolygonRegionsOfInterest": { "items": { - "$ref": "#/definitions/AWS::Rekognition::StreamProcessor.Polygon" + "type": "object" }, "type": "array" }, @@ -119647,21 +119698,6 @@ var CdkSchema = `{ ], "type": "object" }, - "AWS::Rekognition::StreamProcessor.Polygon": { - "additionalProperties": false, - "properties": { - "Polygon": { - "items": { - "$ref": "#/definitions/AWS::Rekognition::StreamProcessor.Point" - }, - "type": "array" - } - }, - "required": [ - "Polygon" - ], - "type": "object" - }, "AWS::Rekognition::StreamProcessor.S3Destination": { "additionalProperties": false, "properties": { diff --git a/schema/cdk.schema.json b/schema/cdk.schema.json index 5c4200aa5d..08b1f6f4bd 100644 --- a/schema/cdk.schema.json +++ b/schema/cdk.schema.json @@ -19630,9 +19630,27 @@ ], "type": "object" }, + "AWS::Budgets::Budget.AutoAdjustData": { + "additionalProperties": false, + "properties": { + "AutoAdjustType": { + "type": "string" + }, + "HistoricalOptions": { + "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions" + } + }, + "required": [ + "AutoAdjustType" + ], + "type": "object" + }, "AWS::Budgets::Budget.BudgetData": { "additionalProperties": false, "properties": { + "AutoAdjustData": { + "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData" + }, "BudgetLimit": { "$ref": "#/definitions/AWS::Budgets::Budget.Spend" }, @@ -19703,6 +19721,18 @@ }, "type": "object" }, + "AWS::Budgets::Budget.HistoricalOptions": { + "additionalProperties": false, + "properties": { + "BudgetAdjustmentPeriod": { + "type": "number" + } + }, + "required": [ + "BudgetAdjustmentPeriod" + ], + "type": "object" + }, "AWS::Budgets::Budget.Notification": { "additionalProperties": false, "properties": { @@ -116006,6 +116036,12 @@ "DeletionProtection": { "type": "boolean" }, + "Domain": { + "type": "string" + }, + "DomainIAMRoleName": { + "type": "string" + }, "EnableCloudwatchLogsExports": { "items": { "type": "string" @@ -116048,6 +116084,9 @@ "MonitoringRoleArn": { "type": "string" }, + "NetworkType": { + "type": "string" + }, "PerformanceInsightsEnabled": { "type": "boolean" }, @@ -116426,6 +116465,9 @@ "NcharCharacterSetName": { "type": "string" }, + "NetworkType": { + "type": "string" + }, "OptionGroupName": { "type": "string" }, @@ -118279,11 +118321,20 @@ "SubnetGroupName": { "type": "string" }, + "VpcEndpoint": { + "type": "object" + }, "VpcSecurityGroupIds": { "items": { "type": "string" }, "type": "array" + }, + "VpcSecurityGroups": { + "items": { + "$ref": "#/definitions/AWS::Redshift::EndpointAccess.VpcSecurityGroup" + }, + "type": "array" } }, "required": [ @@ -119477,7 +119528,7 @@ }, "PolygonRegionsOfInterest": { "items": { - "$ref": "#/definitions/AWS::Rekognition::StreamProcessor.Polygon" + "type": "object" }, "type": "array" }, @@ -119642,21 +119693,6 @@ ], "type": "object" }, - "AWS::Rekognition::StreamProcessor.Polygon": { - "additionalProperties": false, - "properties": { - "Polygon": { - "items": { - "$ref": "#/definitions/AWS::Rekognition::StreamProcessor.Point" - }, - "type": "array" - } - }, - "required": [ - "Polygon" - ], - "type": "object" - }, "AWS::Rekognition::StreamProcessor.S3Destination": { "additionalProperties": false, "properties": { diff --git a/schema/cloudformation.go b/schema/cloudformation.go index 87df1b0cbd..dc1fc34526 100644 --- a/schema/cloudformation.go +++ b/schema/cloudformation.go @@ -19635,9 +19635,27 @@ var CloudformationSchema = `{ ], "type": "object" }, + "AWS::Budgets::Budget.AutoAdjustData": { + "additionalProperties": false, + "properties": { + "AutoAdjustType": { + "type": "string" + }, + "HistoricalOptions": { + "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions" + } + }, + "required": [ + "AutoAdjustType" + ], + "type": "object" + }, "AWS::Budgets::Budget.BudgetData": { "additionalProperties": false, "properties": { + "AutoAdjustData": { + "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData" + }, "BudgetLimit": { "$ref": "#/definitions/AWS::Budgets::Budget.Spend" }, @@ -19708,6 +19726,18 @@ var CloudformationSchema = `{ }, "type": "object" }, + "AWS::Budgets::Budget.HistoricalOptions": { + "additionalProperties": false, + "properties": { + "BudgetAdjustmentPeriod": { + "type": "number" + } + }, + "required": [ + "BudgetAdjustmentPeriod" + ], + "type": "object" + }, "AWS::Budgets::Budget.Notification": { "additionalProperties": false, "properties": { @@ -115950,6 +115980,12 @@ var CloudformationSchema = `{ "DeletionProtection": { "type": "boolean" }, + "Domain": { + "type": "string" + }, + "DomainIAMRoleName": { + "type": "string" + }, "EnableCloudwatchLogsExports": { "items": { "type": "string" @@ -115992,6 +116028,9 @@ var CloudformationSchema = `{ "MonitoringRoleArn": { "type": "string" }, + "NetworkType": { + "type": "string" + }, "PerformanceInsightsEnabled": { "type": "boolean" }, @@ -116370,6 +116409,9 @@ var CloudformationSchema = `{ "NcharCharacterSetName": { "type": "string" }, + "NetworkType": { + "type": "string" + }, "OptionGroupName": { "type": "string" }, @@ -118223,11 +118265,20 @@ var CloudformationSchema = `{ "SubnetGroupName": { "type": "string" }, + "VpcEndpoint": { + "type": "object" + }, "VpcSecurityGroupIds": { "items": { "type": "string" }, "type": "array" + }, + "VpcSecurityGroups": { + "items": { + "$ref": "#/definitions/AWS::Redshift::EndpointAccess.VpcSecurityGroup" + }, + "type": "array" } }, "required": [ @@ -119421,7 +119472,7 @@ var CloudformationSchema = `{ }, "PolygonRegionsOfInterest": { "items": { - "$ref": "#/definitions/AWS::Rekognition::StreamProcessor.Polygon" + "type": "object" }, "type": "array" }, @@ -119586,21 +119637,6 @@ var CloudformationSchema = `{ ], "type": "object" }, - "AWS::Rekognition::StreamProcessor.Polygon": { - "additionalProperties": false, - "properties": { - "Polygon": { - "items": { - "$ref": "#/definitions/AWS::Rekognition::StreamProcessor.Point" - }, - "type": "array" - } - }, - "required": [ - "Polygon" - ], - "type": "object" - }, "AWS::Rekognition::StreamProcessor.S3Destination": { "additionalProperties": false, "properties": { diff --git a/schema/cloudformation.schema.json b/schema/cloudformation.schema.json index b8dc3fccb7..abadd17632 100644 --- a/schema/cloudformation.schema.json +++ b/schema/cloudformation.schema.json @@ -19630,9 +19630,27 @@ ], "type": "object" }, + "AWS::Budgets::Budget.AutoAdjustData": { + "additionalProperties": false, + "properties": { + "AutoAdjustType": { + "type": "string" + }, + "HistoricalOptions": { + "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions" + } + }, + "required": [ + "AutoAdjustType" + ], + "type": "object" + }, "AWS::Budgets::Budget.BudgetData": { "additionalProperties": false, "properties": { + "AutoAdjustData": { + "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData" + }, "BudgetLimit": { "$ref": "#/definitions/AWS::Budgets::Budget.Spend" }, @@ -19703,6 +19721,18 @@ }, "type": "object" }, + "AWS::Budgets::Budget.HistoricalOptions": { + "additionalProperties": false, + "properties": { + "BudgetAdjustmentPeriod": { + "type": "number" + } + }, + "required": [ + "BudgetAdjustmentPeriod" + ], + "type": "object" + }, "AWS::Budgets::Budget.Notification": { "additionalProperties": false, "properties": { @@ -115945,6 +115975,12 @@ "DeletionProtection": { "type": "boolean" }, + "Domain": { + "type": "string" + }, + "DomainIAMRoleName": { + "type": "string" + }, "EnableCloudwatchLogsExports": { "items": { "type": "string" @@ -115987,6 +116023,9 @@ "MonitoringRoleArn": { "type": "string" }, + "NetworkType": { + "type": "string" + }, "PerformanceInsightsEnabled": { "type": "boolean" }, @@ -116365,6 +116404,9 @@ "NcharCharacterSetName": { "type": "string" }, + "NetworkType": { + "type": "string" + }, "OptionGroupName": { "type": "string" }, @@ -118218,11 +118260,20 @@ "SubnetGroupName": { "type": "string" }, + "VpcEndpoint": { + "type": "object" + }, "VpcSecurityGroupIds": { "items": { "type": "string" }, "type": "array" + }, + "VpcSecurityGroups": { + "items": { + "$ref": "#/definitions/AWS::Redshift::EndpointAccess.VpcSecurityGroup" + }, + "type": "array" } }, "required": [ @@ -119416,7 +119467,7 @@ }, "PolygonRegionsOfInterest": { "items": { - "$ref": "#/definitions/AWS::Rekognition::StreamProcessor.Polygon" + "type": "object" }, "type": "array" }, @@ -119581,21 +119632,6 @@ ], "type": "object" }, - "AWS::Rekognition::StreamProcessor.Polygon": { - "additionalProperties": false, - "properties": { - "Polygon": { - "items": { - "$ref": "#/definitions/AWS::Rekognition::StreamProcessor.Point" - }, - "type": "array" - } - }, - "required": [ - "Polygon" - ], - "type": "object" - }, "AWS::Rekognition::StreamProcessor.S3Destination": { "additionalProperties": false, "properties": { diff --git a/schema/sam.go b/schema/sam.go index c72a16d522..78fc43f6d5 100644 --- a/schema/sam.go +++ b/schema/sam.go @@ -19635,9 +19635,27 @@ var SamSchema = `{ ], "type": "object" }, + "AWS::Budgets::Budget.AutoAdjustData": { + "additionalProperties": false, + "properties": { + "AutoAdjustType": { + "type": "string" + }, + "HistoricalOptions": { + "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions" + } + }, + "required": [ + "AutoAdjustType" + ], + "type": "object" + }, "AWS::Budgets::Budget.BudgetData": { "additionalProperties": false, "properties": { + "AutoAdjustData": { + "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData" + }, "BudgetLimit": { "$ref": "#/definitions/AWS::Budgets::Budget.Spend" }, @@ -19708,6 +19726,18 @@ var SamSchema = `{ }, "type": "object" }, + "AWS::Budgets::Budget.HistoricalOptions": { + "additionalProperties": false, + "properties": { + "BudgetAdjustmentPeriod": { + "type": "number" + } + }, + "required": [ + "BudgetAdjustmentPeriod" + ], + "type": "object" + }, "AWS::Budgets::Budget.Notification": { "additionalProperties": false, "properties": { @@ -115950,6 +115980,12 @@ var SamSchema = `{ "DeletionProtection": { "type": "boolean" }, + "Domain": { + "type": "string" + }, + "DomainIAMRoleName": { + "type": "string" + }, "EnableCloudwatchLogsExports": { "items": { "type": "string" @@ -115992,6 +116028,9 @@ var SamSchema = `{ "MonitoringRoleArn": { "type": "string" }, + "NetworkType": { + "type": "string" + }, "PerformanceInsightsEnabled": { "type": "boolean" }, @@ -116370,6 +116409,9 @@ var SamSchema = `{ "NcharCharacterSetName": { "type": "string" }, + "NetworkType": { + "type": "string" + }, "OptionGroupName": { "type": "string" }, @@ -118223,11 +118265,20 @@ var SamSchema = `{ "SubnetGroupName": { "type": "string" }, + "VpcEndpoint": { + "type": "object" + }, "VpcSecurityGroupIds": { "items": { "type": "string" }, "type": "array" + }, + "VpcSecurityGroups": { + "items": { + "$ref": "#/definitions/AWS::Redshift::EndpointAccess.VpcSecurityGroup" + }, + "type": "array" } }, "required": [ @@ -119421,7 +119472,7 @@ var SamSchema = `{ }, "PolygonRegionsOfInterest": { "items": { - "$ref": "#/definitions/AWS::Rekognition::StreamProcessor.Polygon" + "type": "object" }, "type": "array" }, @@ -119586,21 +119637,6 @@ var SamSchema = `{ ], "type": "object" }, - "AWS::Rekognition::StreamProcessor.Polygon": { - "additionalProperties": false, - "properties": { - "Polygon": { - "items": { - "$ref": "#/definitions/AWS::Rekognition::StreamProcessor.Point" - }, - "type": "array" - } - }, - "required": [ - "Polygon" - ], - "type": "object" - }, "AWS::Rekognition::StreamProcessor.S3Destination": { "additionalProperties": false, "properties": { diff --git a/schema/sam.schema.json b/schema/sam.schema.json index 976e6b23b6..3a2d739d51 100644 --- a/schema/sam.schema.json +++ b/schema/sam.schema.json @@ -19630,9 +19630,27 @@ ], "type": "object" }, + "AWS::Budgets::Budget.AutoAdjustData": { + "additionalProperties": false, + "properties": { + "AutoAdjustType": { + "type": "string" + }, + "HistoricalOptions": { + "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions" + } + }, + "required": [ + "AutoAdjustType" + ], + "type": "object" + }, "AWS::Budgets::Budget.BudgetData": { "additionalProperties": false, "properties": { + "AutoAdjustData": { + "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData" + }, "BudgetLimit": { "$ref": "#/definitions/AWS::Budgets::Budget.Spend" }, @@ -19703,6 +19721,18 @@ }, "type": "object" }, + "AWS::Budgets::Budget.HistoricalOptions": { + "additionalProperties": false, + "properties": { + "BudgetAdjustmentPeriod": { + "type": "number" + } + }, + "required": [ + "BudgetAdjustmentPeriod" + ], + "type": "object" + }, "AWS::Budgets::Budget.Notification": { "additionalProperties": false, "properties": { @@ -115945,6 +115975,12 @@ "DeletionProtection": { "type": "boolean" }, + "Domain": { + "type": "string" + }, + "DomainIAMRoleName": { + "type": "string" + }, "EnableCloudwatchLogsExports": { "items": { "type": "string" @@ -115987,6 +116023,9 @@ "MonitoringRoleArn": { "type": "string" }, + "NetworkType": { + "type": "string" + }, "PerformanceInsightsEnabled": { "type": "boolean" }, @@ -116365,6 +116404,9 @@ "NcharCharacterSetName": { "type": "string" }, + "NetworkType": { + "type": "string" + }, "OptionGroupName": { "type": "string" }, @@ -118218,11 +118260,20 @@ "SubnetGroupName": { "type": "string" }, + "VpcEndpoint": { + "type": "object" + }, "VpcSecurityGroupIds": { "items": { "type": "string" }, "type": "array" + }, + "VpcSecurityGroups": { + "items": { + "$ref": "#/definitions/AWS::Redshift::EndpointAccess.VpcSecurityGroup" + }, + "type": "array" } }, "required": [ @@ -119416,7 +119467,7 @@ }, "PolygonRegionsOfInterest": { "items": { - "$ref": "#/definitions/AWS::Rekognition::StreamProcessor.Polygon" + "type": "object" }, "type": "array" }, @@ -119581,21 +119632,6 @@ ], "type": "object" }, - "AWS::Rekognition::StreamProcessor.Polygon": { - "additionalProperties": false, - "properties": { - "Polygon": { - "items": { - "$ref": "#/definitions/AWS::Rekognition::StreamProcessor.Point" - }, - "type": "array" - } - }, - "required": [ - "Polygon" - ], - "type": "object" - }, "AWS::Rekognition::StreamProcessor.S3Destination": { "additionalProperties": false, "properties": {