From 2a0102ebe21001cb127ae5d38bbdd8547b231581 Mon Sep 17 00:00:00 2001 From: Frank van Boven Date: Mon, 14 Jan 2019 17:44:25 +0100 Subject: [PATCH] Add Workspace allowed_values --- .../data/CloudSpecs/ap-northeast-1.json | 25 +++++++++++++++++-- .../data/CloudSpecs/ap-northeast-2.json | 25 +++++++++++++++++-- .../data/CloudSpecs/ap-northeast-3.json | 25 +++++++++++++++++-- src/cfnlint/data/CloudSpecs/ap-south-1.json | 25 +++++++++++++++++-- .../data/CloudSpecs/ap-southeast-1.json | 25 +++++++++++++++++-- .../data/CloudSpecs/ap-southeast-2.json | 25 +++++++++++++++++-- src/cfnlint/data/CloudSpecs/ca-central-1.json | 25 +++++++++++++++++-- src/cfnlint/data/CloudSpecs/eu-central-1.json | 25 +++++++++++++++++-- src/cfnlint/data/CloudSpecs/eu-north-1.json | 25 +++++++++++++++++-- src/cfnlint/data/CloudSpecs/eu-west-1.json | 25 +++++++++++++++++-- src/cfnlint/data/CloudSpecs/eu-west-2.json | 25 +++++++++++++++++-- src/cfnlint/data/CloudSpecs/eu-west-3.json | 25 +++++++++++++++++-- src/cfnlint/data/CloudSpecs/sa-east-1.json | 25 +++++++++++++++++-- src/cfnlint/data/CloudSpecs/us-east-1.json | 25 +++++++++++++++++-- src/cfnlint/data/CloudSpecs/us-east-2.json | 25 +++++++++++++++++-- .../data/CloudSpecs/us-gov-east-1.json | 25 +++++++++++++++++-- .../data/CloudSpecs/us-gov-west-1.json | 25 +++++++++++++++++-- src/cfnlint/data/CloudSpecs/us-west-1.json | 25 +++++++++++++++++-- src/cfnlint/data/CloudSpecs/us-west-2.json | 25 +++++++++++++++++-- .../ExtendedSpecs/all/03_value_types.json | 15 +++++++++++ .../ExtendedSpecs/all/04_property_values.json | 14 +++++++++++ .../resources/properties/allowed_values.yaml | 9 +++++++ .../resources/properties/allowed_values.yaml | 9 +++++++ .../properties/test_allowed_value.py | 2 +- 24 files changed, 485 insertions(+), 39 deletions(-) diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json index ba08ff57c4..6e0e7bed43 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json @@ -16798,7 +16798,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -16810,7 +16813,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -32282,6 +32288,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json index 6aaa50b42b..3c93e7d878 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json @@ -15553,7 +15553,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -15565,7 +15568,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -29801,6 +29807,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json index b196d19b9f..d915c8ee40 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json @@ -11020,7 +11020,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -11032,7 +11035,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -21596,6 +21602,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ap-south-1.json b/src/cfnlint/data/CloudSpecs/ap-south-1.json index d6b3f7dc44..7eb8253a6a 100644 --- a/src/cfnlint/data/CloudSpecs/ap-south-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-south-1.json @@ -14993,7 +14993,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -15005,7 +15008,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -28641,6 +28647,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json index f1df07a2ae..6d95550554 100644 --- a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json @@ -15389,7 +15389,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -15401,7 +15404,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -29799,6 +29805,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json index fc3afabaf8..ca9474643a 100644 --- a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json +++ b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json @@ -15852,7 +15852,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -15864,7 +15867,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -30677,6 +30683,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ca-central-1.json b/src/cfnlint/data/CloudSpecs/ca-central-1.json index f647baa630..b00dc9947b 100644 --- a/src/cfnlint/data/CloudSpecs/ca-central-1.json +++ b/src/cfnlint/data/CloudSpecs/ca-central-1.json @@ -14047,7 +14047,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -14059,7 +14062,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -27001,6 +27007,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/eu-central-1.json b/src/cfnlint/data/CloudSpecs/eu-central-1.json index 7e7ec395f3..26c7b2a92e 100644 --- a/src/cfnlint/data/CloudSpecs/eu-central-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-central-1.json @@ -16401,7 +16401,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -16413,7 +16416,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -31482,6 +31488,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/eu-north-1.json b/src/cfnlint/data/CloudSpecs/eu-north-1.json index 7ada629ac1..23cea53aec 100644 --- a/src/cfnlint/data/CloudSpecs/eu-north-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-north-1.json @@ -11021,7 +11021,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -11033,7 +11036,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -22012,6 +22018,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/eu-west-1.json b/src/cfnlint/data/CloudSpecs/eu-west-1.json index 0a7ab5bc23..dc62643137 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-1.json @@ -18051,7 +18051,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -18063,7 +18066,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -34584,6 +34590,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/eu-west-2.json b/src/cfnlint/data/CloudSpecs/eu-west-2.json index e8f40b2c69..e5b5e026dc 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-2.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-2.json @@ -14520,7 +14520,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -14532,7 +14535,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -28302,6 +28308,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/eu-west-3.json b/src/cfnlint/data/CloudSpecs/eu-west-3.json index d2fb37008b..e6ee44d478 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-3.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-3.json @@ -13059,7 +13059,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -13071,7 +13074,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -25202,6 +25208,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/sa-east-1.json b/src/cfnlint/data/CloudSpecs/sa-east-1.json index d63949fa6a..774f469bc8 100644 --- a/src/cfnlint/data/CloudSpecs/sa-east-1.json +++ b/src/cfnlint/data/CloudSpecs/sa-east-1.json @@ -13610,7 +13610,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -13622,7 +13625,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -26175,6 +26181,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/us-east-1.json b/src/cfnlint/data/CloudSpecs/us-east-1.json index 3d9312b374..ed325c709c 100644 --- a/src/cfnlint/data/CloudSpecs/us-east-1.json +++ b/src/cfnlint/data/CloudSpecs/us-east-1.json @@ -18052,7 +18052,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -18064,7 +18067,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -34613,6 +34619,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/us-east-2.json b/src/cfnlint/data/CloudSpecs/us-east-2.json index 3057071614..1db923bd88 100644 --- a/src/cfnlint/data/CloudSpecs/us-east-2.json +++ b/src/cfnlint/data/CloudSpecs/us-east-2.json @@ -16933,7 +16933,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -16945,7 +16948,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -32626,6 +32632,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/us-gov-east-1.json b/src/cfnlint/data/CloudSpecs/us-gov-east-1.json index 4b8ac12658..da6b224e4a 100644 --- a/src/cfnlint/data/CloudSpecs/us-gov-east-1.json +++ b/src/cfnlint/data/CloudSpecs/us-gov-east-1.json @@ -10840,7 +10840,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -10852,7 +10855,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -21371,6 +21377,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json index c1aa835385..b4c5704f54 100644 --- a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json +++ b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json @@ -10886,7 +10886,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -10898,7 +10901,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -21588,6 +21594,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/us-west-1.json b/src/cfnlint/data/CloudSpecs/us-west-1.json index 5babb5efd6..6d1e75e51b 100644 --- a/src/cfnlint/data/CloudSpecs/us-west-1.json +++ b/src/cfnlint/data/CloudSpecs/us-west-1.json @@ -14197,7 +14197,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -14209,7 +14212,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -27635,6 +27641,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/us-west-2.json b/src/cfnlint/data/CloudSpecs/us-west-2.json index 7825da200b..16d529ca08 100644 --- a/src/cfnlint/data/CloudSpecs/us-west-2.json +++ b/src/cfnlint/data/CloudSpecs/us-west-2.json @@ -18070,7 +18070,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyComputeType" + } }, "RootVolumeSizeGib": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib", @@ -18082,7 +18085,10 @@ "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Mutable", + "Value": { + "ValueType": "WorkspacePropertyRunningMode" + } }, "RunningModeAutoStopTimeoutInMinutes": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes", @@ -34643,6 +34649,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } \ No newline at end of file diff --git a/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json index 9167f6a315..86ff24dd9e 100644 --- a/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json +++ b/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json @@ -818,6 +818,21 @@ "AWS::EC2::VPC" ] } + }, + "WorkspacePropertyComputeType": { + "AllowedValues": [ + "GRAPHICS", + "PERFORMANCE", + "POWER", + "STANDARD", + "VALUE" + ] + }, + "WorkspacePropertyRunningMode": { + "AllowedValues": [ + "ALWAYS_ON", + "AUTO_STOP" + ] } } } diff --git a/src/cfnlint/data/ExtendedSpecs/all/04_property_values.json b/src/cfnlint/data/ExtendedSpecs/all/04_property_values.json index 8d070379a3..e8d2614f53 100644 --- a/src/cfnlint/data/ExtendedSpecs/all/04_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/all/04_property_values.json @@ -322,6 +322,20 @@ "ValueType": "SesReceiptRuleTlsPolicy" } }, + { + "op": "add", + "path": "/PropertyTypes/AWS::WorkSpaces::Workspace.WorkspaceProperties/Properties/ComputeTypeName/Value", + "value": { + "ValueType": "WorkspacePropertyComputeType" + } + }, + { + "op": "add", + "path": "/PropertyTypes/AWS::WorkSpaces::Workspace.WorkspaceProperties/Properties/RunningMode/Value", + "value": { + "ValueType": "WorkspacePropertyRunningMode" + } + }, { "op": "add", "path": "/ResourceTypes/AWS::ApiGateway::Authorizer/Properties/RestApiId/Value", diff --git a/test/fixtures/templates/bad/resources/properties/allowed_values.yaml b/test/fixtures/templates/bad/resources/properties/allowed_values.yaml index eef91d70fa..0254221e8b 100644 --- a/test/fixtures/templates/bad/resources/properties/allowed_values.yaml +++ b/test/fixtures/templates/bad/resources/properties/allowed_values.yaml @@ -297,3 +297,12 @@ Resources: - DataId: "DataId" Negated: false Type: "Bytematch" # Invalid AllowedValue + Workspace: + Type: "AWS::WorkSpaces::Workspace" + Properties: + BundleId: "Workspace" + DirectoryId: "DirectoryId" + UserName: "test" + WorkspaceProperties: + ComputeTypeName: "DEFAULT" # Invalid AllowedValue + RunningMode: "ALWAYS_OFF" # Invalid AllowedValue diff --git a/test/fixtures/templates/good/resources/properties/allowed_values.yaml b/test/fixtures/templates/good/resources/properties/allowed_values.yaml index 589af47bcd..ade955146e 100644 --- a/test/fixtures/templates/good/resources/properties/allowed_values.yaml +++ b/test/fixtures/templates/good/resources/properties/allowed_values.yaml @@ -296,3 +296,12 @@ Resources: - DataId: "DataId" Negated: false Type: "ByteMatch" # Valid AllowedValue + Workspace: + Type: "AWS::WorkSpaces::Workspace" + Properties: + BundleId: "Workspace" + DirectoryId: "DirectoryId" + UserName: "test" + WorkspaceProperties: + ComputeTypeName: "STANDARD" # Valid AllowedValue + RunningMode: "ALWAYS_ON" # Valid AllowedValue diff --git a/test/rules/resources/properties/test_allowed_value.py b/test/rules/resources/properties/test_allowed_value.py index c363472636..08c04469c7 100644 --- a/test/rules/resources/properties/test_allowed_value.py +++ b/test/rules/resources/properties/test_allowed_value.py @@ -34,4 +34,4 @@ def test_file_positive(self): def test_file_negative(self): """Test failure""" - self.helper_file_negative('test/fixtures/templates/bad/resources/properties/allowed_values.yaml', 64) + self.helper_file_negative('test/fixtures/templates/bad/resources/properties/allowed_values.yaml', 66)