|
766 | 766 | },
|
767 | 767 | "AzureBlobAuthenticationType":{
|
768 | 768 | "type":"string",
|
769 |
| - "enum":["SAS"] |
| 769 | + "enum":[ |
| 770 | + "SAS", |
| 771 | + "NONE" |
| 772 | + ] |
770 | 773 | },
|
771 | 774 | "AzureBlobContainerUrl":{
|
772 | 775 | "type":"string",
|
|
811 | 814 | "type":"structure",
|
812 | 815 | "members":{}
|
813 | 816 | },
|
| 817 | + "CmkSecretConfig":{ |
| 818 | + "type":"structure", |
| 819 | + "members":{ |
| 820 | + "SecretArn":{"shape":"SecretArn"}, |
| 821 | + "KmsKeyArn":{"shape":"KmsKeyArn"} |
| 822 | + } |
| 823 | + }, |
814 | 824 | "CreateAgentRequest":{
|
815 | 825 | "type":"structure",
|
816 | 826 | "required":["ActivationKey"],
|
|
833 | 843 | "type":"structure",
|
834 | 844 | "required":[
|
835 | 845 | "ContainerUrl",
|
836 |
| - "AuthenticationType", |
837 |
| - "AgentArns" |
| 846 | + "AuthenticationType" |
838 | 847 | ],
|
839 | 848 | "members":{
|
840 | 849 | "ContainerUrl":{"shape":"AzureBlobContainerUrl"},
|
|
844 | 853 | "AccessTier":{"shape":"AzureAccessTier"},
|
845 | 854 | "Subdirectory":{"shape":"AzureBlobSubdirectory"},
|
846 | 855 | "AgentArns":{"shape":"AgentArnList"},
|
847 |
| - "Tags":{"shape":"InputTagList"} |
| 856 | + "Tags":{"shape":"InputTagList"}, |
| 857 | + "CmkSecretConfig":{"shape":"CmkSecretConfig"}, |
| 858 | + "CustomSecretConfig":{"shape":"CustomSecretConfig"} |
848 | 859 | }
|
849 | 860 | },
|
850 | 861 | "CreateLocationAzureBlobResponse":{
|
|
1014 | 1025 | "type":"structure",
|
1015 | 1026 | "required":[
|
1016 | 1027 | "ServerHostname",
|
1017 |
| - "BucketName", |
1018 |
| - "AgentArns" |
| 1028 | + "BucketName" |
1019 | 1029 | ],
|
1020 | 1030 | "members":{
|
1021 | 1031 | "ServerHostname":{"shape":"ServerHostname"},
|
|
1027 | 1037 | "SecretKey":{"shape":"ObjectStorageSecretKey"},
|
1028 | 1038 | "AgentArns":{"shape":"AgentArnList"},
|
1029 | 1039 | "Tags":{"shape":"InputTagList"},
|
1030 |
| - "ServerCertificate":{"shape":"ObjectStorageCertificate"} |
| 1040 | + "ServerCertificate":{"shape":"ObjectStorageCertificate"}, |
| 1041 | + "CmkSecretConfig":{"shape":"CmkSecretConfig"}, |
| 1042 | + "CustomSecretConfig":{"shape":"CustomSecretConfig"} |
1031 | 1043 | }
|
1032 | 1044 | },
|
1033 | 1045 | "CreateLocationObjectStorageResponse":{
|
|
1113 | 1125 | "TaskArn":{"shape":"TaskArn"}
|
1114 | 1126 | }
|
1115 | 1127 | },
|
| 1128 | + "CustomSecretConfig":{ |
| 1129 | + "type":"structure", |
| 1130 | + "members":{ |
| 1131 | + "SecretArn":{"shape":"SecretArn"}, |
| 1132 | + "SecretAccessRoleArn":{"shape":"IamRoleArnOrEmptyString"} |
| 1133 | + } |
| 1134 | + }, |
1116 | 1135 | "DeleteAgentRequest":{
|
1117 | 1136 | "type":"structure",
|
1118 | 1137 | "required":["AgentArn"],
|
|
1182 | 1201 | "BlobType":{"shape":"AzureBlobType"},
|
1183 | 1202 | "AccessTier":{"shape":"AzureAccessTier"},
|
1184 | 1203 | "AgentArns":{"shape":"AgentArnList"},
|
1185 |
| - "CreationTime":{"shape":"Time"} |
| 1204 | + "CreationTime":{"shape":"Time"}, |
| 1205 | + "ManagedSecretConfig":{"shape":"ManagedSecretConfig"}, |
| 1206 | + "CmkSecretConfig":{"shape":"CmkSecretConfig"}, |
| 1207 | + "CustomSecretConfig":{"shape":"CustomSecretConfig"} |
1186 | 1208 | }
|
1187 | 1209 | },
|
1188 | 1210 | "DescribeLocationEfsRequest":{
|
|
1332 | 1354 | "ServerProtocol":{"shape":"ObjectStorageServerProtocol"},
|
1333 | 1355 | "AgentArns":{"shape":"AgentArnList"},
|
1334 | 1356 | "CreationTime":{"shape":"Time"},
|
1335 |
| - "ServerCertificate":{"shape":"ObjectStorageCertificate"} |
| 1357 | + "ServerCertificate":{"shape":"ObjectStorageCertificate"}, |
| 1358 | + "ManagedSecretConfig":{"shape":"ManagedSecretConfig"}, |
| 1359 | + "CmkSecretConfig":{"shape":"CmkSecretConfig"}, |
| 1360 | + "CustomSecretConfig":{"shape":"CustomSecretConfig"} |
1336 | 1361 | }
|
1337 | 1362 | },
|
1338 | 1363 | "DescribeLocationS3Request":{
|
|
1408 | 1433 | "TaskMode":{"shape":"TaskMode"},
|
1409 | 1434 | "FilesPrepared":{"shape":"long"},
|
1410 | 1435 | "FilesListed":{"shape":"TaskExecutionFilesListedDetail"},
|
1411 |
| - "FilesFailed":{"shape":"TaskExecutionFilesFailedDetail"} |
| 1436 | + "FilesFailed":{"shape":"TaskExecutionFilesFailedDetail"}, |
| 1437 | + "LaunchTime":{"shape":"Time"}, |
| 1438 | + "EndTime":{"shape":"Time"} |
1412 | 1439 | }
|
1413 | 1440 | },
|
1414 | 1441 | "DescribeTaskRequest":{
|
|
1710 | 1737 | "max":2048,
|
1711 | 1738 | "pattern":"^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):iam::[0-9]{12}:role/.*$"
|
1712 | 1739 | },
|
| 1740 | + "IamRoleArnOrEmptyString":{ |
| 1741 | + "type":"string", |
| 1742 | + "max":2048, |
| 1743 | + "pattern":"^(arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):iam::[0-9]{12}:role/[a-zA-Z0-9+=,.@_-]+|)$" |
| 1744 | + }, |
1713 | 1745 | "InputTagList":{
|
1714 | 1746 | "type":"list",
|
1715 | 1747 | "member":{"shape":"TagListEntry"},
|
|
1748 | 1780 | "min":1,
|
1749 | 1781 | "pattern":"^.+$"
|
1750 | 1782 | },
|
| 1783 | + "KmsKeyArn":{ |
| 1784 | + "type":"string", |
| 1785 | + "max":2048, |
| 1786 | + "pattern":"^(arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):kms:[a-z\\-0-9]+:[0-9]{12}:key/.*|)$" |
| 1787 | + }, |
1751 | 1788 | "KmsKeyProviderUri":{
|
1752 | 1789 | "type":"string",
|
1753 | 1790 | "max":255,
|
|
1888 | 1925 | "TRANSFER"
|
1889 | 1926 | ]
|
1890 | 1927 | },
|
| 1928 | + "ManagedSecretConfig":{ |
| 1929 | + "type":"structure", |
| 1930 | + "members":{ |
| 1931 | + "SecretArn":{"shape":"SecretArn"} |
| 1932 | + } |
| 1933 | + }, |
1891 | 1934 | "ManifestAction":{
|
1892 | 1935 | "type":"string",
|
1893 | 1936 | "enum":["TRANSFER"]
|
|
2243 | 2286 | "DISABLED"
|
2244 | 2287 | ]
|
2245 | 2288 | },
|
| 2289 | + "SecretArn":{ |
| 2290 | + "type":"string", |
| 2291 | + "max":2048, |
| 2292 | + "pattern":"^(arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):secretsmanager:[a-z\\-0-9]+:[0-9]{12}:secret:.*|)$" |
| 2293 | + }, |
2246 | 2294 | "ServerHostname":{
|
2247 | 2295 | "type":"string",
|
2248 | 2296 | "max":255,
|
|
2593 | 2641 | "SasConfiguration":{"shape":"AzureBlobSasConfiguration"},
|
2594 | 2642 | "BlobType":{"shape":"AzureBlobType"},
|
2595 | 2643 | "AccessTier":{"shape":"AzureAccessTier"},
|
2596 |
| - "AgentArns":{"shape":"AgentArnList"} |
| 2644 | + "AgentArns":{"shape":"AgentArnList"}, |
| 2645 | + "CmkSecretConfig":{"shape":"CmkSecretConfig"}, |
| 2646 | + "CustomSecretConfig":{"shape":"CustomSecretConfig"} |
2597 | 2647 | }
|
2598 | 2648 | },
|
2599 | 2649 | "UpdateLocationAzureBlobResponse":{
|
|
2718 | 2768 | "AccessKey":{"shape":"ObjectStorageAccessKey"},
|
2719 | 2769 | "SecretKey":{"shape":"ObjectStorageSecretKey"},
|
2720 | 2770 | "AgentArns":{"shape":"AgentArnList"},
|
2721 |
| - "ServerCertificate":{"shape":"ObjectStorageCertificate"} |
| 2771 | + "ServerCertificate":{"shape":"ObjectStorageCertificate"}, |
| 2772 | + "CmkSecretConfig":{"shape":"CmkSecretConfig"}, |
| 2773 | + "CustomSecretConfig":{"shape":"CustomSecretConfig"} |
2722 | 2774 | }
|
2723 | 2775 | },
|
2724 | 2776 | "UpdateLocationObjectStorageResponse":{
|
|
0 commit comments