Skip to content

Commit

Permalink
Allow vanity DNS domain when creating a new ASC instance
Browse files Browse the repository at this point in the history
  • Loading branch information
@aws-sdk-dotnet-automation
aws-sdk-dotnet-automation committed Jan 6, 2025
1 parent 121de43 commit b1ed28c
Show file tree
Hide file tree
Showing 11 changed files with 65 additions and 29 deletions.
3 changes: 2 additions & 1 deletion generator/ServiceModels/supplychain/supplychain-2024-01-01.api.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@
"instanceName":{"shape":"InstanceName"},
"instanceDescription":{"shape":"InstanceDescription"},
"kmsKeyArn":{"shape":"KmsKeyArn"},
"webAppDnsDomain":{"shape":"InstanceWebAppDnsDomain"},
"tags":{"shape":"TagMap"},
"clientToken":{
"shape":"ClientToken",
Expand Down Expand Up @@ -1213,7 +1214,7 @@
},
"InstanceWebAppDnsDomain":{
"type":"string",
"pattern":"[A-Za-z0-9]+(.[A-Za-z0-9]+)+"
"pattern":"(?![-])[a-zA-Z0-9-]{1,62}[a-zA-Z0-9]"
},
"InternalServerException":{
"type":"structure",
Expand Down
13 changes: 7 additions & 6 deletions generator/ServiceModels/supplychain/supplychain-2024-01-01.docs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"DataIntegrationEventData": {
"base": null,
"refs": {
"SendDataIntegrationEventRequest$data": "<p>The data payload of the event. For more information on the data schema to use, see <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">Data entities supported in AWS Supply Chain </a>.</p>"
"SendDataIntegrationEventRequest$data": "<p>The data payload of the event. For more information on the data schema to use, see <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">Data entities supported in AWS Supply Chain</a>.</p>"
}
},
"DataIntegrationEventGroupId": {
Expand Down Expand Up @@ -338,7 +338,7 @@
"refs": {
"CreateDataLakeDatasetRequest$name": "<p>The name of the dataset. For <b>asc</b> name space, the name must be one of the supported data entities under <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p>",
"DataLakeDataset$name": "<p>The name of the dataset. For <b>asc</b> name space, the name must be one of the supported data entities under <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p>",
"DeleteDataLakeDatasetRequest$name": "<p>The name of the dataset. If the namespace is <i>asc</i>, the name must be one of the supported <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">data entities </a>.</p>",
"DeleteDataLakeDatasetRequest$name": "<p>The name of the dataset. For <b>asc</b> name space, the name must be one of the supported data entities under <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p>",
"DeleteDataLakeDatasetResponse$name": "<p>The name of deleted dataset.</p>",
"GetDataLakeDatasetRequest$name": "<p>The name of the dataset. For <b>asc</b> name space, the name must be one of the supported data entities under <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p>",
"UpdateDataLakeDatasetRequest$name": "<p>The name of the dataset. For <b>asc</b> name space, the name must be one of the supported data entities under <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p>"
Expand All @@ -349,10 +349,10 @@
"refs": {
"CreateDataLakeDatasetRequest$namespace": "<p>The name space of the dataset.</p> <ul> <li> <p> <b>asc</b> - For information on the Amazon Web Services Supply Chain supported datasets see <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p> </li> <li> <p> <b>default</b> - For datasets with custom user-defined schemas.</p> </li> </ul>",
"DataLakeDataset$namespace": "<p>The name space of the dataset. The available values are:</p> <ul> <li> <p> <b>asc</b> - For information on the Amazon Web Services Supply Chain supported datasets see <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p> </li> <li> <p> <b>default</b> - For datasets with custom user-defined schemas.</p> </li> </ul>",
"DeleteDataLakeDatasetRequest$namespace": "<p>The namespace of the dataset. The available values are:</p> <ul> <li> <p>asc: for <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\"> AWS Supply Chain supported datasets </a>.</p> </li> <li> <p>default: for datasets with custom user-defined schemas.</p> </li> </ul>",
"DeleteDataLakeDatasetResponse$namespace": "<p>The namespace of deleted dataset.</p>",
"DeleteDataLakeDatasetRequest$namespace": "<p>The name space of the dataset. The available values are:</p> <ul> <li> <p> <b>asc</b> - For information on the Amazon Web Services Supply Chain supported datasets see <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p> </li> <li> <p> <b>default</b> - For datasets with custom user-defined schemas.</p> </li> </ul>",
"DeleteDataLakeDatasetResponse$namespace": "<p>The name space of deleted dataset.</p>",
"GetDataLakeDatasetRequest$namespace": "<p>The name space of the dataset. The available values are:</p> <ul> <li> <p> <b>asc</b> - For information on the Amazon Web Services Supply Chain supported datasets see <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p> </li> <li> <p> <b>default</b> - For datasets with custom user-defined schemas.</p> </li> </ul>",
"ListDataLakeDatasetsRequest$namespace": "<p>The namespace of the dataset. The available values are:</p> <ul> <li> <p>asc: for <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\"> AWS Supply Chain supported datasets </a>.</p> </li> <li> <p>default: for datasets with custom user-defined schemas.</p> </li> </ul>",
"ListDataLakeDatasetsRequest$namespace": "<p>The name space of the dataset. The available values are:</p> <ul> <li> <p> <b>asc</b> - For information on the Amazon Web Services Supply Chain supported datasets see <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p> </li> <li> <p> <b>default</b> - For datasets with custom user-defined schemas.</p> </li> </ul>",
"UpdateDataLakeDatasetRequest$namespace": "<p>The name space of the dataset. The available values are:</p> <ul> <li> <p> <b>asc</b> - For information on the Amazon Web Services Supply Chain supported datasets see <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p> </li> <li> <p> <b>default</b> - For datasets with custom user-defined schemas.</p> </li> </ul>"
}
},
Expand All @@ -366,7 +366,7 @@
"DataLakeDatasetSchema": {
"base": "<p>The schema details of the dataset.</p>",
"refs": {
"CreateDataLakeDatasetRequest$schema": "<p>The custom schema of the data lake dataset and is only required when the name space is <i>default</i>.</p>",
"CreateDataLakeDatasetRequest$schema": "<p>The custom schema of the data lake dataset and is only required when the name space is <b>default</b>.</p>",
"DataLakeDataset$schema": "<p>The schema of the dataset.</p>"
}
},
Expand Down Expand Up @@ -551,6 +551,7 @@
"InstanceWebAppDnsDomain": {
"base": null,
"refs": {
"CreateInstanceRequest$webAppDnsDomain": "<p>The DNS subdomain of the web app. This would be \"example\" in the URL \"example.scn.global.on.aws\". You can set this to a custom value, as long as the domain isn't already being used by someone else. The name may only include alphanumeric characters and hyphens.</p>",
"Instance$webAppDnsDomain": "<p>The WebApp DNS domain name of the instance.</p>"
}
},
Expand Down
18 changes: 11 additions & 7 deletions generator/ServiceModels/supplychain/supplychain-2024-01-01.normal.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@
},
"schema":{
"shape":"DataLakeDatasetSchema",
"documentation":"<p>The custom schema of the data lake dataset and is only required when the name space is <i>default</i>.</p>"
"documentation":"<p>The custom schema of the data lake dataset and is only required when the name space is <b>default</b>.</p>"
},
"description":{
"shape":"DataLakeDatasetDescription",
Expand Down Expand Up @@ -698,6 +698,10 @@
"shape":"KmsKeyArn",
"documentation":"<p>The ARN (Amazon Resource Name) of the Key Management Service (KMS) key you provide for encryption. This is required if you do not want to use the Amazon Web Services owned KMS key. If you don't provide anything here, AWS Supply Chain uses the Amazon Web Services owned KMS key.</p>"
},
"webAppDnsDomain":{
"shape":"InstanceWebAppDnsDomain",
"documentation":"<p>The DNS subdomain of the web app. This would be \"example\" in the URL \"example.scn.global.on.aws\". You can set this to a custom value, as long as the domain isn't already being used by someone else. The name may only include alphanumeric characters and hyphens.</p>"
},
"tags":{
"shape":"TagMap",
"documentation":"<p>The Amazon Web Services tags of an instance to be created.</p>"
Expand Down Expand Up @@ -1255,13 +1259,13 @@
},
"namespace":{
"shape":"DataLakeDatasetNamespace",
"documentation":"<p>The namespace of the dataset. The available values are:</p> <ul> <li> <p>asc: for <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\"> AWS Supply Chain supported datasets </a>.</p> </li> <li> <p>default: for datasets with custom user-defined schemas.</p> </li> </ul>",
"documentation":"<p>The name space of the dataset. The available values are:</p> <ul> <li> <p> <b>asc</b> - For information on the Amazon Web Services Supply Chain supported datasets see <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p> </li> <li> <p> <b>default</b> - For datasets with custom user-defined schemas.</p> </li> </ul>",
"location":"uri",
"locationName":"namespace"
},
"name":{
"shape":"DataLakeDatasetName",
"documentation":"<p>The name of the dataset. If the namespace is <i>asc</i>, the name must be one of the supported <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">data entities </a>.</p>",
"documentation":"<p>The name of the dataset. For <b>asc</b> name space, the name must be one of the supported data entities under <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p>",
"location":"uri",
"locationName":"name"
}
Expand All @@ -1282,7 +1286,7 @@
},
"namespace":{
"shape":"DataLakeDatasetNamespace",
"documentation":"<p>The namespace of deleted dataset.</p>"
"documentation":"<p>The name space of deleted dataset.</p>"
},
"name":{
"shape":"DataLakeDatasetName",
Expand Down Expand Up @@ -1556,7 +1560,7 @@
},
"InstanceWebAppDnsDomain":{
"type":"string",
"pattern":"[A-Za-z0-9]+(.[A-Za-z0-9]+)+"
"pattern":"(?![-])[a-zA-Z0-9-]{1,62}[a-zA-Z0-9]"
},
"InternalServerException":{
"type":"structure",
Expand Down Expand Up @@ -1630,7 +1634,7 @@
},
"namespace":{
"shape":"DataLakeDatasetNamespace",
"documentation":"<p>The namespace of the dataset. The available values are:</p> <ul> <li> <p>asc: for <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\"> AWS Supply Chain supported datasets </a>.</p> </li> <li> <p>default: for datasets with custom user-defined schemas.</p> </li> </ul>",
"documentation":"<p>The name space of the dataset. The available values are:</p> <ul> <li> <p> <b>asc</b> - For information on the Amazon Web Services Supply Chain supported datasets see <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.</p> </li> <li> <p> <b>default</b> - For datasets with custom user-defined schemas.</p> </li> </ul>",
"location":"uri",
"locationName":"namespace"
},
Expand Down Expand Up @@ -1772,7 +1776,7 @@
},
"data":{
"shape":"DataIntegrationEventData",
"documentation":"<p>The data payload of the event. For more information on the data schema to use, see <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">Data entities supported in AWS Supply Chain </a>.</p>"
"documentation":"<p>The data payload of the event. For more information on the data schema to use, see <a href=\"https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html\">Data entities supported in AWS Supply Chain</a>.</p>"
},
"eventGroupId":{
"shape":"DataIntegrationEventGroupId",
Expand Down
6 changes: 5 additions & 1 deletion sdk/code-analysis/ServiceAnalysis/SupplyChain/Generated/PropertyValueRules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@
<max>2048</max>
<pattern>arn:[a-z0-9][-.a-z0-9]{0,62}:kms:([a-z0-9][-.a-z0-9]{0,62})?:([a-z0-9][-.a-z0-9]{0,62})?:key/.{0,1019}</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.SupplyChain.Model.CreateInstanceRequest.WebAppDnsDomain</property>
<pattern>(?![-])[a-zA-Z0-9-]{1,62}[a-zA-Z0-9]</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.SupplyChain.Model.DeleteDataIntegrationFlowRequest.InstanceId</property>
<min>36</min>
Expand Down Expand Up @@ -514,6 +518,6 @@
</property-value-rule>
<property-value-rule>
<property>Amazon.SupplyChain.Model.Instance.WebAppDnsDomain</property>
<pattern>[A-Za-z0-9]+(.[A-Za-z0-9]+)+</pattern>
<pattern>(?![-])[a-zA-Z0-9-]{1,62}[a-zA-Z0-9]</pattern>
</property-value-rule>
</property-value-rules>
2 changes: 1 addition & 1 deletion sdk/src/Services/SupplyChain/Generated/Model/CreateDataLakeDatasetRequest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ internal bool IsSetNamespace()
/// Gets and sets the property Schema.
/// <para>
/// The custom schema of the data lake dataset and is only required when the name space
/// is <i>default</i>.
/// is <b>default</b>.
/// </para>
/// </summary>
public DataLakeDatasetSchema Schema
Expand Down
21 changes: 21 additions & 0 deletions sdk/src/Services/SupplyChain/Generated/Model/CreateInstanceRequest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public partial class CreateInstanceRequest : AmazonSupplyChainRequest
private string _instanceName;
private string _kmsKeyArn;
private Dictionary<string, string> _tags = AWSConfigs.InitializeCollections ? new Dictionary<string, string>() : null;
private string _webAppDnsDomain;

/// <summary>
/// Gets and sets the property ClientToken.
Expand Down Expand Up @@ -152,5 +153,25 @@ internal bool IsSetTags()
return this._tags != null && (this._tags.Count > 0 || !AWSConfigs.InitializeCollections);
}

