Merge branch 'master' into dependabot/go_modules/github.com/go-git/go…

…-git/v5-5.13.0
JamesWoolfenden · Jan 22, 2025 · f336c6a · f336c6a
2 parents c810e61 + f4567fc
commit f336c6a
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 7 deletions.
diff --git a/schema/aws-acmpca-certificateauthority.json b/schema/aws-acmpca-certificateauthority.json
@@ -388,7 +388,6 @@
     },
     "update": {
       "permissions": [
-        "acm-pca:ListTags",
         "acm-pca:TagCertificateAuthority",
         "acm-pca:UntagCertificateAuthority",
         "acm-pca:UpdateCertificateAuthority"
@@ -473,7 +472,6 @@
     "/properties/Subject",
     "/properties/Subject",
     "/properties/CsrExtensions",
-    "/properties/Tags",
     "/properties/RevocationConfiguration",
     "/properties/KeyStorageSecurityStandard"
   ]

diff --git a/schema/aws-connect-instance.json b/schema/aws-connect-instance.json
@@ -226,6 +226,11 @@
   "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-connect",
   "tagging": {
     "cloudFormationSystemTags": true,
+    "permissions": [
+      "connect:ListTagsForResource",
+      "connect:UntagResource",
+      "connect:TagResource"
+    ],
     "tagOnCreate": true,
     "tagProperty": "/properties/Tags",
     "tagUpdatable": true,

diff --git a/schema/aws-healthimaging-datastore.json b/schema/aws-healthimaging-datastore.json
@@ -146,6 +146,11 @@
   "required": [],
   "tagging": {
     "cloudFormationSystemTags": false,
+    "permissions": [
+      "medical-imaging:TagResource",
+      "medical-imaging:UntagResource",
+      "medical-imaging:ListTagsForResource"
+    ],
     "tagOnCreate": true,
     "tagProperty": "/properties/Tags",
     "tagUpdatable": false,

diff --git a/schema/aws-lambda-codesigningconfig.json b/schema/aws-lambda-codesigningconfig.json
@@ -144,6 +144,11 @@
   ],
   "tagging": {
     "cloudFormationSystemTags": true,
+    "permissions": [
+      "lambda:ListTags",
+      "lambda:TagResource",
+      "lambda:UntagResource"
+    ],
     "tagOnCreate": true,
     "tagProperty": "/properties/Tags",
     "tagUpdatable": true,

diff --git a/schema/aws-m2-application.json b/schema/aws-m2-application.json
@@ -158,7 +158,13 @@
   ],
   "tagging": {
     "cloudFormationSystemTags": false,
+    "permissions": [
+      "m2:TagResource",
+      "m2:UntagResource",
+      "m2:ListTagsForResource"
+    ],
     "tagOnCreate": true,
+    "tagProperty": "/properties/Tags",
     "tagUpdatable": true,
     "taggable": true
   },

diff --git a/schema/aws-m2-environment.json b/schema/aws-m2-environment.json
@@ -285,7 +285,13 @@
   ],
   "tagging": {
     "cloudFormationSystemTags": false,
+    "permissions": [
+      "m2:TagResource",
+      "m2:UntagResource",
+      "m2:ListTagsForResource"
+    ],
     "tagOnCreate": true,
+    "tagProperty": "/properties/Tags",
     "tagUpdatable": true,
     "taggable": true
   },

diff --git a/schema/aws-pcs-computenodegroup.json b/schema/aws-pcs-computenodegroup.json
@@ -212,7 +212,6 @@
     },
     "Name": {
       "description": "The name that identifies the compute node group.",
-      "pattern": "^(?!pcs_)^(?![A-Za-z0-9]{10}$)[A-Za-z][A-Za-z0-9-]+$",
       "type": "string"
     },
     "PurchaseOption": {

diff --git a/schema/aws-pcs-queue.json b/schema/aws-pcs-queue.json
@@ -126,7 +126,6 @@
     },
     "Name": {
       "description": "The name that identifies the queue.",
-      "pattern": "^(?!pcs_)^(?![A-Za-z0-9]{10}$)[A-Za-z][A-Za-z0-9-]+$",
       "type": "string"
     },
     "Status": {

diff --git a/schema/aws-quicksight-topic.json b/schema/aws-quicksight-topic.json
@@ -2,6 +2,7 @@
   "additionalProperties": false,
   "createOnlyProperties": [
     "/properties/AwsAccountId",
+    "/properties/FolderArns",
     "/properties/TopicId"
   ],
   "definitions": {
@@ -390,7 +391,9 @@
         "THOUSANDS",
         "MILLIONS",
         "BILLIONS",
-        "TRILLIONS"
+        "TRILLIONS",
+        "LAKHS",
+        "CRORES"
       ],
       "type": "string"
     },
