Skip to content

Commit 7afe744

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
AWS DataSync now supports the Kerberos authentication protocol for SMB locations.
1 parent 480ee17 commit 7afe744

17 files changed

+784
-130
lines changed

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

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,8 +1289,6 @@
12891289
"required":[
12901290
"Subdirectory",
12911291
"ServerHostname",
1292-
"User",
1293-
"Password",
12941292
"AgentArns"
12951293
],
12961294
"members":{
@@ -1301,7 +1299,12 @@
13011299
"Password":{"shape":"SmbPassword"},
13021300
"AgentArns":{"shape":"AgentArnList"},
13031301
"MountOptions":{"shape":"SmbMountOptions"},
1304-
"Tags":{"shape":"InputTagList"}
1302+
"Tags":{"shape":"InputTagList"},
1303+
"AuthenticationType":{"shape":"SmbAuthenticationType"},
1304+
"DnsIpAddresses":{"shape":"DnsIpList"},
1305+
"KerberosPrincipal":{"shape":"KerberosPrincipal"},
1306+
"KerberosKeytab":{"shape":"KerberosKeytabFile"},
1307+
"KerberosKrb5Conf":{"shape":"KerberosKrb5ConfFile"}
13051308
}
13061309
},
13071310
"CreateLocationSmbResponse":{
@@ -1625,7 +1628,10 @@
16251628
"User":{"shape":"SmbUser"},
16261629
"Domain":{"shape":"SmbDomain"},
16271630
"MountOptions":{"shape":"SmbMountOptions"},
1628-
"CreationTime":{"shape":"Time"}
1631+
"CreationTime":{"shape":"Time"},
1632+
"DnsIpAddresses":{"shape":"DnsIpList"},
1633+
"KerberosPrincipal":{"shape":"KerberosPrincipal"},
1634+
"AuthenticationType":{"shape":"SmbAuthenticationType"}
16291635
}
16301636
},
16311637
"DescribeStorageSystemRequest":{
@@ -1848,6 +1854,11 @@
18481854
"enum":["NetAppONTAP"]
18491855
},
18501856
"DiscoveryTime":{"type":"timestamp"},
1857+
"DnsIpList":{
1858+
"type":"list",
1859+
"member":{"shape":"ServerIpAddress"},
1860+
"max":2
1861+
},
18511862
"Duration":{
18521863
"type":"long",
18531864
"min":0
@@ -2018,17 +2029,12 @@
20182029
"FsxUpdateProtocolSmb":{
20192030
"type":"structure",
20202031
"members":{
2021-
"Domain":{"shape":"FsxUpdateSmbDomain"},
2032+
"Domain":{"shape":"UpdateSmbDomain"},
20222033
"MountOptions":{"shape":"SmbMountOptions"},
20232034
"Password":{"shape":"SmbPassword"},
20242035
"User":{"shape":"SmbUser"}
20252036
}
20262037
},
2027-
"FsxUpdateSmbDomain":{
2028-
"type":"string",
2029-
"max":253,
2030-
"pattern":"^([A-Za-z0-9]((\\.|-+)?[A-Za-z0-9]){0,252})?$"
2031-
},
20322038
"FsxWindowsSubdirectory":{
20332039
"type":"string",
20342040
"max":4096,
@@ -2538,7 +2544,7 @@
25382544
"type":"string",
25392545
"max":63,
25402546
"min":3,
2541-
"pattern":"^[a-zA-Z0-9_\\-\\+\\./\\(\\)\\$\\p{Zs}]+$"
2547+
"pattern":"^[a-zA-Z0-9_\\-\\+\\.\\(\\)\\$\\p{Zs}]+$"
25422548
},
25432549
"ObjectStorageCertificate":{
25442550
"type":"blob",
@@ -2936,6 +2942,19 @@
29362942
"max":255,
29372943
"pattern":"^(([a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9\\-]*[A-Za-z0-9])$"
29382944
},
2945+
"ServerIpAddress":{
2946+
"type":"string",
2947+
"max":15,
2948+
"min":7,
2949+
"pattern":"\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z"
2950+
},
2951+
"SmbAuthenticationType":{
2952+
"type":"string",
2953+
"enum":[
2954+
"NTLM",
2955+
"KERBEROS"
2956+
]
2957+
},
29392958
"SmbDomain":{
29402959
"type":"string",
29412960
"max":253,
@@ -2969,7 +2988,7 @@
29692988
"SmbUser":{
29702989
"type":"string",
29712990
"max":104,
2972-
"pattern":"^[^\\x5B\\x5D\\\\/:;|=,+*?]{1,104}$"
2991+
"pattern":"^[^\\x22\\x5B\\x5D/\\\\:;|=,+*?\\x3C\\x3E]{1,104}$"
29732992
},
29742993
"SmbVersion":{
29752994
"type":"string",
@@ -3427,7 +3446,7 @@
34273446
"members":{
34283447
"LocationArn":{"shape":"LocationArn"},
34293448
"Subdirectory":{"shape":"FsxWindowsSubdirectory"},
3430-
"Domain":{"shape":"FsxUpdateSmbDomain"},
3449+
"Domain":{"shape":"UpdateSmbDomain"},
34313450
"User":{"shape":"SmbUser"},
34323451
"Password":{"shape":"SmbPassword"}
34333452
}
@@ -3520,14 +3539,24 @@
35203539
"Domain":{"shape":"SmbDomain"},
35213540
"Password":{"shape":"SmbPassword"},
35223541
"AgentArns":{"shape":"AgentArnList"},
3523-
"MountOptions":{"shape":"SmbMountOptions"}
3542+
"MountOptions":{"shape":"SmbMountOptions"},
3543+
"AuthenticationType":{"shape":"SmbAuthenticationType"},
3544+
"DnsIpAddresses":{"shape":"DnsIpList"},
3545+
"KerberosPrincipal":{"shape":"KerberosPrincipal"},
3546+
"KerberosKeytab":{"shape":"KerberosKeytabFile"},
3547+
"KerberosKrb5Conf":{"shape":"KerberosKrb5ConfFile"}
35243548
}
35253549
},
35263550
"UpdateLocationSmbResponse":{
35273551
"type":"structure",
35283552
"members":{
35293553
}
35303554
},
3555+
"UpdateSmbDomain":{
3556+
"type":"string",
3557+
"max":253,
3558+
"pattern":"^([A-Za-z0-9]((\\.|-+)?[A-Za-z0-9]){0,252})?$"
3559+
},
35313560
"UpdateStorageSystemRequest":{
35323561
"type":"structure",
35333562
"required":["StorageSystemArn"],

‎generator/ServiceModels/datasync/datasync-2018-11-09.docs.json

Lines changed: 52 additions & 23 deletions
Large diffs are not rendered by default.

‎generator/ServiceModels/datasync/datasync-2018-11-09.normal.json

Lines changed: 93 additions & 25 deletions
Large diffs are not rendered by default.

‎sdk/code-analysis/ServiceAnalysis/DataSync/Generated/PropertyValueRules.xml

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
<property-value-rule>
154154
<property>Amazon.DataSync.Model.CreateLocationFsxWindowsRequest.User</property>
155155
<max>104</max>
156-
<pattern>^[^\x5B\x5D\\/:;|=,+*?]{1,104}$</pattern>
156+
<pattern>^[^\x22\x5B\x5D/\\:;|=,+*?\x3C\x3E]{1,104}$</pattern>
157157
</property-value-rule>
158158
<property-value-rule>
159159
<property>Amazon.DataSync.Model.CreateLocationFsxWindowsResponse.LocationArn</property>
@@ -231,7 +231,7 @@
231231
<property>Amazon.DataSync.Model.CreateLocationObjectStorageRequest.BucketName</property>
232232
<min>3</min>
233233
<max>63</max>
234-
<pattern>^[a-zA-Z0-9_\-\+\./\(\)\$\p{Zs}]+$</pattern>
234+
<pattern>^[a-zA-Z0-9_\-\+\.\(\)\$\p{Zs}]+$</pattern>
235235
</property-value-rule>
236236
<property-value-rule>
237237
<property>Amazon.DataSync.Model.CreateLocationObjectStorageRequest.SecretKey</property>
@@ -283,6 +283,20 @@
283283
<max>253</max>
284284
<pattern>^[A-Za-z0-9]((\.|-+)?[A-Za-z0-9]){0,252}$</pattern>
285285
</property-value-rule>
286+
<property-value-rule>
287+
<property>Amazon.DataSync.Model.CreateLocationSmbRequest.KerberosKeytab</property>
288+
<max>65536</max>
289+
</property-value-rule>
290+
<property-value-rule>
291+
<property>Amazon.DataSync.Model.CreateLocationSmbRequest.KerberosKrb5Conf</property>
292+
<max>131072</max>
293+
</property-value-rule>
294+
<property-value-rule>
295+
<property>Amazon.DataSync.Model.CreateLocationSmbRequest.KerberosPrincipal</property>
296+
<min>1</min>
297+
<max>256</max>
298+
<pattern>^.+$</pattern>
299+
</property-value-rule>
286300
<property-value-rule>
287301
<property>Amazon.DataSync.Model.CreateLocationSmbRequest.Password</property>
288302
<max>104</max>
@@ -301,7 +315,7 @@
301315
<property-value-rule>
302316
<property>Amazon.DataSync.Model.CreateLocationSmbRequest.User</property>
303317
<max>104</max>
304-
<pattern>^[^\x5B\x5D\\/:;|=,+*?]{1,104}$</pattern>
318+
<pattern>^[^\x22\x5B\x5D/\\:;|=,+*?\x3C\x3E]{1,104}$</pattern>
305319
</property-value-rule>
306320
<property-value-rule>
307321
<property>Amazon.DataSync.Model.CreateLocationSmbResponse.LocationArn</property>
@@ -503,7 +517,7 @@
503517
<property-value-rule>
504518
<property>Amazon.DataSync.Model.DescribeLocationFsxWindowsResponse.User</property>
505519
<max>104</max>
506-
<pattern>^[^\x5B\x5D\\/:;|=,+*?]{1,104}$</pattern>
520+
<pattern>^[^\x22\x5B\x5D/\\:;|=,+*?\x3C\x3E]{1,104}$</pattern>
507521
</property-value-rule>
508522
<property-value-rule>
509523
<property>Amazon.DataSync.Model.DescribeLocationHdfsRequest.LocationArn</property>
@@ -618,6 +632,12 @@
618632
<max>253</max>
619633
<pattern>^[A-Za-z0-9]((\.|-+)?[A-Za-z0-9]){0,252}$</pattern>
620634
</property-value-rule>
635+
<property-value-rule>
636+
<property>Amazon.DataSync.Model.DescribeLocationSmbResponse.KerberosPrincipal</property>
637+
<min>1</min>
638+
<max>256</max>
639+
<pattern>^.+$</pattern>
640+
</property-value-rule>
621641
<property-value-rule>
622642
<property>Amazon.DataSync.Model.DescribeLocationSmbResponse.LocationArn</property>
623643
<max>128</max>
@@ -631,7 +651,7 @@
631651
<property-value-rule>
632652
<property>Amazon.DataSync.Model.DescribeLocationSmbResponse.User</property>
633653
<max>104</max>
634-
<pattern>^[^\x5B\x5D\\/:;|=,+*?]{1,104}$</pattern>
654+
<pattern>^[^\x22\x5B\x5D/\\:;|=,+*?\x3C\x3E]{1,104}$</pattern>
635655
</property-value-rule>
636656
<property-value-rule>
637657
<property>Amazon.DataSync.Model.DescribeStorageSystemRequest.StorageSystemArn</property>
@@ -1032,7 +1052,7 @@
10321052
<property-value-rule>
10331053
<property>Amazon.DataSync.Model.UpdateLocationFsxWindowsRequest.User</property>
10341054
<max>104</max>
1035-
<pattern>^[^\x5B\x5D\\/:;|=,+*?]{1,104}$</pattern>
1055+
<pattern>^[^\x22\x5B\x5D/\\:;|=,+*?\x3C\x3E]{1,104}$</pattern>
10361056
</property-value-rule>
10371057
<property-value-rule>
10381058
<property>Amazon.DataSync.Model.UpdateLocationHdfsRequest.BlockSize</property>
@@ -1136,6 +1156,20 @@
11361156
<max>253</max>
11371157
<pattern>^[A-Za-z0-9]((\.|-+)?[A-Za-z0-9]){0,252}$</pattern>
11381158
</property-value-rule>
1159+
<property-value-rule>
1160+
<property>Amazon.DataSync.Model.UpdateLocationSmbRequest.KerberosKeytab</property>
1161+
<max>65536</max>
1162+
</property-value-rule>
1163+
<property-value-rule>
1164+
<property>Amazon.DataSync.Model.UpdateLocationSmbRequest.KerberosKrb5Conf</property>
1165+
<max>131072</max>
1166+
</property-value-rule>
1167+
<property-value-rule>
1168+
<property>Amazon.DataSync.Model.UpdateLocationSmbRequest.KerberosPrincipal</property>
1169+
<min>1</min>
1170+
<max>256</max>
1171+
<pattern>^.+$</pattern>
1172+
</property-value-rule>
11391173
<property-value-rule>
11401174
<property>Amazon.DataSync.Model.UpdateLocationSmbRequest.LocationArn</property>
11411175
<max>128</max>
@@ -1154,7 +1188,7 @@
11541188
<property-value-rule>
11551189
<property>Amazon.DataSync.Model.UpdateLocationSmbRequest.User</property>
11561190
<max>104</max>
1157-
<pattern>^[^\x5B\x5D\\/:;|=,+*?]{1,104}$</pattern>
1191+
<pattern>^[^\x22\x5B\x5D/\\:;|=,+*?\x3C\x3E]{1,104}$</pattern>
11581192
</property-value-rule>
11591193
<property-value-rule>
11601194
<property>Amazon.DataSync.Model.UpdateStorageSystemRequest.CloudWatchLogGroupArn</property>
@@ -1279,7 +1313,7 @@
12791313
<property-value-rule>
12801314
<property>Amazon.DataSync.Model.FsxProtocolSmb.User</property>
12811315
<max>104</max>
1282-
<pattern>^[^\x5B\x5D\\/:;|=,+*?]{1,104}$</pattern>
1316+
<pattern>^[^\x22\x5B\x5D/\\:;|=,+*?\x3C\x3E]{1,104}$</pattern>
12831317
</property-value-rule>
12841318
<property-value-rule>
12851319
<property>Amazon.DataSync.Model.FsxUpdateProtocolSmb.Domain</property>
@@ -1294,7 +1328,7 @@
12941328
<property-value-rule>
12951329
<property>Amazon.DataSync.Model.FsxUpdateProtocolSmb.User</property>
12961330
<max>104</max>
1297-
<pattern>^[^\x5B\x5D\\/:;|=,+*?]{1,104}$</pattern>
1331+
<pattern>^[^\x22\x5B\x5D/\\:;|=,+*?\x3C\x3E]{1,104}$</pattern>
12981332
</property-value-rule>
12991333
<property-value-rule>
13001334
<property>Amazon.DataSync.Model.HdfsNameNode.Hostname</property>

0 commit comments

Comments
 (0)