Add validation pattern to S3KeyPrefix on the EnableLogging API

aws · Oct 7, 2024 · 885228b · 885228b
1 parent 64ef67a
commit 885228b
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 46 deletions.
diff --git a/generator/ServiceModels/redshift/redshift-2012-12-01.api.json b/generator/ServiceModels/redshift/redshift-2012-12-01.api.json
@@ -4509,7 +4509,7 @@
  "members":{
  "ClusterIdentifier":{"shape":"String"},
  "BucketName":{"shape":"String"},
- "S3KeyPrefix":{"shape":"String"},
+ "S3KeyPrefix":{"shape":"S3KeyPrefixValue"},
  "LogDestinationType":{"shape":"LogDestinationType"},
  "LogExports":{"shape":"LogTypeList"}
  }
@@ -5551,7 +5551,7 @@
  "members":{
  "LoggingEnabled":{"shape":"Boolean"},
  "BucketName":{"shape":"String"},
- "S3KeyPrefix":{"shape":"String"},
+ "S3KeyPrefix":{"shape":"S3KeyPrefixValue"},
  "LastSuccessfulDeliveryTime":{"shape":"TStamp"},
  "LastFailureTime":{"shape":"TStamp"},
  "LastFailureMessage":{"shape":"String"},
@@ -6789,6 +6789,11 @@
  "Cluster":{"shape":"Cluster"}
  }
  },
