Skip to content

Commit 9a43e4e

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
Released support for IPv6 and dual-stack active directories
1 parent e32e1ce commit 9a43e4e

File tree

8 files changed

+106
-1
lines changed

8 files changed

+106
-1
lines changed

‎generator/ServiceModels/license-manager-user-subscriptions/license-manager-user-subscriptions-2018-05-10.api.json‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@
351351
"members":{
352352
"DomainName":{"shape":"String"},
353353
"DomainIpv4List":{"shape":"ActiveDirectorySettingsDomainIpv4ListList"},
354+
"DomainIpv6List":{"shape":"ActiveDirectorySettingsDomainIpv6ListList"},
354355
"DomainCredentialsProvider":{"shape":"CredentialsProvider"},
355356
"DomainNetworkSettings":{"shape":"DomainNetworkSettings"}
356357
}
@@ -361,6 +362,12 @@
361362
"max":2,
362363
"min":1
363364
},
365+
"ActiveDirectorySettingsDomainIpv6ListList":{
366+
"type":"list",
367+
"member":{"shape":"IpV6"},
368+
"max":2,
369+
"min":1
370+
},
364371
"ActiveDirectoryType":{
365372
"type":"string",
366373
"enum":[
@@ -600,12 +607,17 @@
600607
"type":"string",
601608
"pattern":"(?:(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\\.(?!$)|$)){4}"
602609
},
610+
"IpV6":{
611+
"type":"string",
612+
"pattern":"([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|::|::[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}"
613+
},
603614
"LicenseServer":{
604615
"type":"structure",
605616
"members":{
606617
"ProvisioningStatus":{"shape":"LicenseServerEndpointProvisioningStatus"},
607618
"HealthStatus":{"shape":"LicenseServerHealthStatus"},
608-
"Ipv4Address":{"shape":"String"}
619+
"Ipv4Address":{"shape":"String"},
620+
"Ipv6Address":{"shape":"String"}
609621
}
610622
},
611623
"LicenseServerEndpoint":{

‎generator/ServiceModels/license-manager-user-subscriptions/license-manager-user-subscriptions-2018-05-10.docs.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
"ActiveDirectorySettings$DomainIpv4List": "<p>A list of domain IPv4 addresses that are used for the Active Directory.</p>"
4444
}
4545
},
46+
"ActiveDirectorySettingsDomainIpv6ListList": {
47+
"base": null,
48+
"refs": {
49+
"ActiveDirectorySettings$DomainIpv6List": "<p>A list of domain IPv6 addresses that are used for the Active Directory.</p>"
50+
}
51+
},
4652
"ActiveDirectoryType": {
4753
"base": null,
4854
"refs": {
@@ -235,6 +241,12 @@
235241
"ActiveDirectorySettingsDomainIpv4ListList$member": null
236242
}
237243
},
244+
"IpV6": {
245+
"base": null,
246+
"refs": {
247+
"ActiveDirectorySettingsDomainIpv6ListList$member": null
248+
}
249+
},
238250
"LicenseServer": {
239251
"base": "<p>Information about a Remote Desktop Services (RDS) license server.</p>",
240252
"refs": {
@@ -485,6 +497,7 @@
485497
"InstanceUserSummary$DisassociationDate": "<p>The date a user was disassociated from an EC2 instance.</p>",
486498
"InternalServerException$message": null,
487499
"LicenseServer$Ipv4Address": "<p>A list of domain IPv4 addresses that are used for the RDS license server.</p>",
500+
"LicenseServer$Ipv6Address": "<p>A list of domain IPv6 addresses that are used for the RDS license server.</p>",
488501
"LicenseServerEndpoint$IdentityProviderArn": "<p>The Amazon Resource Name (ARN) of the identity provider that's associated with the RDS license server endpoint.</p>",
489502
"LicenseServerEndpoint$StatusMessage": "<p>The message associated with the provisioning status, if there is one.</p>",
490503
"ListIdentityProvidersRequest$NextToken": "<p>A token to specify where to start paginating. This is the nextToken from a previously truncated response.</p>",

‎generator/ServiceModels/license-manager-user-subscriptions/license-manager-user-subscriptions-2018-05-10.normal.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,10 @@
388388
"shape":"ActiveDirectorySettingsDomainIpv4ListList",
389389
"documentation":"<p>A list of domain IPv4 addresses that are used for the Active Directory.</p>"
390390
},
391+
"DomainIpv6List":{
392+
"shape":"ActiveDirectorySettingsDomainIpv6ListList",
393+
"documentation":"<p>A list of domain IPv6 addresses that are used for the Active Directory.</p>"
394+
},
391395
"DomainCredentialsProvider":{
392396
"shape":"CredentialsProvider",
393397
"documentation":"<p>Points to the <code>CredentialsProvider</code> resource that contains information about the credential provider for user administration.</p>"
@@ -405,6 +409,12 @@
405409
"max":2,
406410
"min":1
407411
},
412+
"ActiveDirectorySettingsDomainIpv6ListList":{
413+
"type":"list",
414+
"member":{"shape":"IpV6"},
415+
"max":2,
416+
"min":1
417+
},
408418
"ActiveDirectoryType":{
409419
"type":"string",
410420
"enum":[
@@ -812,6 +822,10 @@
812822
"type":"string",
813823
"pattern":"(?:(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\\.(?!$)|$)){4}"
814824
},
825+
"IpV6":{
826+
"type":"string",
827+
"pattern":"([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|::|::[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}"
828+
},
815829
"LicenseServer":{
816830
"type":"structure",
817831
"members":{
@@ -826,6 +840,10 @@
826840
"Ipv4Address":{
827841
"shape":"String",
828842
"documentation":"<p>A list of domain IPv4 addresses that are used for the RDS license server.</p>"
843+
},
844+
"Ipv6Address":{
845+
"shape":"String",
846+
"documentation":"<p>A list of domain IPv6 addresses that are used for the RDS license server.</p>"
829847
}
830848
},
831849
"documentation":"<p>Information about a Remote Desktop Services (RDS) license server.</p>"

‎sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/ActiveDirectorySettings.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public partial class ActiveDirectorySettings
3737
{
3838
private CredentialsProvider _domainCredentialsProvider;
3939
private List<string> _domainIpv4List = AWSConfigs.InitializeCollections ? new List<string>() : null;
40+
private List<string> _domainIpv6List = AWSConfigs.InitializeCollections ? new List<string>() : null;
4041
private string _domainName;
4142
private DomainNetworkSettings _domainNetworkSettings;
4243

@@ -78,6 +79,25 @@ internal bool IsSetDomainIpv4List()
7879
return this._domainIpv4List != null && (this._domainIpv4List.Count > 0 || !AWSConfigs.InitializeCollections);
7980
}
8081

82+
/// <summary>
83+
/// Gets and sets the property DomainIpv6List.
84+
/// <para>
85+
/// A list of domain IPv6 addresses that are used for the Active Directory.
86+
/// </para>
87+
/// </summary>
88+
[AWSProperty(Min=1, Max=2)]
89+
public List<string> DomainIpv6List
90+
{
91+
get { return this._domainIpv6List; }
92+
set { this._domainIpv6List = value; }
93+
}
94+
95+
// Check to see if DomainIpv6List property is set
96+
internal bool IsSetDomainIpv6List()
97+
{
98+
return this._domainIpv6List != null && (this._domainIpv6List.Count > 0 || !AWSConfigs.InitializeCollections);
99+
}
100+
81101
/// <summary>
82102
/// Gets and sets the property DomainName.
83103
/// <para>

‎sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/ActiveDirectorySettingsMarshaller.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@ public void Marshall(ActiveDirectorySettings requestObject, JsonMarshallerContex
7070
context.Writer.WriteArrayEnd();
7171
}
7272

73+
if(requestObject.IsSetDomainIpv6List())
74+
{
75+
context.Writer.WritePropertyName("DomainIpv6List");
76+
context.Writer.WriteArrayStart();
77+
foreach(var requestObjectDomainIpv6ListListValue in requestObject.DomainIpv6List)
78+
{
79+
context.Writer.Write(requestObjectDomainIpv6ListListValue);
80+
}
81+
context.Writer.WriteArrayEnd();
82+
}
83+
7384
if(requestObject.IsSetDomainName())
7485
{
7586
context.Writer.WritePropertyName("DomainName");

‎sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/ActiveDirectorySettingsUnmarshaller.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ public ActiveDirectorySettings Unmarshall(JsonUnmarshallerContext context)
7878
unmarshalledObject.DomainIpv4List = unmarshaller.Unmarshall(context);
7979
continue;
8080
}
81+
if (context.TestExpression("DomainIpv6List", targetDepth))
82+
{
83+
var unmarshaller = new ListUnmarshaller<string, StringUnmarshaller>(StringUnmarshaller.Instance);
84+
unmarshalledObject.DomainIpv6List = unmarshaller.Unmarshall(context);
85+
continue;
86+
}
8187
if (context.TestExpression("DomainName", targetDepth))
8288
{
8389
var unmarshaller = StringUnmarshaller.Instance;

‎sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/Internal/MarshallTransformations/LicenseServerUnmarshaller.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ public LicenseServer Unmarshall(JsonUnmarshallerContext context)
7878
unmarshalledObject.Ipv4Address = unmarshaller.Unmarshall(context);
7979
continue;
8080
}
81+
if (context.TestExpression("Ipv6Address", targetDepth))
82+
{
83+
var unmarshaller = StringUnmarshaller.Instance;
84+
unmarshalledObject.Ipv6Address = unmarshaller.Unmarshall(context);
85+
continue;
86+
}
8187
if (context.TestExpression("ProvisioningStatus", targetDepth))
8288
{
8389
var unmarshaller = StringUnmarshaller.Instance;

‎sdk/src/Services/LicenseManagerUserSubscriptions/Generated/Model/LicenseServer.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public partial class LicenseServer
3636
{
3737
private LicenseServerHealthStatus _healthStatus;
3838
private string _ipv4Address;
39+
private string _ipv6Address;
3940
private LicenseServerEndpointProvisioningStatus _provisioningStatus;
4041

4142
/// <summary>
@@ -74,6 +75,24 @@ internal bool IsSetIpv4Address()
7475
return this._ipv4Address != null;
7576
}
7677

78+
/// <summary>
79+
/// Gets and sets the property Ipv6Address.
80+
/// <para>
81+
/// A list of domain IPv6 addresses that are used for the RDS license server.
82+
/// </para>
83+
/// </summary>
84+
public string Ipv6Address
85+
{
86+
get { return this._ipv6Address; }
87+
set { this._ipv6Address = value; }
88+
}
89+
90+
// Check to see if Ipv6Address property is set
91+
internal bool IsSetIpv6Address()
92+
{
93+
return this._ipv6Address != null;
94+
}
95+
7796
/// <summary>
7897
/// Gets and sets the property ProvisioningStatus.
7998
/// <para>

0 commit comments

Comments
 (0)