s3-secure-bucket 0.1.6 → 0.2.1

package/.jsii

@@ -8455,7 +8455,7 @@
   },
   "name": "s3-secure-bucket",
   "readme": {
-    "markdown": "# S3 Secure Bucket (AWS CDK v2)\n\n[![GitHub](https://img.shields.io/github/license/gammarers-aws-cdk-resources/s3-secure-bucket?style=flat-square)](https://github.com/gammarers-aws-cdk-resources/s3-secure-bucket/blob/main/LICENSE)\n[![npm version](https://img.shields.io/npm/v/s3-secure-bucket?style=flat-square)](https://www.npmjs.com/package/s3-secure-bucket)\n[![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/gammarers-aws-cdk-resources/s3-secure-bucket/build.yml?branch=main&label=build&style=flat-square)](https://github.com/gammarers-aws-cdk-resources/s3-secure-bucket/actions/workflows/build.yml)\n[![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/gammarers-aws-cdk-resources/s3-secure-bucket/release.yml?branch=main&label=release&style=flat-square)](https://github.com/gammarers-aws-cdk-resources/s3-secure-bucket/actions/workflows/release.yml)\n[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/gammarers-aws-cdk-resources/s3-secure-bucket?sort=semver&style=flat-square)](https://github.com/gammarers-aws-cdk-resources/s3-secure-bucket/releases)\n\nAn [AWS CDK](https://aws.amazon.com/cdk/) construct that defines an S3 bucket with security-focused defaults. It wraps the standard `s3.Bucket` and applies settings that follow AWS best practices, so you can create buckets without accidentally leaving them open or unencrypted. You can still override any option or use it as a drop-in replacement where a regular `s3.Bucket` is expected. For CDK pipeline artifact buckets or CloudFront origins, use the `bucketType` option so encryption and resource policies are set appropriately.\n\n## Features\n\n- Security-focused defaults for S3 buckets (private, block public access, enforce SSL)\n- Encryption enabled by default\n- Versioning enabled by default\n- Object ownership enforced by default (`BucketOwnerEnforced`)\n- `RemovalPolicy.RETAIN` by default (prevent accidental deletion)\n- Bucket-type presets via `bucketType` for common production use cases\n  - `DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET`: CDK pipeline artifact buckets with custom qualifier support\n  - `CLOUDFRONT_ORIGIN_BUCKET`: CloudFront origin buckets using S3-managed encryption\n  - `ACCESS_LOG_BUCKET`: Centralized access log buckets with minimal log-delivery permissions\n\n## Installation\n\n**npm**\n\n```shell\nnpm install s3-secure-bucket\n```\n\n**yarn**\n\n```shell\nyarn add s3-secure-bucket\n```\n\n## Usage\n\n### Default secure bucket\n\n```typescript\nimport { S3SecureBucket } from 's3-secure-bucket';\n\nconst bucket = new S3SecureBucket(stack, 'S3SecureBucket', {\n  bucketName: 'example-secure-bucket',\n});\n```\n\n### Centralized access log bucket (ALB / CloudFront / S3)\n\n```typescript\nimport { S3SecureBucket, S3SecureBucketType } from 's3-secure-bucket';\n\nconst accessLogBucket = new S3SecureBucket(stack, 'AccessLogBucket', {\n  bucketType: S3SecureBucketType.ACCESS_LOG_BUCKET,\n});\n```\n\n## Options\n\nThe `S3SecureBucket` constructor accepts `S3SecureBucketProps`. Since it extends `s3.BucketProps`, you can also use standard S3 bucket options such as `bucketName`, `versioned`, and `encryption`.\n\n### S3SecureBucket-specific options\n\n| Property | Type | Default | Description |\n| --- | --- | --- | --- |\n| `bucketType` | `S3SecureBucketType` | `S3SecureBucketType.DEFAULT_BUCKET` | Determines encryption and resource policy behavior. |\n\n### S3SecureBucketType values\n\n| Constant | Use case |\n| --- | --- |\n| `S3SecureBucketType.DEFAULT_BUCKET` | Default bucket when not using a custom qualifier |\n| `S3SecureBucketType.ACCESS_LOG_BUCKET` | Centralized access log bucket for ALB / CloudFront / S3 (RETAIN + minimal log-delivery permissions) |\n| `S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET` | CDK pipeline artifact bucket (when using a custom qualifier) |\n| `S3SecureBucketType.CLOUDFRONT_ORIGIN_BUCKET` | CloudFront origin bucket |\n\nSee [API.md](./API.md) for the full API reference.\n\n## Requirements\n\n- Node.js >= 20\n- AWS CDK v2 (`aws-cdk-lib`)\n\n## License\n\nThis project is licensed under the Apache-2.0 License.\n"
+    "markdown": "# S3 Secure Bucket (AWS CDK v2)\n\n[![GitHub](https://img.shields.io/github/license/gammarers-aws-cdk-resources/s3-secure-bucket?style=flat-square)](https://github.com/gammarers-aws-cdk-resources/s3-secure-bucket/blob/main/LICENSE)\n[![npm version](https://img.shields.io/npm/v/s3-secure-bucket?style=flat-square)](https://www.npmjs.com/package/s3-secure-bucket)\n[![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/gammarers-aws-cdk-resources/s3-secure-bucket/build.yml?branch=main&label=build&style=flat-square)](https://github.com/gammarers-aws-cdk-resources/s3-secure-bucket/actions/workflows/build.yml)\n[![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/gammarers-aws-cdk-resources/s3-secure-bucket/release.yml?branch=main&label=release&style=flat-square)](https://github.com/gammarers-aws-cdk-resources/s3-secure-bucket/actions/workflows/release.yml)\n[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/gammarers-aws-cdk-resources/s3-secure-bucket?sort=semver&style=flat-square)](https://github.com/gammarers-aws-cdk-resources/s3-secure-bucket/releases)\n\nAWS CDK v2 construct library: an [`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html) with security-focused defaults (private ACLs, block public access, TLS-only access, encryption, versioning, `BucketOwnerEnforced`, `RemovalPolicy.RETAIN`). Use `bucketType` for pipeline artifacts, CloudFront origins, and centralized access logs so encryption and bucket policies match each workload.\n\n## Features\n\n- Private access, block public access, and deny insecure transport (`enforceSSL`)\n- **Default bucket**: KMS-managed encryption (`aws:kms`) unless overridden\n- **Log / origin types**: S3-managed encryption (`AES256`) for `ACCESS_LOG_BUCKET` and `CLOUDFRONT_ORIGIN_BUCKET`\n- Versioning on by default; object ownership `BucketOwnerEnforced` by default\n- `RemovalPolicy.RETAIN` on the bucket\n- **`bucketType` presets**\n  - **`DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET`**: optional `s3:*` grant for the CDK deploy role when using a **non-default** bootstrap qualifier\n  - **`CLOUDFRONT_ORIGIN_BUCKET`**: S3-managed encryption for typical origin use\n  - **`ACCESS_LOG_BUCKET`**: `s3:PutObject` on `AWSLogs/<account>/*` for ALB/NLB (`logdelivery.elasticloadbalancing.amazonaws.com` + regional **ELBv2 account** from `aws-cdk-lib/region-info` when known), CloudFront standard logging (`delivery.logs.amazonaws.com`), and S3 server access logging (`logging.s3.amazonaws.com`)\n- **`accessLogBucketPolicyDependable`** (access-log buckets only): use with `loadBalancer.node.addDependency(...)` so ALB/NLB access-log enablement runs after the bucket policy exists (avoids validation `PutObject` failures)\n\n## Installation\n\n**npm**\n\n```shell\nnpm install s3-secure-bucket\n```\n\n**yarn**\n\n```shell\nyarn add s3-secure-bucket\n```\n\n## Usage\n\n### Default secure bucket\n\n```typescript\nimport { Stack } from 'aws-cdk-lib';\nimport { S3SecureBucket } from 's3-secure-bucket';\n\ndeclare const stack: Stack;\n\nconst bucket = new S3SecureBucket(stack, 'S3SecureBucket', {\n  bucketName: 'example-secure-bucket',\n});\n```\n\n### Centralized access log bucket (ALB / NLB / CloudFront / S3)\n\nFor `ACCESS_LOG_BUCKET`, the stack **`env.region` must be a concrete region** at synthesis time (not a token) so the regional ELBv2 log-delivery account ID can be resolved.\n\n```typescript\nimport { Stack } from 'aws-cdk-lib';\nimport { S3SecureBucket, S3SecureBucketType } from 's3-secure-bucket';\n\ndeclare const stack: Stack;\n\nconst accessLogBucket = new S3SecureBucket(stack, 'AccessLogBucket', {\n  bucketType: S3SecureBucketType.ACCESS_LOG_BUCKET,\n});\n\n// After creating your load balancer (e.g. elbv2.ApplicationLoadBalancer), depend on the bucket policy\n// so ELB's validation PutObject runs after the policy exists:\n// loadBalancer.node.addDependency(accessLogBucket.accessLogBucketPolicyDependable!);\n```\n\nWire logging on the load balancer using your normal approach (for example L1 attributes or another construct). This library only configures the **bucket** and its **resource policy**.\n\n## Options\n\n`S3SecureBucket` accepts `S3SecureBucketProps`, which extends [`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html). Standard options such as `bucketName`, `versioned`, `encryption`, and `lifecycleRules` work as usual alongside the secure defaults.\n\n### Construct props (`S3SecureBucketProps`)\n\n| Property | Type | Default | Description |\n| --- | --- | --- | --- |\n| `bucketType` | `S3SecureBucketType` | `DEFAULT_BUCKET` | Selects encryption defaults and optional resource-policy statements. |\n| *(inherited)* | `s3.BucketProps` | — | All other `Bucket` properties are passed through (some receive overrides inside the construct). |\n\n### `S3SecureBucketType` values\n\n| Constant | Use case |\n| --- | --- |\n| `S3SecureBucketType.DEFAULT_BUCKET` | General-purpose secure bucket |\n| `S3SecureBucketType.ACCESS_LOG_BUCKET` | Centralized access logs (`AWSLogs/<account>/*` writers only) |\n| `S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET` | CDK pipeline artifact bucket (custom bootstrap qualifier) |\n| `S3SecureBucketType.CLOUDFRONT_ORIGIN_BUCKET` | CloudFront origin bucket |\n\n### Read-only: `accessLogBucketPolicyDependable`\n\n| Property | Type | When set | Description |\n| --- | --- | --- | --- |\n| `accessLogBucketPolicyDependable` | `IDependable \\| undefined` | `bucketType === ACCESS_LOG_BUCKET` | Depend on this from ALB/NLB so access-log configuration waits for the bucket policy resource. |\n\nSee [API.md](./API.md) for the full API reference.\n\n## Requirements\n\n- Node.js >= 20\n- Peer dependencies: `aws-cdk-lib` ^2.232.0, `constructs` ^10.5.1\n\n## License\n\nThis project is licensed under the Apache-2.0 License.\n"
   },
   "repository": {
     "type": "git",
@@ -8472,32 +8472,46 @@
       "assembly": "s3-secure-bucket",
       "base": "aws-cdk-lib.aws_s3.Bucket",
       "docs": {
+        "custom": {
+          "remarks": "- {@link S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET }: may attach a deploy-role policy when a non-default bootstrap qualifier is present.\n- {@link S3SecureBucketType.ACCESS_LOG_BUCKET }: adds log-writer principals; see {@link S3SecureBucketType.ACCESS_LOG_BUCKET } and {@link S3SecureBucket#accessLogBucketPolicyDependable }."
+        },
+        "remarks": "KMS-managed by default otherwise).",
         "stability": "stable",
-        "summary": "An S3 bucket with secure defaults: private access, SSL enforced, public access blocked, and encryption required."
+        "summary": "S3 bucket with opinionated secure defaults: private ACLs, block public access, TLS-only access, and encryption (S3-managed for log/origin types;"
       },
       "fqn": "s3-secure-bucket.S3SecureBucket",
       "initializer": {
         "docs": {
-          "stability": "stable"
+          "stability": "stable",
+          "summary": "Creates a secure S3 bucket according to `bucketType` and merged `props`."
         },
         "locationInModule": {
           "filename": "src/index.ts",
-          "line": 49
+          "line": 84
         },
         "parameters": [
           {
+            "docs": {
+              "summary": "- Parent construct, typically a {@link Stack}."
+            },
             "name": "scope",
             "type": {
               "fqn": "constructs.Construct"
             }
           },
           {
+            "docs": {
+              "summary": "- Construct ID (stable logical ID segment)."
+            },
             "name": "id",
             "type": {
               "primitive": "string"
             }
           },
           {
+            "docs": {
+              "summary": "- Optional {@link s3.BucketProps} plus {@link S3SecureBucketProps.bucketType} and `eventBridgeEnabled` (applied via L1 override when true)."
+            },
             "name": "props",
             "optional": true,
             "type": {
@@ -8509,18 +8523,38 @@
       "kind": "class",
       "locationInModule": {
         "filename": "src/index.ts",
-        "line": 48
+        "line": 65
       },
       "name": "S3SecureBucket",
+      "properties": [
+        {
+          "docs": {
+            "default": "undefined when `bucketType` is not {@link S3SecureBucketType.ACCESS_LOG_BUCKET }.",
+            "remarks": "Example: `loadBalancer.node.addDependency(bucket.accessLogBucketPolicyDependable!)`.",
+            "stability": "stable",
+            "summary": "Set only when {@link S3SecureBucketProps.bucketType} is {@link S3SecureBucketType.ACCESS_LOG_BUCKET}. Use as a dependency target so load balancer access-log enablement runs after the bucket policy exists (ELB performs an immediate validation `PutObject` that fails if the policy is not applied yet)."
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "src/index.ts",
+            "line": 75
+          },
+          "name": "accessLogBucketPolicyDependable",
+          "optional": true,
+          "type": {
+            "fqn": "constructs.IDependable"
+          }
+        }
+      ],
       "symbolId": "src/index:S3SecureBucket"
     },
     "s3-secure-bucket.S3SecureBucketProps": {
       "assembly": "s3-secure-bucket",
       "datatype": true,
       "docs": {
-        "remarks": "Extends `s3.BucketProps` with a bucket type for secure defaults.",
+        "remarks": "Extends {@link s3.BucketProps}; several fields receive secure defaults inside the construct.",
         "stability": "stable",
-        "summary": "Props for {@link S3SecureBucket}."
+        "summary": "Construction properties for {@link S3SecureBucket}."
       },
       "fqn": "s3-secure-bucket.S3SecureBucketProps",
       "interfaces": [
@@ -8529,22 +8563,21 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/index.ts",
-        "line": 36
+        "line": 47
       },
       "name": "S3SecureBucketProps",
       "properties": [
         {
           "abstract": true,
           "docs": {
-            "default": "S3SecureBucketType.DEFAULT_BUCKET",
-            "remarks": "Determines encryption and resource policy behavior.",
+            "default": "{@link S3SecureBucketType.DEFAULT_BUCKET }",
             "stability": "stable",
-            "summary": "The type of the bucket."
+            "summary": "Selects encryption defaults and optional resource-policy statements."
           },
           "immutable": true,
           "locationInModule": {
             "filename": "src/index.ts",
-            "line": 42
+            "line": 54
           },
           "name": "bucketType",
           "optional": true,
@@ -8556,6 +8589,6 @@
       "symbolId": "src/index:S3SecureBucketProps"
     }
   },
-  "version": "0.1.6",
-  "fingerprint": "0kEfMWeqRChTf87wSYgg0YgUuUKNes2RMuHCmJaDU2g="
+  "version": "0.2.1",
+  "fingerprint": "xlXsC0RrVqg4UJOgmJhEODMfux8HAPA3glSh/bLKJ3o="
 }

package/API.md

@@ -4,7 +4,9 @@
 
 ### S3SecureBucket <a name="S3SecureBucket" id="s3-secure-bucket.S3SecureBucket"></a>
 
-An S3 bucket with secure defaults: private access, SSL enforced, public access blocked, and encryption required.
+S3 bucket with opinionated secure defaults: private ACLs, block public access, TLS-only access, and encryption (S3-managed for log/origin types;
+
+KMS-managed by default otherwise).
 
 #### Initializers <a name="Initializers" id="s3-secure-bucket.S3SecureBucket.Initializer"></a>
 
@@ -16,9 +18,9 @@ new S3SecureBucket(scope: Construct, id: string, props?: S3SecureBucketProps)
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href="#s3-secure-bucket.S3SecureBucket.Initializer.parameter.scope">scope</a></code> | <code>constructs.Construct</code> | *No description.* |
-| <code><a href="#s3-secure-bucket.S3SecureBucket.Initializer.parameter.id">id</a></code> | <code>string</code> | *No description.* |
-| <code><a href="#s3-secure-bucket.S3SecureBucket.Initializer.parameter.props">props</a></code> | <code><a href="#s3-secure-bucket.S3SecureBucketProps">S3SecureBucketProps</a></code> | *No description.* |
+| <code><a href="#s3-secure-bucket.S3SecureBucket.Initializer.parameter.scope">scope</a></code> | <code>constructs.Construct</code> | - Parent construct, typically a {@link Stack}. |
+| <code><a href="#s3-secure-bucket.S3SecureBucket.Initializer.parameter.id">id</a></code> | <code>string</code> | - Construct ID (stable logical ID segment). |
+| <code><a href="#s3-secure-bucket.S3SecureBucket.Initializer.parameter.props">props</a></code> | <code><a href="#s3-secure-bucket.S3SecureBucketProps">S3SecureBucketProps</a></code> | - Optional {@link s3.BucketProps} plus {@link S3SecureBucketProps.bucketType} and `eventBridgeEnabled` (applied via L1 override when true). |
 
 ---
 
@@ -26,18 +28,24 @@ new S3SecureBucket(scope: Construct, id: string, props?: S3SecureBucketProps)
 
 - *Type:* constructs.Construct
 
+Parent construct, typically a {@link Stack}.
+
 ---
 
 ##### `id`<sup>Required</sup> <a name="id" id="s3-secure-bucket.S3SecureBucket.Initializer.parameter.id"></a>
 
 - *Type:* string
 
+Construct ID (stable logical ID segment).
+
 ---
 
 ##### `props`<sup>Optional</sup> <a name="props" id="s3-secure-bucket.S3SecureBucket.Initializer.parameter.props"></a>
 
 - *Type:* <a href="#s3-secure-bucket.S3SecureBucketProps">S3SecureBucketProps</a>
 
+Optional {@link s3.BucketProps} plus {@link S3SecureBucketProps.bucketType} and `eventBridgeEnabled` (applied via L1 override when true).
+
 ---
 
 #### Methods <a name="Methods" id="Methods"></a>
@@ -1085,6 +1093,7 @@ allow legacy bucket naming style, default is false.
 | <code><a href="#s3-secure-bucket.S3SecureBucket.property.disallowPublicAccess">disallowPublicAccess</a></code> | <code>boolean</code> | Whether to disallow public access. |
 | <code><a href="#s3-secure-bucket.S3SecureBucket.property.policy">policy</a></code> | <code>aws-cdk-lib.aws_s3.BucketPolicy</code> | The resource policy associated with this bucket. |
 | <code><a href="#s3-secure-bucket.S3SecureBucket.property.replicationRoleArn">replicationRoleArn</a></code> | <code>string</code> | Role used to set up permissions on this bucket for replication. |
+| <code><a href="#s3-secure-bucket.S3SecureBucket.property.accessLogBucketPolicyDependable">accessLogBucketPolicyDependable</a></code> | <code>constructs.IDependable</code> | Set only when {@link S3SecureBucketProps.bucketType} is {@link S3SecureBucketType.ACCESS_LOG_BUCKET}. Use as a dependency target so load balancer access-log enablement runs after the bucket policy exists (ELB performs an immediate validation `PutObject` that fails if the policy is not applied yet). |
 
 ---
 
@@ -1303,6 +1312,21 @@ Role used to set up permissions on this bucket for replication.
 
 ---
 
+##### `accessLogBucketPolicyDependable`<sup>Optional</sup> <a name="accessLogBucketPolicyDependable" id="s3-secure-bucket.S3SecureBucket.property.accessLogBucketPolicyDependable"></a>
+
+```typescript
+public readonly accessLogBucketPolicyDependable: IDependable;
+```
+
+- *Type:* constructs.IDependable
+- *Default:* undefined when `bucketType` is not {@link S3SecureBucketType.ACCESS_LOG_BUCKET }.
+
+Set only when {@link S3SecureBucketProps.bucketType} is {@link S3SecureBucketType.ACCESS_LOG_BUCKET}. Use as a dependency target so load balancer access-log enablement runs after the bucket policy exists (ELB performs an immediate validation `PutObject` that fails if the policy is not applied yet).
+
+Example: `loadBalancer.node.addDependency(bucket.accessLogBucketPolicyDependable!)`.
+
+---
+
 #### Constants <a name="Constants" id="Constants"></a>
 
 | **Name** | **Type** | **Description** |
@@ -1327,9 +1351,9 @@ Uniquely identifies this class.
 
 ### S3SecureBucketProps <a name="S3SecureBucketProps" id="s3-secure-bucket.S3SecureBucketProps"></a>
 
-Props for {@link S3SecureBucket}.
+Construction properties for {@link S3SecureBucket}.
 
-Extends `s3.BucketProps` with a bucket type for secure defaults.
+Extends {@link s3.BucketProps}; several fields receive secure defaults inside the construct.
 
 #### Initializer <a name="Initializer" id="s3-secure-bucket.S3SecureBucketProps.Initializer"></a>
 
@@ -1377,7 +1401,7 @@ const s3SecureBucketProps: S3SecureBucketProps = { ... }
 | <code><a href="#s3-secure-bucket.S3SecureBucketProps.property.websiteIndexDocument">websiteIndexDocument</a></code> | <code>string</code> | The name of the index document (e.g. "index.html") for the website. Enables static website hosting for this bucket. |
 | <code><a href="#s3-secure-bucket.S3SecureBucketProps.property.websiteRedirect">websiteRedirect</a></code> | <code>aws-cdk-lib.aws_s3.RedirectTarget</code> | Specifies the redirect behavior of all requests to a website endpoint of a bucket. |
 | <code><a href="#s3-secure-bucket.S3SecureBucketProps.property.websiteRoutingRules">websiteRoutingRules</a></code> | <code>aws-cdk-lib.aws_s3.RoutingRule[]</code> | Rules that define when a redirect is applied and the redirect behavior. |
-| <code><a href="#s3-secure-bucket.S3SecureBucketProps.property.bucketType">bucketType</a></code> | <code>string</code> | The type of the bucket. |
+| <code><a href="#s3-secure-bucket.S3SecureBucketProps.property.bucketType">bucketType</a></code> | <code>string</code> | Selects encryption defaults and optional resource-policy statements. |
 
 ---
 
@@ -1898,11 +1922,9 @@ public readonly bucketType: string;
 ```
 
 - *Type:* string
-- *Default:* S3SecureBucketType.DEFAULT_BUCKET
-
-The type of the bucket.
+- *Default:* {@link S3SecureBucketType.DEFAULT_BUCKET }
 
-Determines encryption and resource policy behavior.
+Selects encryption defaults and optional resource-policy statements.
 
 ---
 

package/README.md

@@ -6,19 +6,20 @@
 [![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/gammarers-aws-cdk-resources/s3-secure-bucket/release.yml?branch=main&label=release&style=flat-square)](https://github.com/gammarers-aws-cdk-resources/s3-secure-bucket/actions/workflows/release.yml)
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/gammarers-aws-cdk-resources/s3-secure-bucket?sort=semver&style=flat-square)](https://github.com/gammarers-aws-cdk-resources/s3-secure-bucket/releases)
 
-An [AWS CDK](https://aws.amazon.com/cdk/) construct that defines an S3 bucket with security-focused defaults. It wraps the standard `s3.Bucket` and applies settings that follow AWS best practices, so you can create buckets without accidentally leaving them open or unencrypted. You can still override any option or use it as a drop-in replacement where a regular `s3.Bucket` is expected. For CDK pipeline artifact buckets or CloudFront origins, use the `bucketType` option so encryption and resource policies are set appropriately.
+AWS CDK v2 construct library: an [`s3.Bucket`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.Bucket.html) with security-focused defaults (private ACLs, block public access, TLS-only access, encryption, versioning, `BucketOwnerEnforced`, `RemovalPolicy.RETAIN`). Use `bucketType` for pipeline artifacts, CloudFront origins, and centralized access logs so encryption and bucket policies match each workload.
 
 ## Features
 
-- Security-focused defaults for S3 buckets (private, block public access, enforce SSL)
-- Encryption enabled by default
-- Versioning enabled by default
-- Object ownership enforced by default (`BucketOwnerEnforced`)
-- `RemovalPolicy.RETAIN` by default (prevent accidental deletion)
-- Bucket-type presets via `bucketType` for common production use cases
-  - `DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET`: CDK pipeline artifact buckets with custom qualifier support
-  - `CLOUDFRONT_ORIGIN_BUCKET`: CloudFront origin buckets using S3-managed encryption
-  - `ACCESS_LOG_BUCKET`: Centralized access log buckets with minimal log-delivery permissions
+- Private access, block public access, and deny insecure transport (`enforceSSL`)
+- **Default bucket**: KMS-managed encryption (`aws:kms`) unless overridden
+- **Log / origin types**: S3-managed encryption (`AES256`) for `ACCESS_LOG_BUCKET` and `CLOUDFRONT_ORIGIN_BUCKET`
+- Versioning on by default; object ownership `BucketOwnerEnforced` by default
+- `RemovalPolicy.RETAIN` on the bucket
+- **`bucketType` presets**
+  - **`DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET`**: optional `s3:*` grant for the CDK deploy role when using a **non-default** bootstrap qualifier
+  - **`CLOUDFRONT_ORIGIN_BUCKET`**: S3-managed encryption for typical origin use
+  - **`ACCESS_LOG_BUCKET`**: `s3:PutObject` on `AWSLogs/<account>/*` for ALB/NLB (`logdelivery.elasticloadbalancing.amazonaws.com` + regional **ELBv2 account** from `aws-cdk-lib/region-info` when known), CloudFront standard logging (`delivery.logs.amazonaws.com`), and S3 server access logging (`logging.s3.amazonaws.com`)
+- **`accessLogBucketPolicyDependable`** (access-log buckets only): use with `loadBalancer.node.addDependency(...)` so ALB/NLB access-log enablement runs after the bucket policy exists (avoids validation `PutObject` failures)
 
 ## Installation
 
@@ -39,48 +40,69 @@ yarn add s3-secure-bucket
 ### Default secure bucket
 
 ```typescript
+import { Stack } from 'aws-cdk-lib';
 import { S3SecureBucket } from 's3-secure-bucket';
 
+declare const stack: Stack;
+
 const bucket = new S3SecureBucket(stack, 'S3SecureBucket', {
   bucketName: 'example-secure-bucket',
 });
 ```
 
-### Centralized access log bucket (ALB / CloudFront / S3)
+### Centralized access log bucket (ALB / NLB / CloudFront / S3)
+
+For `ACCESS_LOG_BUCKET`, the stack **`env.region` must be a concrete region** at synthesis time (not a token) so the regional ELBv2 log-delivery account ID can be resolved.
 
 ```typescript
+import { Stack } from 'aws-cdk-lib';
 import { S3SecureBucket, S3SecureBucketType } from 's3-secure-bucket';
 
+declare const stack: Stack;
+
 const accessLogBucket = new S3SecureBucket(stack, 'AccessLogBucket', {
   bucketType: S3SecureBucketType.ACCESS_LOG_BUCKET,
 });
+
+// After creating your load balancer (e.g. elbv2.ApplicationLoadBalancer), depend on the bucket policy
+// so ELB's validation PutObject runs after the policy exists:
+// loadBalancer.node.addDependency(accessLogBucket.accessLogBucketPolicyDependable!);
 ```
 
+Wire logging on the load balancer using your normal approach (for example L1 attributes or another construct). This library only configures the **bucket** and its **resource policy**.
+
 ## Options
 
-The `S3SecureBucket` constructor accepts `S3SecureBucketProps`. Since it extends `s3.BucketProps`, you can also use standard S3 bucket options such as `bucketName`, `versioned`, and `encryption`.
+`S3SecureBucket` accepts `S3SecureBucketProps`, which extends [`s3.BucketProps`](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3.BucketProps.html). Standard options such as `bucketName`, `versioned`, `encryption`, and `lifecycleRules` work as usual alongside the secure defaults.
 
-### S3SecureBucket-specific options
+### Construct props (`S3SecureBucketProps`)
 
 | Property | Type | Default | Description |
 | --- | --- | --- | --- |
-| `bucketType` | `S3SecureBucketType` | `S3SecureBucketType.DEFAULT_BUCKET` | Determines encryption and resource policy behavior. |
+| `bucketType` | `S3SecureBucketType` | `DEFAULT_BUCKET` | Selects encryption defaults and optional resource-policy statements. |
+| *(inherited)* | `s3.BucketProps` | — | All other `Bucket` properties are passed through (some receive overrides inside the construct). |
 
-### S3SecureBucketType values
+### `S3SecureBucketType` values
 
 | Constant | Use case |
 | --- | --- |
-| `S3SecureBucketType.DEFAULT_BUCKET` | Default bucket when not using a custom qualifier |
-| `S3SecureBucketType.ACCESS_LOG_BUCKET` | Centralized access log bucket for ALB / CloudFront / S3 (RETAIN + minimal log-delivery permissions) |
-| `S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET` | CDK pipeline artifact bucket (when using a custom qualifier) |
+| `S3SecureBucketType.DEFAULT_BUCKET` | General-purpose secure bucket |
+| `S3SecureBucketType.ACCESS_LOG_BUCKET` | Centralized access logs (`AWSLogs/<account>/*` writers only) |
+| `S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET` | CDK pipeline artifact bucket (custom bootstrap qualifier) |
 | `S3SecureBucketType.CLOUDFRONT_ORIGIN_BUCKET` | CloudFront origin bucket |
 
+### Read-only: `accessLogBucketPolicyDependable`
+
+| Property | Type | When set | Description |
+| --- | --- | --- | --- |
+| `accessLogBucketPolicyDependable` | `IDependable \| undefined` | `bucketType === ACCESS_LOG_BUCKET` | Depend on this from ALB/NLB so access-log configuration waits for the bucket policy resource. |
+
 See [API.md](./API.md) for the full API reference.
 
 ## Requirements
 
 - Node.js >= 20
-- AWS CDK v2 (`aws-cdk-lib`)
+- Peer dependencies: `aws-cdk-lib` ^2.232.0, `constructs` ^10.5.1
 
 ## License
 

package/lib/index.d.ts

@@ -1,43 +1,76 @@
 import * as s3 from 'aws-cdk-lib/aws-s3';
-import { Construct } from 'constructs';
+import { Construct, IDependable } from 'constructs';
 /**
- * Bucket type constants. Use these values for the {@link S3SecureBucketProps.bucketType} property.
+ * Bucket type discriminator values for {@link S3SecureBucketProps.bucketType}.
+ *
+ * @see {@link S3SecureBucketProps.bucketType}
  */
 export declare const S3SecureBucketType: {
     /**
-     * Select when using this bucket as the CDK pipeline artifact bucket with a custom Qualifier
-     * (single-region or multi-region deployment).
+     * Pipeline artifact bucket when using a custom CDK bootstrap qualifier
+     * (single- or multi-region deployments).
      */
     readonly DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET: "DeploymentPipelineArtifactBucket";
     /**
-     * Select when using this bucket as the CloudFront origin.
+     * Origin bucket for CloudFront distributions.
      */
     readonly CLOUDFRONT_ORIGIN_BUCKET: "CloudFrontOriginBucket";
     /**
-     * Select for the default bucket when not using a custom Qualifier.
+     * General-purpose secure bucket (default qualifier / standard use).
      */
     readonly DEFAULT_BUCKET: "DefaultBucket";
     /**
-     * Select when using this bucket as a centralized access log bucket
-     * for ALB, CloudFront, S3 server access logging, and similar producers.
+     * Centralized access logs for producers such as ALB/NLB, CloudFront standard logging (v2),
+     * and S3 server access logging. Grants `s3:PutObject` on `AWSLogs/<account>/*` only (no read/list).
+     *
+     * For {@link S3SecureBucketType.ACCESS_LOG_BUCKET}, the regional ELBv2 log-delivery account ID
+     * (legacy path alongside the log delivery service principal) is resolved from `aws-cdk-lib/region-info`
+     * at synthesis time when {@link Stack#region} is known, or via a deploy-time mapping when it is a token.
      */
     readonly ACCESS_LOG_BUCKET: "AccessLogBucket";
 };
-/** Bucket type: one of the {@link S3SecureBucketType} constant values. */
+/**
+ * Discriminated union of {@link S3SecureBucketType} string literals.
+ */
 export type S3SecureBucketType = typeof S3SecureBucketType[keyof typeof S3SecureBucketType];
 /**
- * Props for {@link S3SecureBucket}. Extends `s3.BucketProps` with a bucket type for secure defaults.
+ * Construction properties for {@link S3SecureBucket}.
+ *
+ * Extends {@link s3.BucketProps}; several fields receive secure defaults inside the construct.
  */
 export interface S3SecureBucketProps extends s3.BucketProps {
     /**
-     * The type of the bucket. Determines encryption and resource policy behavior.
-     * @default S3SecureBucketType.DEFAULT_BUCKET
+     * Selects encryption defaults and optional resource-policy statements.
+     *
+     * @default {@link S3SecureBucketType.DEFAULT_BUCKET}
      */
     readonly bucketType?: S3SecureBucketType;
 }
 /**
- * An S3 bucket with secure defaults: private access, SSL enforced, public access blocked, and encryption required.
+ * S3 bucket with opinionated secure defaults: private ACLs, block public access, TLS-only access,
+ * and encryption (S3-managed for log/origin types; KMS-managed by default otherwise).
+ *
+ * @remarks
+ * - {@link S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET}: may attach a deploy-role policy when a non-default bootstrap qualifier is present.
+ * - {@link S3SecureBucketType.ACCESS_LOG_BUCKET}: adds log-writer principals; see {@link S3SecureBucketType.ACCESS_LOG_BUCKET} and {@link S3SecureBucket#accessLogBucketPolicyDependable}.
  */
 export declare class S3SecureBucket extends s3.Bucket {
+    /**
+     * Set only when {@link S3SecureBucketProps.bucketType} is {@link S3SecureBucketType.ACCESS_LOG_BUCKET}.
+     * Use as a dependency target so load balancer access-log enablement runs after the bucket policy
+     * exists (ELB performs an immediate validation `PutObject` that fails if the policy is not applied yet).
+     *
+     * Example: `loadBalancer.node.addDependency(bucket.accessLogBucketPolicyDependable!)`.
+     *
+     * @default undefined when `bucketType` is not {@link S3SecureBucketType.ACCESS_LOG_BUCKET}.
+     */
+    readonly accessLogBucketPolicyDependable?: IDependable;
+    /**
+     * Creates a secure S3 bucket according to `bucketType` and merged `props`.
+     *
+     * @param scope - Parent construct, typically a {@link Stack}.
+     * @param id - Construct ID (stable logical ID segment).
+     * @param props - Optional {@link s3.BucketProps} plus {@link S3SecureBucketProps.bucketType} and `eventBridgeEnabled` (applied via L1 override when true).
+     */
     constructor(scope: Construct, id: string, props?: S3SecureBucketProps);
 }

package/lib/index.js

@@ -6,33 +6,52 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const iam = require("aws-cdk-lib/aws-iam");
 const s3 = require("aws-cdk-lib/aws-s3");
+const region_info_1 = require("aws-cdk-lib/region-info");
 /**
- * Bucket type constants. Use these values for the {@link S3SecureBucketProps.bucketType} property.
+ * Bucket type discriminator values for {@link S3SecureBucketProps.bucketType}.
+ *
+ * @see {@link S3SecureBucketProps.bucketType}
  */
 exports.S3SecureBucketType = {
     /**
-     * Select when using this bucket as the CDK pipeline artifact bucket with a custom Qualifier
-     * (single-region or multi-region deployment).
+     * Pipeline artifact bucket when using a custom CDK bootstrap qualifier
+     * (single- or multi-region deployments).
      */
     DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET: 'DeploymentPipelineArtifactBucket',
     /**
-     * Select when using this bucket as the CloudFront origin.
+     * Origin bucket for CloudFront distributions.
      */
     CLOUDFRONT_ORIGIN_BUCKET: 'CloudFrontOriginBucket',
     /**
-     * Select for the default bucket when not using a custom Qualifier.
+     * General-purpose secure bucket (default qualifier / standard use).
      */
     DEFAULT_BUCKET: 'DefaultBucket',
     /**
-     * Select when using this bucket as a centralized access log bucket
-     * for ALB, CloudFront, S3 server access logging, and similar producers.
+     * Centralized access logs for producers such as ALB/NLB, CloudFront standard logging (v2),
+     * and S3 server access logging. Grants `s3:PutObject` on `AWSLogs/<account>/*` only (no read/list).
+     *
+     * For {@link S3SecureBucketType.ACCESS_LOG_BUCKET}, the regional ELBv2 log-delivery account ID
+     * (legacy path alongside the log delivery service principal) is resolved from `aws-cdk-lib/region-info`
+     * at synthesis time when {@link Stack#region} is known, or via a deploy-time mapping when it is a token.
      */
     ACCESS_LOG_BUCKET: 'AccessLogBucket',
 };
 /**
- * An S3 bucket with secure defaults: private access, SSL enforced, public access blocked, and encryption required.
+ * S3 bucket with opinionated secure defaults: private ACLs, block public access, TLS-only access,
+ * and encryption (S3-managed for log/origin types; KMS-managed by default otherwise).
+ *
+ * @remarks
+ * - {@link S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET}: may attach a deploy-role policy when a non-default bootstrap qualifier is present.
+ * - {@link S3SecureBucketType.ACCESS_LOG_BUCKET}: adds log-writer principals; see {@link S3SecureBucketType.ACCESS_LOG_BUCKET} and {@link S3SecureBucket#accessLogBucketPolicyDependable}.
  */
 class S3SecureBucket extends s3.Bucket {
+    /**
+     * Creates a secure S3 bucket according to `bucketType` and merged `props`.
+     *
+     * @param scope - Parent construct, typically a {@link Stack}.
+     * @param id - Construct ID (stable logical ID segment).
+     * @param props - Optional {@link s3.BucketProps} plus {@link S3SecureBucketProps.bucketType} and `eventBridgeEnabled` (applied via L1 override when true).
+     */
     constructor(scope, id, props) {
         const bucketType = props?.bucketType || exports.S3SecureBucketType.DEFAULT_BUCKET;
         super(scope, id, {
@@ -86,8 +105,9 @@ class S3SecureBucket extends s3.Bucket {
             }
         }
         if (bucketType === exports.S3SecureBucketType.ACCESS_LOG_BUCKET) {
-            // Allow ALB / NLB log delivery to put objects (no read or list)
-            this.addToResourcePolicy(new iam.PolicyStatement({
+            const awsLogsPrefixResource = `${this.bucketArn}/AWSLogs/${account}/*`;
+            // Allow ALB / NLB log delivery (modern service principal path; also required in opt-in regions).
+            const albLogDeliveryPolicyResult = this.addToResourcePolicy(new iam.PolicyStatement({
                 effect: iam.Effect.ALLOW,
                 principals: [
                     new iam.ServicePrincipal('logdelivery.elasticloadbalancing.amazonaws.com'),
@@ -96,9 +116,30 @@ class S3SecureBucket extends s3.Bucket {
                     's3:PutObject',
                 ],
                 resources: [
-                    `${this.bucketArn}/AWSLogs/${account}/*`,
+                    awsLogsPrefixResource,
                 ],
             }));
+            // In non–opt-in regions (for example ap-northeast-1), access logs are often delivered using the
+            // regional ELBv2 account (root of that account) for s3:PutObject, not only the service principal above.
+            const stack = aws_cdk_lib_1.Stack.of(this);
+            const elbAccountId = aws_cdk_lib_1.Token.isUnresolved(stack.region)
+                ? stack.regionalFact(region_info_1.FactName.ELBV2_ACCOUNT)
+                : region_info_1.RegionInfo.get(stack.region).elbv2Account;
+            if (elbAccountId) {
+                this.addToResourcePolicy(new iam.PolicyStatement({
+                    effect: iam.Effect.ALLOW,
+                    principals: [
+                        new iam.AccountPrincipal(elbAccountId),
+                    ],
+                    actions: [
+                        's3:PutObject',
+                    ],
+                    resources: [
+                        awsLogsPrefixResource,
+                    ],
+                }));
+            }
+            this.accessLogBucketPolicyDependable = albLogDeliveryPolicyResult.policyDependable ?? this;
             // Allow CloudFront standard logging (v2) to write logs
             this.addToResourcePolicy(new iam.PolicyStatement({
                 effect: iam.Effect.ALLOW,
@@ -109,7 +150,7 @@ class S3SecureBucket extends s3.Bucket {
                     's3:PutObject',
                 ],
                 resources: [
-                    `${this.bucketArn}/AWSLogs/${account}/*`,
+                    awsLogsPrefixResource,
                 ],
             }));
             // Allow S3 server access logging to write logs when required by configuration
@@ -122,7 +163,7 @@ class S3SecureBucket extends s3.Bucket {
                     's3:PutObject',
                 ],
                 resources: [
-                    `${this.bucketArn}/AWSLogs/${account}/*`,
+                    awsLogsPrefixResource,
                 ],
             }));
         }
@@ -130,5 +171,5 @@ class S3SecureBucket extends s3.Bucket {
 }
 exports.S3SecureBucket = S3SecureBucket;
 _a = JSII_RTTI_SYMBOL_1;
-S3SecureBucket[_a] = { fqn: "s3-secure-bucket.S3SecureBucket", version: "0.1.6" };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { DefaultStackSynthesizer, RemovalPolicy, Stack } from 'aws-cdk-lib';\nimport * as iam from 'aws-cdk-lib/aws-iam';\nimport * as s3 from 'aws-cdk-lib/aws-s3';\nimport { Construct } from 'constructs';\n\n/**\n * Bucket type constants. Use these values for the {@link S3SecureBucketProps.bucketType} property.\n */\nexport const S3SecureBucketType = {\n  /**\n   * Select when using this bucket as the CDK pipeline artifact bucket with a custom Qualifier\n   * (single-region or multi-region deployment).\n   */\n  DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET: 'DeploymentPipelineArtifactBucket',\n  /**\n   * Select when using this bucket as the CloudFront origin.\n   */\n  CLOUDFRONT_ORIGIN_BUCKET: 'CloudFrontOriginBucket',\n  /**\n   * Select for the default bucket when not using a custom Qualifier.\n   */\n  DEFAULT_BUCKET: 'DefaultBucket',\n  /**\n   * Select when using this bucket as a centralized access log bucket\n   * for ALB, CloudFront, S3 server access logging, and similar producers.\n   */\n  ACCESS_LOG_BUCKET: 'AccessLogBucket',\n} as const;\n\n/** Bucket type: one of the {@link S3SecureBucketType} constant values. */\nexport type S3SecureBucketType = typeof S3SecureBucketType[keyof typeof S3SecureBucketType];\n\n/**\n * Props for {@link S3SecureBucket}. Extends `s3.BucketProps` with a bucket type for secure defaults.\n */\nexport interface S3SecureBucketProps extends s3.BucketProps {\n\n  /**\n   * The type of the bucket. Determines encryption and resource policy behavior.\n   * @default S3SecureBucketType.DEFAULT_BUCKET\n   */\n  readonly bucketType?: S3SecureBucketType;\n}\n\n/**\n * An S3 bucket with secure defaults: private access, SSL enforced, public access blocked, and encryption required.\n */\nexport class S3SecureBucket extends s3.Bucket {\n  constructor(scope: Construct, id: string, props?: S3SecureBucketProps) {\n    const bucketType = props?.bucketType || S3SecureBucketType.DEFAULT_BUCKET;\n    super(scope, id, {\n      ...props,\n      removalPolicy: RemovalPolicy.RETAIN,\n      encryption: (() => {\n        if (bucketType === S3SecureBucketType.CLOUDFRONT_ORIGIN_BUCKET || bucketType === S3SecureBucketType.ACCESS_LOG_BUCKET) {\n          return s3.BucketEncryption.S3_MANAGED;\n        }\n        return props?.encryption || s3.BucketEncryption.KMS_MANAGED;\n      })(),\n      accessControl: (() => {\n        if (!props?.accessControl) {\n          return s3.BucketAccessControl.PRIVATE;\n        }\n        return props.accessControl;\n      })(),\n      eventBridgeEnabled: undefined,\n      publicReadAccess: false,\n      blockPublicAccess: s3.BlockPublicAccess.BLOCK_ALL,\n      enforceSSL: true,\n      versioned: props?.versioned !== undefined ? props.versioned : true,\n      objectOwnership: (() => {\n        if (props?.objectOwnership) {\n          return props.objectOwnership;\n        }\n        return s3.ObjectOwnership.BUCKET_OWNER_ENFORCED;\n      })(),\n    });\n\n    const cfnBucket = this.node.defaultChild as s3.CfnBucket;\n    if (props?.eventBridgeEnabled === true) {\n      cfnBucket.addPropertyOverride('NotificationConfiguration.EventBridgeConfiguration.EventBridgeEnabled', true);\n    }\n\n    const account = Stack.of(this).account;\n    const region = Stack.of(this).region;\n\n    if (bucketType === S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET) {\n\n      const qualifier = Stack.of(this).synthesizer.bootstrapQualifier;\n\n      if (qualifier && (qualifier != DefaultStackSynthesizer.DEFAULT_QUALIFIER)) {\n        this.addToResourcePolicy(new iam.PolicyStatement({\n          actions: [\n            's3:*',\n          ],\n          resources: [\n            `${this.bucketArn}`,\n            `${this.bucketArn}/*`,\n          ],\n          principals: [\n            new iam.ArnPrincipal(`arn:aws:iam::${account}:role/cdk-${qualifier}-deploy-role-${account}-${region}`),\n          ],\n        }));\n      }\n    }\n\n    if (bucketType === S3SecureBucketType.ACCESS_LOG_BUCKET) {\n      // Allow ALB / NLB log delivery to put objects (no read or list)\n      this.addToResourcePolicy(new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        principals: [\n          new iam.ServicePrincipal('logdelivery.elasticloadbalancing.amazonaws.com'),\n        ],\n        actions: [\n          's3:PutObject',\n        ],\n        resources: [\n          `${this.bucketArn}/AWSLogs/${account}/*`,\n        ],\n      }));\n\n      // Allow CloudFront standard logging (v2) to write logs\n      this.addToResourcePolicy(new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        principals: [\n          new iam.ServicePrincipal('delivery.logs.amazonaws.com'),\n        ],\n        actions: [\n          's3:PutObject',\n        ],\n        resources: [\n          `${this.bucketArn}/AWSLogs/${account}/*`,\n        ],\n      }));\n\n      // Allow S3 server access logging to write logs when required by configuration\n      this.addToResourcePolicy(new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        principals: [\n          new iam.ServicePrincipal('logging.s3.amazonaws.com'),\n        ],\n        actions: [\n          's3:PutObject',\n        ],\n        resources: [\n          `${this.bucketArn}/AWSLogs/${account}/*`,\n        ],\n      }));\n    }\n  }\n}\n"]}
+S3SecureBucket[_a] = { fqn: "s3-secure-bucket.S3SecureBucket", version: "0.2.1" };
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { DefaultStackSynthesizer, RemovalPolicy, Stack, Token } from 'aws-cdk-lib';\nimport * as iam from 'aws-cdk-lib/aws-iam';\nimport * as s3 from 'aws-cdk-lib/aws-s3';\nimport { FactName, RegionInfo } from 'aws-cdk-lib/region-info';\nimport { Construct, IDependable } from 'constructs';\n\n/**\n * Bucket type discriminator values for {@link S3SecureBucketProps.bucketType}.\n *\n * @see {@link S3SecureBucketProps.bucketType}\n */\nexport const S3SecureBucketType = {\n  /**\n   * Pipeline artifact bucket when using a custom CDK bootstrap qualifier\n   * (single- or multi-region deployments).\n   */\n  DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET: 'DeploymentPipelineArtifactBucket',\n  /**\n   * Origin bucket for CloudFront distributions.\n   */\n  CLOUDFRONT_ORIGIN_BUCKET: 'CloudFrontOriginBucket',\n  /**\n   * General-purpose secure bucket (default qualifier / standard use).\n   */\n  DEFAULT_BUCKET: 'DefaultBucket',\n  /**\n   * Centralized access logs for producers such as ALB/NLB, CloudFront standard logging (v2),\n   * and S3 server access logging. Grants `s3:PutObject` on `AWSLogs/<account>/*` only (no read/list).\n   *\n   * For {@link S3SecureBucketType.ACCESS_LOG_BUCKET}, the regional ELBv2 log-delivery account ID\n   * (legacy path alongside the log delivery service principal) is resolved from `aws-cdk-lib/region-info`\n   * at synthesis time when {@link Stack#region} is known, or via a deploy-time mapping when it is a token.\n   */\n  ACCESS_LOG_BUCKET: 'AccessLogBucket',\n} as const;\n\n/**\n * Discriminated union of {@link S3SecureBucketType} string literals.\n */\nexport type S3SecureBucketType = typeof S3SecureBucketType[keyof typeof S3SecureBucketType];\n\n/**\n * Construction properties for {@link S3SecureBucket}.\n *\n * Extends {@link s3.BucketProps}; several fields receive secure defaults inside the construct.\n */\nexport interface S3SecureBucketProps extends s3.BucketProps {\n\n  /**\n   * Selects encryption defaults and optional resource-policy statements.\n   *\n   * @default {@link S3SecureBucketType.DEFAULT_BUCKET}\n   */\n  readonly bucketType?: S3SecureBucketType;\n}\n\n/**\n * S3 bucket with opinionated secure defaults: private ACLs, block public access, TLS-only access,\n * and encryption (S3-managed for log/origin types; KMS-managed by default otherwise).\n *\n * @remarks\n * - {@link S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET}: may attach a deploy-role policy when a non-default bootstrap qualifier is present.\n * - {@link S3SecureBucketType.ACCESS_LOG_BUCKET}: adds log-writer principals; see {@link S3SecureBucketType.ACCESS_LOG_BUCKET} and {@link S3SecureBucket#accessLogBucketPolicyDependable}.\n */\nexport class S3SecureBucket extends s3.Bucket {\n  /**\n   * Set only when {@link S3SecureBucketProps.bucketType} is {@link S3SecureBucketType.ACCESS_LOG_BUCKET}.\n   * Use as a dependency target so load balancer access-log enablement runs after the bucket policy\n   * exists (ELB performs an immediate validation `PutObject` that fails if the policy is not applied yet).\n   *\n   * Example: `loadBalancer.node.addDependency(bucket.accessLogBucketPolicyDependable!)`.\n   *\n   * @default undefined when `bucketType` is not {@link S3SecureBucketType.ACCESS_LOG_BUCKET}.\n   */\n  public readonly accessLogBucketPolicyDependable?: IDependable;\n\n  /**\n   * Creates a secure S3 bucket according to `bucketType` and merged `props`.\n   *\n   * @param scope - Parent construct, typically a {@link Stack}.\n   * @param id - Construct ID (stable logical ID segment).\n   * @param props - Optional {@link s3.BucketProps} plus {@link S3SecureBucketProps.bucketType} and `eventBridgeEnabled` (applied via L1 override when true).\n   */\n  constructor(scope: Construct, id: string, props?: S3SecureBucketProps) {\n    const bucketType = props?.bucketType || S3SecureBucketType.DEFAULT_BUCKET;\n    super(scope, id, {\n      ...props,\n      removalPolicy: RemovalPolicy.RETAIN,\n      encryption: (() => {\n        if (bucketType === S3SecureBucketType.CLOUDFRONT_ORIGIN_BUCKET || bucketType === S3SecureBucketType.ACCESS_LOG_BUCKET) {\n          return s3.BucketEncryption.S3_MANAGED;\n        }\n        return props?.encryption || s3.BucketEncryption.KMS_MANAGED;\n      })(),\n      accessControl: (() => {\n        if (!props?.accessControl) {\n          return s3.BucketAccessControl.PRIVATE;\n        }\n        return props.accessControl;\n      })(),\n      eventBridgeEnabled: undefined,\n      publicReadAccess: false,\n      blockPublicAccess: s3.BlockPublicAccess.BLOCK_ALL,\n      enforceSSL: true,\n      versioned: props?.versioned !== undefined ? props.versioned : true,\n      objectOwnership: (() => {\n        if (props?.objectOwnership) {\n          return props.objectOwnership;\n        }\n        return s3.ObjectOwnership.BUCKET_OWNER_ENFORCED;\n      })(),\n    });\n\n    const cfnBucket = this.node.defaultChild as s3.CfnBucket;\n    if (props?.eventBridgeEnabled === true) {\n      cfnBucket.addPropertyOverride('NotificationConfiguration.EventBridgeConfiguration.EventBridgeEnabled', true);\n    }\n\n    const account = Stack.of(this).account;\n    const region = Stack.of(this).region;\n\n    if (bucketType === S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET) {\n\n      const qualifier = Stack.of(this).synthesizer.bootstrapQualifier;\n\n      if (qualifier && (qualifier != DefaultStackSynthesizer.DEFAULT_QUALIFIER)) {\n        this.addToResourcePolicy(new iam.PolicyStatement({\n          actions: [\n            's3:*',\n          ],\n          resources: [\n            `${this.bucketArn}`,\n            `${this.bucketArn}/*`,\n          ],\n          principals: [\n            new iam.ArnPrincipal(`arn:aws:iam::${account}:role/cdk-${qualifier}-deploy-role-${account}-${region}`),\n          ],\n        }));\n      }\n    }\n\n    if (bucketType === S3SecureBucketType.ACCESS_LOG_BUCKET) {\n      const awsLogsPrefixResource = `${this.bucketArn}/AWSLogs/${account}/*`;\n\n      // Allow ALB / NLB log delivery (modern service principal path; also required in opt-in regions).\n      const albLogDeliveryPolicyResult = this.addToResourcePolicy(new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        principals: [\n          new iam.ServicePrincipal('logdelivery.elasticloadbalancing.amazonaws.com'),\n        ],\n        actions: [\n          's3:PutObject',\n        ],\n        resources: [\n          awsLogsPrefixResource,\n        ],\n      }));\n\n      // In non–opt-in regions (for example ap-northeast-1), access logs are often delivered using the\n      // regional ELBv2 account (root of that account) for s3:PutObject, not only the service principal above.\n      const stack = Stack.of(this);\n      const elbAccountId = Token.isUnresolved(stack.region)\n        ? stack.regionalFact(FactName.ELBV2_ACCOUNT)\n        : RegionInfo.get(stack.region).elbv2Account;\n      if (elbAccountId) {\n        this.addToResourcePolicy(new iam.PolicyStatement({\n          effect: iam.Effect.ALLOW,\n          principals: [\n            new iam.AccountPrincipal(elbAccountId),\n          ],\n          actions: [\n            's3:PutObject',\n          ],\n          resources: [\n            awsLogsPrefixResource,\n          ],\n        }));\n      }\n\n      this.accessLogBucketPolicyDependable = albLogDeliveryPolicyResult.policyDependable ?? this;\n\n      // Allow CloudFront standard logging (v2) to write logs\n      this.addToResourcePolicy(new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        principals: [\n          new iam.ServicePrincipal('delivery.logs.amazonaws.com'),\n        ],\n        actions: [\n          's3:PutObject',\n        ],\n        resources: [\n          awsLogsPrefixResource,\n        ],\n      }));\n\n      // Allow S3 server access logging to write logs when required by configuration\n      this.addToResourcePolicy(new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        principals: [\n          new iam.ServicePrincipal('logging.s3.amazonaws.com'),\n        ],\n        actions: [\n          's3:PutObject',\n        ],\n        resources: [\n          awsLogsPrefixResource,\n        ],\n      }));\n    }\n  }\n}\n"]}

package/package.json

@@ -79,7 +79,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.6",
+  "version": "0.2.1",
   "jest": {
     "coverageProvider": "v8",
     "testMatch": [