Skip to content

Commit 28efb3d

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
New and updated API operations to support License Included User-based Subscription of Microsoft Remote Desktop Services (RDS).
1 parent 315683f commit 28efb3d

File tree

98 files changed

+8719
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+8719
-229
lines changed

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

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

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

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

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

Lines changed: 636 additions & 75 deletions
Large diffs are not rendered by default.

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
"limit_key": "MaxResults",
1313
"result_key": "InstanceSummaries"
1414
},
15+
"ListLicenseServerEndpoints": {
16+
"input_token": "NextToken",
17+
"output_token": "NextToken",
18+
"limit_key": "MaxResults",
19+
"result_key": "LicenseServerEndpoints"
20+
},
1521
"ListProductSubscriptions": {
1622
"input_token": "NextToken",
1723
"output_token": "NextToken",

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

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,78 @@
11
<?xml version="1.0" encoding="utf-16"?>
22
<property-value-rules>
3+
<property-value-rule>
4+
<property>Amazon.LicenseManagerUserSubscriptions.Model.CreateLicenseServerEndpointRequest.IdentityProviderArn</property>
5+
<pattern>^arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-zA-Z0-9-\.]{1,510}/[a-zA-Z0-9-\.]{1,510}$</pattern>
6+
</property-value-rule>
7+
<property-value-rule>
8+
<property>Amazon.LicenseManagerUserSubscriptions.Model.CreateLicenseServerEndpointResponse.IdentityProviderArn</property>
9+
<pattern>^arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-zA-Z0-9-\.]{1,510}/[a-zA-Z0-9-\.]{1,510}$</pattern>
10+
</property-value-rule>
11+
<property-value-rule>
12+
<property>Amazon.LicenseManagerUserSubscriptions.Model.CreateLicenseServerEndpointResponse.LicenseServerEndpointArn</property>
13+
<pattern>^arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-zA-Z0-9-\.]{1,510}/[a-zA-Z0-9-\.]{1,510}$</pattern>
14+
</property-value-rule>
15+
<property-value-rule>
16+
<property>Amazon.LicenseManagerUserSubscriptions.Model.DeleteLicenseServerEndpointRequest.LicenseServerEndpointArn</property>
17+
<pattern>^arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-zA-Z0-9-\.]{1,510}/[a-zA-Z0-9-\.]{1,510}$</pattern>
18+
</property-value-rule>
19+
<property-value-rule>
20+
<property>Amazon.LicenseManagerUserSubscriptions.Model.DeregisterIdentityProviderRequest.IdentityProviderArn</property>
21+
<pattern>^arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-zA-Z0-9-\.]{1,510}/[a-zA-Z0-9-\.]{1,510}$</pattern>
22+
</property-value-rule>
23+
<property-value-rule>
24+
<property>Amazon.LicenseManagerUserSubscriptions.Model.DisassociateUserRequest.InstanceUserArn</property>
25+
<pattern>^arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-zA-Z0-9-\.]{1,510}/[a-zA-Z0-9-\.]{1,510}$</pattern>
26+
</property-value-rule>
27+
<property-value-rule>
28+
<property>Amazon.LicenseManagerUserSubscriptions.Model.ListLicenseServerEndpointsRequest.MaxResults</property>
29+
<min>1</min>
30+
<max>100</max>
31+
</property-value-rule>
32+
<property-value-rule>
33+
<property>Amazon.LicenseManagerUserSubscriptions.Model.ListTagsForResourceRequest.ResourceArn</property>
34+
<pattern>^arn:([a-z0-9-\.]{1,63}):([a-z0-9-\.]{1,63}):([a-z0-9-\.]{1,63}):([a-z0-9-\.]{1,63}):([a-z0-9-\.]{1,510})/([a-z0-9-\.]{1,510})$</pattern>
35+
</property-value-rule>
36+
<property-value-rule>
37+
<property>Amazon.LicenseManagerUserSubscriptions.Model.StopProductSubscriptionRequest.ProductUserArn</property>
38+
<pattern>^arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-zA-Z0-9-\.]{1,510}/[a-zA-Z0-9-\.]{1,510}$</pattern>
39+
</property-value-rule>
40+
<property-value-rule>
41+
<property>Amazon.LicenseManagerUserSubscriptions.Model.TagResourceRequest.ResourceArn</property>
42+
<pattern>^arn:([a-z0-9-\.]{1,63}):([a-z0-9-\.]{1,63}):([a-z0-9-\.]{1,63}):([a-z0-9-\.]{1,63}):([a-z0-9-\.]{1,510})/([a-z0-9-\.]{1,510})$</pattern>
43+
</property-value-rule>
44+
<property-value-rule>
45+
<property>Amazon.LicenseManagerUserSubscriptions.Model.UntagResourceRequest.ResourceArn</property>
46+
<pattern>^arn:([a-z0-9-\.]{1,63}):([a-z0-9-\.]{1,63}):([a-z0-9-\.]{1,63}):([a-z0-9-\.]{1,63}):([a-z0-9-\.]{1,510})/([a-z0-9-\.]{1,510})$</pattern>
47+
</property-value-rule>
48+
<property-value-rule>
49+
<property>Amazon.LicenseManagerUserSubscriptions.Model.UpdateIdentityProviderSettingsRequest.IdentityProviderArn</property>
50+
<pattern>^arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-zA-Z0-9-\.]{1,510}/[a-zA-Z0-9-\.]{1,510}$</pattern>
51+
</property-value-rule>
52+
<property-value-rule>
53+
<property>Amazon.LicenseManagerUserSubscriptions.Model.ActiveDirectoryIdentityProvider.DirectoryId</property>
54+
<pattern>^(d|sd)-[0-9a-f]{10}$</pattern>
55+
</property-value-rule>
56+
<property-value-rule>
57+
<property>Amazon.LicenseManagerUserSubscriptions.Model.IdentityProviderSummary.IdentityProviderArn</property>
58+
<pattern>^arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-zA-Z0-9-\.]{1,510}/[a-zA-Z0-9-\.]{1,510}$</pattern>
59+
</property-value-rule>
60+
<property-value-rule>
61+
<property>Amazon.LicenseManagerUserSubscriptions.Model.InstanceUserSummary.InstanceUserArn</property>
62+
<pattern>^arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-zA-Z0-9-\.]{1,510}/[a-zA-Z0-9-\.]{1,510}$</pattern>
63+
</property-value-rule>
64+
<property-value-rule>
65+
<property>Amazon.LicenseManagerUserSubscriptions.Model.LicenseServerEndpoint.LicenseServerEndpointArn</property>
66+
<pattern>^arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-zA-Z0-9-\.]{1,510}/[a-zA-Z0-9-\.]{1,510}$</pattern>
67+
</property-value-rule>
68+
<property-value-rule>
69+
<property>Amazon.LicenseManagerUserSubscriptions.Model.ProductUserSummary.ProductUserArn</property>
70+
<pattern>^arn:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-z0-9-\.]{1,63}:[a-zA-Z0-9-\.]{1,510}/[a-zA-Z0-9-\.]{1,510}$</pattern>
71+
</property-value-rule>
72+
<property-value-rule>
73+
<property>Amazon.LicenseManagerUserSubscriptions.Model.SecretsManagerCredentialsProvider.SecretId</property>
74+
<min>1</min>
75+
</property-value-rule>
376
<property-value-rule>
477
<property>Amazon.LicenseManagerUserSubscriptions.Model.Settings.SecurityGroupId</property>
578
<min>5</min>

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,49 @@ namespace Amazon.LicenseManagerUserSubscriptions.Model
3434
/// </summary>
3535
public partial class ActiveDirectoryIdentityProvider
3636
{
37+
private ActiveDirectorySettings _activeDirectorySettings;
38+
private ActiveDirectoryType _activeDirectoryType;
3739
private string _directoryId;
3840

41+
/// <summary>
42+
/// Gets and sets the property ActiveDirectorySettings.
43+
/// <para>
44+
/// The <c>ActiveDirectorySettings</c> resource contains details about the Active Directory,
45+
/// including network access details such as domain name and IP addresses, and the credential
46+
/// provider for user administration.
47+
/// </para>
48+
/// </summary>
49+
public ActiveDirectorySettings ActiveDirectorySettings
50+
{
51+
get { return this._activeDirectorySettings; }
52+
set { this._activeDirectorySettings = value; }
53+
}
54+
55+
// Check to see if ActiveDirectorySettings property is set
56+
internal bool IsSetActiveDirectorySettings()
57+
{
58+
return this._activeDirectorySettings != null;
59+
}
60+
61+
/// <summary>
62+
/// Gets and sets the property ActiveDirectoryType.
63+
/// <para>
64+
/// The type of Active Directory – either a self-managed Active Directory or an Amazon
65+
/// Web Services Managed Active Directory.
66+
/// </para>
67+
/// </summary>
68+
public ActiveDirectoryType ActiveDirectoryType
69+
{
70+
get { return this._activeDirectoryType; }
71+
set { this._activeDirectoryType = value; }
72+
}
73+
74+
// Check to see if ActiveDirectoryType property is set
75+
internal bool IsSetActiveDirectoryType()
76+
{
77+
return this._activeDirectoryType != null;
78+
}
79+
3980
/// <summary>
4081
/// Gets and sets the property DirectoryId.
4182
/// <para>

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

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
/*
17+
* Do not modify this file. This file is generated from the license-manager-user-subscriptions-2018-05-10.normal.json service model.
18+
*/
19+
using System;
20+
using System.Collections.Generic;
21+
using System.Xml.Serialization;
22+
using System.Text;
23+
using System.IO;
24+
using System.Net;
25+
26+
using Amazon.Runtime;
27+
using Amazon.Runtime.Internal;
28+
29+
#pragma warning disable CS0612,CS0618,CS1570
30+
namespace Amazon.LicenseManagerUserSubscriptions.Model
31+
{
32+
/// <summary>
33+
/// Contains network access and credential details that are needed for user administration
34+
/// in the Active Directory.
35+
/// </summary>
36+
public partial class ActiveDirectorySettings
37+
{
38+
private CredentialsProvider _domainCredentialsProvider;
39+
private List<string> _domainIpv4List = AWSConfigs.InitializeCollections ? new List<string>() : null;
40+
private string _domainName;
41+
private DomainNetworkSettings _domainNetworkSettings;
42+
43+
/// <summary>
44+
/// Gets and sets the property DomainCredentialsProvider.
45+
/// <para>
46+
/// Points to the <c>CredentialsProvider</c> resource that contains information about
47+
/// the credential provider for user administration.
48+
/// </para>
49+
/// </summary>
50+
public CredentialsProvider DomainCredentialsProvider
51+
{
52+
get { return this._domainCredentialsProvider; }
53+
set { this._domainCredentialsProvider = value; }
54+
}
55+
56+
// Check to see if DomainCredentialsProvider property is set
57+
internal bool IsSetDomainCredentialsProvider()
58+
{
59+
return this._domainCredentialsProvider != null;
60+
}
61+
62+
/// <summary>
63+
/// Gets and sets the property DomainIpv4List.
64+
/// <para>
65+
/// A list of domain IPv4 addresses that are used for the Active Directory.
66+
/// </para>
67+
/// </summary>
68+
[AWSProperty(Min=1, Max=2)]
69+
public List<string> DomainIpv4List
70+
{
71+
get { return this._domainIpv4List; }
72+
set { this._domainIpv4List = value; }
73+
}
74+
75+
// Check to see if DomainIpv4List property is set
76+
internal bool IsSetDomainIpv4List()
77+
{
78+
return this._domainIpv4List != null && (this._domainIpv4List.Count > 0 || !AWSConfigs.InitializeCollections);
79+
}
80+
81+
/// <summary>
82+
/// Gets and sets the property DomainName.
83+
/// <para>
84+
/// The domain name for the Active Directory.
85+
/// </para>
86+
/// </summary>
87+
public string DomainName
88+
{
89+
get { return this._domainName; }
90+
set { this._domainName = value; }
91+
}
92+
93+
// Check to see if DomainName property is set
94+
internal bool IsSetDomainName()
95+
{
96+
return this._domainName != null;
97+
}
98+
99+
/// <summary>
100+
/// Gets and sets the property DomainNetworkSettings.
101+
/// <para>
102+
/// The <c>DomainNetworkSettings</c> resource contains an array of subnets that apply
103+
/// for the Active Directory.
104+
/// </para>
105+
/// </summary>
106+
public DomainNetworkSettings DomainNetworkSettings
107+
{
108+
get { return this._domainNetworkSettings; }
109+
set { this._domainNetworkSettings = value; }
110+
}
111+
112+
// Check to see if DomainNetworkSettings property is set
113+
internal bool IsSetDomainNetworkSettings()
114+
{
115+
return this._domainNetworkSettings != null;
116+
}
117+
118+
}
119+
}

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

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,14 @@ public partial class AssociateUserRequest : AmazonLicenseManagerUserSubscription
4747
private string _domain;
4848
private IdentityProvider _identityProvider;
4949
private string _instanceId;
50+
private Dictionary<string, string> _tags = AWSConfigs.InitializeCollections ? new Dictionary<string, string>() : null;
5051
private string _username;
5152

5253
/// <summary>
5354
/// Gets and sets the property Domain.
5455
/// <para>
55-
/// The domain name of the user.
56+
/// The domain name of the Active Directory that contains information for the user to
57+
/// associate.
5658
/// </para>
5759
/// </summary>
5860
public string Domain
@@ -70,7 +72,7 @@ internal bool IsSetDomain()
7072
/// <summary>
7173
/// Gets and sets the property IdentityProvider.
7274
/// <para>
73-
/// The identity provider of the user.
75+
/// The identity provider for the user.
7476
/// </para>
7577
/// </summary>
7678
[AWSProperty(Required=true)]
@@ -89,7 +91,7 @@ internal bool IsSetIdentityProvider()
8991
/// <summary>
9092
/// Gets and sets the property InstanceId.
9193
/// <para>
92-
/// The ID of the EC2 instance, which provides user-based subscriptions.
94+
/// The ID of the EC2 instance that provides the user-based subscription.
9395
/// </para>
9496
/// </summary>
9597
[AWSProperty(Required=true)]
@@ -105,10 +107,29 @@ internal bool IsSetInstanceId()
105107
return this._instanceId != null;
106108
}
107109

110+
/// <summary>
111+
/// Gets and sets the property Tags.
112+
/// <para>
113+
/// The tags that apply for the user association.
114+
/// </para>
115+
/// </summary>
116+
[AWSProperty(Sensitive=true, Min=0, Max=50)]
117+
public Dictionary<string, string> Tags
118+
{
119+
get { return this._tags; }
120+
set { this._tags = value; }
121+
}
122+
123+
// Check to see if Tags property is set
124+
internal bool IsSetTags()
125+
{
126+
return this._tags != null && (this._tags.Count > 0 || !AWSConfigs.InitializeCollections);
127+
}
128+
108129
/// <summary>
109130
/// Gets and sets the property Username.
110131
/// <para>
111-
/// The user name from the identity provider for the user.
132+
/// The user name from the identity provider.
112133
/// </para>
113134
/// </summary>
114135
[AWSProperty(Required=true)]

0 commit comments

Comments
 (0)