@@ -684,6 +687,16 @@
       ],
       "type": "object"
     },
+    "TopicConfigOptions": {
+      "additionalProperties": false,
+      "description": "Model for configuration of a Topic",
+      "properties": {
+        "QBusinessInsightsEnabled": {
+          "type": "boolean"
+        }
+      },
+      "type": "object"
+    },
     "TopicDateRangeFilter": {
       "additionalProperties": false,
       "properties": {
@@ -700,6 +713,9 @@
     "TopicDetails": {
       "additionalProperties": false,
       "properties": {
+        "ConfigOptions": {
+          "$ref": "#/definitions/TopicConfigOptions"
+        },
         "DataSets": {
           "items": {
             "$ref": "#/definitions/DatasetMetadata"
@@ -983,6 +999,9 @@
       "pattern": "^[0-9]{12}$",
       "type": "string"
     },
+    "ConfigOptions": {
+      "$ref": "#/definitions/TopicConfigOptions"
+    },
     "DataSets": {
       "items": {
         "$ref": "#/definitions/DatasetMetadata"
@@ -994,6 +1013,14 @@
       "minLength": 0,
       "type": "string"
     },
+    "FolderArns": {
+      "items": {
+        "type": "string"
+      },
+      "maxItems": 20,
+      "minItems": 0,
+      "type": "array"
+    },
     "Name": {
       "maxLength": 128,
       "minLength": 1,
@@ -1018,5 +1045,8 @@
     "tagUpdatable": false,
     "taggable": false
   },
-  "typeName": "AWS::QuickSight::Topic"
+  "typeName": "AWS::QuickSight::Topic",
+  "writeOnlyProperties": [
+    "/properties/FolderArns"
+  ]
 }
diff --git a/schema/aws-securityhub-hub.json b/schema/aws-securityhub-hub.json
@@ -89,6 +89,11 @@
   "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-securityhub",
   "tagging": {
     "cloudFormationSystemTags": true,
+    "permissions": [
+      "securityhub:ListTagsForResource",
+      "securityhub:TagResource",
+      "securityhub:UntagResource"
+    ],
     "tagOnCreate": true,
     "tagProperty": "/properties/Tags",
     "tagUpdatable": true,

diff --git a/src/see/resource_mapping.go b/src/see/resource_mapping.go
@@ -1042,6 +1042,7 @@ var lookupMapping = map[string]string{
 	"aws::qldb::ledger":                                                   "aws_qldb_ledger",
 	"aws::qldb::stream":                                                   "aws_qldb_stream",
 	"aws::quicksight::analysis":                                           "aws_quicksight_analysis",
+	"aws::quicksight::custompermissions":                                  none,
 	"aws::quicksight::dashboard":                                          "aws_quicksight_dashboard",
 	"aws::quicksight::dataset":                                            "aws_quicksight_data_set",
 	"aws::quicksight::datasource":                                         "aws_quicksight_data_source",
@@ -1181,7 +1182,7 @@ var lookupMapping = map[string]string{
 	"aws::sagemaker::monitoringschedule":                                  "aws_sagemaker_monitoring_schedule",
 	"aws::sagemaker::notebookinstance":                                    "aws_sagemaker_notebook_instance",
 	"aws::sagemaker::notebookinstancelifecycleconfig":                     "aws_sagemaker_notebook_instance_lifecycle_configuration",
-	"aws::sagemaker::partnerapp:":                                         none,
+	"aws::sagemaker::partnerapp":                                          none,
 	"aws::sagemaker::pipeline":                                            "aws_sagemaker_pipeline",
 	"aws::sagemaker::project":                                             "aws_sagemaker_project",
 	"aws::sagemaker::space":                                               none,