Skip to content

Commit

Permalink
Amazon MWAA now supports Airflow web server auto scaling to automatic…
Browse files Browse the repository at this point in the history
…ally handle increased demand from REST APIs, Command Line Interface (CLI), or more Airflow User Interface (UI) users. Customers can specify maximum and minimum web server instances during environment creation and update workflow.
  • Loading branch information
aws-sdk-dotnet-automation committed May 16, 2024
1 parent b52d1c7 commit bf48f7c
Show file tree
Hide file tree
Showing 10 changed files with 733 additions and 427 deletions.
220 changes: 118 additions & 102 deletions generator/ServiceModels/mwaa/mwaa-2020-07-01.api.json

Large diffs are not rendered by default.

46 changes: 31 additions & 15 deletions generator/ServiceModels/mwaa/mwaa-2020-07-01.docs.json

Large diffs are not rendered by default.

558 changes: 296 additions & 262 deletions generator/ServiceModels/mwaa/mwaa-2020-07-01.normal.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<property>Amazon.MWAA.Model.CreateCliTokenRequest.Name</property>
<min>1</min>
<max>80</max>
<pattern>^[a-zA-Z][0-9a-zA-Z-_]*$</pattern>
<pattern>[a-zA-Z][0-9a-zA-Z-_]*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateCliTokenResponse.WebServerHostname</property>
<min>1</min>
<max>255</max>
<pattern>^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$</pattern>
<pattern>(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.AirflowVersion</property>
<min>1</min>
<max>32</max>
<pattern>^[0-9a-z.]+$</pattern>
<pattern>[0-9a-z.]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.DagS3Path</property>
Expand All @@ -33,18 +33,26 @@
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.ExecutionRoleArn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+$</pattern>
<pattern>arn:aws(-[a-z]+)?:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.KmsKey</property>
<min>1</min>
<max>1224</max>
<pattern>^(((arn:aws(-[a-z]+)?:kms:[a-z]{2}-[a-z]+-\d:\d+:)?key\/)?[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}|(arn:aws(-[a-z]+)?:kms:[a-z]{2}-[a-z]+-\d:\d+:)?alias/.+)$</pattern>
<pattern>(((arn:aws(-[a-z]+)?:kms:[a-z]{2}-[a-z]+-\d:\d+:)?key\/)?[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}|(arn:aws(-[a-z]+)?:kms:[a-z]{2}-[a-z]+-\d:\d+:)?alias/.+)</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.MaxWebservers</property>
<min>2</min>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.MaxWorkers</property>
<min>1</min>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.MinWebservers</property>
<min>2</min>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.MinWorkers</property>
<min>1</min>
Expand All @@ -53,7 +61,7 @@
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.Name</property>
<min>1</min>
<max>80</max>
<pattern>^[a-zA-Z][0-9a-zA-Z-_]*$</pattern>
<pattern>[a-zA-Z][0-9a-zA-Z-_]*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.PluginsS3ObjectVersion</property>
Expand Down Expand Up @@ -85,7 +93,7 @@
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.SourceBucketArn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:s3:::[a-z0-9.\-]+$</pattern>
<pattern>arn:aws(-[a-z]+)?:s3:::[a-z0-9.\-]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.StartupScriptS3ObjectVersion</property>
Expand All @@ -102,19 +110,19 @@
<property>Amazon.MWAA.Model.CreateEnvironmentRequest.WeeklyMaintenanceWindowStart</property>
<min>1</min>
<max>9</max>
<pattern>(MON|TUE|WED|THU|FRI|SAT|SUN):([01]\d|2[0-3]):(00|30)</pattern>
<pattern>.*(MON|TUE|WED|THU|FRI|SAT|SUN):([01]\d|2[0-3]):(00|30).*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateEnvironmentResponse.Arn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:airflow:[a-z0-9\-]+:\d{12}:environment/\w+</pattern>
<pattern>arn:aws(-[a-z]+)?:airflow:[a-z0-9\-]+:\d{12}:environment/\w+.*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateWebLoginTokenRequest.Name</property>
<min>1</min>
<max>80</max>
<pattern>^[a-zA-Z][0-9a-zA-Z-_]*$</pattern>
<pattern>[a-zA-Z][0-9a-zA-Z-_]*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.CreateWebLoginTokenResponse.AirflowIdentity</property>
Expand All @@ -125,19 +133,19 @@
<property>Amazon.MWAA.Model.CreateWebLoginTokenResponse.WebServerHostname</property>
<min>1</min>
<max>255</max>
<pattern>^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$</pattern>
<pattern>(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.DeleteEnvironmentRequest.Name</property>
<min>1</min>
<max>80</max>
<pattern>^[a-zA-Z][0-9a-zA-Z-_]*$</pattern>
<pattern>[a-zA-Z][0-9a-zA-Z-_]*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.GetEnvironmentRequest.Name</property>
<min>1</min>
<max>80</max>
<pattern>^[a-zA-Z][0-9a-zA-Z-_]*$</pattern>
<pattern>[a-zA-Z][0-9a-zA-Z-_]*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.ListEnvironmentsRequest.MaxResults</property>
Expand All @@ -158,31 +166,31 @@
<property>Amazon.MWAA.Model.ListTagsForResourceRequest.ResourceArn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:airflow:[a-z0-9\-]+:\d{12}:environment/\w+</pattern>
<pattern>arn:aws(-[a-z]+)?:airflow:[a-z0-9\-]+:\d{12}:environment/\w+.*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.PublishMetricsRequest.EnvironmentName</property>
<min>1</min>
<max>80</max>
<pattern>^[a-zA-Z][0-9a-zA-Z-_]*$</pattern>
<pattern>[a-zA-Z][0-9a-zA-Z-_]*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.TagResourceRequest.ResourceArn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:airflow:[a-z0-9\-]+:\d{12}:environment/\w+</pattern>
<pattern>arn:aws(-[a-z]+)?:airflow:[a-z0-9\-]+:\d{12}:environment/\w+.*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.UntagResourceRequest.ResourceArn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:airflow:[a-z0-9\-]+:\d{12}:environment/\w+</pattern>
<pattern>arn:aws(-[a-z]+)?:airflow:[a-z0-9\-]+:\d{12}:environment/\w+.*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.UpdateEnvironmentRequest.AirflowVersion</property>
<min>1</min>
<max>32</max>
<pattern>^[0-9a-z.]+$</pattern>
<pattern>[0-9a-z.]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.UpdateEnvironmentRequest.DagS3Path</property>
Expand All @@ -199,12 +207,20 @@
<property>Amazon.MWAA.Model.UpdateEnvironmentRequest.ExecutionRoleArn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+$</pattern>
<pattern>arn:aws(-[a-z]+)?:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.UpdateEnvironmentRequest.MaxWebservers</property>
<min>2</min>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.UpdateEnvironmentRequest.MaxWorkers</property>
<min>1</min>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.UpdateEnvironmentRequest.MinWebservers</property>
<min>2</min>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.UpdateEnvironmentRequest.MinWorkers</property>
<min>1</min>
Expand All @@ -213,7 +229,7 @@
<property>Amazon.MWAA.Model.UpdateEnvironmentRequest.Name</property>
<min>1</min>
<max>80</max>
<pattern>^[a-zA-Z][0-9a-zA-Z-_]*$</pattern>
<pattern>[a-zA-Z][0-9a-zA-Z-_]*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.UpdateEnvironmentRequest.PluginsS3ObjectVersion</property>
Expand Down Expand Up @@ -245,7 +261,7 @@
<property>Amazon.MWAA.Model.UpdateEnvironmentRequest.SourceBucketArn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:s3:::[a-z0-9.\-]+$</pattern>
<pattern>arn:aws(-[a-z]+)?:s3:::[a-z0-9.\-]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.UpdateEnvironmentRequest.StartupScriptS3ObjectVersion</property>
Expand All @@ -262,31 +278,31 @@
<property>Amazon.MWAA.Model.UpdateEnvironmentRequest.WeeklyMaintenanceWindowStart</property>
<min>1</min>
<max>9</max>
<pattern>(MON|TUE|WED|THU|FRI|SAT|SUN):([01]\d|2[0-3]):(00|30)</pattern>
<pattern>.*(MON|TUE|WED|THU|FRI|SAT|SUN):([01]\d|2[0-3]):(00|30).*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.UpdateEnvironmentResponse.Arn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:airflow:[a-z0-9\-]+:\d{12}:environment/\w+</pattern>
<pattern>arn:aws(-[a-z]+)?:airflow:[a-z0-9\-]+:\d{12}:environment/\w+.*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.AirflowVersion</property>
<min>1</min>
<max>32</max>
<pattern>^[0-9a-z.]+$</pattern>
<pattern>[0-9a-z.]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.Arn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:airflow:[a-z0-9\-]+:\d{12}:environment/\w+</pattern>
<pattern>arn:aws(-[a-z]+)?:airflow:[a-z0-9\-]+:\d{12}:environment/\w+.*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.CeleryExecutorQueue</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:sqs:[a-z0-9\-]+:\d{12}:[a-zA-Z_0-9+=,.@\-_/]+$</pattern>
<pattern>arn:aws(-[a-z]+)?:sqs:[a-z0-9\-]+:\d{12}:[a-zA-Z_0-9+=,.@\-_/]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.DagS3Path</property>
Expand All @@ -298,7 +314,7 @@
<property>Amazon.MWAA.Model.Environment.DatabaseVpcEndpointService</property>
<min>1</min>
<max>1224</max>
<pattern>^([a-z.-]+)?com\.amazonaws\.vpce\.[a-z0-9\-]+\.[a-zA-Z_0-9+=,.@\-_/]+$</pattern>
<pattern>([a-z.-]+)?com\.amazonaws\.vpce\.[a-z0-9\-]+\.[a-zA-Z_0-9+=,.@\-_/]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.EnvironmentClass</property>
Expand All @@ -309,18 +325,26 @@
<property>Amazon.MWAA.Model.Environment.ExecutionRoleArn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+$</pattern>
<pattern>arn:aws(-[a-z]+)?:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.KmsKey</property>
<min>1</min>
<max>1224</max>
<pattern>^(((arn:aws(-[a-z]+)?:kms:[a-z]{2}-[a-z]+-\d:\d+:)?key\/)?[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}|(arn:aws(-[a-z]+)?:kms:[a-z]{2}-[a-z]+-\d:\d+:)?alias/.+)$</pattern>
<pattern>(((arn:aws(-[a-z]+)?:kms:[a-z]{2}-[a-z]+-\d:\d+:)?key\/)?[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}|(arn:aws(-[a-z]+)?:kms:[a-z]{2}-[a-z]+-\d:\d+:)?alias/.+)</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.MaxWebservers</property>
<min>2</min>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.MaxWorkers</property>
<min>1</min>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.MinWebservers</property>
<min>2</min>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.MinWorkers</property>
<min>1</min>
Expand All @@ -329,7 +353,7 @@
<property>Amazon.MWAA.Model.Environment.Name</property>
<min>1</min>
<max>80</max>
<pattern>^[a-zA-Z][0-9a-zA-Z-_]*$</pattern>
<pattern>[a-zA-Z][0-9a-zA-Z-_]*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.PluginsS3ObjectVersion</property>
Expand Down Expand Up @@ -361,48 +385,48 @@
<property>Amazon.MWAA.Model.Environment.ServiceRoleArn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+$</pattern>
<pattern>arn:aws(-[a-z]+)?:iam::\d{12}:role/?[a-zA-Z_0-9+=,.@\-_/]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.SourceBucketArn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:s3:::[a-z0-9.\-]+$</pattern>
<pattern>arn:aws(-[a-z]+)?:s3:::[a-z0-9.\-]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.WebserverUrl</property>
<min>1</min>
<max>256</max>
<pattern>^https://.+$</pattern>
<pattern>https://.+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.WebserverVpcEndpointService</property>
<min>1</min>
<max>1224</max>
<pattern>^([a-z.-]+)?com\.amazonaws\.vpce\.[a-z0-9\-]+\.[a-zA-Z_0-9+=,.@\-_/]+$</pattern>
<pattern>([a-z.-]+)?com\.amazonaws\.vpce\.[a-z0-9\-]+\.[a-zA-Z_0-9+=,.@\-_/]+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.Environment.WeeklyMaintenanceWindowStart</property>
<min>1</min>
<max>9</max>
<pattern>(MON|TUE|WED|THU|FRI|SAT|SUN):([01]\d|2[0-3]):(00|30)</pattern>
<pattern>.*(MON|TUE|WED|THU|FRI|SAT|SUN):([01]\d|2[0-3]):(00|30).*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.LastUpdate.Source</property>
<min>1</min>
<max>256</max>
<pattern>^.+$</pattern>
<pattern>.+</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.ModuleLoggingConfiguration.CloudWatchLogGroupArn</property>
<min>1</min>
<max>1224</max>
<pattern>^arn:aws(-[a-z]+)?:logs:[a-z0-9\-]+:\d{12}:log-group:\w+</pattern>
<pattern>arn:aws(-[a-z]+)?:logs:[a-z0-9\-]+:\d{12}:log-group:\w+.*</pattern>
</property-value-rule>
<property-value-rule>
<property>Amazon.MWAA.Model.UpdateError.ErrorMessage</property>
<min>1</min>
<max>1024</max>
<pattern>^.+$</pattern>
<pattern>.+</pattern>
</property-value-rule>
</property-value-rules>
Loading

0 comments on commit bf48f7c

Please sign in to comment.