fix integ

aws · Jan 20, 2024 · 2b03fba · 2b03fba
1 parent 2f823fd
commit 2b03fba
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/...ws-s3/test/integ.bucket.server-access-logs.js.snapshot/aws-cdk-s3-access-logs.assets.json b/...ws-s3/test/integ.bucket.server-access-logs.js.snapshot/aws-cdk-s3-access-logs.assets.json
diff --git a/...-s3/test/integ.bucket.server-access-logs.js.snapshot/aws-cdk-s3-access-logs.template.json b/...-s3/test/integ.bucket.server-access-logs.js.snapshot/aws-cdk-s3-access-logs.template.json
@@ -80,7 +80,7 @@
             "Arn"
            ]
           },
-          "/example*"
+          "/example2*"
          ]
         ]
        }
@@ -116,7 +116,7 @@
             "Arn"
            ]
           },
-          "/example*"
+          "/example3*"
          ]
         ]
        }
@@ -152,7 +152,7 @@
             "Arn"
            ]
           },
-          "/example*"
+          "/example4*"
          ]
         ]
        }
@@ -182,7 +182,7 @@
      "DestinationBucketName": {
       "Ref": "MyAccessLogsBucketF7FE6635"
      },
-     "LogFilePrefix": "example",
+     "LogFilePrefix": "example2",
      "TargetObjectKeyFormat": {
       "SimplePrefix": {}
      }
@@ -198,7 +198,7 @@
      "DestinationBucketName": {
       "Ref": "MyAccessLogsBucketF7FE6635"
      },
-     "LogFilePrefix": "example",
+     "LogFilePrefix": "example3",
      "TargetObjectKeyFormat": {
       "PartitionedPrefix": {
        "PartitionDateSource": "EventTime"
@@ -216,7 +216,7 @@
      "DestinationBucketName": {
       "Ref": "MyAccessLogsBucketF7FE6635"
      },
-     "LogFilePrefix": "example",
+     "LogFilePrefix": "example4",
      "TargetObjectKeyFormat": {
       "PartitionedPrefix": {
        "PartitionDateSource": "DeliveryTime"

diff --git a/...ramework-integ/test/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/manifest.json b/...ramework-integ/test/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/manifest.json
diff --git a/...ng/framework-integ/test/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/tree.json b/...ng/framework-integ/test/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/tree.json
diff --git a/...ages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket.server-access-logs.ts b/...ages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket.server-access-logs.ts
@@ -19,21 +19,21 @@ new s3.Bucket(stack, 'MyBucket', {
 
 new s3.Bucket(stack, 'MyBucket2', {
   serverAccessLogsBucket: accessLogBucket,
-  serverAccessLogsPrefix: 'example',
+  serverAccessLogsPrefix: 'example2',
   logObjectKeyFormat: s3.LogObjectKeyFormat.simplePrefix(),
   removalPolicy: cdk.RemovalPolicy.DESTROY,
 });
 
 new s3.Bucket(stack, 'MyBucket3', {
   serverAccessLogsBucket: accessLogBucket,
-  serverAccessLogsPrefix: 'example',
+  serverAccessLogsPrefix: 'example3',
   logObjectKeyFormat: s3.LogObjectKeyFormat.partitionedPrefix(s3.PartitionDateSource.EVENT_TIME),
   removalPolicy: cdk.RemovalPolicy.DESTROY,
 });
 
 new s3.Bucket(stack, 'MyBucket4', {
   serverAccessLogsBucket: accessLogBucket,
-  serverAccessLogsPrefix: 'example',
+  serverAccessLogsPrefix: 'example4',
   logObjectKeyFormat: s3.LogObjectKeyFormat.partitionedPrefix(s3.PartitionDateSource.DELIVERY_TIME),
   removalPolicy: cdk.RemovalPolicy.DESTROY,
 });

diff --git a/packages/aws-cdk-lib/aws-s3/README.md b/packages/aws-cdk-lib/aws-s3/README.md
@@ -415,7 +415,7 @@ const accessLogsBucket = new s3.Bucket(this, 'AccessLogsBucket');
 const bucket = new s3.Bucket(this, 'MyBucket', {
   serverAccessLogsBucket: accessLogsBucket,
   serverAccessLogsPrefix: 'logs',
-  // You can use a simple prefix with `LogObjectKeyFormat.simplePrefix()`, but it is the same even if you do not specify it.
+  // You can use a simple prefix with `LogObjectKeyFormat.simplePrefix()`, but it is the same even if you do not specify `logObjectKeyFormat` property.
   logObjectKeyFormat: s3.LogObjectKeyFormat.simplePrefix(),
 });
 ```

diff --git a/packages/aws-cdk-lib/aws-s3/lib/bucket.ts b/packages/aws-cdk-lib/aws-s3/lib/bucket.ts
@@ -1390,7 +1390,7 @@ export abstract class LogObjectKeyFormat {
   }
 
   /**
-   * Render the log file key format.
+   * Render the log object key format.
    *
    * @internal
    */
-Original file line number
+Diff line change
@@ Expand Up / @@ -1390,7 +1390,7 @@ export abstract class LogObjectKeyFormat { @@
       }
       /**
-       * Render the log file key format.
+       * Render the log object key format.
        *
        * @internal
        */
@@ Expand Down @@