+ "S3KeyPrefixValue":{
+ "type":"string",
+ "max":256,
+ "pattern":"[\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*"
+ },
  "SNSInvalidTopicFault":{
  "type":"structure",
  "members":{

diff --git a/generator/ServiceModels/redshift/redshift-2012-12-01.docs.json b/generator/ServiceModels/redshift/redshift-2012-12-01.docs.json
@@ -3027,6 +3027,13 @@
  "refs": {
  }
  },
+ "S3KeyPrefixValue": {
+ "base": null,
+ "refs": {
+ "EnableLoggingMessage$S3KeyPrefix": "<p>The prefix applied to the log file names.</p> <p>Valid characters are any letter from any language, any whitespace character, any numeric character, and the following characters: underscore (<code>_</code>), period (<code>.</code>), colon (<code>:</code>), slash (<code>/</code>), equal (<code>=</code>), plus (<code>+</code>), backslash (<code>\\</code>), hyphen (<code>-</code>), at symbol (<code>@</code>).</p>",
+ "LoggingStatus$S3KeyPrefix": "<p>The prefix applied to the log file names.</p>"
+ }
+ },
  "SNSInvalidTopicFault": {
  "base": "<p>Amazon SNS has responded that there is a problem with the specified Amazon SNS topic.</p>",
  "refs": {
@@ -3653,7 +3660,6 @@
  "ElasticIpStatus$Status": "<p>The status of the elastic IP (EIP) address.</p>",
  "EnableLoggingMessage$ClusterIdentifier": "<p>The identifier of the cluster on which logging is to be started.</p> <p>Example: <code>examplecluster</code> </p>",
  "EnableLoggingMessage$BucketName": "<p>The name of an existing S3 bucket where the log files are to be stored.</p> <p>Constraints:</p> <ul> <li> <p>Must be in the same region as the cluster</p> </li> <li> <p>The cluster must have read bucket and put object permissions</p> </li> </ul>",
- "EnableLoggingMessage$S3KeyPrefix": "<p>The prefix applied to the log file names.</p> <p>Constraints:</p> <ul> <li> <p>Cannot exceed 512 characters</p> </li> <li> <p>Cannot contain spaces( ), double quotes (\"), single quotes ('), a backslash (\\), or control characters. The hexadecimal codes for invalid characters are: </p> <ul> <li> <p>x00 to x20</p> </li> <li> <p>x22</p> </li> <li> <p>x27</p> </li> <li> <p>x5c</p> </li> <li> <p>x7f or larger</p> </li> </ul> </li> </ul>",
  "EnableSnapshotCopyMessage$ClusterIdentifier": "<p>The unique identifier of the source cluster to copy snapshots from.</p> <p>Constraints: Must be the valid name of an existing cluster that does not already have cross-region snapshot copy enabled.</p>",
  "EnableSnapshotCopyMessage$DestinationRegion": "<p>The destination Amazon Web Services Region that you want to copy snapshots to.</p> <p>Constraints: Must be the name of a valid Amazon Web Services Region. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/rande.html#redshift_region\">Regions and Endpoints</a> in the Amazon Web Services General Reference. </p>",
  "EnableSnapshotCopyMessage$SnapshotCopyGrantName": "<p>The name of the snapshot copy grant to use when snapshots of an Amazon Web Services KMS-encrypted cluster are copied to the destination region.</p>",
@@ -3732,7 +3738,6 @@
  "ListRecommendationsResult$Marker": "<p>A value that indicates the starting point for the next set of response records in a subsequent request. If a value is returned in a response, you can retrieve the next set of records by providing this returned marker value in the Marker parameter and retrying the command. If the Marker field is empty, all response records have been retrieved for the request. </p>",
  "LogTypeList$member": null,
  "LoggingStatus$BucketName": "<p>The name of the S3 bucket where the log files are stored.</p>",
- "LoggingStatus$S3KeyPrefix": "<p>The prefix applied to the log file names.</p>",
  "LoggingStatus$LastFailureMessage": "<p>The message indicating that logs failed to be delivered.</p>",
  "MaintenanceTrack$MaintenanceTrackName": "<p>The name of the maintenance track. Possible values are <code>current</code> and <code>trailing</code>.</p>",
  "MaintenanceTrack$DatabaseVersion": "<p>The version number for the cluster release.</p>",

diff --git a/generator/ServiceModels/redshift/redshift-2012-12-01.normal.json b/generator/ServiceModels/redshift/redshift-2012-12-01.normal.json
@@ -6420,8 +6420,8 @@
  "documentation":"<p>The name of an existing S3 bucket where the log files are to be stored.</p> <p>Constraints:</p> <ul> <li> <p>Must be in the same region as the cluster</p> </li> <li> <p>The cluster must have read bucket and put object permissions</p> </li> </ul>"
  },
  "S3KeyPrefix":{
- "shape":"String",
- "documentation":"<p>The prefix applied to the log file names.</p> <p>Constraints:</p> <ul> <li> <p>Cannot exceed 512 characters</p> </li> <li> <p>Cannot contain spaces( ), double quotes (\"), single quotes ('), a backslash (\\), or control characters. The hexadecimal codes for invalid characters are: </p> <ul> <li> <p>x00 to x20</p> </li> <li> <p>x22</p> </li> <li> <p>x27</p> </li> <li> <p>x5c</p> </li> <li> <p>x7f or larger</p> </li> </ul> </li> </ul>"
+ "shape":"S3KeyPrefixValue",
+ "documentation":"<p>The prefix applied to the log file names.</p> <p>Valid characters are any letter from any language, any whitespace character, any numeric character, and the following characters: underscore (<code>_</code>), period (<code>.</code>), colon (<code>:</code>), slash (<code>/</code>), equal (<code>=</code>), plus (<code>+</code>), backslash (<code>\\</code>), hyphen (<code>-</code>), at symbol (<code>@</code>).</p>"
  },
  "LogDestinationType":{
  "shape":"LogDestinationType",
@@ -7916,7 +7916,7 @@
  "documentation":"<p>The name of the S3 bucket where the log files are stored.</p>"
  },
  "S3KeyPrefix":{
- "shape":"String",
+ "shape":"S3KeyPrefixValue",
  "documentation":"<p>The prefix applied to the log file names.</p>"
  },
  "LastSuccessfulDeliveryTime":{
@@ -10201,6 +10201,11 @@
  "Cluster":{"shape":"Cluster"}
  }
  },
+ "S3KeyPrefixValue":{
+ "type":"string",
+ "max":256,
+ "pattern":"[\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*"
+ },
  "SNSInvalidTopicFault":{
  "type":"structure",
  "members":{

diff --git a/sdk/code-analysis/ServiceAnalysis/Redshift/Generated/PropertyValueRules.xml b/sdk/code-analysis/ServiceAnalysis/Redshift/Generated/PropertyValueRules.xml
@@ -1029,7 +1029,8 @@
  </property-value-rule>
  <property-value-rule>
  <property>Amazon.Redshift.Model.DescribeLoggingStatusResponse.S3KeyPrefix</property>
- <max>2147483647</max>
+ <max>256</max>
+ <pattern>[\p{L}\p{Z}\p{N}_.:/=+\-@]*</pattern>
  </property-value-rule>
  <property-value-rule>
  <property>Amazon.Redshift.Model.DescribeNodeConfigurationOptionsRequest.ClusterIdentifier</property>
@@ -1274,7 +1275,8 @@
  </property-value-rule>
  <property-value-rule>
  <property>Amazon.Redshift.Model.DisableLoggingResponse.S3KeyPrefix</property>
- <max>2147483647</max>
+ <max>256</max>
+ <pattern>[\p{L}\p{Z}\p{N}_.:/=+\-@]*</pattern>
  </property-value-rule>
  <property-value-rule>
  <property>Amazon.Redshift.Model.DisableSnapshotCopyRequest.ClusterIdentifier</property>
@@ -1314,7 +1316,8 @@
  </property-value-rule>
  <property-value-rule>
  <property>Amazon.Redshift.Model.EnableLoggingRequest.S3KeyPrefix</property>
- <max>2147483647</max>
+ <max>256</max>
+ <pattern>[\p{L}\p{Z}\p{N}_.:/=+\-@]*</pattern>
  </property-value-rule>
  <property-value-rule>
  <property>Amazon.Redshift.Model.EnableLoggingResponse.BucketName</property>
@@ -1326,7 +1329,8 @@
  </property-value-rule>
  <property-value-rule>
  <property>Amazon.Redshift.Model.EnableLoggingResponse.S3KeyPrefix</property>
- <max>2147483647</max>
+ <max>256</max>
+ <pattern>[\p{L}\p{Z}\p{N}_.:/=+\-@]*</pattern>
  </property-value-rule>
  <property-value-rule>
  <property>Amazon.Redshift.Model.EnableSnapshotCopyRequest.ClusterIdentifier</property>

diff --git a/sdk/src/Services/Redshift/Generated/Model/DescribeLoggingStatusResponse.cs b/sdk/src/Services/Redshift/Generated/Model/DescribeLoggingStatusResponse.cs
@@ -178,7 +178,7 @@ internal bool IsSetLoggingEnabled()
  /// The prefix applied to the log file names.
  /// </para>
  /// </summary>
- [AWSProperty(Max=2147483647)]
+ [AWSProperty(Max=256)]
  public string S3KeyPrefix
  {
  get { return this._s3KeyPrefix; }

diff --git a/sdk/src/Services/Redshift/Generated/Model/DisableLoggingResponse.cs b/sdk/src/Services/Redshift/Generated/Model/DisableLoggingResponse.cs
@@ -178,7 +178,7 @@ internal bool IsSetLoggingEnabled()
  /// The prefix applied to the log file names.
  /// </para>
  /// </summary>
- [AWSProperty(Max=2147483647)]
+ [AWSProperty(Max=256)]
  public string S3KeyPrefix
  {
  get { return this._s3KeyPrefix; }

diff --git a/sdk/src/Services/Redshift/Generated/Model/EnableLoggingRequest.cs b/sdk/src/Services/Redshift/Generated/Model/EnableLoggingRequest.cs
@@ -141,40 +141,13 @@ internal bool IsSetLogExports()
  /// </para>
  /// 
  /// <para>
- /// Constraints:
- /// </para>
- /// <ul> <li> 
- /// <para>
- /// Cannot exceed 512 characters
- /// </para>
- /// </li> <li> 
- /// <para>
- /// Cannot contain spaces( ), double quotes ("), single quotes ('), a backslash (\), or
- /// control characters. The hexadecimal codes for invalid characters are: 
- /// </para>
- /// <ul> <li> 
- /// <para>
- /// x00 to x20
+ /// Valid characters are any letter from any language, any whitespace character, any numeric
+ /// character, and the following characters: underscore (<c>_</c>), period (<c>.</c>),
+ /// colon (<c>:</c>), slash (<c>/</c>), equal (<c>=</c>), plus (<c>+</c>), backslash (<c>\</c>),
+ /// hyphen (<c>-</c>), at symbol (<c>@</c>).
  /// </para>
- /// </li> <li> 
- /// <para>
- /// x22
- /// </para>
- /// </li> <li> 
- /// <para>
- /// x27
- /// </para>
- /// </li> <li> 
- /// <para>
- /// x5c
- /// </para>
- /// </li> <li> 
- /// <para>
- /// x7f or larger
- /// </para>
- /// </li> </ul> </li> </ul>
  /// </summary>
- [AWSProperty(Max=2147483647)]
+ [AWSProperty(Max=256)]
  public string S3KeyPrefix
  {
  get { return this._s3KeyPrefix; }

diff --git a/sdk/src/Services/Redshift/Generated/Model/EnableLoggingResponse.cs b/sdk/src/Services/Redshift/Generated/Model/EnableLoggingResponse.cs
@@ -178,7 +178,7 @@ internal bool IsSetLoggingEnabled()
  /// The prefix applied to the log file names.
  /// </para>
  /// </summary>
- [AWSProperty(Max=2147483647)]
+ [AWSProperty(Max=256)]
  public string S3KeyPrefix
  {
  get { return this._s3KeyPrefix; }