CloudFormation Template Schema upgrade

https://github.com/aws-cloudformation/cloudformation-template-schema/tree/main

Author: kddejong

server/schema/resources.schema.json

@@ -123,6 +123,17 @@
       "additionalProperties": false,
       "markdownDescription": "If query results are encrypted in Amazon S3, indicates the encryption option used (for example, SSE-KMS or CSE-KMS) and key information.\n\n---\n\nRequired: No  \nUpdate requires: No interruption\n"
     },
+    "ManagedStorageEncryptionConfiguration": {
+      "description": "Indicates the encryption configuration for Athena Managed Storage. If not setting this field, Managed Storage will encrypt the query results with Athena's encryption key",
+      "type": "object",
+      "properties": {
+        "KmsKey": {
+          "$ref": "#/definitions/KmsKey"
+        }
+      },
+      "additionalProperties": false,
+      "markdownDescription": "Indicates the encryption configuration for Athena Managed Storage. If not setting this field, Managed Storage will encrypt the query results with Athena's encryption key\n\n---\n\nRequired: No  \nUpdate requires: No interruption\n"
+    },
     "RemoveEncryptionConfiguration": {
       "type": "boolean",
       "markdownDescription": "\n\n---\n\nRequired: No  \nType: Boolean  \nUpdate requires: No interruption\n"
@@ -246,6 +257,21 @@
       "additionalProperties": false,
       "markdownDescription": "The result configuration information about the queries in this workgroup that will be updated. Includes the updated results location and an updated option for encrypting query results. \n\n---\n\nRequired: No  \nUpdate requires: No interruption\n"
     },
+    "ManagedQueryResultsConfiguration": {
+      "description": "The configuration for the managed query results and encryption option. ResultConfiguration and ManagedQueryResultsConfiguration cannot be set at the same time",
+      "type": "object",
+      "properties": {
+        "EncryptionConfiguration": {
+          "$ref": "#/definitions/ManagedStorageEncryptionConfiguration"
+        },
+        "Enabled": {
+          "type": "boolean",
+          "markdownDescription": "\n\n---\n\nRequired: No  \nType: Boolean  \nUpdate requires: No interruption\n"
+        }
+      },
+      "additionalProperties": false,
+      "markdownDescription": "The configuration for the managed query results and encryption option. ResultConfiguration and ManagedQueryResultsConfiguration cannot be set at the same time\n\n---\n\nRequired: No  \nUpdate requires: No interruption\n"
+    },
     "WorkGroupConfiguration": {
       "type": "object",
       "properties": {
@@ -275,6 +301,9 @@
         },
         "CustomerContentEncryptionConfiguration": {
           "$ref": "#/definitions/CustomerContentEncryptionConfiguration"
+        },
+        "ManagedQueryResultsConfiguration": {
+          "$ref": "#/definitions/ManagedQueryResultsConfiguration"
         }
       },
       "additionalProperties": false,
@@ -316,6 +345,9 @@
         },
         "RemoveCustomerContentEncryptionConfiguration": {
           "$ref": "#/definitions/RemoveCustomerContentEncryptionConfiguration"
+        },
+        "ManagedQueryResultsConfiguration": {
+          "$ref": "#/definitions/ManagedQueryResultsConfiguration"
         }
       },
       "additionalProperties": false,

server/schema/resources/aws-athena-workgroup.json

@@ -13,13 +13,52 @@
       "description": "The ID of the VPC for which to create the egress-only internet gateway.",
       "type": "string",
       "markdownDescription": "The ID of the VPC for which to create the egress-only internet gateway.\n\n---\n\nRequired: Yes  \nType: String  \nUpdate requires: Replacement\n"
+    },
+    "Tags": {
+      "type": "array",
+      "description": "Any tags assigned to the egress only internet gateway.",
+      "uniqueItems": false,
+      "insertionOrder": false,
+      "items": {
+        "$ref": "#/definitions/Tag"
+      },
+      "markdownDescription": "Any tags assigned to the egress only internet gateway.\n\n---\n\nRequired: No  \nType: Array  \nUpdate requires: No interruption\n"
+    }
+  },
+  "definitions": {
+    "Tag": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "Key": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 128,
+          "markdownDescription": "\n\n---\n\nRequired: Yes  \nType: String  \nMinimum Length: 1  \nMaximum Length: 128  \nUpdate requires: No interruption\n"
+        },
+        "Value": {
+          "type": "string",
+          "maxLength": 256,
+          "markdownDescription": "\n\n---\n\nRequired: Yes  \nType: String  \nMaximum Length: 256  \nUpdate requires: No interruption\n"
+        }
+      },
+      "required": [
+        "Value",
+        "Key"
+      ],
+      "markdownDescription": "\n\n---\n\nRequired: No  \nUpdate requires: No interruption\n"
     }
   },
   "tagging": {
-    "taggable": false,
-    "tagOnCreate": false,
-    "tagUpdatable": false,
-    "cloudFormationSystemTags": false
+    "taggable": true,
+    "tagOnCreate": true,
+    "tagUpdatable": true,
+    "cloudFormationSystemTags": true,
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "ec2:CreateTags",
+      "ec2:DeleteTags"
+    ]
   },
   "required": [
     "VpcId"
@@ -37,19 +76,29 @@
     "create": {
       "permissions": [
         "ec2:CreateEgressOnlyInternetGateway",
+        "ec2:CreateTags",
         "ec2:DescribeEgressOnlyInternetGateways"
       ]
     },
     "read": {
       "permissions": [
-        "ec2:DescribeEgressOnlyInternetGateways"
+        "ec2:DescribeEgressOnlyInternetGateways",
+        "ec2:DescribeTags"
       ]
     },
     "delete": {
       "permissions": [
         "ec2:DeleteEgressOnlyInternetGateway",
         "ec2:DescribeEgressOnlyInternetGateways",
-        "ec2:DescribeVpcs"
+        "ec2:DescribeVpcs",
+        "ec2:DeleteTags"
+      ]
+    },
+    "update": {
+      "permissions": [
+        "ec2:DeleteTags",
+        "ec2:CreateTags",
+        "ec2:DescribeEgressOnlyInternetGateways"
       ]
     },
     "list": {