Skip to content

Commit 2abb7de

Browse files
Minor fix to ARN validation for Lambda functions passed to S3 Batch Operations
1 parent 72804b3 commit 2abb7de

File tree

6 files changed

+21
-10
lines changed

6 files changed

+21
-10
lines changed

generator/ServiceModels/s3control/s3control-2018-08-20.api.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2829,7 +2829,7 @@
28292829
"type":"string",
28302830
"max":1024,
28312831
"min":1,
2832-
"pattern":"(arn:(aws[a-zA-Z-]*)?:lambda:)?([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}:)?(\\d{12}:)?(function:)?([a-zA-Z0-9-_]+)(:(\\$LATEST|[a-zA-Z0-9-_]+))?"
2832+
"pattern":"(arn:(aws[a-zA-Z-]*)?:lambda:)?([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}:)?(\\d{12}:)?(function:)?([a-zA-Z0-9-_]+)(:(\\$LATEST|[a-zA-Z0-9-_]+))?"
28332833
},
28342834
"GeneratedManifestEncryption":{
28352835
"type":"structure",

generator/ServiceModels/s3control/s3control-2018-08-20.docs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@
991991
"ExpiredObjectDeleteMarker": {
992992
"base": null,
993993
"refs": {
994-
"LifecycleExpiration$ExpiredObjectDeleteMarker": "<p>Indicates whether Amazon S3 will remove a delete marker with no noncurrent versions. If set to true, the delete marker will be expired. If set to false, the policy takes no action. This cannot be specified with Days or Date in a Lifecycle Expiration Policy.</p>"
994+
"LifecycleExpiration$ExpiredObjectDeleteMarker": "<p>Indicates whether Amazon S3 will remove a delete marker with no noncurrent versions. If set to true, the delete marker will be expired. If set to false, the policy takes no action. This cannot be specified with Days or Date in a Lifecycle Expiration Policy. To learn more about delete markers, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/userguide/DeleteMarker.html\">Working with delete markers</a>.</p>"
995995
}
996996
},
997997
"Format": {
@@ -2986,7 +2986,7 @@
29862986
"S3RegionalOrS3ExpressBucketArnString": {
29872987
"base": null,
29882988
"refs": {
2989-
"S3CopyObjectOperation$TargetResource": "<p>Specifies the destination bucket Amazon Resource Name (ARN) for the batch copy operation.</p> <ul> <li> <p> <b>General purpose buckets</b> - For example, to copy objects to a general purpose bucket named <code>destinationBucket</code>, set the <code>TargetResource</code> property to <code>arn:aws:s3:::destinationBucket</code>.</p> </li> <li> <p> <b>Directory buckets</b> - For example, to copy objects to a directory bucket named <code>destinationBucket</code> in the Availability Zone; identified by the AZ ID <code>usw2-az1</code>, set the <code>TargetResource</code> property to <code>arn:aws:s3express:<i>region</i>:<i>account_id</i>:/bucket/<i>destination_bucket_base_name</i>--<i>usw2-az1</i>--x-s3</code>.</p> </li> </ul>"
2989+
"S3CopyObjectOperation$TargetResource": "<p>Specifies the destination bucket Amazon Resource Name (ARN) for the batch copy operation.</p> <ul> <li> <p> <b>General purpose buckets</b> - For example, to copy objects to a general purpose bucket named <code>destinationBucket</code>, set the <code>TargetResource</code> property to <code>arn:aws:s3:::destinationBucket</code>.</p> </li> <li> <p> <b>Directory buckets</b> - For example, to copy objects to a directory bucket named <code>destinationBucket</code> in the Availability Zone identified by the AZ ID <code>usw2-az1</code>, set the <code>TargetResource</code> property to <code>arn:aws:s3express:<i>region</i>:<i>account_id</i>:/bucket/<i>destination_bucket_base_name</i>--<i>usw2-az1</i>--x-s3</code>. A directory bucket as a destination bucket can be in Availability Zone or Local Zone. </p> <note> <p>Copying objects across different Amazon Web Services Regions isn't supported when the source or destination bucket is in Amazon Web Services Local Zones. The source and destination buckets must have the same parent Amazon Web Services Region. Otherwise, you get an HTTP <code>400 Bad Request</code> error with the error code <code>InvalidRequest</code>.</p> </note> </li> </ul>"
29902990
}
29912991
},
29922992
"S3ReplicateObjectOperation": {

generator/ServiceModels/s3control/s3control-2018-08-20.normal.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3380,7 +3380,7 @@
33803380
"type":"string",
33813381
"max":1024,
33823382
"min":1,
3383-
"pattern":"(arn:(aws[a-zA-Z-]*)?:lambda:)?([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}:)?(\\d{12}:)?(function:)?([a-zA-Z0-9-_]+)(:(\\$LATEST|[a-zA-Z0-9-_]+))?"
3383+
"pattern":"(arn:(aws[a-zA-Z-]*)?:lambda:)?([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}:)?(\\d{12}:)?(function:)?([a-zA-Z0-9-_]+)(:(\\$LATEST|[a-zA-Z0-9-_]+))?"
33843384
},
33853385
"GeneratedManifestEncryption":{
33863386
"type":"structure",
@@ -5102,7 +5102,7 @@
51025102
},
51035103
"ExpiredObjectDeleteMarker":{
51045104
"shape":"ExpiredObjectDeleteMarker",
5105-
"documentation":"<p>Indicates whether Amazon S3 will remove a delete marker with no noncurrent versions. If set to true, the delete marker will be expired. If set to false, the policy takes no action. This cannot be specified with Days or Date in a Lifecycle Expiration Policy.</p>"
5105+
"documentation":"<p>Indicates whether Amazon S3 will remove a delete marker with no noncurrent versions. If set to true, the delete marker will be expired. If set to false, the policy takes no action. This cannot be specified with Days or Date in a Lifecycle Expiration Policy. To learn more about delete markers, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/userguide/DeleteMarker.html\">Working with delete markers</a>.</p>"
51065106
}
51075107
},
51085108
"documentation":"<p>The container of the Outposts bucket lifecycle expiration.</p>"
@@ -7408,7 +7408,7 @@
74087408
"members":{
74097409
"TargetResource":{
74107410
"shape":"S3RegionalOrS3ExpressBucketArnString",
7411-
"documentation":"<p>Specifies the destination bucket Amazon Resource Name (ARN) for the batch copy operation.</p> <ul> <li> <p> <b>General purpose buckets</b> - For example, to copy objects to a general purpose bucket named <code>destinationBucket</code>, set the <code>TargetResource</code> property to <code>arn:aws:s3:::destinationBucket</code>.</p> </li> <li> <p> <b>Directory buckets</b> - For example, to copy objects to a directory bucket named <code>destinationBucket</code> in the Availability Zone; identified by the AZ ID <code>usw2-az1</code>, set the <code>TargetResource</code> property to <code>arn:aws:s3express:<i>region</i>:<i>account_id</i>:/bucket/<i>destination_bucket_base_name</i>--<i>usw2-az1</i>--x-s3</code>.</p> </li> </ul>"
7411+
"documentation":"<p>Specifies the destination bucket Amazon Resource Name (ARN) for the batch copy operation.</p> <ul> <li> <p> <b>General purpose buckets</b> - For example, to copy objects to a general purpose bucket named <code>destinationBucket</code>, set the <code>TargetResource</code> property to <code>arn:aws:s3:::destinationBucket</code>.</p> </li> <li> <p> <b>Directory buckets</b> - For example, to copy objects to a directory bucket named <code>destinationBucket</code> in the Availability Zone identified by the AZ ID <code>usw2-az1</code>, set the <code>TargetResource</code> property to <code>arn:aws:s3express:<i>region</i>:<i>account_id</i>:/bucket/<i>destination_bucket_base_name</i>--<i>usw2-az1</i>--x-s3</code>. A directory bucket as a destination bucket can be in Availability Zone or Local Zone. </p> <note> <p>Copying objects across different Amazon Web Services Regions isn't supported when the source or destination bucket is in Amazon Web Services Local Zones. The source and destination buckets must have the same parent Amazon Web Services Region. Otherwise, you get an HTTP <code>400 Bad Request</code> error with the error code <code>InvalidRequest</code>.</p> </note> </li> </ul>"
74127412
},
74137413
"CannedAccessControlList":{
74147414
"shape":"S3CannedAccessControlList",

sdk/code-analysis/ServiceAnalysis/S3Control/Generated/PropertyValueRules.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,7 +1441,7 @@
14411441
<property>Amazon.S3Control.Model.AwsLambdaTransformation.FunctionArn</property>
14421442
<min>1</min>
14431443
<max>1024</max>
1444-
<pattern>(arn:(aws[a-zA-Z-]*)?:lambda:)?([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\d{1}:)?(\d{12}:)?(function:)?([a-zA-Z0-9-_]+)(:(\$LATEST|[a-zA-Z0-9-_]+))?</pattern>
1444+
<pattern>(arn:(aws[a-zA-Z-]*)?:lambda:)?([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\d{1}:)?(\d{12}:)?(function:)?([a-zA-Z0-9-_]+)(:(\$LATEST|[a-zA-Z0-9-_]+))?</pattern>
14451445
</property-value-rule>
14461446
<property-value-rule>
14471447
<property>Amazon.S3Control.Model.CreateMultiRegionAccessPointInput.Name</property>
@@ -1567,7 +1567,7 @@
15671567
<property>Amazon.S3Control.Model.LambdaInvokeOperation.FunctionArn</property>
15681568
<min>1</min>
15691569
<max>1024</max>
1570-
<pattern>(arn:(aws[a-zA-Z-]*)?:lambda:)?([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\d{1}:)?(\d{12}:)?(function:)?([a-zA-Z0-9-_]+)(:(\$LATEST|[a-zA-Z0-9-_]+))?</pattern>
1570+
<pattern>(arn:(aws[a-zA-Z-]*)?:lambda:)?([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\d{1}:)?(\d{12}:)?(function:)?([a-zA-Z0-9-_]+)(:(\$LATEST|[a-zA-Z0-9-_]+))?</pattern>
15711571
</property-value-rule>
15721572
<property-value-rule>
15731573
<property>Amazon.S3Control.Model.LambdaInvokeOperation.InvocationSchemaVersion</property>

sdk/src/Services/S3Control/Generated/Model/LifecycleExpiration.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ internal bool IsSetDays()
8181
/// Indicates whether Amazon S3 will remove a delete marker with no noncurrent versions.
8282
/// If set to true, the delete marker will be expired. If set to false, the policy takes
8383
/// no action. This cannot be specified with Days or Date in a Lifecycle Expiration Policy.
84+
/// To learn more about delete markers, see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/DeleteMarker.html">Working
85+
/// with delete markers</a>.
8486
/// </para>
8587
/// </summary>
8688
public bool ExpiredObjectDeleteMarker

sdk/src/Services/S3Control/Generated/Model/S3CopyObjectOperation.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,10 +440,19 @@ internal bool IsSetTargetKeyPrefix()
440440
/// </li> <li>
441441
/// <para>
442442
/// <b>Directory buckets</b> - For example, to copy objects to a directory bucket named
443-
/// <c>destinationBucket</c> in the Availability Zone; identified by the AZ ID <c>usw2-az1</c>,
443+
/// <c>destinationBucket</c> in the Availability Zone identified by the AZ ID <c>usw2-az1</c>,
444444
/// set the <c>TargetResource</c> property to <c>arn:aws:s3express:<i>region</i>:<i>account_id</i>:/bucket/<i>destination_bucket_base_name</i>--<i>usw2-az1</i>--x-s3</c>.
445+
/// A directory bucket as a destination bucket can be in Availability Zone or Local Zone.
446+
///
447+
/// </para>
448+
/// <note>
449+
/// <para>
450+
/// Copying objects across different Amazon Web Services Regions isn't supported when
451+
/// the source or destination bucket is in Amazon Web Services Local Zones. The source
452+
/// and destination buckets must have the same parent Amazon Web Services Region. Otherwise,
453+
/// you get an HTTP <c>400 Bad Request</c> error with the error code <c>InvalidRequest</c>.
445454
/// </para>
446-
/// </li> </ul>
455+
/// </note> </li> </ul>
447456
/// </summary>
448457
[AWSProperty(Min=1, Max=128)]
449458
public string TargetResource

0 commit comments

Comments
 (0)