Merge branch 'version-3' into auth-trait

aws · Jul 1, 2024 · d70a073 · d70a073
2 parents 1f91534 + 2f73fef
commit d70a073
Show file tree

Hide file tree

Showing 1,003 changed files with 3,417 additions and 1,436 deletions.
diff --git a/apis/acm-pca/2017-08-22/api-2.json b/apis/acm-pca/2017-08-22/api-2.json
@@ -1038,14 +1038,16 @@
         "RSA_2048",
         "RSA_4096",
         "EC_prime256v1",
-        "EC_secp384r1"
+        "EC_secp384r1",
+        "SM2"
       ]
     },
     "KeyStorageSecurityStandard":{
       "type":"string",
       "enum":[
         "FIPS_140_2_LEVEL_2_OR_HIGHER",
-        "FIPS_140_2_LEVEL_3_OR_HIGHER"
+        "FIPS_140_2_LEVEL_3_OR_HIGHER",
+        "CCPC_LEVEL_1_OR_HIGHER"
       ]
     },
     "KeyUsage":{
@@ -1359,7 +1361,8 @@
         "SHA512WITHECDSA",
         "SHA256WITHRSA",
         "SHA384WITHRSA",
-        "SHA512WITHRSA"
+        "SHA512WITHRSA",
+        "SM3WITHSM2"
       ]
     },
     "String":{"type":"string"},

diff --git a/apis/cloudhsmv2/2017-04-28/api-2.json b/apis/cloudhsmv2/2017-04-28/api-2.json
@@ -115,6 +115,22 @@
         {"shape":"CloudHsmAccessDeniedException"}
       ]
     },
+    "DeleteResourcePolicy":{
+      "name":"DeleteResourcePolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteResourcePolicyRequest"},
+      "output":{"shape":"DeleteResourcePolicyResponse"},
+      "errors":[
+        {"shape":"CloudHsmInternalFailureException"},
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmInvalidRequestException"},
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmAccessDeniedException"}
+      ]
+    },
     "DescribeBackups":{
       "name":"DescribeBackups",
       "http":{
@@ -148,6 +164,22 @@
         {"shape":"CloudHsmTagException"}
       ]
     },
+    "GetResourcePolicy":{
+      "name":"GetResourcePolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetResourcePolicyRequest"},
+      "output":{"shape":"GetResourcePolicyResponse"},
+      "errors":[
+        {"shape":"CloudHsmInternalFailureException"},
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmInvalidRequestException"},
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmAccessDeniedException"}
+      ]
+    },
     "InitializeCluster":{
       "name":"InitializeCluster",
       "http":{
@@ -213,6 +245,22 @@
         {"shape":"CloudHsmServiceException"}
       ]
     },
+    "PutResourcePolicy":{
+      "name":"PutResourcePolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutResourcePolicyRequest"},
+      "output":{"shape":"PutResourcePolicyResponse"},
+      "errors":[
+        {"shape":"CloudHsmInternalFailureException"},
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmInvalidRequestException"},
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmAccessDeniedException"}
+      ]
+    },
     "RestoreBackup":{
       "name":"RestoreBackup",
       "http":{
@@ -270,6 +318,7 @@
       "required":["BackupId"],
       "members":{
         "BackupId":{"shape":"BackupId"},
+        "BackupArn":{"shape":"BackupArn"},
         "BackupState":{"shape":"BackupState"},
         "ClusterId":{"shape":"ClusterId"},
         "CreateTimestamp":{"shape":"Timestamp"},
@@ -284,6 +333,10 @@
         "Mode":{"shape":"ClusterMode"}
       }
     },
+    "BackupArn":{
+      "type":"string",
+      "pattern":"^(arn:aws(-(us-gov))?:cloudhsm:([a-z]{2}(-(gov|isob|iso))?-(east|west|north|south|central){1,2}-[0-9]{1}):[0-9]{12}:backup/)?backup-[2-7a-zA-Z]{11,16}"
+    },
     "BackupId":{
       "type":"string",
       "pattern":"backup-[2-7a-zA-Z]{11,16}"
@@ -350,6 +403,10 @@
       },
       "exception":true
     },
+    "CloudHsmArn":{
+      "type":"string",
+      "pattern":"arn:aws(-(us-gov))?:cloudhsm:([a-z]{2}(-(gov|isob|iso))?-(east|west|north|south|central){1,2}-[0-9]{1}):[0-9]{12}:(backup/backup|cluster/cluster|hsm/hsm)-[2-7a-zA-Z]{11,16}"
+    },
     "CloudHsmInternalFailureException":{
       "type":"structure",
       "members":{
@@ -468,7 +525,7 @@
       "members":{
         "BackupRetentionPolicy":{"shape":"BackupRetentionPolicy"},
         "HsmType":{"shape":"HsmType"},
-        "SourceBackupId":{"shape":"BackupId"},
+        "SourceBackupId":{"shape":"BackupArn"},
         "SubnetIds":{"shape":"SubnetIds"},
         "TagList":{"shape":"TagList"},
         "Mode":{"shape":"ClusterMode"}
@@ -540,12 +597,26 @@
         "HsmId":{"shape":"HsmId"}
       }
     },
+    "DeleteResourcePolicyRequest":{
+      "type":"structure",
+      "members":{
+        "ResourceArn":{"shape":"CloudHsmArn"}
+      }
+    },
+    "DeleteResourcePolicyResponse":{
+      "type":"structure",
+      "members":{
+        "ResourceArn":{"shape":"CloudHsmArn"},
+        "Policy":{"shape":"ResourcePolicy"}
+      }
+    },
     "DescribeBackupsRequest":{
       "type":"structure",
       "members":{
         "NextToken":{"shape":"NextToken"},
         "MaxResults":{"shape":"BackupsMaxSize"},
         "Filters":{"shape":"Filters"},
+        "Shared":{"shape":"Boolean"},
         "SortAscending":{"shape":"Boolean"}
       }
     },
@@ -603,6 +674,18 @@
       "value":{"shape":"Strings"},
       "max":30
     },
+    "GetResourcePolicyRequest":{
+      "type":"structure",
+      "members":{
+        "ResourceArn":{"shape":"CloudHsmArn"}
+      }
+    },
+    "GetResourcePolicyResponse":{
+      "type":"structure",
+      "members":{
+        "Policy":{"shape":"ResourcePolicy"}
+      }
+    },
     "Hsm":{
       "type":"structure",
       "required":["HsmId"],
@@ -730,6 +813,20 @@
       "max":32,
       "min":7
     },
+    "PutResourcePolicyRequest":{
+      "type":"structure",
+      "members":{
+        "ResourceArn":{"shape":"CloudHsmArn"},
+        "Policy":{"shape":"ResourcePolicy"}
+      }
+    },
+    "PutResourcePolicyResponse":{
+      "type":"structure",
+      "members":{
+        "ResourceArn":{"shape":"CloudHsmArn"},
+        "Policy":{"shape":"ResourcePolicy"}
+      }
+    },
     "Region":{
       "type":"string",
       "pattern":"[a-z]{2}(-(gov))?-(east|west|north|south|central){1,2}-\\d"
@@ -738,6 +835,11 @@
       "type":"string",
       "pattern":"(?:cluster|backup)-[2-7a-zA-Z]{11,16}"
     },
+    "ResourcePolicy":{
+      "type":"string",
+      "max":20000,
+      "min":1
+    },
     "RestoreBackupRequest":{
       "type":"structure",
       "required":["BackupId"],