/// <summary>
/// Gets and sets the property WebAppDnsDomain.
/// <para>
/// The DNS subdomain of the web app. This would be "example" in the URL "example.scn.global.on.aws".
/// You can set this to a custom value, as long as the domain isn't already being used
/// by someone else. The name may only include alphanumeric characters and hyphens.
/// </para>
/// </summary>
public string WebAppDnsDomain
{
get { return this._webAppDnsDomain; }
set { this._webAppDnsDomain = value; }
}

// Check to see if WebAppDnsDomain property is set
internal bool IsSetWebAppDnsDomain()
{
return this._webAppDnsDomain != null;
}

}
}
13 changes: 6 additions & 7 deletions sdk/src/Services/SupplyChain/Generated/Model/DeleteDataLakeDatasetRequest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,8 @@ internal bool IsSetInstanceId()
/// <summary>
/// Gets and sets the property Name.
/// <para>
/// The name of the dataset. If the namespace is <i>asc</i>, the name must be one of the
/// supported <a href="https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html">data
/// entities </a>.
/// The name of the dataset. For <b>asc</b> name space, the name must be one of the supported
/// data entities under <a href="https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.
/// </para>
/// </summary>
[AWSProperty(Required=true, Min=1, Max=75)]
Expand All @@ -84,16 +83,16 @@ internal bool IsSetName()
/// <summary>
/// Gets and sets the property Namespace.
/// <para>
/// The namespace of the dataset. The available values are:
/// The name space of the dataset. The available values are:
/// </para>
/// <ul> <li>
/// <para>
/// asc: for <a href="https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html">
/// AWS Supply Chain supported datasets </a>.
/// <b>asc</b> - For information on the Amazon Web Services Supply Chain supported datasets
/// see <a href="https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.
/// </para>
/// </li> <li>
/// <para>
/// default: for datasets with custom user-defined schemas.
/// <b>default</b> - For datasets with custom user-defined schemas.
/// </para>
/// </li> </ul>
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/Services/SupplyChain/Generated/Model/DeleteDataLakeDatasetResponse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ internal bool IsSetName()
/// <summary>
/// Gets and sets the property Namespace.
/// <para>
/// The namespace of deleted dataset.
/// The name space of deleted dataset.
/// </para>
/// </summary>
[AWSProperty(Required=true, Min=1, Max=50)]
Expand Down
6 changes: 6 additions & 0 deletions ...Chain/Generated/Model/Internal/MarshallTransformations/CreateInstanceRequestMarshaller.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ public IRequest Marshall(CreateInstanceRequest publicRequest)
context.Writer.WriteObjectEnd();
}

