Skip to content

Commit 22f5416

Browse files
AgentArns field is made optional for Object Storage and Azure Blob location create requests. Location credentials are now managed via Secrets Manager, and may be encrypted with service managed or customer managed keys. Authentication is now optional for Azure Blob locations.
1 parent 4752433 commit 22f5416

32 files changed

+1573
-89
lines changed

generator/ServiceModels/datasync/datasync-2018-11-09.api.json

Lines changed: 64 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,10 @@
766766
},
767767
"AzureBlobAuthenticationType":{
768768
"type":"string",
769-
"enum":["SAS"]
769+
"enum":[
770+
"SAS",
771+
"NONE"
772+
]
770773
},
771774
"AzureBlobContainerUrl":{
772775
"type":"string",
@@ -811,6 +814,13 @@
811814
"type":"structure",
812815
"members":{}
813816
},
817+
"CmkSecretConfig":{
818+
"type":"structure",
819+
"members":{
820+
"SecretArn":{"shape":"SecretArn"},
821+
"KmsKeyArn":{"shape":"KmsKeyArn"}
822+
}
823+
},
814824
"CreateAgentRequest":{
815825
"type":"structure",
816826
"required":["ActivationKey"],
@@ -833,8 +843,7 @@
833843
"type":"structure",
834844
"required":[
835845
"ContainerUrl",
836-
"AuthenticationType",
837-
"AgentArns"
846+
"AuthenticationType"
838847
],
839848
"members":{
840849
"ContainerUrl":{"shape":"AzureBlobContainerUrl"},
@@ -844,7 +853,9 @@
844853
"AccessTier":{"shape":"AzureAccessTier"},
845854
"Subdirectory":{"shape":"AzureBlobSubdirectory"},
846855
"AgentArns":{"shape":"AgentArnList"},
847-
"Tags":{"shape":"InputTagList"}
856+
"Tags":{"shape":"InputTagList"},
857+
"CmkSecretConfig":{"shape":"CmkSecretConfig"},
858+
"CustomSecretConfig":{"shape":"CustomSecretConfig"}
848859
}
849860
},
850861
"CreateLocationAzureBlobResponse":{
@@ -1014,8 +1025,7 @@
10141025
"type":"structure",
10151026
"required":[
10161027
"ServerHostname",
1017-
"BucketName",
1018-
"AgentArns"
1028+
"BucketName"
10191029
],
10201030
"members":{
10211031
"ServerHostname":{"shape":"ServerHostname"},
@@ -1027,7 +1037,9 @@
10271037
"SecretKey":{"shape":"ObjectStorageSecretKey"},
10281038
"AgentArns":{"shape":"AgentArnList"},
10291039
"Tags":{"shape":"InputTagList"},
1030-
"ServerCertificate":{"shape":"ObjectStorageCertificate"}
1040+
"ServerCertificate":{"shape":"ObjectStorageCertificate"},
1041+
"CmkSecretConfig":{"shape":"CmkSecretConfig"},
1042+
"CustomSecretConfig":{"shape":"CustomSecretConfig"}
10311043
}
10321044
},
10331045
"CreateLocationObjectStorageResponse":{
@@ -1113,6 +1125,13 @@
11131125
"TaskArn":{"shape":"TaskArn"}
11141126
}
11151127
},
1128+
"CustomSecretConfig":{
1129+
"type":"structure",
1130+
"members":{
1131+
"SecretArn":{"shape":"SecretArn"},
1132+
"SecretAccessRoleArn":{"shape":"IamRoleArnOrEmptyString"}
1133+
}
1134+
},
11161135
"DeleteAgentRequest":{
11171136
"type":"structure",
11181137
"required":["AgentArn"],
@@ -1182,7 +1201,10 @@
11821201
"BlobType":{"shape":"AzureBlobType"},
11831202
"AccessTier":{"shape":"AzureAccessTier"},
11841203
"AgentArns":{"shape":"AgentArnList"},
1185-
"CreationTime":{"shape":"Time"}
1204+
"CreationTime":{"shape":"Time"},
1205+
"ManagedSecretConfig":{"shape":"ManagedSecretConfig"},
1206+
"CmkSecretConfig":{"shape":"CmkSecretConfig"},
1207+
"CustomSecretConfig":{"shape":"CustomSecretConfig"}
11861208
}
11871209
},
11881210
"DescribeLocationEfsRequest":{
@@ -1332,7 +1354,10 @@
13321354
"ServerProtocol":{"shape":"ObjectStorageServerProtocol"},
13331355
"AgentArns":{"shape":"AgentArnList"},
13341356
"CreationTime":{"shape":"Time"},
1335-
"ServerCertificate":{"shape":"ObjectStorageCertificate"}
1357+
"ServerCertificate":{"shape":"ObjectStorageCertificate"},
1358+
"ManagedSecretConfig":{"shape":"ManagedSecretConfig"},
1359+
"CmkSecretConfig":{"shape":"CmkSecretConfig"},
1360+
"CustomSecretConfig":{"shape":"CustomSecretConfig"}
13361361
}
13371362
},
13381363
"DescribeLocationS3Request":{
@@ -1408,7 +1433,9 @@
14081433
"TaskMode":{"shape":"TaskMode"},
14091434
"FilesPrepared":{"shape":"long"},
14101435
"FilesListed":{"shape":"TaskExecutionFilesListedDetail"},
1411-
"FilesFailed":{"shape":"TaskExecutionFilesFailedDetail"}
1436+
"FilesFailed":{"shape":"TaskExecutionFilesFailedDetail"},
1437+
"LaunchTime":{"shape":"Time"},
1438+
"EndTime":{"shape":"Time"}
14121439
}
14131440
},
14141441
"DescribeTaskRequest":{
@@ -1710,6 +1737,11 @@
17101737
"max":2048,
17111738
"pattern":"^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):iam::[0-9]{12}:role/.*$"
17121739
},
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+
},
17131745
"InputTagList":{
17141746
"type":"list",
17151747
"member":{"shape":"TagListEntry"},
@@ -1748,6 +1780,11 @@
17481780
"min":1,
17491781
"pattern":"^.+$"
17501782
},
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+
},
17511788
"KmsKeyProviderUri":{
17521789
"type":"string",
17531790
"max":255,
@@ -1888,6 +1925,12 @@
18881925
"TRANSFER"
18891926
]
18901927
},
1928+
"ManagedSecretConfig":{
1929+
"type":"structure",
1930+
"members":{
1931+
"SecretArn":{"shape":"SecretArn"}
1932+
}
1933+
},
18911934
"ManifestAction":{
18921935
"type":"string",
18931936
"enum":["TRANSFER"]
@@ -2243,6 +2286,11 @@
22432286
"DISABLED"
22442287
]
22452288
},
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+
},
22462294
"ServerHostname":{
22472295
"type":"string",
22482296
"max":255,
@@ -2593,7 +2641,9 @@
25932641
"SasConfiguration":{"shape":"AzureBlobSasConfiguration"},
25942642
"BlobType":{"shape":"AzureBlobType"},
25952643
"AccessTier":{"shape":"AzureAccessTier"},
2596-
"AgentArns":{"shape":"AgentArnList"}
2644+
"AgentArns":{"shape":"AgentArnList"},
2645+
"CmkSecretConfig":{"shape":"CmkSecretConfig"},
2646+
"CustomSecretConfig":{"shape":"CustomSecretConfig"}
25972647
}
25982648
},
25992649
"UpdateLocationAzureBlobResponse":{
@@ -2718,7 +2768,9 @@
27182768
"AccessKey":{"shape":"ObjectStorageAccessKey"},
27192769
"SecretKey":{"shape":"ObjectStorageSecretKey"},
27202770
"AgentArns":{"shape":"AgentArnList"},
2721-
"ServerCertificate":{"shape":"ObjectStorageCertificate"}
2771+
"ServerCertificate":{"shape":"ObjectStorageCertificate"},
2772+
"CmkSecretConfig":{"shape":"CmkSecretConfig"},
2773+
"CustomSecretConfig":{"shape":"CustomSecretConfig"}
27222774
}
27232775
},
27242776
"UpdateLocationObjectStorageResponse":{

0 commit comments

Comments
 (0)