diff --git a/.docs.version b/.docs.version
index c9e73c69bd..a00d73a322 100644
--- a/.docs.version
+++ b/.docs.version
@@ -1 +1 @@
-16cf7b1c1b8b2730112a0ee5938a40765612d1fd
+c68fb78a5b20627942cc6d77718d4ae7ca151006
diff --git a/aws-cloudformation-schema/aws-fis-experimenttemplate.json b/aws-cloudformation-schema/aws-fis-experimenttemplate.json
index a3a53ec88b..552f272ab6 100644
--- a/aws-cloudformation-schema/aws-fis-experimenttemplate.json
+++ b/aws-cloudformation-schema/aws-fis-experimenttemplate.json
@@ -331,6 +331,7 @@
"tagOnCreate" : true,
"tagUpdatable" : true,
"cloudFormationSystemTags" : true,
+ "tagProperty" : "/properties/Tags",
"permissions" : [ "fis:TagResource", "fis:UntagResource", "fis:ListTagsForResource" ]
},
"primaryIdentifier" : [ "/properties/Id" ],
diff --git a/aws-cloudformation-schema/aws-gamelift-containergroupdefinition.json b/aws-cloudformation-schema/aws-gamelift-containergroupdefinition.json
index 47020e9f0c..3628072734 100644
--- a/aws-cloudformation-schema/aws-gamelift-containergroupdefinition.json
+++ b/aws-cloudformation-schema/aws-gamelift-containergroupdefinition.json
@@ -1,313 +1,337 @@
{
- "$schema" : "https://schema.cloudformation.us-east-1.amazonaws.com/provider.definition.schema.v1.json",
- "typeName" : "AWS::GameLift::ContainerGroupDefinition",
- "description" : "The AWS::GameLift::ContainerGroupDefinition resource creates an Amazon GameLift container group definition.",
- "sourceUrl" : "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-gamelift.git",
"tagging" : {
+ "permissions" : [ "gamelift:ListTagsForResource", "gamelift:TagResource", "gamelift:UntagResource" ],
"taggable" : true,
- "cloudFormationSystemTags" : false,
"tagOnCreate" : true,
"tagUpdatable" : true,
- "tagProperty" : "/properties/Tags"
+ "tagProperty" : "/properties/Tags",
+ "cloudFormationSystemTags" : false
+ },
+ "$schema" : "https://schema.cloudformation.us-east-1.amazonaws.com/provider.definition.schema.v1.json",
+ "typeName" : "AWS::GameLift::ContainerGroupDefinition",
+ "readOnlyProperties" : [ "/properties/ContainerGroupDefinitionArn", "/properties/CreationTime", "/properties/ContainerDefinitions/*/ResolvedImageDigest" ],
+ "description" : "The AWS::GameLift::ContainerGroupDefinition resource creates an Amazon GameLift container group definition.",
+ "createOnlyProperties" : [ "/properties/Name", "/properties/SchedulingStrategy", "/properties/TotalMemoryLimit", "/properties/TotalCpuLimit", "/properties/ContainerDefinitions", "/properties/OperatingSystem" ],
+ "primaryIdentifier" : [ "/properties/Name" ],
+ "required" : [ "Name", "TotalMemoryLimit", "TotalCpuLimit", "ContainerDefinitions", "OperatingSystem" ],
+ "sourceUrl" : "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-gamelift.git",
+ "handlers" : {
+ "read" : {
+ "permissions" : [ "gamelift:DescribeContainerGroupDefinition", "gamelift:ListTagsForResource" ]
+ },
+ "create" : {
+ "permissions" : [ "gamelift:CreateContainerGroupDefinition", "gamelift:DescribeContainerGroupDefinition", "gamelift:ListTagsForResource", "gamelift:TagResource", "ecr:BatchCheckLayerAvailability", "ecr:BatchGetImage", "ecr:GetDownloadUrlForLayer", "ecr:DescribeImages" ]
+ },
+ "update" : {
+ "permissions" : [ "gamelift:ListTagsForResource", "gamelift:TagResource", "gamelift:UntagResource" ]
+ },
+ "list" : {
+ "permissions" : [ "gamelift:ListContainerGroupDefinitions" ]
+ },
+ "delete" : {
+ "permissions" : [ "gamelift:DescribeContainerGroupDefinition", "gamelift:DeleteContainerGroupDefinition" ]
+ }
},
+ "additionalProperties" : false,
"definitions" : {
- "ContainerDefinition" : {
- "description" : "Details about a container that is used in a container fleet",
+ "ContainerPortRange" : {
+ "description" : "A set of one or more port numbers that can be opened on the container.",
+ "additionalProperties" : false,
"type" : "object",
"properties" : {
+ "FromPort" : {
+ "description" : "A starting value for the range of allowed port numbers.",
+ "maximum" : 60000,
+ "type" : "integer",
+ "minimum" : 1
+ },
+ "ToPort" : {
+ "description" : "An ending value for the range of allowed port numbers. Port numbers are end-inclusive. This value must be equal to or greater than FromPort.",
+ "maximum" : 60000,
+ "type" : "integer",
+ "minimum" : 1
+ },
+ "Protocol" : {
+ "description" : "Defines the protocol of these ports.",
+ "type" : "string",
+ "enum" : [ "TCP", "UDP" ]
+ }
+ },
+ "required" : [ "FromPort", "Protocol", "ToPort" ]
+ },
+ "MemoryLimits" : {
+ "description" : "Specifies how much memory is available to the container.",
+ "additionalProperties" : false,
+ "type" : "object",
+ "properties" : {
+ "SoftLimit" : {
+ "description" : "The amount of memory that is reserved for the container.",
+ "maximum" : 1024000,
+ "type" : "integer",
+ "minimum" : 4
+ },
+ "HardLimit" : {
+ "description" : "The hard limit of memory to reserve for the container.",
+ "maximum" : 1024000,
+ "type" : "integer",
+ "minimum" : 4
+ }
+ }
+ },
+ "ContainerDependency" : {
+ "description" : "A dependency that impacts a container's startup and shutdown.",
+ "additionalProperties" : false,
+ "type" : "object",
+ "properties" : {
+ "Condition" : {
+ "description" : "The type of dependency.",
+ "type" : "string",
+ "enum" : [ "START", "COMPLETE", "SUCCESS", "HEALTHY" ]
+ },
"ContainerName" : {
- "description" : "A descriptive label for the container definition. Container definition names must be unique with a container group definition.",
+ "minLength" : 1,
+ "pattern" : "^[a-zA-Z0-9-]+$",
+ "description" : "A descriptive label for the container definition. The container being defined depends on this container's condition.",
"type" : "string",
+ "maxLength" : 128
+ }
+ },
+ "required" : [ "ContainerName", "Condition" ]
+ },
+ "ContainerEnvironment" : {
+ "description" : "An environment variable to set inside a container, in the form of a key-value pair.",
+ "additionalProperties" : false,
+ "type" : "object",
+ "properties" : {
+ "Value" : {
"minLength" : 1,
- "maxLength" : 128,
- "pattern" : "^[a-zA-Z0-9-]+$"
+ "pattern" : "^.*$",
+ "description" : "The environment variable value.",
+ "type" : "string",
+ "maxLength" : 255
},
- "ImageUri" : {
- "description" : "Specifies the image URI of this container.",
+ "Name" : {
+ "minLength" : 1,
+ "pattern" : "^.*$",
+ "description" : "The environment variable name.",
"type" : "string",
+ "maxLength" : 255
+ }
+ },
+ "required" : [ "Name", "Value" ]
+ },
+ "ContainerDefinition" : {
+ "description" : "Details about a container that is used in a container fleet",
+ "additionalProperties" : false,
+ "type" : "object",
+ "properties" : {
+ "WorkingDirectory" : {
"minLength" : 1,
- "maxLength" : 255,
- "pattern" : "^[a-zA-Z0-9-_\\.@\\/:]+$"
- },
- "ResolvedImageDigest" : {
- "description" : "The digest of the container image.",
+ "pattern" : "^.*$",
+ "description" : "The working directory to run commands inside the container in.",
"type" : "string",
- "pattern" : "^sha256:[a-fA-F0-9]{64}$"
+ "maxLength" : 255
},
"MemoryLimits" : {
"description" : "Specifies how much memory is available to the container. You must specify at least this parameter or the TotalMemoryLimit parameter of the ContainerGroupDefinition.",
"$ref" : "#/definitions/MemoryLimits"
},
- "PortConfiguration" : {
- "description" : "Defines the ports on the container.",
- "$ref" : "#/definitions/PortConfiguration"
+ "HealthCheck" : {
+ "description" : "Specifies how the health of the containers will be checked.",
+ "$ref" : "#/definitions/ContainerHealthCheck"
},
"Cpu" : {
"description" : "The maximum number of CPU units reserved for this container. The value is expressed as an integer amount of CPU units. 1 vCPU is equal to 1024 CPU units",
+ "maximum" : 10240,
"type" : "integer",
- "minimum" : 1,
- "maximum" : 10240
+ "minimum" : 1
},
- "HealthCheck" : {
- "description" : "Specifies how the health of the containers will be checked.",
- "$ref" : "#/definitions/ContainerHealthCheck"
- },
- "Command" : {
- "description" : "The command that's passed to the container.",
- "type" : "array",
- "uniqueItems" : false,
- "insertionOrder" : true,
+ "EntryPoint" : {
"minItems" : 1,
"maxItems" : 20,
+ "uniqueItems" : false,
+ "description" : "The entry point that's passed to the container so that it will run as an executable. If there are multiple arguments, each argument is a string in the array.",
+ "insertionOrder" : true,
+ "type" : "array",
"items" : {
- "type" : "string",
"minLength" : 1,
- "maxLength" : 255,
- "pattern" : "^.*$"
+ "type" : "string",
+ "maxLength" : 1024
}
},
+ "ImageUri" : {
+ "minLength" : 1,
+ "pattern" : "^[a-zA-Z0-9-_\\.@\\/:]+$",
+ "description" : "Specifies the image URI of this container.",
+ "type" : "string",
+ "maxLength" : 255
+ },
+ "ResolvedImageDigest" : {
+ "pattern" : "^sha256:[a-fA-F0-9]{64}$",
+ "description" : "The digest of the container image.",
+ "type" : "string"
+ },
"Essential" : {
"description" : "Specifies if the container is essential. If an essential container fails a health check, then all containers in the container group will be restarted. You must specify exactly 1 essential container in a container group.",
"type" : "boolean"
},
- "EntryPoint" : {
- "description" : "The entry point that's passed to the container so that it will run as an executable. If there are multiple arguments, each argument is a string in the array.",
- "type" : "array",
- "uniqueItems" : false,
- "insertionOrder" : true,
+ "PortConfiguration" : {
+ "description" : "Defines the ports on the container.",
+ "$ref" : "#/definitions/PortConfiguration"
+ },
+ "DependsOn" : {
"minItems" : 1,
- "maxItems" : 20,
+ "maxItems" : 10,
+ "uniqueItems" : true,
+ "description" : "A list of container dependencies that determines when this container starts up and shuts down. For container groups with multiple containers, dependencies let you define a startup/shutdown sequence across the containers.",
+ "insertionOrder" : true,
+ "type" : "array",
"items" : {
- "type" : "string",
- "minLength" : 1,
- "maxLength" : 1024
+ "$ref" : "#/definitions/ContainerDependency"
}
},
- "WorkingDirectory" : {
- "description" : "The working directory to run commands inside the container in.",
- "type" : "string",
+ "ContainerName" : {
"minLength" : 1,
- "maxLength" : 255,
- "pattern" : "^.*$"
+ "pattern" : "^[a-zA-Z0-9-]+$",
+ "description" : "A descriptive label for the container definition. Container definition names must be unique with a container group definition.",
+ "type" : "string",
+ "maxLength" : 128
},
- "Environment" : {
- "description" : "The environment variables to pass to a container.",
- "type" : "array",
- "uniqueItems" : true,
- "insertionOrder" : false,
+ "Command" : {
"minItems" : 1,
"maxItems" : 20,
+ "uniqueItems" : false,
+ "description" : "The command that's passed to the container.",
+ "insertionOrder" : true,
+ "type" : "array",
"items" : {
- "$ref" : "#/definitions/ContainerEnvironment"
+ "minLength" : 1,
+ "pattern" : "^.*$",
+ "type" : "string",
+ "maxLength" : 255
}
},
- "DependsOn" : {
- "description" : "A list of container dependencies that determines when this container starts up and shuts down. For container groups with multiple containers, dependencies let you define a startup/shutdown sequence across the containers.",
- "type" : "array",
- "uniqueItems" : true,
- "insertionOrder" : true,
+ "Environment" : {
"minItems" : 1,
- "maxItems" : 10,
+ "maxItems" : 20,
+ "uniqueItems" : true,
+ "description" : "The environment variables to pass to a container.",
+ "insertionOrder" : false,
+ "type" : "array",
"items" : {
- "$ref" : "#/definitions/ContainerDependency"
+ "$ref" : "#/definitions/ContainerEnvironment"
}
}
},
- "required" : [ "ContainerName", "ImageUri" ],
- "additionalProperties" : false
+ "required" : [ "ContainerName", "ImageUri" ]
},
- "MemoryLimits" : {
- "description" : "Specifies how much memory is available to the container.",
+ "Tag" : {
+ "description" : "A key-value pair to associate with a resource.",
+ "additionalProperties" : false,
"type" : "object",
"properties" : {
- "SoftLimit" : {
- "description" : "The amount of memory that is reserved for the container.",
- "type" : "integer",
- "minimum" : 4,
- "maximum" : 1024000
+ "Value" : {
+ "minLength" : 0,
+ "pattern" : "^.*$",
+ "description" : "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length.",
+ "type" : "string",
+ "maxLength" : 256
},
- "HardLimit" : {
- "description" : "The hard limit of memory to reserve for the container.",
- "type" : "integer",
- "minimum" : 4,
- "maximum" : 1024000
+ "Key" : {
+ "minLength" : 1,
+ "pattern" : "^.*$",
+ "description" : "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length.",
+ "type" : "string",
+ "maxLength" : 128
}
},
- "additionalProperties" : false
+ "required" : [ "Key", "Value" ]
},
"PortConfiguration" : {
"description" : "Defines the ports on a container.",
+ "additionalProperties" : false,
"type" : "object",
"properties" : {
"ContainerPortRanges" : {
- "description" : "Specifies one or more ranges of ports on a container.",
- "type" : "array",
- "uniqueItems" : true,
- "insertionOrder" : false,
"minItems" : 1,
"maxItems" : 100,
+ "uniqueItems" : true,
+ "description" : "Specifies one or more ranges of ports on a container.",
+ "insertionOrder" : false,
+ "type" : "array",
"items" : {
"$ref" : "#/definitions/ContainerPortRange"
}
}
},
- "required" : [ "ContainerPortRanges" ],
- "additionalProperties" : false
- },
- "ContainerPortRange" : {
- "description" : "A set of one or more port numbers that can be opened on the container.",
- "type" : "object",
- "properties" : {
- "FromPort" : {
- "description" : "A starting value for the range of allowed port numbers.",
- "type" : "integer",
- "minimum" : 1,
- "maximum" : 60000
- },
- "Protocol" : {
- "description" : "Defines the protocol of these ports.",
- "type" : "string",
- "enum" : [ "TCP", "UDP" ]
- },
- "ToPort" : {
- "description" : "An ending value for the range of allowed port numbers. Port numbers are end-inclusive. This value must be equal to or greater than FromPort.",
- "type" : "integer",
- "minimum" : 1,
- "maximum" : 60000
- }
- },
- "required" : [ "FromPort", "Protocol", "ToPort" ],
- "additionalProperties" : false
+ "required" : [ "ContainerPortRanges" ]
},
"ContainerHealthCheck" : {
"description" : "Specifies how the process manager checks the health of containers.",
+ "additionalProperties" : false,
"type" : "object",
"properties" : {
"Command" : {
- "description" : "A string array representing the command that the container runs to determine if it is healthy.",
- "type" : "array",
- "uniqueItems" : false,
- "insertionOrder" : true,
"minItems" : 1,
"maxItems" : 20,
+ "uniqueItems" : false,
+ "description" : "A string array representing the command that the container runs to determine if it is healthy.",
+ "insertionOrder" : true,
+ "type" : "array",
"items" : {
- "type" : "string",
"minLength" : 1,
- "maxLength" : 255,
- "pattern" : "^.*$"
+ "pattern" : "^.*$",
+ "type" : "string",
+ "maxLength" : 255
}
},
- "Interval" : {
- "description" : "How often (in seconds) the health is checked.",
- "type" : "integer",
- "minimum" : 60,
- "maximum" : 300
- },
"Timeout" : {
"description" : "How many seconds the process manager allows the command to run before canceling it.",
+ "maximum" : 60,
"type" : "integer",
- "minimum" : 30,
- "maximum" : 60
+ "minimum" : 30
},
"Retries" : {
"description" : "How many times the process manager will retry the command after a timeout. (The first run of the command does not count as a retry.)",
+ "maximum" : 10,
"type" : "integer",
- "minimum" : 5,
- "maximum" : 10
+ "minimum" : 5
+ },
+ "Interval" : {
+ "description" : "How often (in seconds) the health is checked.",
+ "maximum" : 300,
+ "type" : "integer",
+ "minimum" : 60
},
"StartPeriod" : {
"description" : "The optional grace period (in seconds) to give a container time to boostrap before teh health check is declared failed.",
+ "maximum" : 300,
"type" : "integer",
- "minimum" : 0,
- "maximum" : 300
+ "minimum" : 0
}
},
- "required" : [ "Command" ],
- "additionalProperties" : false
- },
- "ContainerEnvironment" : {
- "description" : "An environment variable to set inside a container, in the form of a key-value pair.",
- "type" : "object",
- "properties" : {
- "Name" : {
- "description" : "The environment variable name.",
- "type" : "string",
- "minLength" : 1,
- "maxLength" : 255,
- "pattern" : "^.*$"
- },
- "Value" : {
- "description" : "The environment variable value.",
- "type" : "string",
- "minLength" : 1,
- "maxLength" : 255,
- "pattern" : "^.*$"
- }
- },
- "required" : [ "Name", "Value" ],
- "additionalProperties" : false
- },
- "ContainerDependency" : {
- "description" : "A dependency that impacts a container's startup and shutdown.",
- "type" : "object",
- "properties" : {
- "ContainerName" : {
- "description" : "A descriptive label for the container definition. The container being defined depends on this container's condition.",
- "type" : "string",
- "minLength" : 1,
- "maxLength" : 128,
- "pattern" : "^[a-zA-Z0-9-]+$"
- },
- "Condition" : {
- "description" : "The type of dependency.",
- "type" : "string",
- "enum" : [ "START", "COMPLETE", "SUCCESS", "HEALTHY" ]
- }
- },
- "required" : [ "ContainerName", "Condition" ],
- "additionalProperties" : false
- },
- "Tag" : {
- "description" : "A key-value pair to associate with a resource.",
- "type" : "object",
- "properties" : {
- "Key" : {
- "description" : "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length.",
- "type" : "string",
- "minLength" : 1,
- "maxLength" : 128,
- "pattern" : "^.*$"
- },
- "Value" : {
- "description" : "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length.",
- "type" : "string",
- "minLength" : 0,
- "maxLength" : 256,
- "pattern" : "^.*$"
- }
- },
- "required" : [ "Key", "Value" ],
- "additionalProperties" : false
+ "required" : [ "Command" ]
}
},
"properties" : {
- "ContainerGroupDefinitionArn" : {
- "description" : "The Amazon Resource Name (ARN) that is assigned to a Amazon GameLift container group resource and uniquely identifies it across all AWS Regions.",
+ "OperatingSystem" : {
+ "description" : "The operating system of the container group",
"type" : "string",
- "minLength" : 1,
- "maxLength" : 512,
- "pattern" : "^arn:.*:containergroupdefinition/containergroupdefinition-[a-zA-Z0-9-]+$"
+ "enum" : [ "AMAZON_LINUX_2023" ]
},
"Name" : {
+ "minLength" : 1,
+ "pattern" : "^[a-zA-Z0-9-]+$",
"description" : "A descriptive label for the container group definition.",
"type" : "string",
- "minLength" : 1,
- "maxLength" : 128,
- "pattern" : "^[a-zA-Z0-9-]+$"
+ "maxLength" : 128
},
- "CreationTime" : {
- "description" : "A time stamp indicating when this data object was created. Format is a number expressed in Unix time as milliseconds (for example \"1469498468.057\").",
- "type" : "string"
+ "ContainerGroupDefinitionArn" : {
+ "minLength" : 1,
+ "pattern" : "^arn:.*:containergroupdefinition/containergroupdefinition-[a-zA-Z0-9-]+$|^arn:.*:containergroupdefinition/[a-zA-Z0-9-\\:]+$",
+ "description" : "The Amazon Resource Name (ARN) that is assigned to a Amazon GameLift container group resource and uniquely identifies it across all AWS Regions.",
+ "type" : "string",
+ "maxLength" : 512
},
"SchedulingStrategy" : {
"description" : "Specifies whether the container group includes replica or daemon containers.",
@@ -316,64 +340,41 @@
},
"TotalMemoryLimit" : {
"description" : "The maximum amount of memory (in MiB) to allocate for this container group.",
+ "maximum" : 1024000,
"type" : "integer",
- "minimum" : 4,
- "maximum" : 1024000
+ "minimum" : 4
},
- "TotalCpuLimit" : {
- "description" : "The maximum number of CPU units reserved for this container group. The value is expressed as an integer amount of CPU units. (1 vCPU is equal to 1024 CPU units.)",
- "type" : "integer",
- "minimum" : 128,
- "maximum" : 10240
+ "CreationTime" : {
+ "description" : "A time stamp indicating when this data object was created. Format is a number expressed in Unix time as milliseconds (for example \"1469498468.057\").",
+ "type" : "string"
},
"ContainerDefinitions" : {
- "description" : "A collection of container definitions that define the containers in this group.",
- "type" : "array",
- "uniqueItems" : true,
- "insertionOrder" : false,
"minItems" : 1,
"maxItems" : 10,
+ "uniqueItems" : true,
+ "description" : "A collection of container definitions that define the containers in this group.",
+ "insertionOrder" : false,
+ "type" : "array",
"items" : {
"$ref" : "#/definitions/ContainerDefinition"
}
},
"Tags" : {
- "description" : "An array of key-value pairs to apply to this resource.",
- "type" : "array",
- "uniqueItems" : true,
- "insertionOrder" : false,
"minItems" : 0,
"maxItems" : 200,
+ "uniqueItems" : true,
+ "description" : "An array of key-value pairs to apply to this resource.",
+ "insertionOrder" : false,
+ "type" : "array",
"items" : {
"$ref" : "#/definitions/Tag"
}
},
- "OperatingSystem" : {
- "description" : "The operating system of the container group",
- "type" : "string",
- "enum" : [ "AMAZON_LINUX_2023" ]
- }
- },
- "additionalProperties" : false,
- "required" : [ "Name", "TotalMemoryLimit", "TotalCpuLimit", "ContainerDefinitions", "OperatingSystem" ],
- "createOnlyProperties" : [ "/properties/Name", "/properties/SchedulingStrategy", "/properties/TotalMemoryLimit", "/properties/TotalCpuLimit", "/properties/ContainerDefinitions", "/properties/OperatingSystem" ],
- "readOnlyProperties" : [ "/properties/ContainerGroupDefinitionArn", "/properties/CreationTime", "/properties/ContainerDefinitions/*/ResolvedImageDigest" ],
- "primaryIdentifier" : [ "/properties/Name" ],
- "handlers" : {
- "create" : {
- "permissions" : [ "gamelift:CreateContainerGroupDefinition", "gamelift:DescribeContainerGroupDefinition", "gamelift:ListTagsForResource", "gamelift:TagResource", "ecr:BatchCheckLayerAvailability", "ecr:BatchGetImage", "ecr:GetDownloadUrlForLayer", "ecr:DescribeImages" ]
- },
- "read" : {
- "permissions" : [ "gamelift:DescribeContainerGroupDefinition", "gamelift:ListTagsForResource" ]
- },
- "update" : {
- "permissions" : [ "gamelift:ListTagsForResource", "gamelift:TagResource", "gamelift:UntagResource" ]
- },
- "delete" : {
- "permissions" : [ "gamelift:DescribeContainerGroupDefinition", "gamelift:DeleteContainerGroupDefinition" ]
- },
- "list" : {
- "permissions" : [ "gamelift:ListContainerGroupDefinitions" ]
+ "TotalCpuLimit" : {
+ "description" : "The maximum number of CPU units reserved for this container group. The value is expressed as an integer amount of CPU units. (1 vCPU is equal to 1024 CPU units.)",
+ "maximum" : 10240,
+ "type" : "integer",
+ "minimum" : 128
}
}
}
\ No newline at end of file
diff --git a/aws-cloudformation-schema/aws-gamelift-gameservergroup.json b/aws-cloudformation-schema/aws-gamelift-gameservergroup.json
index 63cdbf9427..17d0531205 100644
--- a/aws-cloudformation-schema/aws-gamelift-gameservergroup.json
+++ b/aws-cloudformation-schema/aws-gamelift-gameservergroup.json
@@ -3,6 +3,7 @@
"typeName" : "AWS::GameLift::GameServerGroup",
"description" : "The AWS::GameLift::GameServerGroup resource creates an Amazon GameLift (GameLift) GameServerGroup.",
"sourceUrl" : "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-gamelift.git",
+ "taggable" : true,
"definitions" : {
"AutoScalingPolicy" : {
"type" : "object",
@@ -337,6 +338,5 @@
"list" : {
"permissions" : [ "gamelift:ListGameServerGroups" ]
}
- },
- "taggable" : true
+ }
}
\ No newline at end of file
diff --git a/aws-cloudformation-schema/aws-iotfleetwise-campaign.json b/aws-cloudformation-schema/aws-iotfleetwise-campaign.json
index a7da8b3292..9705155f3e 100644
--- a/aws-cloudformation-schema/aws-iotfleetwise-campaign.json
+++ b/aws-cloudformation-schema/aws-iotfleetwise-campaign.json
@@ -455,14 +455,15 @@
"tagOnCreate" : true,
"tagUpdatable" : true,
"cloudFormationSystemTags" : true,
- "tagProperty" : "/properties/Tags"
+ "tagProperty" : "/properties/Tags",
+ "permissions" : [ "iotfleetwise:UntagResource", "iotfleetwise:TagResource", "iotfleetwise:ListTagsForResource" ]
},
"readOnlyProperties" : [ "/properties/Arn", "/properties/Status", "/properties/CreationTime", "/properties/LastModificationTime" ],
"writeOnlyProperties" : [ "/properties/Action" ],
"createOnlyProperties" : [ "/properties/Name", "/properties/TargetArn", "/properties/SignalCatalogArn", "/properties/PostTriggerCollectionDuration", "/properties/DiagnosticsMode", "/properties/SpoolingMode", "/properties/CollectionScheme", "/properties/Priority", "/properties/Compression", "/properties/StartTime", "/properties/ExpiryTime" ],
"additionalProperties" : false,
"primaryIdentifier" : [ "/properties/Name" ],
- "required" : [ "Name", "Action", "CollectionScheme", "SignalCatalogArn", "TargetArn" ],
+ "required" : [ "Name", "CollectionScheme", "SignalCatalogArn", "TargetArn" ],
"handlers" : {
"read" : {
"permissions" : [ "iotfleetwise:GetCampaign", "iotfleetwise:ListTagsForResource" ]
diff --git a/aws-cloudformation-schema/aws-lightsail-distribution.json b/aws-cloudformation-schema/aws-lightsail-distribution.json
index 432e5d9261..3234d6e648 100644
--- a/aws-cloudformation-schema/aws-lightsail-distribution.json
+++ b/aws-cloudformation-schema/aws-lightsail-distribution.json
@@ -238,7 +238,6 @@
"additionalProperties" : false,
"required" : [ "DistributionName", "BundleId", "DefaultCacheBehavior", "Origin" ],
"readOnlyProperties" : [ "/properties/DistributionArn", "/properties/Status", "/properties/AbleToUpdateBundle" ],
- "taggable" : true,
"primaryIdentifier" : [ "/properties/DistributionName" ],
"createOnlyProperties" : [ "/properties/DistributionName", "/properties/IpAddressType" ],
"handlers" : {
@@ -257,5 +256,13 @@
"list" : {
"permissions" : [ "lightsail:GetDistributions" ]
}
+ },
+ "tagging" : {
+ "taggable" : true,
+ "tagOnCreate" : true,
+ "tagUpdatable" : true,
+ "cloudFormationSystemTags" : false,
+ "tagProperty" : "/properties/Tags",
+ "permissions" : [ "lightsail:TagResource", "lightsail:UntagResource" ]
}
}
\ No newline at end of file
diff --git a/meta/.botocore.version b/meta/.botocore.version
index a2dd955e45..319f81df26 100644
--- a/meta/.botocore.version
+++ b/meta/.botocore.version
@@ -1 +1 @@
-1.35.23
+1.35.24
diff --git a/provider/cmd/pulumi-resource-aws-native/metadata.json b/provider/cmd/pulumi-resource-aws-native/metadata.json
index 3f8ecafb72..c3379bbb2a 100644
--- a/provider/cmd/pulumi-resource-aws-native/metadata.json
+++ b/provider/cmd/pulumi-resource-aws-native/metadata.json
@@ -86369,7 +86369,7 @@
"outputs": {
"findingAggregationRegion": {
"type": "string",
- "description": "The aggregation Region."
+ "description": "The home Region. Findings generated in linked Regions are replicated and sent to the home Region."
},
"findingAggregatorArn": {
"type": "string",
diff --git a/provider/cmd/pulumi-resource-aws-native/schema.json b/provider/cmd/pulumi-resource-aws-native/schema.json
index dec9da649f..eb248e36c6 100644
--- a/provider/cmd/pulumi-resource-aws-native/schema.json
+++ b/provider/cmd/pulumi-resource-aws-native/schema.json
@@ -247844,7 +247844,7 @@
"properties": {
"findingAggregationRegion": {
"type": "string",
- "description": "The aggregation Region."
+ "description": "The home Region. Findings generated in linked Regions are replicated and sent to the home Region."
},
"findingAggregatorArn": {
"type": "string",
@@ -300592,7 +300592,7 @@
"properties": {
"findingAggregationRegion": {
"type": "string",
- "description": "The aggregation Region."
+ "description": "The home Region. Findings generated in linked Regions are replicated and sent to the home Region."
},
"findingAggregatorArn": {
"type": "string",
diff --git a/sdk/dotnet/SecurityHub/FindingAggregator.cs b/sdk/dotnet/SecurityHub/FindingAggregator.cs
index 74edd982bc..15aadfaed0 100644
--- a/sdk/dotnet/SecurityHub/FindingAggregator.cs
+++ b/sdk/dotnet/SecurityHub/FindingAggregator.cs
@@ -18,7 +18,7 @@ namespace Pulumi.AwsNative.SecurityHub
public partial class FindingAggregator : global::Pulumi.CustomResource
{
///
- /// The aggregation Region.
+ /// The home Region. Findings generated in linked Regions are replicated and sent to the home Region.
///
[Output("findingAggregationRegion")]
public Output FindingAggregationRegion { get; private set; } = null!;
diff --git a/sdk/dotnet/SecurityHub/GetFindingAggregator.cs b/sdk/dotnet/SecurityHub/GetFindingAggregator.cs
index 3528a31d4b..ba91db1b83 100644
--- a/sdk/dotnet/SecurityHub/GetFindingAggregator.cs
+++ b/sdk/dotnet/SecurityHub/GetFindingAggregator.cs
@@ -62,7 +62,7 @@ public GetFindingAggregatorInvokeArgs()
public sealed class GetFindingAggregatorResult
{
///
- /// The aggregation Region.
+ /// The home Region. Findings generated in linked Regions are replicated and sent to the home Region.
///
public readonly string? FindingAggregationRegion;
///
diff --git a/sdk/go/aws/securityhub/findingAggregator.go b/sdk/go/aws/securityhub/findingAggregator.go
index c1e5f4557b..6aa6b0137c 100644
--- a/sdk/go/aws/securityhub/findingAggregator.go
+++ b/sdk/go/aws/securityhub/findingAggregator.go
@@ -19,7 +19,7 @@ import (
type FindingAggregator struct {
pulumi.CustomResourceState
- // The aggregation Region.
+ // The home Region. Findings generated in linked Regions are replicated and sent to the home Region.
FindingAggregationRegion pulumi.StringOutput `pulumi:"findingAggregationRegion"`
// The ARN of the finding aggregator. You use the finding aggregator ARN to retrieve details for, update, and delete the finding aggregator.
FindingAggregatorArn pulumi.StringOutput `pulumi:"findingAggregatorArn"`
@@ -147,7 +147,7 @@ func (o FindingAggregatorOutput) ToFindingAggregatorOutputWithContext(ctx contex
return o
}
-// The aggregation Region.
+// The home Region. Findings generated in linked Regions are replicated and sent to the home Region.
func (o FindingAggregatorOutput) FindingAggregationRegion() pulumi.StringOutput {
return o.ApplyT(func(v *FindingAggregator) pulumi.StringOutput { return v.FindingAggregationRegion }).(pulumi.StringOutput)
}
diff --git a/sdk/go/aws/securityhub/getFindingAggregator.go b/sdk/go/aws/securityhub/getFindingAggregator.go
index 101803c0e0..059a23878e 100644
--- a/sdk/go/aws/securityhub/getFindingAggregator.go
+++ b/sdk/go/aws/securityhub/getFindingAggregator.go
@@ -31,7 +31,7 @@ type LookupFindingAggregatorArgs struct {
}
type LookupFindingAggregatorResult struct {
- // The aggregation Region.
+ // The home Region. Findings generated in linked Regions are replicated and sent to the home Region.
FindingAggregationRegion *string `pulumi:"findingAggregationRegion"`
// The ARN of the finding aggregator. You use the finding aggregator ARN to retrieve details for, update, and delete the finding aggregator.
FindingAggregatorArn *string `pulumi:"findingAggregatorArn"`
@@ -91,7 +91,7 @@ func (o LookupFindingAggregatorResultOutput) ToLookupFindingAggregatorResultOutp
return o
}
-// The aggregation Region.
+// The home Region. Findings generated in linked Regions are replicated and sent to the home Region.
func (o LookupFindingAggregatorResultOutput) FindingAggregationRegion() pulumi.StringPtrOutput {
return o.ApplyT(func(v LookupFindingAggregatorResult) *string { return v.FindingAggregationRegion }).(pulumi.StringPtrOutput)
}
diff --git a/sdk/nodejs/securityhub/findingAggregator.ts b/sdk/nodejs/securityhub/findingAggregator.ts
index 43e410844c..28be4d6cf1 100644
--- a/sdk/nodejs/securityhub/findingAggregator.ts
+++ b/sdk/nodejs/securityhub/findingAggregator.ts
@@ -40,7 +40,7 @@ export class FindingAggregator extends pulumi.CustomResource {
}
/**
- * The aggregation Region.
+ * The home Region. Findings generated in linked Regions are replicated and sent to the home Region.
*/
public /*out*/ readonly findingAggregationRegion!: pulumi.Output;
/**
diff --git a/sdk/nodejs/securityhub/getFindingAggregator.ts b/sdk/nodejs/securityhub/getFindingAggregator.ts
index 201ae02374..4d83814689 100644
--- a/sdk/nodejs/securityhub/getFindingAggregator.ts
+++ b/sdk/nodejs/securityhub/getFindingAggregator.ts
@@ -28,7 +28,7 @@ export interface GetFindingAggregatorArgs {
export interface GetFindingAggregatorResult {
/**
- * The aggregation Region.
+ * The home Region. Findings generated in linked Regions are replicated and sent to the home Region.
*/
readonly findingAggregationRegion?: string;
/**
diff --git a/sdk/python/pulumi_aws_native/securityhub/finding_aggregator.py b/sdk/python/pulumi_aws_native/securityhub/finding_aggregator.py
index c25065db54..fb2300a354 100644
--- a/sdk/python/pulumi_aws_native/securityhub/finding_aggregator.py
+++ b/sdk/python/pulumi_aws_native/securityhub/finding_aggregator.py
@@ -168,7 +168,7 @@ def get(resource_name: str,
@pulumi.getter(name="findingAggregationRegion")
def finding_aggregation_region(self) -> pulumi.Output[str]:
"""
- The aggregation Region.
+ The home Region. Findings generated in linked Regions are replicated and sent to the home Region.
"""
return pulumi.get(self, "finding_aggregation_region")
diff --git a/sdk/python/pulumi_aws_native/securityhub/get_finding_aggregator.py b/sdk/python/pulumi_aws_native/securityhub/get_finding_aggregator.py
index 7c3e8580df..db73e4673e 100644
--- a/sdk/python/pulumi_aws_native/securityhub/get_finding_aggregator.py
+++ b/sdk/python/pulumi_aws_native/securityhub/get_finding_aggregator.py
@@ -37,7 +37,7 @@ def __init__(__self__, finding_aggregation_region=None, finding_aggregator_arn=N
@pulumi.getter(name="findingAggregationRegion")
def finding_aggregation_region(self) -> Optional[str]:
"""
- The aggregation Region.
+ The home Region. Findings generated in linked Regions are replicated and sent to the home Region.
"""
return pulumi.get(self, "finding_aggregation_region")