if(publicRequest.IsSetWebAppDnsDomain())
{
context.Writer.WritePropertyName("webAppDnsDomain");
context.Writer.Write(publicRequest.WebAppDnsDomain);
}

writer.WriteObjectEnd();
string snippet = stringWriter.ToString();
request.Content = System.Text.Encoding.UTF8.GetBytes(snippet);
Expand Down
8 changes: 4 additions & 4 deletions sdk/src/Services/SupplyChain/Generated/Model/ListDataLakeDatasetsRequest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,16 @@ internal bool IsSetMaxResults()
/// <summary>
/// Gets and sets the property Namespace.
/// <para>
/// The namespace of the dataset. The available values are:
/// The name space of the dataset. The available values are:
/// </para>
/// <ul> <li>
/// <para>
/// asc: for <a href="https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html">
/// AWS Supply Chain supported datasets </a>.
/// <b>asc</b> - For information on the Amazon Web Services Supply Chain supported datasets
/// see <a href="https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html">https://docs.aws.amazon.com/aws-supply-chain/latest/userguide/data-model-asc.html</a>.
/// </para>
/// </li> <li>
/// <para>
/// default: for datasets with custom user-defined schemas.
/// <b>default</b> - For datasets with custom user-defined schemas.
/// </para>
/// </li> </ul>
/// </summary>
Expand Down
Loading

0 comments on commit b1ed28c

Please sign in to comment.