s3-secure-bucket 0.4.4 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/.jsii CHANGED
@@ -8456,7 +8456,7 @@
8456
8456
  },
8457
8457
  "name": "s3-secure-bucket",
8458
8458
  "readme": {
8459
- "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` so encryption and bucket policies match pipeline artifacts, CloudFront origins, centralized access logs, and CloudWatch Logs export archives.\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 / archive types**: S3-managed encryption (`AES256`) for `ACCESS_LOG_BUCKET`, `CLOUDFRONT_ORIGIN_BUCKET`, and `CLOUD_WATCH_LOG_ARCHIVE_BUCKET`\n- Versioning on by default; object ownership `BucketOwnerEnforced` by default\n- `RemovalPolicy.RETAIN` on the bucket\n- Optional EventBridge notifications via `eventBridgeEnabled` (applied through an L1 property override when `true`)\n- **`bucketType` presets**\n - **`DEFAULT_BUCKET`**: general-purpose secure bucket (KMS-managed encryption by default)\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 CloudFront 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 - **`CLOUD_WATCH_LOG_ARCHIVE_BUCKET`**: `s3:GetBucketAcl` and `s3:PutObject` (`bucket-owner-full-control`) for CloudWatch Logs export tasks (`logs.<region>.amazonaws.com`, same-account log groups in the stack Region)\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### CDK deployment pipeline artifact bucket\n\nWhen the stack uses a **non-default** CDK bootstrap qualifier, the construct grants `s3:*` on the bucket to the regional `cdk-<qualifier>-deploy-role`.\n\n```typescript\nimport { Stack } from 'aws-cdk-lib';\nimport { S3SecureBucket, S3SecureBucketType } from 's3-secure-bucket';\n\ndeclare const stack: Stack;\n\nconst artifactBucket = new S3SecureBucket(stack, 'ArtifactBucket', {\n bucketType: S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET,\n});\n```\n\n### CloudFront origin bucket\n\n```typescript\nimport { Stack } from 'aws-cdk-lib';\nimport { S3SecureBucket, S3SecureBucketType } from 's3-secure-bucket';\n\ndeclare const stack: Stack;\n\nconst originBucket = new S3SecureBucket(stack, 'OriginBucket', {\n bucketType: S3SecureBucketType.CLOUDFRONT_ORIGIN_BUCKET,\n});\n```\n\nWire the bucket to CloudFront (for example `origins.S3Origin`) using your usual approach. This library only configures the **bucket** defaults and encryption.\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 when the region is known.\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### CloudWatch Logs export archive bucket\n\nStore log data exported from CloudWatch Logs via [export tasks](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/S3Export.html). The bucket must be in the **same Region** as the log groups you export. Create export tasks with your usual workflow (console, CLI, or API); this library configures the **bucket** and **resource policy** for same-account exports.\n\n```typescript\nimport { Stack } from 'aws-cdk-lib';\nimport { S3SecureBucket, S3SecureBucketType } from 's3-secure-bucket';\n\ndeclare const stack: Stack;\n\nconst logArchiveBucket = new S3SecureBucket(stack, 'LogArchiveBucket', {\n bucketType: S3SecureBucketType.CLOUD_WATCH_LOG_ARCHIVE_BUCKET,\n});\n```\n\nFor cross-account export, extend the bucket policy with additional `aws:SourceAccount` and `aws:SourceArn` entries per [AWS documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/S3ExportTasks.html).\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`, `lifecycleRules`, and `eventBridgeEnabled` work as usual alongside the secure defaults. When `eventBridgeEnabled` is `true`, EventBridge notification is enabled via an L1 override on the underlying `AWS::S3::Bucket`.\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.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET` | CDK pipeline artifact bucket (custom bootstrap qualifier) |\n| `S3SecureBucketType.CLOUDFRONT_ORIGIN_BUCKET` | CloudFront origin bucket |\n| `S3SecureBucketType.ACCESS_LOG_BUCKET` | Centralized access logs (`AWSLogs/<account>/*` writers only) |\n| `S3SecureBucketType.CLOUD_WATCH_LOG_ARCHIVE_BUCKET` | CloudWatch Logs export archive |\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"
8459
+ "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` so encryption and bucket policies match pipeline artifacts, CloudFront origins, centralized access logs, and CloudWatch Logs export archives.\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 / archive types**: S3-managed encryption (`AES256`) for `ACCESS_LOG_BUCKET`, `CLOUDFRONT_ORIGIN_BUCKET`, and `CLOUD_WATCH_LOG_ARCHIVE_BUCKET`\n- Versioning on by default; object ownership `BucketOwnerEnforced` by default\n- `RemovalPolicy.RETAIN` on the bucket\n- Optional EventBridge notifications via `eventBridgeEnabled` (applied through an L1 property override when `true`)\n- **`bucketType` presets**\n - **`DEFAULT_BUCKET`**: general-purpose secure bucket (KMS-managed encryption by default)\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 CloudFront origin use\n - **`ACCESS_LOG_BUCKET`**: `s3:PutObject` 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`). Writers default to `AWSLogs/<stack account>/*`; override with `accessLogDelivery` (`allowedSourceAccountIds` or `organizationId`)\n - **`CLOUD_WATCH_LOG_ARCHIVE_BUCKET`**: `s3:GetBucketAcl` and `s3:PutObject` (`bucket-owner-full-control`) for CloudWatch Logs export tasks (`logs.<region>.amazonaws.com`, same-account log groups in the stack Region)\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### CDK deployment pipeline artifact bucket\n\nWhen the stack uses a **non-default** CDK bootstrap qualifier, the construct grants `s3:*` on the bucket to the regional `cdk-<qualifier>-deploy-role`.\n\n```typescript\nimport { Stack } from 'aws-cdk-lib';\nimport { S3SecureBucket, S3SecureBucketType } from 's3-secure-bucket';\n\ndeclare const stack: Stack;\n\nconst artifactBucket = new S3SecureBucket(stack, 'ArtifactBucket', {\n bucketType: S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET,\n});\n```\n\n### CloudFront origin bucket\n\n```typescript\nimport { Stack } from 'aws-cdk-lib';\nimport { S3SecureBucket, S3SecureBucketType } from 's3-secure-bucket';\n\ndeclare const stack: Stack;\n\nconst originBucket = new S3SecureBucket(stack, 'OriginBucket', {\n bucketType: S3SecureBucketType.CLOUDFRONT_ORIGIN_BUCKET,\n});\n```\n\nWire the bucket to CloudFront (for example `origins.S3Origin`) using your usual approach. This library only configures the **bucket** defaults and encryption.\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 when the region is known.\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\nTo accept logs from other accounts, set **exactly one** of the following on `accessLogDelivery` (the stack account is **not** added automatically):\n\n```typescript\nconst multiAccountLogBucket = new S3SecureBucket(stack, 'MultiAccountAccessLogBucket', {\n bucketType: S3SecureBucketType.ACCESS_LOG_BUCKET,\n accessLogDelivery: {\n allowedSourceAccountIds: ['111111111111', '222222222222'],\n },\n});\n\nconst organizationLogBucket = new S3SecureBucket(stack, 'OrganizationAccessLogBucket', {\n bucketType: S3SecureBucketType.ACCESS_LOG_BUCKET,\n accessLogDelivery: {\n organizationId: 'o-xxxxxxxxxx',\n },\n});\n```\n\nOrganization scope uses resource `AWSLogs/*` and `aws:SourceOrgID` on the log-delivery **service** principals. The regional ELBv2 account statement is not organization-conditioned (that principal is not an organization member).\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### CloudWatch Logs export archive bucket\n\nStore log data exported from CloudWatch Logs via [export tasks](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/S3Export.html). The bucket must be in the **same Region** as the log groups you export. Create export tasks with your usual workflow (console, CLI, or API); this library configures the **bucket** and **resource policy** for same-account exports.\n\n```typescript\nimport { Stack } from 'aws-cdk-lib';\nimport { S3SecureBucket, S3SecureBucketType } from 's3-secure-bucket';\n\ndeclare const stack: Stack;\n\nconst logArchiveBucket = new S3SecureBucket(stack, 'LogArchiveBucket', {\n bucketType: S3SecureBucketType.CLOUD_WATCH_LOG_ARCHIVE_BUCKET,\n});\n```\n\nFor cross-account export, extend the bucket policy with additional `aws:SourceAccount` and `aws:SourceArn` entries per [AWS documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/S3ExportTasks.html).\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`, `lifecycleRules`, and `eventBridgeEnabled` work as usual alongside the secure defaults. When `eventBridgeEnabled` is `true`, EventBridge notification is enabled via an L1 override on the underlying `AWS::S3::Bucket`.\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| `accessLogDelivery` | `AccessLogDeliveryScope` | stack account only | `ACCESS_LOG_BUCKET` only. Exactly one of `allowedSourceAccountIds` or `organizationId`. |\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.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET` | CDK pipeline artifact bucket (custom bootstrap qualifier) |\n| `S3SecureBucketType.CLOUDFRONT_ORIGIN_BUCKET` | CloudFront origin bucket |\n| `S3SecureBucketType.ACCESS_LOG_BUCKET` | Centralized access logs (`AWSLogs/<account>/*` by default; widen with `accessLogDelivery`) |\n| `S3SecureBucketType.CLOUD_WATCH_LOG_ARCHIVE_BUCKET` | CloudWatch Logs export archive |\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"
8460
8460
  },
8461
8461
  "repository": {
8462
8462
  "type": "git",
@@ -8469,12 +8469,74 @@
8469
8469
  }
8470
8470
  },
8471
8471
  "types": {
8472
+ "s3-secure-bucket.AccessLogDeliveryScope": {
8473
+ "assembly": "s3-secure-bucket",
8474
+ "datatype": true,
8475
+ "docs": {
8476
+ "remarks": "Specify **exactly one** of {@link AccessLogDeliveryScope.allowedSourceAccountIds} or\n{@link AccessLogDeliveryScope.organizationId}. Omit {@link S3SecureBucketProps.accessLogDelivery }\nto allow only the stack account (default).\n\njsii does not support a discriminated union of structs, so exclusivity is enforced at construct time.",
8477
+ "stability": "stable",
8478
+ "summary": "Account scope for {@link S3SecureBucketType.ACCESS_LOG_BUCKET } resource policies."
8479
+ },
8480
+ "fqn": "s3-secure-bucket.AccessLogDeliveryScope",
8481
+ "kind": "interface",
8482
+ "locationInModule": {
8483
+ "filename": "src/bucket-types/access-log-delivery-scope.ts",
8484
+ "line": 10
8485
+ },
8486
+ "name": "AccessLogDeliveryScope",
8487
+ "properties": [
8488
+ {
8489
+ "abstract": true,
8490
+ "docs": {
8491
+ "default": "undefined (do not use an explicit account list)",
8492
+ "remarks": "The list is used as specified; include the stack account if that account should also deliver logs.\nDuplicate IDs are ignored. Mutually exclusive with {@link AccessLogDeliveryScope.organizationId}.",
8493
+ "stability": "stable",
8494
+ "summary": "Account IDs allowed to write under `AWSLogs/<accountId>/*`."
8495
+ },
8496
+ "immutable": true,
8497
+ "locationInModule": {
8498
+ "filename": "src/bucket-types/access-log-delivery-scope.ts",
8499
+ "line": 19
8500
+ },
8501
+ "name": "allowedSourceAccountIds",
8502
+ "optional": true,
8503
+ "type": {
8504
+ "collection": {
8505
+ "elementtype": {
8506
+ "primitive": "string"
8507
+ },
8508
+ "kind": "array"
8509
+ }
8510
+ }
8511
+ },
8512
+ {
8513
+ "abstract": true,
8514
+ "docs": {
8515
+ "default": "undefined (do not use an organization-wide policy)",
8516
+ "remarks": "Allows log delivery from accounts in the organization via `aws:SourceOrgID`,\nwith resource `AWSLogs/*`. Mutually exclusive with {@link AccessLogDeliveryScope.allowedSourceAccountIds}.",
8517
+ "stability": "stable",
8518
+ "summary": "AWS Organizations ID (`o-` followed by 10–32 lowercase letters or digits)."
8519
+ },
8520
+ "immutable": true,
8521
+ "locationInModule": {
8522
+ "filename": "src/bucket-types/access-log-delivery-scope.ts",
8523
+ "line": 29
8524
+ },
8525
+ "name": "organizationId",
8526
+ "optional": true,
8527
+ "type": {
8528
+ "primitive": "string"
8529
+ }
8530
+ }
8531
+ ],
8532
+ "symbolId": "src/bucket-types/access-log-delivery-scope:AccessLogDeliveryScope"
8533
+ },
8472
8534
  "s3-secure-bucket.S3SecureBucket": {
8473
8535
  "assembly": "s3-secure-bucket",
8474
8536
  "base": "aws-cdk-lib.aws_s3.Bucket",
8475
8537
  "docs": {
8476
8538
  "custom": {
8477
- "remarks": "Secure defaults applied regardless of `props`:\n- `removalPolicy`: {@link RemovalPolicy.RETAIN }\n- `publicReadAccess`: `false`\n- `blockPublicAccess`: {@link s3.BlockPublicAccess.BLOCK_ALL }\n- `enforceSSL`: `true`\n- `versioned`: `true` unless explicitly set in `props`\n- `objectOwnership`: {@link s3.ObjectOwnership.BUCKET_OWNER_ENFORCED } unless overridden\n- `accessControl`: {@link s3.BucketAccessControl.PRIVATE } unless overridden\n\nBucket-type-specific behavior:\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 S3SecureBucket#accessLogBucketPolicyDependable }.\n- {@link S3SecureBucketType.CLOUD_WATCH_LOG_ARCHIVE_BUCKET }: adds CloudWatch Logs export principals (`logs.<region>.amazonaws.com`)."
8539
+ "remarks": "Secure defaults applied regardless of `props`:\n- `removalPolicy`: {@link RemovalPolicy.RETAIN }\n- `publicReadAccess`: `false`\n- `blockPublicAccess`: {@link s3.BlockPublicAccess.BLOCK_ALL }\n- `enforceSSL`: `true`\n- `versioned`: `true` unless explicitly set in `props`\n- `objectOwnership`: {@link s3.ObjectOwnership.BUCKET_OWNER_ENFORCED } unless overridden\n- `accessControl`: {@link s3.BucketAccessControl.PRIVATE } unless overridden\n\nBucket-type-specific behavior:\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 S3SecureBucket#accessLogBucketPolicyDependable }\n and {@link S3SecureBucketProps.accessLogDelivery }.\n- {@link S3SecureBucketType.CLOUD_WATCH_LOG_ARCHIVE_BUCKET }: adds CloudWatch Logs export principals (`logs.<region>.amazonaws.com`)."
8478
8540
  },
8479
8541
  "remarks": "KMS-managed by default otherwise).",
8480
8542
  "stability": "stable",
@@ -8488,7 +8550,7 @@
8488
8550
  },
8489
8551
  "locationInModule": {
8490
8552
  "filename": "src/s3-secure-bucket.ts",
8491
- "line": 50
8553
+ "line": 51
8492
8554
  },
8493
8555
  "parameters": [
8494
8556
  {
@@ -8525,7 +8587,7 @@
8525
8587
  "kind": "class",
8526
8588
  "locationInModule": {
8527
8589
  "filename": "src/s3-secure-bucket.ts",
8528
- "line": 30
8590
+ "line": 31
8529
8591
  },
8530
8592
  "name": "S3SecureBucket",
8531
8593
  "properties": [
@@ -8539,7 +8601,7 @@
8539
8601
  "immutable": true,
8540
8602
  "locationInModule": {
8541
8603
  "filename": "src/s3-secure-bucket.ts",
8542
- "line": 40
8604
+ "line": 41
8543
8605
  },
8544
8606
  "name": "accessLogBucketPolicyDependable",
8545
8607
  "optional": true,
@@ -8565,10 +8627,29 @@
8565
8627
  "kind": "interface",
8566
8628
  "locationInModule": {
8567
8629
  "filename": "src/bucket-types/props.ts",
8568
- "line": 10
8630
+ "line": 11
8569
8631
  },
8570
8632
  "name": "S3SecureBucketProps",
8571
8633
  "properties": [
8634
+ {
8635
+ "abstract": true,
8636
+ "docs": {
8637
+ "default": "stack account only",
8638
+ "remarks": "Specify exactly one of {@link AccessLogDeliveryScope.allowedSourceAccountIds} or\n{@link AccessLogDeliveryScope.organizationId}. When omitted, only the stack account\nmay deliver logs (`AWSLogs/<stack account>/*`).\n\nSupported only when {@link S3SecureBucketProps.bucketType} is\n{@link S3SecureBucketType.ACCESS_LOG_BUCKET}.",
8639
+ "stability": "stable",
8640
+ "summary": "Account or organization scope for {@link S3SecureBucketType.ACCESS_LOG_BUCKET} writers."
8641
+ },
8642
+ "immutable": true,
8643
+ "locationInModule": {
8644
+ "filename": "src/bucket-types/props.ts",
8645
+ "line": 32
8646
+ },
8647
+ "name": "accessLogDelivery",
8648
+ "optional": true,
8649
+ "type": {
8650
+ "fqn": "s3-secure-bucket.AccessLogDeliveryScope"
8651
+ }
8652
+ },
8572
8653
  {
8573
8654
  "abstract": true,
8574
8655
  "docs": {
@@ -8579,7 +8660,7 @@
8579
8660
  "immutable": true,
8580
8661
  "locationInModule": {
8581
8662
  "filename": "src/bucket-types/props.ts",
8582
- "line": 17
8663
+ "line": 18
8583
8664
  },
8584
8665
  "name": "bucketType",
8585
8666
  "optional": true,
@@ -8591,6 +8672,6 @@
8591
8672
  "symbolId": "src/bucket-types/props:S3SecureBucketProps"
8592
8673
  }
8593
8674
  },
8594
- "version": "0.4.4",
8595
- "fingerprint": "gVaatSIXJvO6r+S0+/GPOHy3nP+t7uyu2PMH7GuYIP0="
8675
+ "version": "0.5.0",
8676
+ "fingerprint": "nvK17FwH8pGzYr+bm69kCg5PnIhuAZGOA/uLz/68tKM="
8596
8677
  }
package/API.md CHANGED
@@ -1352,6 +1352,65 @@ Uniquely identifies this class.
1352
1352
 
1353
1353
  ## Structs <a name="Structs" id="Structs"></a>
1354
1354
 
1355
+ ### AccessLogDeliveryScope <a name="AccessLogDeliveryScope" id="s3-secure-bucket.AccessLogDeliveryScope"></a>
1356
+
1357
+ Account scope for {@link S3SecureBucketType.ACCESS_LOG_BUCKET } resource policies.
1358
+
1359
+ Specify **exactly one** of {@link AccessLogDeliveryScope.allowedSourceAccountIds} or
1360
+ {@link AccessLogDeliveryScope.organizationId}. Omit {@link S3SecureBucketProps.accessLogDelivery }
1361
+ to allow only the stack account (default).
1362
+
1363
+ jsii does not support a discriminated union of structs, so exclusivity is enforced at construct time.
1364
+
1365
+ #### Initializer <a name="Initializer" id="s3-secure-bucket.AccessLogDeliveryScope.Initializer"></a>
1366
+
1367
+ ```typescript
1368
+ import { AccessLogDeliveryScope } from 's3-secure-bucket'
1369
+
1370
+ const accessLogDeliveryScope: AccessLogDeliveryScope = { ... }
1371
+ ```
1372
+
1373
+ #### Properties <a name="Properties" id="Properties"></a>
1374
+
1375
+ | **Name** | **Type** | **Description** |
1376
+ | --- | --- | --- |
1377
+ | <code><a href="#s3-secure-bucket.AccessLogDeliveryScope.property.allowedSourceAccountIds">allowedSourceAccountIds</a></code> | <code>string[]</code> | Account IDs allowed to write under `AWSLogs/<accountId>/*`. |
1378
+ | <code><a href="#s3-secure-bucket.AccessLogDeliveryScope.property.organizationId">organizationId</a></code> | <code>string</code> | AWS Organizations ID (`o-` followed by 10–32 lowercase letters or digits). |
1379
+
1380
+ ---
1381
+
1382
+ ##### `allowedSourceAccountIds`<sup>Optional</sup> <a name="allowedSourceAccountIds" id="s3-secure-bucket.AccessLogDeliveryScope.property.allowedSourceAccountIds"></a>
1383
+
1384
+ ```typescript
1385
+ public readonly allowedSourceAccountIds: string[];
1386
+ ```
1387
+
1388
+ - *Type:* string[]
1389
+ - *Default:* undefined (do not use an explicit account list)
1390
+
1391
+ Account IDs allowed to write under `AWSLogs/<accountId>/*`.
1392
+
1393
+ The list is used as specified; include the stack account if that account should also deliver logs.
1394
+ Duplicate IDs are ignored. Mutually exclusive with {@link AccessLogDeliveryScope.organizationId}.
1395
+
1396
+ ---
1397
+
1398
+ ##### `organizationId`<sup>Optional</sup> <a name="organizationId" id="s3-secure-bucket.AccessLogDeliveryScope.property.organizationId"></a>
1399
+
1400
+ ```typescript
1401
+ public readonly organizationId: string;
1402
+ ```
1403
+
1404
+ - *Type:* string
1405
+ - *Default:* undefined (do not use an organization-wide policy)
1406
+
1407
+ AWS Organizations ID (`o-` followed by 10–32 lowercase letters or digits).
1408
+
1409
+ Allows log delivery from accounts in the organization via `aws:SourceOrgID`,
1410
+ with resource `AWSLogs/*`. Mutually exclusive with {@link AccessLogDeliveryScope.allowedSourceAccountIds}.
1411
+
1412
+ ---
1413
+
1355
1414
  ### S3SecureBucketProps <a name="S3SecureBucketProps" id="s3-secure-bucket.S3SecureBucketProps"></a>
1356
1415
 
1357
1416
  Construction properties for {@link S3SecureBucket }.
@@ -1405,6 +1464,7 @@ const s3SecureBucketProps: S3SecureBucketProps = { ... }
1405
1464
  | <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. |
1406
1465
  | <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. |
1407
1466
  | <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. |
1467
+ | <code><a href="#s3-secure-bucket.S3SecureBucketProps.property.accessLogDelivery">accessLogDelivery</a></code> | <code><a href="#s3-secure-bucket.AccessLogDeliveryScope">AccessLogDeliveryScope</a></code> | Account or organization scope for {@link S3SecureBucketType.ACCESS_LOG_BUCKET} writers. |
1408
1468
  | <code><a href="#s3-secure-bucket.S3SecureBucketProps.property.bucketType">bucketType</a></code> | <code>string</code> | Selects encryption defaults and optional resource-policy statements. |
1409
1469
 
1410
1470
  ---
@@ -1919,6 +1979,26 @@ Rules that define when a redirect is applied and the redirect behavior.
1919
1979
 
1920
1980
  ---
1921
1981
 
1982
+ ##### `accessLogDelivery`<sup>Optional</sup> <a name="accessLogDelivery" id="s3-secure-bucket.S3SecureBucketProps.property.accessLogDelivery"></a>
1983
+
1984
+ ```typescript
1985
+ public readonly accessLogDelivery: AccessLogDeliveryScope;
1986
+ ```
1987
+
1988
+ - *Type:* <a href="#s3-secure-bucket.AccessLogDeliveryScope">AccessLogDeliveryScope</a>
1989
+ - *Default:* stack account only
1990
+
1991
+ Account or organization scope for {@link S3SecureBucketType.ACCESS_LOG_BUCKET} writers.
1992
+
1993
+ Specify exactly one of {@link AccessLogDeliveryScope.allowedSourceAccountIds} or
1994
+ {@link AccessLogDeliveryScope.organizationId}. When omitted, only the stack account
1995
+ may deliver logs (`AWSLogs/<stack account>/*`).
1996
+
1997
+ Supported only when {@link S3SecureBucketProps.bucketType} is
1998
+ {@link S3SecureBucketType.ACCESS_LOG_BUCKET}.
1999
+
2000
+ ---
2001
+
1922
2002
  ##### `bucketType`<sup>Optional</sup> <a name="bucketType" id="s3-secure-bucket.S3SecureBucketProps.property.bucketType"></a>
1923
2003
 
1924
2004
  ```typescript
package/README.md CHANGED
@@ -20,7 +20,7 @@ AWS CDK v2 construct library: an [`s3.Bucket`](https://docs.aws.amazon.com/cdk/a
20
20
  - **`DEFAULT_BUCKET`**: general-purpose secure bucket (KMS-managed encryption by default)
21
21
  - **`DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET`**: optional `s3:*` grant for the CDK deploy role when using a **non-default** bootstrap qualifier
22
22
  - **`CLOUDFRONT_ORIGIN_BUCKET`**: S3-managed encryption for typical CloudFront origin use
23
- - **`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`)
23
+ - **`ACCESS_LOG_BUCKET`**: `s3:PutObject` 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`). Writers default to `AWSLogs/<stack account>/*`; override with `accessLogDelivery` (`allowedSourceAccountIds` or `organizationId`)
24
24
  - **`CLOUD_WATCH_LOG_ARCHIVE_BUCKET`**: `s3:GetBucketAcl` and `s3:PutObject` (`bucket-owner-full-control`) for CloudWatch Logs export tasks (`logs.<region>.amazonaws.com`, same-account log groups in the stack Region)
25
25
  - **`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)
26
26
 
@@ -102,6 +102,26 @@ const accessLogBucket = new S3SecureBucket(stack, 'AccessLogBucket', {
102
102
  // loadBalancer.node.addDependency(accessLogBucket.accessLogBucketPolicyDependable!);
103
103
  ```
104
104
 
105
+ To accept logs from other accounts, set **exactly one** of the following on `accessLogDelivery` (the stack account is **not** added automatically):
106
+
107
+ ```typescript
108
+ const multiAccountLogBucket = new S3SecureBucket(stack, 'MultiAccountAccessLogBucket', {
109
+ bucketType: S3SecureBucketType.ACCESS_LOG_BUCKET,
110
+ accessLogDelivery: {
111
+ allowedSourceAccountIds: ['111111111111', '222222222222'],
112
+ },
113
+ });
114
+
115
+ const organizationLogBucket = new S3SecureBucket(stack, 'OrganizationAccessLogBucket', {
116
+ bucketType: S3SecureBucketType.ACCESS_LOG_BUCKET,
117
+ accessLogDelivery: {
118
+ organizationId: 'o-xxxxxxxxxx',
119
+ },
120
+ });
121
+ ```
122
+
123
+ Organization scope uses resource `AWSLogs/*` and `aws:SourceOrgID` on the log-delivery **service** principals. The regional ELBv2 account statement is not organization-conditioned (that principal is not an organization member).
124
+
105
125
  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**.
106
126
 
107
127
  ### CloudWatch Logs export archive bucket
@@ -130,6 +150,7 @@ For cross-account export, extend the bucket policy with additional `aws:SourceAc
130
150
  | Property | Type | Default | Description |
131
151
  | --- | --- | --- | --- |
132
152
  | `bucketType` | `S3SecureBucketType` | `DEFAULT_BUCKET` | Selects encryption defaults and optional resource-policy statements. |
153
+ | `accessLogDelivery` | `AccessLogDeliveryScope` | stack account only | `ACCESS_LOG_BUCKET` only. Exactly one of `allowedSourceAccountIds` or `organizationId`. |
133
154
  | *(inherited)* | `s3.BucketProps` | — | All other `Bucket` properties are passed through (some receive overrides inside the construct). |
134
155
 
135
156
  ### `S3SecureBucketType` values
@@ -139,7 +160,7 @@ For cross-account export, extend the bucket policy with additional `aws:SourceAc
139
160
  | `S3SecureBucketType.DEFAULT_BUCKET` | General-purpose secure bucket |
140
161
  | `S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET` | CDK pipeline artifact bucket (custom bootstrap qualifier) |
141
162
  | `S3SecureBucketType.CLOUDFRONT_ORIGIN_BUCKET` | CloudFront origin bucket |
142
- | `S3SecureBucketType.ACCESS_LOG_BUCKET` | Centralized access logs (`AWSLogs/<account>/*` writers only) |
163
+ | `S3SecureBucketType.ACCESS_LOG_BUCKET` | Centralized access logs (`AWSLogs/<account>/*` by default; widen with `accessLogDelivery`) |
143
164
  | `S3SecureBucketType.CLOUD_WATCH_LOG_ARCHIVE_BUCKET` | CloudWatch Logs export archive |
144
165
 
145
166
  ### Read-only: `accessLogBucketPolicyDependable`
@@ -2,14 +2,17 @@ import { BucketPolicyApplyResult, BucketPolicyContext } from './types';
2
2
  /**
3
3
  * Adds resource policies for ALB/NLB, CloudFront standard logging (v2), and S3 server access logging.
4
4
  *
5
- * Grants `s3:PutObject` on `AWSLogs/<stack.account>/*` to:
5
+ * Grants `s3:PutObject` on `AWSLogs/...` prefixes to:
6
6
  * - `logdelivery.elasticloadbalancing.amazonaws.com`
7
7
  * - The regional ELBv2 log-delivery account (when known)
8
8
  * - `delivery.logs.amazonaws.com`
9
9
  * - `logging.s3.amazonaws.com`
10
10
  *
11
- * @param context - Bucket and owning stack (account and region are read from `stack`).
11
+ * Prefixes default to `AWSLogs/<stack.account>/*`. {@link BucketPolicyContext.accessLogDelivery}
12
+ * can widen this to an explicit account list or to `AWSLogs/*` constrained by `aws:SourceOrgID`.
13
+ *
14
+ * @param context - Bucket, owning stack, and optional delivery scope.
12
15
  * @returns A result containing {@link BucketPolicyApplyResult.accessLogBucketPolicyDependable} for the
13
16
  * first (ELB) policy statement so load balancer log enablement can wait until the bucket policy exists.
14
17
  */
15
- export declare const applyAccessLogBucketPolicy: ({ bucket, stack, }: BucketPolicyContext) => BucketPolicyApplyResult;
18
+ export declare const applyAccessLogBucketPolicy: ({ bucket, stack, accessLogDelivery, }: BucketPolicyContext) => BucketPolicyApplyResult;
@@ -37,21 +37,43 @@ exports.applyAccessLogBucketPolicy = void 0;
37
37
  const aws_cdk_lib_1 = require("aws-cdk-lib");
38
38
  const iam = __importStar(require("aws-cdk-lib/aws-iam"));
39
39
  const region_info_1 = require("aws-cdk-lib/region-info");
40
+ const resolve_access_log_delivery_1 = require("./resolve-access-log-delivery");
41
+ const ELB_SOURCE_ARN = 'arn:aws:elasticloadbalancing:*:*:loadbalancer/*';
40
42
  /**
41
43
  * Adds resource policies for ALB/NLB, CloudFront standard logging (v2), and S3 server access logging.
42
44
  *
43
- * Grants `s3:PutObject` on `AWSLogs/<stack.account>/*` to:
45
+ * Grants `s3:PutObject` on `AWSLogs/...` prefixes to:
44
46
  * - `logdelivery.elasticloadbalancing.amazonaws.com`
45
47
  * - The regional ELBv2 log-delivery account (when known)
46
48
  * - `delivery.logs.amazonaws.com`
47
49
  * - `logging.s3.amazonaws.com`
48
50
  *
49
- * @param context - Bucket and owning stack (account and region are read from `stack`).
51
+ * Prefixes default to `AWSLogs/<stack.account>/*`. {@link BucketPolicyContext.accessLogDelivery}
52
+ * can widen this to an explicit account list or to `AWSLogs/*` constrained by `aws:SourceOrgID`.
53
+ *
54
+ * @param context - Bucket, owning stack, and optional delivery scope.
50
55
  * @returns A result containing {@link BucketPolicyApplyResult.accessLogBucketPolicyDependable} for the
51
56
  * first (ELB) policy statement so load balancer log enablement can wait until the bucket policy exists.
52
57
  */
53
- const applyAccessLogBucketPolicy = ({ bucket, stack, }) => {
54
- const awsLogsPrefixResource = `${bucket.bucketArn}/AWSLogs/${stack.account}/*`;
58
+ const applyAccessLogBucketPolicy = ({ bucket, stack, accessLogDelivery, }) => {
59
+ const { awsLogsResources, organizationId } = (0, resolve_access_log_delivery_1.resolveAccessLogDelivery)(bucket.bucketArn, stack.account, accessLogDelivery);
60
+ const organizationConditions = organizationId === undefined
61
+ ? undefined
62
+ : {
63
+ StringEquals: {
64
+ 'aws:SourceOrgID': organizationId,
65
+ },
66
+ };
67
+ const albOrganizationConditions = organizationId === undefined
68
+ ? undefined
69
+ : {
70
+ StringEquals: {
71
+ 'aws:SourceOrgID': organizationId,
72
+ },
73
+ ArnLike: {
74
+ 'aws:SourceArn': ELB_SOURCE_ARN,
75
+ },
76
+ };
55
77
  // Allow ALB / NLB log delivery (modern service principal path; also required in opt-in regions).
56
78
  const albLogDeliveryPolicyResult = bucket.addToResourcePolicy(new iam.PolicyStatement({
57
79
  effect: iam.Effect.ALLOW,
@@ -61,9 +83,8 @@ const applyAccessLogBucketPolicy = ({ bucket, stack, }) => {
61
83
  actions: [
62
84
  's3:PutObject',
63
85
  ],
64
- resources: [
65
- awsLogsPrefixResource,
66
- ],
86
+ resources: awsLogsResources,
87
+ conditions: albOrganizationConditions,
67
88
  }));
68
89
  // In non–opt-in regions (for example ap-northeast-1), access logs are often delivered using the
69
90
  // regional ELBv2 account (root of that account) for s3:PutObject, not only the service principal above.
@@ -79,9 +100,8 @@ const applyAccessLogBucketPolicy = ({ bucket, stack, }) => {
79
100
  actions: [
80
101
  's3:PutObject',
81
102
  ],
82
- resources: [
83
- awsLogsPrefixResource,
84
- ],
103
+ resources: awsLogsResources,
104
+ // The ELBv2 delivery account is not an organization member; do not attach aws:SourceOrgID.
85
105
  }));
86
106
  }
87
107
  // Allow CloudFront standard logging (v2) to write logs
@@ -93,9 +113,8 @@ const applyAccessLogBucketPolicy = ({ bucket, stack, }) => {
93
113
  actions: [
94
114
  's3:PutObject',
95
115
  ],
96
- resources: [
97
- awsLogsPrefixResource,
98
- ],
116
+ resources: awsLogsResources,
117
+ conditions: organizationConditions,
99
118
  }));
100
119
  // Allow S3 server access logging to write logs when required by configuration
101
120
  bucket.addToResourcePolicy(new iam.PolicyStatement({
@@ -106,13 +125,12 @@ const applyAccessLogBucketPolicy = ({ bucket, stack, }) => {
106
125
  actions: [
107
126
  's3:PutObject',
108
127
  ],
109
- resources: [
110
- awsLogsPrefixResource,
111
- ],
128
+ resources: awsLogsResources,
129
+ conditions: organizationConditions,
112
130
  }));
113
131
  return {
114
132
  accessLogBucketPolicyDependable: albLogDeliveryPolicyResult.policyDependable ?? bucket,
115
133
  };
116
134
  };
117
135
  exports.applyAccessLogBucketPolicy = applyAccessLogBucketPolicy;
118
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjZXNzLWxvZy1idWNrZXQtcG9saWN5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2J1Y2tldC1wb2xpY2llcy9hY2Nlc3MtbG9nLWJ1Y2tldC1wb2xpY3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkNBQW9DO0FBQ3BDLHlEQUEyQztBQUMzQyx5REFBK0Q7QUFHL0Q7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0ksTUFBTSwwQkFBMEIsR0FBRyxDQUFDLEVBQ3pDLE1BQU0sRUFDTixLQUFLLEdBQ2UsRUFBMkIsRUFBRTtJQUNqRCxNQUFNLHFCQUFxQixHQUFHLEdBQUcsTUFBTSxDQUFDLFNBQVMsWUFBWSxLQUFLLENBQUMsT0FBTyxJQUFJLENBQUM7SUFFL0UsaUdBQWlHO0lBQ2pHLE1BQU0sMEJBQTBCLEdBQUcsTUFBTSxDQUFDLG1CQUFtQixDQUFDLElBQUksR0FBRyxDQUFDLGVBQWUsQ0FBQztRQUNwRixNQUFNLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxLQUFLO1FBQ3hCLFVBQVUsRUFBRTtZQUNWLElBQUksR0FBRyxDQUFDLGdCQUFnQixDQUFDLGdEQUFnRCxDQUFDO1NBQzNFO1FBQ0QsT0FBTyxFQUFFO1lBQ1AsY0FBYztTQUNmO1FBQ0QsU0FBUyxFQUFFO1lBQ1QscUJBQXFCO1NBQ3RCO0tBQ0YsQ0FBQyxDQUFDLENBQUM7SUFFSixnR0FBZ0c7SUFDaEcsd0dBQXdHO0lBQ3hHLE1BQU0sWUFBWSxHQUFHLG1CQUFLLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUM7UUFDbkQsQ0FBQyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsc0JBQVEsQ0FBQyxhQUFhLENBQUM7UUFDNUMsQ0FBQyxDQUFDLHdCQUFVLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxZQUFZLENBQUM7SUFDOUMsSUFBSSxZQUFZLEVBQUUsQ0FBQztRQUNqQixNQUFNLENBQUMsbUJBQW1CLENBQUMsSUFBSSxHQUFHLENBQUMsZUFBZSxDQUFDO1lBQ2pELE1BQU0sRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDLEtBQUs7WUFDeEIsVUFBVSxFQUFFO2dCQUNWLElBQUksR0FBRyxDQUFDLGdCQUFnQixDQUFDLFlBQVksQ0FBQzthQUN2QztZQUNELE9BQU8sRUFBRTtnQkFDUCxjQUFjO2FBQ2Y7WUFDRCxTQUFTLEVBQUU7Z0JBQ1QscUJBQXFCO2FBQ3RCO1NBQ0YsQ0FBQyxDQUFDLENBQUM7SUFDTixDQUFDO0lBRUQsdURBQXVEO0lBQ3ZELE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxlQUFlLENBQUM7UUFDakQsTUFBTSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsS0FBSztRQUN4QixVQUFVLEVBQUU7WUFDVixJQUFJLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyw2QkFBNkIsQ0FBQztTQUN4RDtRQUNELE9BQU8sRUFBRTtZQUNQLGNBQWM7U0FDZjtRQUNELFNBQVMsRUFBRTtZQUNULHFCQUFxQjtTQUN0QjtLQUNGLENBQUMsQ0FBQyxDQUFDO0lBRUosOEVBQThFO0lBQzlFLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxlQUFlLENBQUM7UUFDakQsTUFBTSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsS0FBSztRQUN4QixVQUFVLEVBQUU7WUFDVixJQUFJLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQywwQkFBMEIsQ0FBQztTQUNyRDtRQUNELE9BQU8sRUFBRTtZQUNQLGNBQWM7U0FDZjtRQUNELFNBQVMsRUFBRTtZQUNULHFCQUFxQjtTQUN0QjtLQUNGLENBQUMsQ0FBQyxDQUFDO0lBRUosT0FBTztRQUNMLCtCQUErQixFQUFFLDBCQUEwQixDQUFDLGdCQUFnQixJQUFJLE1BQU07S0FDdkYsQ0FBQztBQUNKLENBQUMsQ0FBQztBQXZFVyxRQUFBLDBCQUEwQiw4QkF1RXJDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVG9rZW4gfSBmcm9tICdhd3MtY2RrLWxpYic7XG5pbXBvcnQgKiBhcyBpYW0gZnJvbSAnYXdzLWNkay1saWIvYXdzLWlhbSc7XG5pbXBvcnQgeyBGYWN0TmFtZSwgUmVnaW9uSW5mbyB9IGZyb20gJ2F3cy1jZGstbGliL3JlZ2lvbi1pbmZvJztcbmltcG9ydCB7IEJ1Y2tldFBvbGljeUFwcGx5UmVzdWx0LCBCdWNrZXRQb2xpY3lDb250ZXh0IH0gZnJvbSAnLi90eXBlcyc7XG5cbi8qKlxuICogQWRkcyByZXNvdXJjZSBwb2xpY2llcyBmb3IgQUxCL05MQiwgQ2xvdWRGcm9udCBzdGFuZGFyZCBsb2dnaW5nICh2MiksIGFuZCBTMyBzZXJ2ZXIgYWNjZXNzIGxvZ2dpbmcuXG4gKlxuICogR3JhbnRzIGBzMzpQdXRPYmplY3RgIG9uIGBBV1NMb2dzLzxzdGFjay5hY2NvdW50Pi8qYCB0bzpcbiAqIC0gYGxvZ2RlbGl2ZXJ5LmVsYXN0aWNsb2FkYmFsYW5jaW5nLmFtYXpvbmF3cy5jb21gXG4gKiAtIFRoZSByZWdpb25hbCBFTEJ2MiBsb2ctZGVsaXZlcnkgYWNjb3VudCAod2hlbiBrbm93bilcbiAqIC0gYGRlbGl2ZXJ5LmxvZ3MuYW1hem9uYXdzLmNvbWBcbiAqIC0gYGxvZ2dpbmcuczMuYW1hem9uYXdzLmNvbWBcbiAqXG4gKiBAcGFyYW0gY29udGV4dCAtIEJ1Y2tldCBhbmQgb3duaW5nIHN0YWNrIChhY2NvdW50IGFuZCByZWdpb24gYXJlIHJlYWQgZnJvbSBgc3RhY2tgKS5cbiAqIEByZXR1cm5zIEEgcmVzdWx0IGNvbnRhaW5pbmcge0BsaW5rIEJ1Y2tldFBvbGljeUFwcGx5UmVzdWx0LmFjY2Vzc0xvZ0J1Y2tldFBvbGljeURlcGVuZGFibGV9IGZvciB0aGVcbiAqIGZpcnN0IChFTEIpIHBvbGljeSBzdGF0ZW1lbnQgc28gbG9hZCBiYWxhbmNlciBsb2cgZW5hYmxlbWVudCBjYW4gd2FpdCB1bnRpbCB0aGUgYnVja2V0IHBvbGljeSBleGlzdHMuXG4gKi9cbmV4cG9ydCBjb25zdCBhcHBseUFjY2Vzc0xvZ0J1Y2tldFBvbGljeSA9ICh7XG4gIGJ1Y2tldCxcbiAgc3RhY2ssXG59OiBCdWNrZXRQb2xpY3lDb250ZXh0KTogQnVja2V0UG9saWN5QXBwbHlSZXN1bHQgPT4ge1xuICBjb25zdCBhd3NMb2dzUHJlZml4UmVzb3VyY2UgPSBgJHtidWNrZXQuYnVja2V0QXJufS9BV1NMb2dzLyR7c3RhY2suYWNjb3VudH0vKmA7XG5cbiAgLy8gQWxsb3cgQUxCIC8gTkxCIGxvZyBkZWxpdmVyeSAobW9kZXJuIHNlcnZpY2UgcHJpbmNpcGFsIHBhdGg7IGFsc28gcmVxdWlyZWQgaW4gb3B0LWluIHJlZ2lvbnMpLlxuICBjb25zdCBhbGJMb2dEZWxpdmVyeVBvbGljeVJlc3VsdCA9IGJ1Y2tldC5hZGRUb1Jlc291cmNlUG9saWN5KG5ldyBpYW0uUG9saWN5U3RhdGVtZW50KHtcbiAgICBlZmZlY3Q6IGlhbS5FZmZlY3QuQUxMT1csXG4gICAgcHJpbmNpcGFsczogW1xuICAgICAgbmV3IGlhbS5TZXJ2aWNlUHJpbmNpcGFsKCdsb2dkZWxpdmVyeS5lbGFzdGljbG9hZGJhbGFuY2luZy5hbWF6b25hd3MuY29tJyksXG4gICAgXSxcbiAgICBhY3Rpb25zOiBbXG4gICAgICAnczM6UHV0T2JqZWN0JyxcbiAgICBdLFxuICAgIHJlc291cmNlczogW1xuICAgICAgYXdzTG9nc1ByZWZpeFJlc291cmNlLFxuICAgIF0sXG4gIH0pKTtcblxuICAvLyBJbiBub27igJNvcHQtaW4gcmVnaW9ucyAoZm9yIGV4YW1wbGUgYXAtbm9ydGhlYXN0LTEpLCBhY2Nlc3MgbG9ncyBhcmUgb2Z0ZW4gZGVsaXZlcmVkIHVzaW5nIHRoZVxuICAvLyByZWdpb25hbCBFTEJ2MiBhY2NvdW50IChyb290IG9mIHRoYXQgYWNjb3VudCkgZm9yIHMzOlB1dE9iamVjdCwgbm90IG9ubHkgdGhlIHNlcnZpY2UgcHJpbmNpcGFsIGFib3ZlLlxuICBjb25zdCBlbGJBY2NvdW50SWQgPSBUb2tlbi5pc1VucmVzb2x2ZWQoc3RhY2sucmVnaW9uKVxuICAgID8gc3RhY2sucmVnaW9uYWxGYWN0KEZhY3ROYW1lLkVMQlYyX0FDQ09VTlQpXG4gICAgOiBSZWdpb25JbmZvLmdldChzdGFjay5yZWdpb24pLmVsYnYyQWNjb3VudDtcbiAgaWYgKGVsYkFjY291bnRJZCkge1xuICAgIGJ1Y2tldC5hZGRUb1Jlc291cmNlUG9saWN5KG5ldyBpYW0uUG9saWN5U3RhdGVtZW50KHtcbiAgICAgIGVmZmVjdDogaWFtLkVmZmVjdC5BTExPVyxcbiAgICAgIHByaW5jaXBhbHM6IFtcbiAgICAgICAgbmV3IGlhbS5BY2NvdW50UHJpbmNpcGFsKGVsYkFjY291bnRJZCksXG4gICAgICBdLFxuICAgICAgYWN0aW9uczogW1xuICAgICAgICAnczM6UHV0T2JqZWN0JyxcbiAgICAgIF0sXG4gICAgICByZXNvdXJjZXM6IFtcbiAgICAgICAgYXdzTG9nc1ByZWZpeFJlc291cmNlLFxuICAgICAgXSxcbiAgICB9KSk7XG4gIH1cblxuICAvLyBBbGxvdyBDbG91ZEZyb250IHN0YW5kYXJkIGxvZ2dpbmcgKHYyKSB0byB3cml0ZSBsb2dzXG4gIGJ1Y2tldC5hZGRUb1Jlc291cmNlUG9saWN5KG5ldyBpYW0uUG9saWN5U3RhdGVtZW50KHtcbiAgICBlZmZlY3Q6IGlhbS5FZmZlY3QuQUxMT1csXG4gICAgcHJpbmNpcGFsczogW1xuICAgICAgbmV3IGlhbS5TZXJ2aWNlUHJpbmNpcGFsKCdkZWxpdmVyeS5sb2dzLmFtYXpvbmF3cy5jb20nKSxcbiAgICBdLFxuICAgIGFjdGlvbnM6IFtcbiAgICAgICdzMzpQdXRPYmplY3QnLFxuICAgIF0sXG4gICAgcmVzb3VyY2VzOiBbXG4gICAgICBhd3NMb2dzUHJlZml4UmVzb3VyY2UsXG4gICAgXSxcbiAgfSkpO1xuXG4gIC8vIEFsbG93IFMzIHNlcnZlciBhY2Nlc3MgbG9nZ2luZyB0byB3cml0ZSBsb2dzIHdoZW4gcmVxdWlyZWQgYnkgY29uZmlndXJhdGlvblxuICBidWNrZXQuYWRkVG9SZXNvdXJjZVBvbGljeShuZXcgaWFtLlBvbGljeVN0YXRlbWVudCh7XG4gICAgZWZmZWN0OiBpYW0uRWZmZWN0LkFMTE9XLFxuICAgIHByaW5jaXBhbHM6IFtcbiAgICAgIG5ldyBpYW0uU2VydmljZVByaW5jaXBhbCgnbG9nZ2luZy5zMy5hbWF6b25hd3MuY29tJyksXG4gICAgXSxcbiAgICBhY3Rpb25zOiBbXG4gICAgICAnczM6UHV0T2JqZWN0JyxcbiAgICBdLFxuICAgIHJlc291cmNlczogW1xuICAgICAgYXdzTG9nc1ByZWZpeFJlc291cmNlLFxuICAgIF0sXG4gIH0pKTtcblxuICByZXR1cm4ge1xuICAgIGFjY2Vzc0xvZ0J1Y2tldFBvbGljeURlcGVuZGFibGU6IGFsYkxvZ0RlbGl2ZXJ5UG9saWN5UmVzdWx0LnBvbGljeURlcGVuZGFibGUgPz8gYnVja2V0LFxuICB9O1xufTtcbiJdfQ==
136
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"access-log-bucket-policy.js","sourceRoot":"","sources":["../../src/bucket-policies/access-log-bucket-policy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAoC;AACpC,yDAA2C;AAC3C,yDAA+D;AAC/D,+EAAyE;AAGzE,MAAM,cAAc,GAAG,iDAAiD,CAAC;AAEzE;;;;;;;;;;;;;;;GAeG;AACI,MAAM,0BAA0B,GAAG,CAAC,EACzC,MAAM,EACN,KAAK,EACL,iBAAiB,GACG,EAA2B,EAAE;IACjD,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,IAAA,sDAAwB,EACnE,MAAM,CAAC,SAAS,EAChB,KAAK,CAAC,OAAO,EACb,iBAAiB,CAClB,CAAC;IAEF,MAAM,sBAAsB,GAAG,cAAc,KAAK,SAAS;QACzD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC;YACA,YAAY,EAAE;gBACZ,iBAAiB,EAAE,cAAc;aAClC;SACF,CAAC;IAEJ,MAAM,yBAAyB,GAAG,cAAc,KAAK,SAAS;QAC5D,CAAC,CAAC,SAAS;QACX,CAAC,CAAC;YACA,YAAY,EAAE;gBACZ,iBAAiB,EAAE,cAAc;aAClC;YACD,OAAO,EAAE;gBACP,eAAe,EAAE,cAAc;aAChC;SACF,CAAC;IAEJ,iGAAiG;IACjG,MAAM,0BAA0B,GAAG,MAAM,CAAC,mBAAmB,CAAC,IAAI,GAAG,CAAC,eAAe,CAAC;QACpF,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK;QACxB,UAAU,EAAE;YACV,IAAI,GAAG,CAAC,gBAAgB,CAAC,gDAAgD,CAAC;SAC3E;QACD,OAAO,EAAE;YACP,cAAc;SACf;QACD,SAAS,EAAE,gBAAgB;QAC3B,UAAU,EAAE,yBAAyB;KACtC,CAAC,CAAC,CAAC;IAEJ,gGAAgG;IAChG,wGAAwG;IACxG,MAAM,YAAY,GAAG,mBAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC;QACnD,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,sBAAQ,CAAC,aAAa,CAAC;QAC5C,CAAC,CAAC,wBAAU,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC;IAC9C,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,CAAC,mBAAmB,CAAC,IAAI,GAAG,CAAC,eAAe,CAAC;YACjD,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK;YACxB,UAAU,EAAE;gBACV,IAAI,GAAG,CAAC,gBAAgB,CAAC,YAAY,CAAC;aACvC;YACD,OAAO,EAAE;gBACP,cAAc;aACf;YACD,SAAS,EAAE,gBAAgB;YAC3B,2FAA2F;SAC5F,CAAC,CAAC,CAAC;IACN,CAAC;IAED,uDAAuD;IACvD,MAAM,CAAC,mBAAmB,CAAC,IAAI,GAAG,CAAC,eAAe,CAAC;QACjD,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK;QACxB,UAAU,EAAE;YACV,IAAI,GAAG,CAAC,gBAAgB,CAAC,6BAA6B,CAAC;SACxD;QACD,OAAO,EAAE;YACP,cAAc;SACf;QACD,SAAS,EAAE,gBAAgB;QAC3B,UAAU,EAAE,sBAAsB;KACnC,CAAC,CAAC,CAAC;IAEJ,8EAA8E;IAC9E,MAAM,CAAC,mBAAmB,CAAC,IAAI,GAAG,CAAC,eAAe,CAAC;QACjD,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK;QACxB,UAAU,EAAE;YACV,IAAI,GAAG,CAAC,gBAAgB,CAAC,0BAA0B,CAAC;SACrD;QACD,OAAO,EAAE;YACP,cAAc;SACf;QACD,SAAS,EAAE,gBAAgB;QAC3B,UAAU,EAAE,sBAAsB;KACnC,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,+BAA+B,EAAE,0BAA0B,CAAC,gBAAgB,IAAI,MAAM;KACvF,CAAC;AACJ,CAAC,CAAC;AA3FW,QAAA,0BAA0B,8BA2FrC","sourcesContent":["import { Token } from 'aws-cdk-lib';\nimport * as iam from 'aws-cdk-lib/aws-iam';\nimport { FactName, RegionInfo } from 'aws-cdk-lib/region-info';\nimport { resolveAccessLogDelivery } from './resolve-access-log-delivery';\nimport { BucketPolicyApplyResult, BucketPolicyContext } from './types';\n\nconst ELB_SOURCE_ARN = 'arn:aws:elasticloadbalancing:*:*:loadbalancer/*';\n\n/**\n * Adds resource policies for ALB/NLB, CloudFront standard logging (v2), and S3 server access logging.\n *\n * Grants `s3:PutObject` on `AWSLogs/...` prefixes to:\n * - `logdelivery.elasticloadbalancing.amazonaws.com`\n * - The regional ELBv2 log-delivery account (when known)\n * - `delivery.logs.amazonaws.com`\n * - `logging.s3.amazonaws.com`\n *\n * Prefixes default to `AWSLogs/<stack.account>/*`. {@link BucketPolicyContext.accessLogDelivery}\n * can widen this to an explicit account list or to `AWSLogs/*` constrained by `aws:SourceOrgID`.\n *\n * @param context - Bucket, owning stack, and optional delivery scope.\n * @returns A result containing {@link BucketPolicyApplyResult.accessLogBucketPolicyDependable} for the\n * first (ELB) policy statement so load balancer log enablement can wait until the bucket policy exists.\n */\nexport const applyAccessLogBucketPolicy = ({\n  bucket,\n  stack,\n  accessLogDelivery,\n}: BucketPolicyContext): BucketPolicyApplyResult => {\n  const { awsLogsResources, organizationId } = resolveAccessLogDelivery(\n    bucket.bucketArn,\n    stack.account,\n    accessLogDelivery,\n  );\n\n  const organizationConditions = organizationId === undefined\n    ? undefined\n    : {\n      StringEquals: {\n        'aws:SourceOrgID': organizationId,\n      },\n    };\n\n  const albOrganizationConditions = organizationId === undefined\n    ? undefined\n    : {\n      StringEquals: {\n        'aws:SourceOrgID': organizationId,\n      },\n      ArnLike: {\n        'aws:SourceArn': ELB_SOURCE_ARN,\n      },\n    };\n\n  // Allow ALB / NLB log delivery (modern service principal path; also required in opt-in regions).\n  const albLogDeliveryPolicyResult = bucket.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: awsLogsResources,\n    conditions: albOrganizationConditions,\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 elbAccountId = Token.isUnresolved(stack.region)\n    ? stack.regionalFact(FactName.ELBV2_ACCOUNT)\n    : RegionInfo.get(stack.region).elbv2Account;\n  if (elbAccountId) {\n    bucket.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: awsLogsResources,\n      // The ELBv2 delivery account is not an organization member; do not attach aws:SourceOrgID.\n    }));\n  }\n\n  // Allow CloudFront standard logging (v2) to write logs\n  bucket.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: awsLogsResources,\n    conditions: organizationConditions,\n  }));\n\n  // Allow S3 server access logging to write logs when required by configuration\n  bucket.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: awsLogsResources,\n    conditions: organizationConditions,\n  }));\n\n  return {\n    accessLogBucketPolicyDependable: albLogDeliveryPolicyResult.policyDependable ?? bucket,\n  };\n};\n"]}
@@ -0,0 +1,24 @@
1
+ import { AccessLogDeliveryScope } from '../bucket-types/access-log-delivery-scope';
2
+ /**
3
+ * Resolved `AWSLogs` resource ARNs and optional organization condition value.
4
+ */
5
+ export interface ResolvedAccessLogDelivery {
6
+ /**
7
+ * Bucket object ARNs granted `s3:PutObject` for log writers.
8
+ */
9
+ readonly awsLogsResources: string[];
10
+ /**
11
+ * Set when delivery is scoped to an AWS Organization (`aws:SourceOrgID`).
12
+ */
13
+ readonly organizationId?: string;
14
+ }
15
+ /**
16
+ * Resolves `AWSLogs` resource ARNs (and organization ID when used) for an access-log bucket policy.
17
+ *
18
+ * @param bucketArn - Destination bucket ARN.
19
+ * @param stackAccount - Owning stack account; used when `scope` is omitted.
20
+ * @param scope - Optional exclusive account-list or organization scope.
21
+ * @returns Resource ARNs and optional `organizationId` for policy conditions.
22
+ * @throws If `scope` sets both fields, neither field, an empty account list, or invalid IDs.
23
+ */
24
+ export declare const resolveAccessLogDelivery: (bucketArn: string, stackAccount: string, scope?: AccessLogDeliveryScope) => ResolvedAccessLogDelivery;
@@ -0,0 +1,65 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.resolveAccessLogDelivery = void 0;
4
+ const aws_cdk_lib_1 = require("aws-cdk-lib");
5
+ const access_log_delivery_scope_1 = require("../bucket-types/access-log-delivery-scope");
6
+ const EXCLUSIVE_FIELDS_ERROR = 'accessLogDelivery must specify exactly one of allowedSourceAccountIds or organizationId';
7
+ const assertAccountId = (accountId) => {
8
+ if (aws_cdk_lib_1.Token.isUnresolved(accountId)) {
9
+ return;
10
+ }
11
+ if ((0, access_log_delivery_scope_1.isAwsAccountId)(accountId)) {
12
+ return;
13
+ }
14
+ throw new Error(`allowedSourceAccountIds contains an invalid AWS account ID: ${accountId}`);
15
+ };
16
+ const resolveOrganizationDelivery = (bucketArn, organizationId) => {
17
+ if (!aws_cdk_lib_1.Token.isUnresolved(organizationId) && !(0, access_log_delivery_scope_1.isAwsOrganizationId)(organizationId)) {
18
+ throw new Error(`organizationId must be an AWS Organizations ID (o-...), got: ${organizationId}`);
19
+ }
20
+ return {
21
+ awsLogsResources: [`${bucketArn}/AWSLogs/*`],
22
+ organizationId,
23
+ };
24
+ };
25
+ const resolveAccountListDelivery = (bucketArn, accountIds) => {
26
+ if (accountIds.length === 0) {
27
+ throw new Error('allowedSourceAccountIds must contain at least one account ID');
28
+ }
29
+ const uniqueAccountIds = [...new Set(accountIds)];
30
+ for (const accountId of uniqueAccountIds) {
31
+ assertAccountId(accountId);
32
+ }
33
+ return {
34
+ awsLogsResources: uniqueAccountIds.map((accountId) => `${bucketArn}/AWSLogs/${accountId}/*`),
35
+ };
36
+ };
37
+ /**
38
+ * Resolves `AWSLogs` resource ARNs (and organization ID when used) for an access-log bucket policy.
39
+ *
40
+ * @param bucketArn - Destination bucket ARN.
41
+ * @param stackAccount - Owning stack account; used when `scope` is omitted.
42
+ * @param scope - Optional exclusive account-list or organization scope.
43
+ * @returns Resource ARNs and optional `organizationId` for policy conditions.
44
+ * @throws If `scope` sets both fields, neither field, an empty account list, or invalid IDs.
45
+ */
46
+ const resolveAccessLogDelivery = (bucketArn, stackAccount, scope) => {
47
+ if (scope === undefined) {
48
+ return {
49
+ awsLogsResources: [`${bucketArn}/AWSLogs/${stackAccount}/*`],
50
+ };
51
+ }
52
+ const { allowedSourceAccountIds, organizationId } = scope;
53
+ if (organizationId !== undefined) {
54
+ if (allowedSourceAccountIds !== undefined) {
55
+ throw new Error(EXCLUSIVE_FIELDS_ERROR);
56
+ }
57
+ return resolveOrganizationDelivery(bucketArn, organizationId);
58
+ }
59
+ if (allowedSourceAccountIds !== undefined) {
60
+ return resolveAccountListDelivery(bucketArn, allowedSourceAccountIds);
61
+ }
62
+ throw new Error(EXCLUSIVE_FIELDS_ERROR);
63
+ };
64
+ exports.resolveAccessLogDelivery = resolveAccessLogDelivery;
65
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZS1hY2Nlc3MtbG9nLWRlbGl2ZXJ5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2J1Y2tldC1wb2xpY2llcy9yZXNvbHZlLWFjY2Vzcy1sb2ctZGVsaXZlcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkNBQW9DO0FBQ3BDLHlGQUltRDtBQWdCbkQsTUFBTSxzQkFBc0IsR0FDMUIseUZBQXlGLENBQUM7QUFFNUYsTUFBTSxlQUFlLEdBQUcsQ0FBQyxTQUFpQixFQUFRLEVBQUU7SUFDbEQsSUFBSSxtQkFBSyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDO1FBQ2xDLE9BQU87SUFDVCxDQUFDO0lBQ0QsSUFBSSxJQUFBLDBDQUFjLEVBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztRQUM5QixPQUFPO0lBQ1QsQ0FBQztJQUNELE1BQU0sSUFBSSxLQUFLLENBQUMsK0RBQStELFNBQVMsRUFBRSxDQUFDLENBQUM7QUFDOUYsQ0FBQyxDQUFDO0FBRUYsTUFBTSwyQkFBMkIsR0FBRyxDQUNsQyxTQUFpQixFQUNqQixjQUFzQixFQUNLLEVBQUU7SUFDN0IsSUFBSSxDQUFDLG1CQUFLLENBQUMsWUFBWSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsSUFBQSwrQ0FBbUIsRUFBQyxjQUFjLENBQUMsRUFBRSxDQUFDO1FBQ2hGLE1BQU0sSUFBSSxLQUFLLENBQUMsZ0VBQWdFLGNBQWMsRUFBRSxDQUFDLENBQUM7SUFDcEcsQ0FBQztJQUNELE9BQU87UUFDTCxnQkFBZ0IsRUFBRSxDQUFDLEdBQUcsU0FBUyxZQUFZLENBQUM7UUFDNUMsY0FBYztLQUNmLENBQUM7QUFDSixDQUFDLENBQUM7QUFFRixNQUFNLDBCQUEwQixHQUFHLENBQ2pDLFNBQWlCLEVBQ2pCLFVBQTZCLEVBQ0YsRUFBRTtJQUM3QixJQUFJLFVBQVUsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDNUIsTUFBTSxJQUFJLEtBQUssQ0FBQyw4REFBOEQsQ0FBQyxDQUFDO0lBQ2xGLENBQUM7SUFDRCxNQUFNLGdCQUFnQixHQUFHLENBQUMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0lBQ2xELEtBQUssTUFBTSxTQUFTLElBQUksZ0JBQWdCLEVBQUUsQ0FBQztRQUN6QyxlQUFlLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUNELE9BQU87UUFDTCxnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLEdBQUcsU0FBUyxZQUFZLFNBQVMsSUFBSSxDQUFDO0tBQzdGLENBQUM7QUFDSixDQUFDLENBQUM7QUFFRjs7Ozs7Ozs7R0FRRztBQUNJLE1BQU0sd0JBQXdCLEdBQUcsQ0FDdEMsU0FBaUIsRUFDakIsWUFBb0IsRUFDcEIsS0FBOEIsRUFDSCxFQUFFO0lBQzdCLElBQUksS0FBSyxLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQ3hCLE9BQU87WUFDTCxnQkFBZ0IsRUFBRSxDQUFDLEdBQUcsU0FBUyxZQUFZLFlBQVksSUFBSSxDQUFDO1NBQzdELENBQUM7SUFDSixDQUFDO0lBRUQsTUFBTSxFQUFFLHVCQUF1QixFQUFFLGNBQWMsRUFBRSxHQUFHLEtBQUssQ0FBQztJQUMxRCxJQUFJLGNBQWMsS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUNqQyxJQUFJLHVCQUF1QixLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQzFDLE1BQU0sSUFBSSxLQUFLLENBQUMsc0JBQXNCLENBQUMsQ0FBQztRQUMxQyxDQUFDO1FBQ0QsT0FBTywyQkFBMkIsQ0FBQyxTQUFTLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDaEUsQ0FBQztJQUNELElBQUksdUJBQXVCLEtBQUssU0FBUyxFQUFFLENBQUM7UUFDMUMsT0FBTywwQkFBMEIsQ0FBQyxTQUFTLEVBQUUsdUJBQXVCLENBQUMsQ0FBQztJQUN4RSxDQUFDO0lBQ0QsTUFBTSxJQUFJLEtBQUssQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO0FBQzFDLENBQUMsQ0FBQztBQXRCVyxRQUFBLHdCQUF3Qiw0QkFzQm5DIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVG9rZW4gfSBmcm9tICdhd3MtY2RrLWxpYic7XG5pbXBvcnQge1xuICBBY2Nlc3NMb2dEZWxpdmVyeVNjb3BlLFxuICBpc0F3c0FjY291bnRJZCxcbiAgaXNBd3NPcmdhbml6YXRpb25JZCxcbn0gZnJvbSAnLi4vYnVja2V0LXR5cGVzL2FjY2Vzcy1sb2ctZGVsaXZlcnktc2NvcGUnO1xuXG4vKipcbiAqIFJlc29sdmVkIGBBV1NMb2dzYCByZXNvdXJjZSBBUk5zIGFuZCBvcHRpb25hbCBvcmdhbml6YXRpb24gY29uZGl0aW9uIHZhbHVlLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIFJlc29sdmVkQWNjZXNzTG9nRGVsaXZlcnkge1xuICAvKipcbiAgICogQnVja2V0IG9iamVjdCBBUk5zIGdyYW50ZWQgYHMzOlB1dE9iamVjdGAgZm9yIGxvZyB3cml0ZXJzLlxuICAgKi9cbiAgcmVhZG9ubHkgYXdzTG9nc1Jlc291cmNlczogc3RyaW5nW107XG4gIC8qKlxuICAgKiBTZXQgd2hlbiBkZWxpdmVyeSBpcyBzY29wZWQgdG8gYW4gQVdTIE9yZ2FuaXphdGlvbiAoYGF3czpTb3VyY2VPcmdJRGApLlxuICAgKi9cbiAgcmVhZG9ubHkgb3JnYW5pemF0aW9uSWQ/OiBzdHJpbmc7XG59XG5cbmNvbnN0IEVYQ0xVU0lWRV9GSUVMRFNfRVJST1IgPVxuICAnYWNjZXNzTG9nRGVsaXZlcnkgbXVzdCBzcGVjaWZ5IGV4YWN0bHkgb25lIG9mIGFsbG93ZWRTb3VyY2VBY2NvdW50SWRzIG9yIG9yZ2FuaXphdGlvbklkJztcblxuY29uc3QgYXNzZXJ0QWNjb3VudElkID0gKGFjY291bnRJZDogc3RyaW5nKTogdm9pZCA9PiB7XG4gIGlmIChUb2tlbi5pc1VucmVzb2x2ZWQoYWNjb3VudElkKSkge1xuICAgIHJldHVybjtcbiAgfVxuICBpZiAoaXNBd3NBY2NvdW50SWQoYWNjb3VudElkKSkge1xuICAgIHJldHVybjtcbiAgfVxuICB0aHJvdyBuZXcgRXJyb3IoYGFsbG93ZWRTb3VyY2VBY2NvdW50SWRzIGNvbnRhaW5zIGFuIGludmFsaWQgQVdTIGFjY291bnQgSUQ6ICR7YWNjb3VudElkfWApO1xufTtcblxuY29uc3QgcmVzb2x2ZU9yZ2FuaXphdGlvbkRlbGl2ZXJ5ID0gKFxuICBidWNrZXRBcm46IHN0cmluZyxcbiAgb3JnYW5pemF0aW9uSWQ6IHN0cmluZyxcbik6IFJlc29sdmVkQWNjZXNzTG9nRGVsaXZlcnkgPT4ge1xuICBpZiAoIVRva2VuLmlzVW5yZXNvbHZlZChvcmdhbml6YXRpb25JZCkgJiYgIWlzQXdzT3JnYW5pemF0aW9uSWQob3JnYW5pemF0aW9uSWQpKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKGBvcmdhbml6YXRpb25JZCBtdXN0IGJlIGFuIEFXUyBPcmdhbml6YXRpb25zIElEIChvLS4uLiksIGdvdDogJHtvcmdhbml6YXRpb25JZH1gKTtcbiAgfVxuICByZXR1cm4ge1xuICAgIGF3c0xvZ3NSZXNvdXJjZXM6IFtgJHtidWNrZXRBcm59L0FXU0xvZ3MvKmBdLFxuICAgIG9yZ2FuaXphdGlvbklkLFxuICB9O1xufTtcblxuY29uc3QgcmVzb2x2ZUFjY291bnRMaXN0RGVsaXZlcnkgPSAoXG4gIGJ1Y2tldEFybjogc3RyaW5nLFxuICBhY2NvdW50SWRzOiByZWFkb25seSBzdHJpbmdbXSxcbik6IFJlc29sdmVkQWNjZXNzTG9nRGVsaXZlcnkgPT4ge1xuICBpZiAoYWNjb3VudElkcy5sZW5ndGggPT09IDApIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoJ2FsbG93ZWRTb3VyY2VBY2NvdW50SWRzIG11c3QgY29udGFpbiBhdCBsZWFzdCBvbmUgYWNjb3VudCBJRCcpO1xuICB9XG4gIGNvbnN0IHVuaXF1ZUFjY291bnRJZHMgPSBbLi4ubmV3IFNldChhY2NvdW50SWRzKV07XG4gIGZvciAoY29uc3QgYWNjb3VudElkIG9mIHVuaXF1ZUFjY291bnRJZHMpIHtcbiAgICBhc3NlcnRBY2NvdW50SWQoYWNjb3VudElkKTtcbiAgfVxuICByZXR1cm4ge1xuICAgIGF3c0xvZ3NSZXNvdXJjZXM6IHVuaXF1ZUFjY291bnRJZHMubWFwKChhY2NvdW50SWQpID0+IGAke2J1Y2tldEFybn0vQVdTTG9ncy8ke2FjY291bnRJZH0vKmApLFxuICB9O1xufTtcblxuLyoqXG4gKiBSZXNvbHZlcyBgQVdTTG9nc2AgcmVzb3VyY2UgQVJOcyAoYW5kIG9yZ2FuaXphdGlvbiBJRCB3aGVuIHVzZWQpIGZvciBhbiBhY2Nlc3MtbG9nIGJ1Y2tldCBwb2xpY3kuXG4gKlxuICogQHBhcmFtIGJ1Y2tldEFybiAtIERlc3RpbmF0aW9uIGJ1Y2tldCBBUk4uXG4gKiBAcGFyYW0gc3RhY2tBY2NvdW50IC0gT3duaW5nIHN0YWNrIGFjY291bnQ7IHVzZWQgd2hlbiBgc2NvcGVgIGlzIG9taXR0ZWQuXG4gKiBAcGFyYW0gc2NvcGUgLSBPcHRpb25hbCBleGNsdXNpdmUgYWNjb3VudC1saXN0IG9yIG9yZ2FuaXphdGlvbiBzY29wZS5cbiAqIEByZXR1cm5zIFJlc291cmNlIEFSTnMgYW5kIG9wdGlvbmFsIGBvcmdhbml6YXRpb25JZGAgZm9yIHBvbGljeSBjb25kaXRpb25zLlxuICogQHRocm93cyBJZiBgc2NvcGVgIHNldHMgYm90aCBmaWVsZHMsIG5laXRoZXIgZmllbGQsIGFuIGVtcHR5IGFjY291bnQgbGlzdCwgb3IgaW52YWxpZCBJRHMuXG4gKi9cbmV4cG9ydCBjb25zdCByZXNvbHZlQWNjZXNzTG9nRGVsaXZlcnkgPSAoXG4gIGJ1Y2tldEFybjogc3RyaW5nLFxuICBzdGFja0FjY291bnQ6IHN0cmluZyxcbiAgc2NvcGU/OiBBY2Nlc3NMb2dEZWxpdmVyeVNjb3BlLFxuKTogUmVzb2x2ZWRBY2Nlc3NMb2dEZWxpdmVyeSA9PiB7XG4gIGlmIChzY29wZSA9PT0gdW5kZWZpbmVkKSB7XG4gICAgcmV0dXJuIHtcbiAgICAgIGF3c0xvZ3NSZXNvdXJjZXM6IFtgJHtidWNrZXRBcm59L0FXU0xvZ3MvJHtzdGFja0FjY291bnR9LypgXSxcbiAgICB9O1xuICB9XG5cbiAgY29uc3QgeyBhbGxvd2VkU291cmNlQWNjb3VudElkcywgb3JnYW5pemF0aW9uSWQgfSA9IHNjb3BlO1xuICBpZiAob3JnYW5pemF0aW9uSWQgIT09IHVuZGVmaW5lZCkge1xuICAgIGlmIChhbGxvd2VkU291cmNlQWNjb3VudElkcyAhPT0gdW5kZWZpbmVkKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoRVhDTFVTSVZFX0ZJRUxEU19FUlJPUik7XG4gICAgfVxuICAgIHJldHVybiByZXNvbHZlT3JnYW5pemF0aW9uRGVsaXZlcnkoYnVja2V0QXJuLCBvcmdhbml6YXRpb25JZCk7XG4gIH1cbiAgaWYgKGFsbG93ZWRTb3VyY2VBY2NvdW50SWRzICE9PSB1bmRlZmluZWQpIHtcbiAgICByZXR1cm4gcmVzb2x2ZUFjY291bnRMaXN0RGVsaXZlcnkoYnVja2V0QXJuLCBhbGxvd2VkU291cmNlQWNjb3VudElkcyk7XG4gIH1cbiAgdGhyb3cgbmV3IEVycm9yKEVYQ0xVU0lWRV9GSUVMRFNfRVJST1IpO1xufTtcbiJdfQ==
@@ -1,6 +1,7 @@
1
1
  import { Stack } from 'aws-cdk-lib';
2
2
  import * as s3 from 'aws-cdk-lib/aws-s3';
3
3
  import { IDependable } from 'constructs';
4
+ import type { AccessLogDeliveryScope } from '../bucket-types';
4
5
  /**
5
6
  * Inputs shared by bucket-type resource policy appliers.
6
7
  */
@@ -9,6 +10,11 @@ export interface BucketPolicyContext {
9
10
  readonly bucket: s3.Bucket;
10
11
  /** Stack that owns the bucket; used for account, region, and synthesizer metadata. */
11
12
  readonly stack: Stack;
13
+ /**
14
+ * Optional writer scope for {@link S3SecureBucketType.ACCESS_LOG_BUCKET}.
15
+ * Ignored by other bucket types.
16
+ */
17
+ readonly accessLogDelivery?: AccessLogDeliveryScope;
12
18
  }
13
19
  /**
14
20
  * Optional side effects returned after applying type-specific bucket policies.
@@ -1,3 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVja2V0LXBvbGljaWVzL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBTdGFjayB9IGZyb20gJ2F3cy1jZGstbGliJztcbmltcG9ydCAqIGFzIHMzIGZyb20gJ2F3cy1jZGstbGliL2F3cy1zMyc7XG5pbXBvcnQgeyBJRGVwZW5kYWJsZSB9IGZyb20gJ2NvbnN0cnVjdHMnO1xuXG4vKipcbiAqIElucHV0cyBzaGFyZWQgYnkgYnVja2V0LXR5cGUgcmVzb3VyY2UgcG9saWN5IGFwcGxpZXJzLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIEJ1Y2tldFBvbGljeUNvbnRleHQge1xuICAvKiogVGhlIGJ1Y2tldCB0byBhdHRhY2ggcmVzb3VyY2UgcG9saWNpZXMgdG8uICovXG4gIHJlYWRvbmx5IGJ1Y2tldDogczMuQnVja2V0O1xuICAvKiogU3RhY2sgdGhhdCBvd25zIHRoZSBidWNrZXQ7IHVzZWQgZm9yIGFjY291bnQsIHJlZ2lvbiwgYW5kIHN5bnRoZXNpemVyIG1ldGFkYXRhLiAqL1xuICByZWFkb25seSBzdGFjazogU3RhY2s7XG59XG5cbi8qKlxuICogT3B0aW9uYWwgc2lkZSBlZmZlY3RzIHJldHVybmVkIGFmdGVyIGFwcGx5aW5nIHR5cGUtc3BlY2lmaWMgYnVja2V0IHBvbGljaWVzLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIEJ1Y2tldFBvbGljeUFwcGx5UmVzdWx0IHtcbiAgLyoqXG4gICAqIFNldCB3aGVuIHtAbGluayBTM1NlY3VyZUJ1Y2tldFR5cGUuQUNDRVNTX0xPR19CVUNLRVR9IHBvbGljaWVzIGFyZSBhcHBsaWVkLlxuICAgKiBEZXBlbmQgb24gdGhpcyBiZWZvcmUgZW5hYmxpbmcgQUxCL05MQiBhY2Nlc3MgbG9nZ2luZy5cbiAgICovXG4gIHJlYWRvbmx5IGFjY2Vzc0xvZ0J1Y2tldFBvbGljeURlcGVuZGFibGU/OiBJRGVwZW5kYWJsZTtcbn1cbiJdfQ==
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVja2V0LXBvbGljaWVzL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBTdGFjayB9IGZyb20gJ2F3cy1jZGstbGliJztcbmltcG9ydCAqIGFzIHMzIGZyb20gJ2F3cy1jZGstbGliL2F3cy1zMyc7XG5pbXBvcnQgeyBJRGVwZW5kYWJsZSB9IGZyb20gJ2NvbnN0cnVjdHMnO1xuaW1wb3J0IHR5cGUgeyBBY2Nlc3NMb2dEZWxpdmVyeVNjb3BlIH0gZnJvbSAnLi4vYnVja2V0LXR5cGVzJztcblxuLyoqXG4gKiBJbnB1dHMgc2hhcmVkIGJ5IGJ1Y2tldC10eXBlIHJlc291cmNlIHBvbGljeSBhcHBsaWVycy5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBCdWNrZXRQb2xpY3lDb250ZXh0IHtcbiAgLyoqIFRoZSBidWNrZXQgdG8gYXR0YWNoIHJlc291cmNlIHBvbGljaWVzIHRvLiAqL1xuICByZWFkb25seSBidWNrZXQ6IHMzLkJ1Y2tldDtcbiAgLyoqIFN0YWNrIHRoYXQgb3ducyB0aGUgYnVja2V0OyB1c2VkIGZvciBhY2NvdW50LCByZWdpb24sIGFuZCBzeW50aGVzaXplciBtZXRhZGF0YS4gKi9cbiAgcmVhZG9ubHkgc3RhY2s6IFN0YWNrO1xuICAvKipcbiAgICogT3B0aW9uYWwgd3JpdGVyIHNjb3BlIGZvciB7QGxpbmsgUzNTZWN1cmVCdWNrZXRUeXBlLkFDQ0VTU19MT0dfQlVDS0VUfS5cbiAgICogSWdub3JlZCBieSBvdGhlciBidWNrZXQgdHlwZXMuXG4gICAqL1xuICByZWFkb25seSBhY2Nlc3NMb2dEZWxpdmVyeT86IEFjY2Vzc0xvZ0RlbGl2ZXJ5U2NvcGU7XG59XG5cbi8qKlxuICogT3B0aW9uYWwgc2lkZSBlZmZlY3RzIHJldHVybmVkIGFmdGVyIGFwcGx5aW5nIHR5cGUtc3BlY2lmaWMgYnVja2V0IHBvbGljaWVzLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIEJ1Y2tldFBvbGljeUFwcGx5UmVzdWx0IHtcbiAgLyoqXG4gICAqIFNldCB3aGVuIHtAbGluayBTM1NlY3VyZUJ1Y2tldFR5cGUuQUNDRVNTX0xPR19CVUNLRVR9IHBvbGljaWVzIGFyZSBhcHBsaWVkLlxuICAgKiBEZXBlbmQgb24gdGhpcyBiZWZvcmUgZW5hYmxpbmcgQUxCL05MQiBhY2Nlc3MgbG9nZ2luZy5cbiAgICovXG4gIHJlYWRvbmx5IGFjY2Vzc0xvZ0J1Y2tldFBvbGljeURlcGVuZGFibGU/OiBJRGVwZW5kYWJsZTtcbn1cbiJdfQ==
@@ -0,0 +1,64 @@
1
+ /**
2
+ * Account scope for {@link S3SecureBucketType.ACCESS_LOG_BUCKET} resource policies.
3
+ *
4
+ * Specify **exactly one** of {@link AccessLogDeliveryScope.allowedSourceAccountIds} or
5
+ * {@link AccessLogDeliveryScope.organizationId}. Omit {@link S3SecureBucketProps.accessLogDelivery}
6
+ * to allow only the stack account (default).
7
+ *
8
+ * jsii does not support a discriminated union of structs, so exclusivity is enforced at construct time.
9
+ */
10
+ export interface AccessLogDeliveryScope {
11
+ /**
12
+ * Account IDs allowed to write under `AWSLogs/<accountId>/*`.
13
+ *
14
+ * The list is used as specified; include the stack account if that account should also deliver logs.
15
+ * Duplicate IDs are ignored. Mutually exclusive with {@link AccessLogDeliveryScope.organizationId}.
16
+ *
17
+ * @default undefined (do not use an explicit account list)
18
+ */
19
+ readonly allowedSourceAccountIds?: string[];
20
+ /**
21
+ * AWS Organizations ID (`o-` followed by 10–32 lowercase letters or digits).
22
+ *
23
+ * Allows log delivery from accounts in the organization via `aws:SourceOrgID`,
24
+ * with resource `AWSLogs/*`. Mutually exclusive with {@link AccessLogDeliveryScope.allowedSourceAccountIds}.
25
+ *
26
+ * @default undefined (do not use an organization-wide policy)
27
+ */
28
+ readonly organizationId?: string;
29
+ }
30
+ /**
31
+ * Returns whether `scope` sets {@link AccessLogDeliveryScope.allowedSourceAccountIds}.
32
+ *
33
+ * @param scope - Caller-supplied delivery scope.
34
+ * @returns `true` when the account-list field is present.
35
+ */
36
+ export declare const hasAllowedSourceAccountIds: (scope: AccessLogDeliveryScope) => boolean;
37
+ /**
38
+ * Returns whether `scope` sets {@link AccessLogDeliveryScope.organizationId}.
39
+ *
40
+ * @param scope - Caller-supplied delivery scope.
41
+ * @returns `true` when the organization field is present.
42
+ */
43
+ export declare const hasOrganizationId: (scope: AccessLogDeliveryScope) => boolean;
44
+ /**
45
+ * Returns whether `scope` sets exactly one of the mutually exclusive delivery fields.
46
+ *
47
+ * @param scope - Caller-supplied delivery scope.
48
+ * @returns `true` when exactly one of the two fields is present.
49
+ */
50
+ export declare const isExclusiveAccessLogDeliveryScope: (scope: AccessLogDeliveryScope) => boolean;
51
+ /**
52
+ * Returns whether `value` is a 12-digit AWS account ID.
53
+ *
54
+ * @param value - Candidate account ID.
55
+ * @returns `true` when `value` matches `^[0-9]{12}$`.
56
+ */
57
+ export declare const isAwsAccountId: (value: string) => boolean;
58
+ /**
59
+ * Returns whether `value` is an AWS Organizations ID.
60
+ *
61
+ * @param value - Candidate organization ID.
62
+ * @returns `true` when `value` matches `^o-[a-z0-9]{10,32}$`.
63
+ */
64
+ export declare const isAwsOrganizationId: (value: string) => boolean;
@@ -0,0 +1,54 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.isAwsOrganizationId = exports.isAwsAccountId = exports.isExclusiveAccessLogDeliveryScope = exports.hasOrganizationId = exports.hasAllowedSourceAccountIds = void 0;
4
+ /**
5
+ * Returns whether `scope` sets {@link AccessLogDeliveryScope.allowedSourceAccountIds}.
6
+ *
7
+ * @param scope - Caller-supplied delivery scope.
8
+ * @returns `true` when the account-list field is present.
9
+ */
10
+ const hasAllowedSourceAccountIds = (scope) => {
11
+ return scope.allowedSourceAccountIds !== undefined;
12
+ };
13
+ exports.hasAllowedSourceAccountIds = hasAllowedSourceAccountIds;
14
+ /**
15
+ * Returns whether `scope` sets {@link AccessLogDeliveryScope.organizationId}.
16
+ *
17
+ * @param scope - Caller-supplied delivery scope.
18
+ * @returns `true` when the organization field is present.
19
+ */
20
+ const hasOrganizationId = (scope) => {
21
+ return scope.organizationId !== undefined;
22
+ };
23
+ exports.hasOrganizationId = hasOrganizationId;
24
+ /**
25
+ * Returns whether `scope` sets exactly one of the mutually exclusive delivery fields.
26
+ *
27
+ * @param scope - Caller-supplied delivery scope.
28
+ * @returns `true` when exactly one of the two fields is present.
29
+ */
30
+ const isExclusiveAccessLogDeliveryScope = (scope) => {
31
+ return (0, exports.hasAllowedSourceAccountIds)(scope) !== (0, exports.hasOrganizationId)(scope);
32
+ };
33
+ exports.isExclusiveAccessLogDeliveryScope = isExclusiveAccessLogDeliveryScope;
34
+ /**
35
+ * Returns whether `value` is a 12-digit AWS account ID.
36
+ *
37
+ * @param value - Candidate account ID.
38
+ * @returns `true` when `value` matches `^[0-9]{12}$`.
39
+ */
40
+ const isAwsAccountId = (value) => {
41
+ return /^\d{12}$/.test(value);
42
+ };
43
+ exports.isAwsAccountId = isAwsAccountId;
44
+ /**
45
+ * Returns whether `value` is an AWS Organizations ID.
46
+ *
47
+ * @param value - Candidate organization ID.
48
+ * @returns `true` when `value` matches `^o-[a-z0-9]{10,32}$`.
49
+ */
50
+ const isAwsOrganizationId = (value) => {
51
+ return /^o-[a-z0-9]{10,32}$/.test(value);
52
+ };
53
+ exports.isAwsOrganizationId = isAwsOrganizationId;
54
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjZXNzLWxvZy1kZWxpdmVyeS1zY29wZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9idWNrZXQtdHlwZXMvYWNjZXNzLWxvZy1kZWxpdmVyeS1zY29wZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUErQkE7Ozs7O0dBS0c7QUFDSSxNQUFNLDBCQUEwQixHQUFHLENBQUMsS0FBNkIsRUFBVyxFQUFFO0lBQ25GLE9BQU8sS0FBSyxDQUFDLHVCQUF1QixLQUFLLFNBQVMsQ0FBQztBQUNyRCxDQUFDLENBQUM7QUFGVyxRQUFBLDBCQUEwQiw4QkFFckM7QUFFRjs7Ozs7R0FLRztBQUNJLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxLQUE2QixFQUFXLEVBQUU7SUFDMUUsT0FBTyxLQUFLLENBQUMsY0FBYyxLQUFLLFNBQVMsQ0FBQztBQUM1QyxDQUFDLENBQUM7QUFGVyxRQUFBLGlCQUFpQixxQkFFNUI7QUFFRjs7Ozs7R0FLRztBQUNJLE1BQU0saUNBQWlDLEdBQUcsQ0FBQyxLQUE2QixFQUFXLEVBQUU7SUFDMUYsT0FBTyxJQUFBLGtDQUEwQixFQUFDLEtBQUssQ0FBQyxLQUFLLElBQUEseUJBQWlCLEVBQUMsS0FBSyxDQUFDLENBQUM7QUFDeEUsQ0FBQyxDQUFDO0FBRlcsUUFBQSxpQ0FBaUMscUNBRTVDO0FBRUY7Ozs7O0dBS0c7QUFDSSxNQUFNLGNBQWMsR0FBRyxDQUFDLEtBQWEsRUFBVyxFQUFFO0lBQ3ZELE9BQU8sVUFBVSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUNoQyxDQUFDLENBQUM7QUFGVyxRQUFBLGNBQWMsa0JBRXpCO0FBRUY7Ozs7O0dBS0c7QUFDSSxNQUFNLG1CQUFtQixHQUFHLENBQUMsS0FBYSxFQUFXLEVBQUU7SUFDNUQsT0FBTyxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDM0MsQ0FBQyxDQUFDO0FBRlcsUUFBQSxtQkFBbUIsdUJBRTlCIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBBY2NvdW50IHNjb3BlIGZvciB7QGxpbmsgUzNTZWN1cmVCdWNrZXRUeXBlLkFDQ0VTU19MT0dfQlVDS0VUfSByZXNvdXJjZSBwb2xpY2llcy5cbiAqXG4gKiBTcGVjaWZ5ICoqZXhhY3RseSBvbmUqKiBvZiB7QGxpbmsgQWNjZXNzTG9nRGVsaXZlcnlTY29wZS5hbGxvd2VkU291cmNlQWNjb3VudElkc30gb3JcbiAqIHtAbGluayBBY2Nlc3NMb2dEZWxpdmVyeVNjb3BlLm9yZ2FuaXphdGlvbklkfS4gT21pdCB7QGxpbmsgUzNTZWN1cmVCdWNrZXRQcm9wcy5hY2Nlc3NMb2dEZWxpdmVyeX1cbiAqIHRvIGFsbG93IG9ubHkgdGhlIHN0YWNrIGFjY291bnQgKGRlZmF1bHQpLlxuICpcbiAqIGpzaWkgZG9lcyBub3Qgc3VwcG9ydCBhIGRpc2NyaW1pbmF0ZWQgdW5pb24gb2Ygc3RydWN0cywgc28gZXhjbHVzaXZpdHkgaXMgZW5mb3JjZWQgYXQgY29uc3RydWN0IHRpbWUuXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgQWNjZXNzTG9nRGVsaXZlcnlTY29wZSB7XG4gIC8qKlxuICAgKiBBY2NvdW50IElEcyBhbGxvd2VkIHRvIHdyaXRlIHVuZGVyIGBBV1NMb2dzLzxhY2NvdW50SWQ+LypgLlxuICAgKlxuICAgKiBUaGUgbGlzdCBpcyB1c2VkIGFzIHNwZWNpZmllZDsgaW5jbHVkZSB0aGUgc3RhY2sgYWNjb3VudCBpZiB0aGF0IGFjY291bnQgc2hvdWxkIGFsc28gZGVsaXZlciBsb2dzLlxuICAgKiBEdXBsaWNhdGUgSURzIGFyZSBpZ25vcmVkLiBNdXR1YWxseSBleGNsdXNpdmUgd2l0aCB7QGxpbmsgQWNjZXNzTG9nRGVsaXZlcnlTY29wZS5vcmdhbml6YXRpb25JZH0uXG4gICAqXG4gICAqIEBkZWZhdWx0IHVuZGVmaW5lZCAoZG8gbm90IHVzZSBhbiBleHBsaWNpdCBhY2NvdW50IGxpc3QpXG4gICAqL1xuICByZWFkb25seSBhbGxvd2VkU291cmNlQWNjb3VudElkcz86IHN0cmluZ1tdO1xuXG4gIC8qKlxuICAgKiBBV1MgT3JnYW5pemF0aW9ucyBJRCAoYG8tYCBmb2xsb3dlZCBieSAxMOKAkzMyIGxvd2VyY2FzZSBsZXR0ZXJzIG9yIGRpZ2l0cykuXG4gICAqXG4gICAqIEFsbG93cyBsb2cgZGVsaXZlcnkgZnJvbSBhY2NvdW50cyBpbiB0aGUgb3JnYW5pemF0aW9uIHZpYSBgYXdzOlNvdXJjZU9yZ0lEYCxcbiAgICogd2l0aCByZXNvdXJjZSBgQVdTTG9ncy8qYC4gTXV0dWFsbHkgZXhjbHVzaXZlIHdpdGgge0BsaW5rIEFjY2Vzc0xvZ0RlbGl2ZXJ5U2NvcGUuYWxsb3dlZFNvdXJjZUFjY291bnRJZHN9LlxuICAgKlxuICAgKiBAZGVmYXVsdCB1bmRlZmluZWQgKGRvIG5vdCB1c2UgYW4gb3JnYW5pemF0aW9uLXdpZGUgcG9saWN5KVxuICAgKi9cbiAgcmVhZG9ubHkgb3JnYW5pemF0aW9uSWQ/OiBzdHJpbmc7XG59XG5cbi8qKlxuICogUmV0dXJucyB3aGV0aGVyIGBzY29wZWAgc2V0cyB7QGxpbmsgQWNjZXNzTG9nRGVsaXZlcnlTY29wZS5hbGxvd2VkU291cmNlQWNjb3VudElkc30uXG4gKlxuICogQHBhcmFtIHNjb3BlIC0gQ2FsbGVyLXN1cHBsaWVkIGRlbGl2ZXJ5IHNjb3BlLlxuICogQHJldHVybnMgYHRydWVgIHdoZW4gdGhlIGFjY291bnQtbGlzdCBmaWVsZCBpcyBwcmVzZW50LlxuICovXG5leHBvcnQgY29uc3QgaGFzQWxsb3dlZFNvdXJjZUFjY291bnRJZHMgPSAoc2NvcGU6IEFjY2Vzc0xvZ0RlbGl2ZXJ5U2NvcGUpOiBib29sZWFuID0+IHtcbiAgcmV0dXJuIHNjb3BlLmFsbG93ZWRTb3VyY2VBY2NvdW50SWRzICE9PSB1bmRlZmluZWQ7XG59O1xuXG4vKipcbiAqIFJldHVybnMgd2hldGhlciBgc2NvcGVgIHNldHMge0BsaW5rIEFjY2Vzc0xvZ0RlbGl2ZXJ5U2NvcGUub3JnYW5pemF0aW9uSWR9LlxuICpcbiAqIEBwYXJhbSBzY29wZSAtIENhbGxlci1zdXBwbGllZCBkZWxpdmVyeSBzY29wZS5cbiAqIEByZXR1cm5zIGB0cnVlYCB3aGVuIHRoZSBvcmdhbml6YXRpb24gZmllbGQgaXMgcHJlc2VudC5cbiAqL1xuZXhwb3J0IGNvbnN0IGhhc09yZ2FuaXphdGlvbklkID0gKHNjb3BlOiBBY2Nlc3NMb2dEZWxpdmVyeVNjb3BlKTogYm9vbGVhbiA9PiB7XG4gIHJldHVybiBzY29wZS5vcmdhbml6YXRpb25JZCAhPT0gdW5kZWZpbmVkO1xufTtcblxuLyoqXG4gKiBSZXR1cm5zIHdoZXRoZXIgYHNjb3BlYCBzZXRzIGV4YWN0bHkgb25lIG9mIHRoZSBtdXR1YWxseSBleGNsdXNpdmUgZGVsaXZlcnkgZmllbGRzLlxuICpcbiAqIEBwYXJhbSBzY29wZSAtIENhbGxlci1zdXBwbGllZCBkZWxpdmVyeSBzY29wZS5cbiAqIEByZXR1cm5zIGB0cnVlYCB3aGVuIGV4YWN0bHkgb25lIG9mIHRoZSB0d28gZmllbGRzIGlzIHByZXNlbnQuXG4gKi9cbmV4cG9ydCBjb25zdCBpc0V4Y2x1c2l2ZUFjY2Vzc0xvZ0RlbGl2ZXJ5U2NvcGUgPSAoc2NvcGU6IEFjY2Vzc0xvZ0RlbGl2ZXJ5U2NvcGUpOiBib29sZWFuID0+IHtcbiAgcmV0dXJuIGhhc0FsbG93ZWRTb3VyY2VBY2NvdW50SWRzKHNjb3BlKSAhPT0gaGFzT3JnYW5pemF0aW9uSWQoc2NvcGUpO1xufTtcblxuLyoqXG4gKiBSZXR1cm5zIHdoZXRoZXIgYHZhbHVlYCBpcyBhIDEyLWRpZ2l0IEFXUyBhY2NvdW50IElELlxuICpcbiAqIEBwYXJhbSB2YWx1ZSAtIENhbmRpZGF0ZSBhY2NvdW50IElELlxuICogQHJldHVybnMgYHRydWVgIHdoZW4gYHZhbHVlYCBtYXRjaGVzIGBeWzAtOV17MTJ9JGAuXG4gKi9cbmV4cG9ydCBjb25zdCBpc0F3c0FjY291bnRJZCA9ICh2YWx1ZTogc3RyaW5nKTogYm9vbGVhbiA9PiB7XG4gIHJldHVybiAvXlxcZHsxMn0kLy50ZXN0KHZhbHVlKTtcbn07XG5cbi8qKlxuICogUmV0dXJucyB3aGV0aGVyIGB2YWx1ZWAgaXMgYW4gQVdTIE9yZ2FuaXphdGlvbnMgSUQuXG4gKlxuICogQHBhcmFtIHZhbHVlIC0gQ2FuZGlkYXRlIG9yZ2FuaXphdGlvbiBJRC5cbiAqIEByZXR1cm5zIGB0cnVlYCB3aGVuIGB2YWx1ZWAgbWF0Y2hlcyBgXm8tW2EtejAtOV17MTAsMzJ9JGAuXG4gKi9cbmV4cG9ydCBjb25zdCBpc0F3c09yZ2FuaXphdGlvbklkID0gKHZhbHVlOiBzdHJpbmcpOiBib29sZWFuID0+IHtcbiAgcmV0dXJuIC9eby1bYS16MC05XXsxMCwzMn0kLy50ZXN0KHZhbHVlKTtcbn07XG4iXX0=
@@ -27,7 +27,10 @@ export declare const S3SecureBucketType: {
27
27
  readonly DEFAULT_BUCKET: "DefaultBucket";
28
28
  /**
29
29
  * Centralized access logs for producers such as ALB/NLB, CloudFront standard logging (v2),
30
- * and S3 server access logging. Grants `s3:PutObject` on `AWSLogs/<account>/*` only (no read/list).
30
+ * and S3 server access logging. Grants `s3:PutObject` on `AWSLogs/...` prefixes only (no read/list).
31
+ *
32
+ * By default the prefix is `AWSLogs/<stack account>/*`. Override with
33
+ * {@link S3SecureBucketProps.accessLogDelivery} to allow an explicit account list or an AWS Organization.
31
34
  *
32
35
  * The regional ELBv2 log-delivery account ID (legacy path alongside the log delivery service principal)
33
36
  * is resolved from `aws-cdk-lib/region-info` at synthesis time when {@link Stack#region} is known,
@@ -30,7 +30,10 @@ exports.S3SecureBucketType = {
30
30
  DEFAULT_BUCKET: 'DefaultBucket',
31
31
  /**
32
32
  * Centralized access logs for producers such as ALB/NLB, CloudFront standard logging (v2),
33
- * and S3 server access logging. Grants `s3:PutObject` on `AWSLogs/<account>/*` only (no read/list).
33
+ * and S3 server access logging. Grants `s3:PutObject` on `AWSLogs/...` prefixes only (no read/list).
34
+ *
35
+ * By default the prefix is `AWSLogs/<stack account>/*`. Override with
36
+ * {@link S3SecureBucketProps.accessLogDelivery} to allow an explicit account list or an AWS Organization.
34
37
  *
35
38
  * The regional ELBv2 log-delivery account ID (legacy path alongside the log delivery service principal)
36
39
  * is resolved from `aws-cdk-lib/region-info` at synthesis time when {@link Stack#region} is known,
@@ -45,4 +48,4 @@ exports.S3SecureBucketType = {
45
48
  */
46
49
  CLOUD_WATCH_LOG_ARCHIVE_BUCKET: 'CloudWatchLogArchiveBucket',
47
50
  };
48
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVja2V0LXR5cGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVja2V0LXR5cGVzL2J1Y2tldC10eXBlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7Ozs7R0FNRztBQUNVLFFBQUEsa0JBQWtCLEdBQUc7SUFDaEM7Ozs7O09BS0c7SUFDSCxtQ0FBbUMsRUFBRSxrQ0FBa0M7SUFDdkU7Ozs7T0FJRztJQUNILHdCQUF3QixFQUFFLHdCQUF3QjtJQUNsRDs7OztPQUlHO0lBQ0gsY0FBYyxFQUFFLGVBQWU7SUFDL0I7Ozs7Ozs7T0FPRztJQUNILGlCQUFpQixFQUFFLGlCQUFpQjtJQUNwQzs7Ozs7T0FLRztJQUNILDhCQUE4QixFQUFFLDRCQUE0QjtDQUNwRCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBCdWNrZXQgdHlwZSBkaXNjcmltaW5hdG9yIHZhbHVlcyBmb3Ige0BsaW5rIFMzU2VjdXJlQnVja2V0UHJvcHMuYnVja2V0VHlwZX0uXG4gKlxuICogRWFjaCB2YWx1ZSBzZWxlY3RzIGVuY3J5cHRpb24gZGVmYXVsdHMgYW5kLCBmb3Igc29tZSB0eXBlcywgYWRkaXRpb25hbCBidWNrZXQgcmVzb3VyY2UgcG9saWNpZXMuXG4gKlxuICogQHNlZSB7QGxpbmsgUzNTZWN1cmVCdWNrZXRQcm9wcy5idWNrZXRUeXBlfVxuICovXG5leHBvcnQgY29uc3QgUzNTZWN1cmVCdWNrZXRUeXBlID0ge1xuICAvKipcbiAgICogUGlwZWxpbmUgYXJ0aWZhY3QgYnVja2V0IHdoZW4gdXNpbmcgYSBjdXN0b20gQ0RLIGJvb3RzdHJhcCBxdWFsaWZpZXJcbiAgICogKHNpbmdsZS0gb3IgbXVsdGktcmVnaW9uIGRlcGxveW1lbnRzKS5cbiAgICpcbiAgICogQWRkcyBhbiBgczM6KmAgZ3JhbnQgZm9yIGBjZGstPHF1YWxpZmllcj4tZGVwbG95LXJvbGVgIHdoZW4gdGhlIGJvb3RzdHJhcCBxdWFsaWZpZXIgaXMgbm90IGRlZmF1bHQuXG4gICAqL1xuICBERVBMT1lNRU5UX1BJUEVMSU5FX0FSVElGQUNUX0JVQ0tFVDogJ0RlcGxveW1lbnRQaXBlbGluZUFydGlmYWN0QnVja2V0JyxcbiAgLyoqXG4gICAqIE9yaWdpbiBidWNrZXQgZm9yIENsb3VkRnJvbnQgZGlzdHJpYnV0aW9ucy5cbiAgICpcbiAgICogVXNlcyBTMy1tYW5hZ2VkIGVuY3J5cHRpb24gKHtAbGluayBzMy5CdWNrZXRFbmNyeXB0aW9uLlMzX01BTkFHRUR9KSBieSBkZWZhdWx0LlxuICAgKi9cbiAgQ0xPVURGUk9OVF9PUklHSU5fQlVDS0VUOiAnQ2xvdWRGcm9udE9yaWdpbkJ1Y2tldCcsXG4gIC8qKlxuICAgKiBHZW5lcmFsLXB1cnBvc2Ugc2VjdXJlIGJ1Y2tldCAoZGVmYXVsdCBxdWFsaWZpZXIgLyBzdGFuZGFyZCB1c2UpLlxuICAgKlxuICAgKiBVc2VzIEtNUy1tYW5hZ2VkIGVuY3J5cHRpb24gdW5sZXNzIG92ZXJyaWRkZW4gaW4gcHJvcHMuIE5vIHR5cGUtc3BlY2lmaWMgcmVzb3VyY2UgcG9saWNpZXMuXG4gICAqL1xuICBERUZBVUxUX0JVQ0tFVDogJ0RlZmF1bHRCdWNrZXQnLFxuICAvKipcbiAgICogQ2VudHJhbGl6ZWQgYWNjZXNzIGxvZ3MgZm9yIHByb2R1Y2VycyBzdWNoIGFzIEFMQi9OTEIsIENsb3VkRnJvbnQgc3RhbmRhcmQgbG9nZ2luZyAodjIpLFxuICAgKiBhbmQgUzMgc2VydmVyIGFjY2VzcyBsb2dnaW5nLiBHcmFudHMgYHMzOlB1dE9iamVjdGAgb24gYEFXU0xvZ3MvPGFjY291bnQ+LypgIG9ubHkgKG5vIHJlYWQvbGlzdCkuXG4gICAqXG4gICAqIFRoZSByZWdpb25hbCBFTEJ2MiBsb2ctZGVsaXZlcnkgYWNjb3VudCBJRCAobGVnYWN5IHBhdGggYWxvbmdzaWRlIHRoZSBsb2cgZGVsaXZlcnkgc2VydmljZSBwcmluY2lwYWwpXG4gICAqIGlzIHJlc29sdmVkIGZyb20gYGF3cy1jZGstbGliL3JlZ2lvbi1pbmZvYCBhdCBzeW50aGVzaXMgdGltZSB3aGVuIHtAbGluayBTdGFjayNyZWdpb259IGlzIGtub3duLFxuICAgKiBvciB2aWEgYSBkZXBsb3ktdGltZSBtYXBwaW5nIHdoZW4gaXQgaXMgYSB0b2tlbi5cbiAgICovXG4gIEFDQ0VTU19MT0dfQlVDS0VUOiAnQWNjZXNzTG9nQnVja2V0JyxcbiAgLyoqXG4gICAqIEFyY2hpdmUgYnVja2V0IGZvciBsb2cgZGF0YSBleHBvcnRlZCBmcm9tIENsb3VkV2F0Y2ggTG9ncyB2aWEgZXhwb3J0IHRhc2tzLlxuICAgKlxuICAgKiBHcmFudHMgYGxvZ3MuPHJlZ2lvbj4uYW1hem9uYXdzLmNvbWAgYHMzOkdldEJ1Y2tldEFjbGAgYW5kIGBzMzpQdXRPYmplY3RgIGZvciBsb2cgZ3JvdXBzIGluIHRoZVxuICAgKiBzdGFjayBhY2NvdW50IGFuZCByZWdpb24gKHNlZSBBV1MgZG9jcyBmb3IgY3Jvc3MtYWNjb3VudCBleHBvcnQpLlxuICAgKi9cbiAgQ0xPVURfV0FUQ0hfTE9HX0FSQ0hJVkVfQlVDS0VUOiAnQ2xvdWRXYXRjaExvZ0FyY2hpdmVCdWNrZXQnLFxufSBhcyBjb25zdDtcblxuLyoqXG4gKiBEaXNjcmltaW5hdGVkIHVuaW9uIG9mIHtAbGluayBTM1NlY3VyZUJ1Y2tldFR5cGV9IHN0cmluZyBsaXRlcmFscy5cbiAqL1xuZXhwb3J0IHR5cGUgUzNTZWN1cmVCdWNrZXRUeXBlID0gdHlwZW9mIFMzU2VjdXJlQnVja2V0VHlwZVtrZXlvZiB0eXBlb2YgUzNTZWN1cmVCdWNrZXRUeXBlXTtcbiJdfQ==
51
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVja2V0LXR5cGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVja2V0LXR5cGVzL2J1Y2tldC10eXBlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7Ozs7R0FNRztBQUNVLFFBQUEsa0JBQWtCLEdBQUc7SUFDaEM7Ozs7O09BS0c7SUFDSCxtQ0FBbUMsRUFBRSxrQ0FBa0M7SUFDdkU7Ozs7T0FJRztJQUNILHdCQUF3QixFQUFFLHdCQUF3QjtJQUNsRDs7OztPQUlHO0lBQ0gsY0FBYyxFQUFFLGVBQWU7SUFDL0I7Ozs7Ozs7Ozs7T0FVRztJQUNILGlCQUFpQixFQUFFLGlCQUFpQjtJQUNwQzs7Ozs7T0FLRztJQUNILDhCQUE4QixFQUFFLDRCQUE0QjtDQUNwRCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBCdWNrZXQgdHlwZSBkaXNjcmltaW5hdG9yIHZhbHVlcyBmb3Ige0BsaW5rIFMzU2VjdXJlQnVja2V0UHJvcHMuYnVja2V0VHlwZX0uXG4gKlxuICogRWFjaCB2YWx1ZSBzZWxlY3RzIGVuY3J5cHRpb24gZGVmYXVsdHMgYW5kLCBmb3Igc29tZSB0eXBlcywgYWRkaXRpb25hbCBidWNrZXQgcmVzb3VyY2UgcG9saWNpZXMuXG4gKlxuICogQHNlZSB7QGxpbmsgUzNTZWN1cmVCdWNrZXRQcm9wcy5idWNrZXRUeXBlfVxuICovXG5leHBvcnQgY29uc3QgUzNTZWN1cmVCdWNrZXRUeXBlID0ge1xuICAvKipcbiAgICogUGlwZWxpbmUgYXJ0aWZhY3QgYnVja2V0IHdoZW4gdXNpbmcgYSBjdXN0b20gQ0RLIGJvb3RzdHJhcCBxdWFsaWZpZXJcbiAgICogKHNpbmdsZS0gb3IgbXVsdGktcmVnaW9uIGRlcGxveW1lbnRzKS5cbiAgICpcbiAgICogQWRkcyBhbiBgczM6KmAgZ3JhbnQgZm9yIGBjZGstPHF1YWxpZmllcj4tZGVwbG95LXJvbGVgIHdoZW4gdGhlIGJvb3RzdHJhcCBxdWFsaWZpZXIgaXMgbm90IGRlZmF1bHQuXG4gICAqL1xuICBERVBMT1lNRU5UX1BJUEVMSU5FX0FSVElGQUNUX0JVQ0tFVDogJ0RlcGxveW1lbnRQaXBlbGluZUFydGlmYWN0QnVja2V0JyxcbiAgLyoqXG4gICAqIE9yaWdpbiBidWNrZXQgZm9yIENsb3VkRnJvbnQgZGlzdHJpYnV0aW9ucy5cbiAgICpcbiAgICogVXNlcyBTMy1tYW5hZ2VkIGVuY3J5cHRpb24gKHtAbGluayBzMy5CdWNrZXRFbmNyeXB0aW9uLlMzX01BTkFHRUR9KSBieSBkZWZhdWx0LlxuICAgKi9cbiAgQ0xPVURGUk9OVF9PUklHSU5fQlVDS0VUOiAnQ2xvdWRGcm9udE9yaWdpbkJ1Y2tldCcsXG4gIC8qKlxuICAgKiBHZW5lcmFsLXB1cnBvc2Ugc2VjdXJlIGJ1Y2tldCAoZGVmYXVsdCBxdWFsaWZpZXIgLyBzdGFuZGFyZCB1c2UpLlxuICAgKlxuICAgKiBVc2VzIEtNUy1tYW5hZ2VkIGVuY3J5cHRpb24gdW5sZXNzIG92ZXJyaWRkZW4gaW4gcHJvcHMuIE5vIHR5cGUtc3BlY2lmaWMgcmVzb3VyY2UgcG9saWNpZXMuXG4gICAqL1xuICBERUZBVUxUX0JVQ0tFVDogJ0RlZmF1bHRCdWNrZXQnLFxuICAvKipcbiAgICogQ2VudHJhbGl6ZWQgYWNjZXNzIGxvZ3MgZm9yIHByb2R1Y2VycyBzdWNoIGFzIEFMQi9OTEIsIENsb3VkRnJvbnQgc3RhbmRhcmQgbG9nZ2luZyAodjIpLFxuICAgKiBhbmQgUzMgc2VydmVyIGFjY2VzcyBsb2dnaW5nLiBHcmFudHMgYHMzOlB1dE9iamVjdGAgb24gYEFXU0xvZ3MvLi4uYCBwcmVmaXhlcyBvbmx5IChubyByZWFkL2xpc3QpLlxuICAgKlxuICAgKiBCeSBkZWZhdWx0IHRoZSBwcmVmaXggaXMgYEFXU0xvZ3MvPHN0YWNrIGFjY291bnQ+LypgLiBPdmVycmlkZSB3aXRoXG4gICAqIHtAbGluayBTM1NlY3VyZUJ1Y2tldFByb3BzLmFjY2Vzc0xvZ0RlbGl2ZXJ5fSB0byBhbGxvdyBhbiBleHBsaWNpdCBhY2NvdW50IGxpc3Qgb3IgYW4gQVdTIE9yZ2FuaXphdGlvbi5cbiAgICpcbiAgICogVGhlIHJlZ2lvbmFsIEVMQnYyIGxvZy1kZWxpdmVyeSBhY2NvdW50IElEIChsZWdhY3kgcGF0aCBhbG9uZ3NpZGUgdGhlIGxvZyBkZWxpdmVyeSBzZXJ2aWNlIHByaW5jaXBhbClcbiAgICogaXMgcmVzb2x2ZWQgZnJvbSBgYXdzLWNkay1saWIvcmVnaW9uLWluZm9gIGF0IHN5bnRoZXNpcyB0aW1lIHdoZW4ge0BsaW5rIFN0YWNrI3JlZ2lvbn0gaXMga25vd24sXG4gICAqIG9yIHZpYSBhIGRlcGxveS10aW1lIG1hcHBpbmcgd2hlbiBpdCBpcyBhIHRva2VuLlxuICAgKi9cbiAgQUNDRVNTX0xPR19CVUNLRVQ6ICdBY2Nlc3NMb2dCdWNrZXQnLFxuICAvKipcbiAgICogQXJjaGl2ZSBidWNrZXQgZm9yIGxvZyBkYXRhIGV4cG9ydGVkIGZyb20gQ2xvdWRXYXRjaCBMb2dzIHZpYSBleHBvcnQgdGFza3MuXG4gICAqXG4gICAqIEdyYW50cyBgbG9ncy48cmVnaW9uPi5hbWF6b25hd3MuY29tYCBgczM6R2V0QnVja2V0QWNsYCBhbmQgYHMzOlB1dE9iamVjdGAgZm9yIGxvZyBncm91cHMgaW4gdGhlXG4gICAqIHN0YWNrIGFjY291bnQgYW5kIHJlZ2lvbiAoc2VlIEFXUyBkb2NzIGZvciBjcm9zcy1hY2NvdW50IGV4cG9ydCkuXG4gICAqL1xuICBDTE9VRF9XQVRDSF9MT0dfQVJDSElWRV9CVUNLRVQ6ICdDbG91ZFdhdGNoTG9nQXJjaGl2ZUJ1Y2tldCcsXG59IGFzIGNvbnN0O1xuXG4vKipcbiAqIERpc2NyaW1pbmF0ZWQgdW5pb24gb2Yge0BsaW5rIFMzU2VjdXJlQnVja2V0VHlwZX0gc3RyaW5nIGxpdGVyYWxzLlxuICovXG5leHBvcnQgdHlwZSBTM1NlY3VyZUJ1Y2tldFR5cGUgPSB0eXBlb2YgUzNTZWN1cmVCdWNrZXRUeXBlW2tleW9mIHR5cGVvZiBTM1NlY3VyZUJ1Y2tldFR5cGVdO1xuIl19
@@ -4,5 +4,6 @@
4
4
  * @packageDocumentation
5
5
  */
6
6
  export { S3SecureBucketType } from './bucket-type';
7
+ export type { AccessLogDeliveryScope } from './access-log-delivery-scope';
7
8
  export type { S3SecureBucketProps } from './props';
8
9
  export { resolveEncryptionDefault } from './encryption-default';
@@ -10,4 +10,4 @@ var bucket_type_1 = require("./bucket-type");
10
10
  Object.defineProperty(exports, "S3SecureBucketType", { enumerable: true, get: function () { return bucket_type_1.S3SecureBucketType; } });
11
11
  var encryption_default_1 = require("./encryption-default");
12
12
  Object.defineProperty(exports, "resolveEncryptionDefault", { enumerable: true, get: function () { return encryption_default_1.resolveEncryptionDefault; } });
13
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVja2V0LXR5cGVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7O0dBSUc7QUFDSCw2Q0FBbUQ7QUFBMUMsaUhBQUEsa0JBQWtCLE9BQUE7QUFFM0IsMkRBQWdFO0FBQXZELDhIQUFBLHdCQUF3QixPQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBCdWNrZXQgdHlwZSBkaXNjcmltaW5hdG9ycywgY29uc3RydWN0IHByb3BzLCBhbmQgZW5jcnlwdGlvbiBkZWZhdWx0cy5cbiAqXG4gKiBAcGFja2FnZURvY3VtZW50YXRpb25cbiAqL1xuZXhwb3J0IHsgUzNTZWN1cmVCdWNrZXRUeXBlIH0gZnJvbSAnLi9idWNrZXQtdHlwZSc7XG5leHBvcnQgdHlwZSB7IFMzU2VjdXJlQnVja2V0UHJvcHMgfSBmcm9tICcuL3Byb3BzJztcbmV4cG9ydCB7IHJlc29sdmVFbmNyeXB0aW9uRGVmYXVsdCB9IGZyb20gJy4vZW5jcnlwdGlvbi1kZWZhdWx0JztcbiJdfQ==
13
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVja2V0LXR5cGVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7O0dBSUc7QUFDSCw2Q0FBbUQ7QUFBMUMsaUhBQUEsa0JBQWtCLE9BQUE7QUFHM0IsMkRBQWdFO0FBQXZELDhIQUFBLHdCQUF3QixPQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBCdWNrZXQgdHlwZSBkaXNjcmltaW5hdG9ycywgY29uc3RydWN0IHByb3BzLCBhbmQgZW5jcnlwdGlvbiBkZWZhdWx0cy5cbiAqXG4gKiBAcGFja2FnZURvY3VtZW50YXRpb25cbiAqL1xuZXhwb3J0IHsgUzNTZWN1cmVCdWNrZXRUeXBlIH0gZnJvbSAnLi9idWNrZXQtdHlwZSc7XG5leHBvcnQgdHlwZSB7IEFjY2Vzc0xvZ0RlbGl2ZXJ5U2NvcGUgfSBmcm9tICcuL2FjY2Vzcy1sb2ctZGVsaXZlcnktc2NvcGUnO1xuZXhwb3J0IHR5cGUgeyBTM1NlY3VyZUJ1Y2tldFByb3BzIH0gZnJvbSAnLi9wcm9wcyc7XG5leHBvcnQgeyByZXNvbHZlRW5jcnlwdGlvbkRlZmF1bHQgfSBmcm9tICcuL2VuY3J5cHRpb24tZGVmYXVsdCc7XG4iXX0=
@@ -1,4 +1,5 @@
1
1
  import * as s3 from 'aws-cdk-lib/aws-s3';
2
+ import { AccessLogDeliveryScope } from './access-log-delivery-scope';
2
3
  import { S3SecureBucketType } from './bucket-type';
3
4
  /**
4
5
  * Construction properties for {@link S3SecureBucket}.
@@ -13,4 +14,17 @@ export interface S3SecureBucketProps extends s3.BucketProps {
13
14
  * @default {@link S3SecureBucketType.DEFAULT_BUCKET}
14
15
  */
15
16
  readonly bucketType?: S3SecureBucketType;
17
+ /**
18
+ * Account or organization scope for {@link S3SecureBucketType.ACCESS_LOG_BUCKET} writers.
19
+ *
20
+ * Specify exactly one of {@link AccessLogDeliveryScope.allowedSourceAccountIds} or
21
+ * {@link AccessLogDeliveryScope.organizationId}. When omitted, only the stack account
22
+ * may deliver logs (`AWSLogs/<stack account>/*`).
23
+ *
24
+ * Supported only when {@link S3SecureBucketProps.bucketType} is
25
+ * {@link S3SecureBucketType.ACCESS_LOG_BUCKET}.
26
+ *
27
+ * @default stack account only
28
+ */
29
+ readonly accessLogDelivery?: AccessLogDeliveryScope;
16
30
  }
@@ -34,4 +34,5 @@ var __importStar = (this && this.__importStar) || (function () {
34
34
  })();
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
36
  const s3 = __importStar(require("aws-cdk-lib/aws-s3"));
37
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVja2V0LXR5cGVzL3Byb3BzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQXlDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgczMgZnJvbSAnYXdzLWNkay1saWIvYXdzLXMzJztcbmltcG9ydCB7IFMzU2VjdXJlQnVja2V0VHlwZSB9IGZyb20gJy4vYnVja2V0LXR5cGUnO1xuXG4vKipcbiAqIENvbnN0cnVjdGlvbiBwcm9wZXJ0aWVzIGZvciB7QGxpbmsgUzNTZWN1cmVCdWNrZXR9LlxuICpcbiAqIEV4dGVuZHMge0BsaW5rIHMzLkJ1Y2tldFByb3BzfS4gU2V2ZXJhbCBmaWVsZHMgcmVjZWl2ZSBzZWN1cmUgZGVmYXVsdHMgaW5zaWRlIHRoZSBjb25zdHJ1Y3RcbiAqIGFuZCBtYXkgYmUgb3ZlcnJpZGRlbiB1bmxlc3MgZG9jdW1lbnRlZCBvdGhlcndpc2Ugb24ge0BsaW5rIFMzU2VjdXJlQnVja2V0fS5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBTM1NlY3VyZUJ1Y2tldFByb3BzIGV4dGVuZHMgczMuQnVja2V0UHJvcHMge1xuXG4gIC8qKlxuICAgKiBTZWxlY3RzIGVuY3J5cHRpb24gZGVmYXVsdHMgYW5kIG9wdGlvbmFsIHJlc291cmNlLXBvbGljeSBzdGF0ZW1lbnRzLlxuICAgKlxuICAgKiBAZGVmYXVsdCB7QGxpbmsgUzNTZWN1cmVCdWNrZXRUeXBlLkRFRkFVTFRfQlVDS0VUfVxuICAgKi9cbiAgcmVhZG9ubHkgYnVja2V0VHlwZT86IFMzU2VjdXJlQnVja2V0VHlwZTtcbn1cbiJdfQ==
37
+ const bucket_type_1 = require("./bucket-type");
38
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVja2V0LXR5cGVzL3Byb3BzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQXlDO0FBRXpDLCtDQUFtRCIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIHMzIGZyb20gJ2F3cy1jZGstbGliL2F3cy1zMyc7XG5pbXBvcnQgeyBBY2Nlc3NMb2dEZWxpdmVyeVNjb3BlIH0gZnJvbSAnLi9hY2Nlc3MtbG9nLWRlbGl2ZXJ5LXNjb3BlJztcbmltcG9ydCB7IFMzU2VjdXJlQnVja2V0VHlwZSB9IGZyb20gJy4vYnVja2V0LXR5cGUnO1xuXG4vKipcbiAqIENvbnN0cnVjdGlvbiBwcm9wZXJ0aWVzIGZvciB7QGxpbmsgUzNTZWN1cmVCdWNrZXR9LlxuICpcbiAqIEV4dGVuZHMge0BsaW5rIHMzLkJ1Y2tldFByb3BzfS4gU2V2ZXJhbCBmaWVsZHMgcmVjZWl2ZSBzZWN1cmUgZGVmYXVsdHMgaW5zaWRlIHRoZSBjb25zdHJ1Y3RcbiAqIGFuZCBtYXkgYmUgb3ZlcnJpZGRlbiB1bmxlc3MgZG9jdW1lbnRlZCBvdGhlcndpc2Ugb24ge0BsaW5rIFMzU2VjdXJlQnVja2V0fS5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBTM1NlY3VyZUJ1Y2tldFByb3BzIGV4dGVuZHMgczMuQnVja2V0UHJvcHMge1xuXG4gIC8qKlxuICAgKiBTZWxlY3RzIGVuY3J5cHRpb24gZGVmYXVsdHMgYW5kIG9wdGlvbmFsIHJlc291cmNlLXBvbGljeSBzdGF0ZW1lbnRzLlxuICAgKlxuICAgKiBAZGVmYXVsdCB7QGxpbmsgUzNTZWN1cmVCdWNrZXRUeXBlLkRFRkFVTFRfQlVDS0VUfVxuICAgKi9cbiAgcmVhZG9ubHkgYnVja2V0VHlwZT86IFMzU2VjdXJlQnVja2V0VHlwZTtcblxuICAvKipcbiAgICogQWNjb3VudCBvciBvcmdhbml6YXRpb24gc2NvcGUgZm9yIHtAbGluayBTM1NlY3VyZUJ1Y2tldFR5cGUuQUNDRVNTX0xPR19CVUNLRVR9IHdyaXRlcnMuXG4gICAqXG4gICAqIFNwZWNpZnkgZXhhY3RseSBvbmUgb2Yge0BsaW5rIEFjY2Vzc0xvZ0RlbGl2ZXJ5U2NvcGUuYWxsb3dlZFNvdXJjZUFjY291bnRJZHN9IG9yXG4gICAqIHtAbGluayBBY2Nlc3NMb2dEZWxpdmVyeVNjb3BlLm9yZ2FuaXphdGlvbklkfS4gV2hlbiBvbWl0dGVkLCBvbmx5IHRoZSBzdGFjayBhY2NvdW50XG4gICAqIG1heSBkZWxpdmVyIGxvZ3MgKGBBV1NMb2dzLzxzdGFjayBhY2NvdW50Pi8qYCkuXG4gICAqXG4gICAqIFN1cHBvcnRlZCBvbmx5IHdoZW4ge0BsaW5rIFMzU2VjdXJlQnVja2V0UHJvcHMuYnVja2V0VHlwZX0gaXNcbiAgICoge0BsaW5rIFMzU2VjdXJlQnVja2V0VHlwZS5BQ0NFU1NfTE9HX0JVQ0tFVH0uXG4gICAqXG4gICAqIEBkZWZhdWx0IHN0YWNrIGFjY291bnQgb25seVxuICAgKi9cbiAgcmVhZG9ubHkgYWNjZXNzTG9nRGVsaXZlcnk/OiBBY2Nlc3NMb2dEZWxpdmVyeVNjb3BlO1xufVxuIl19
package/lib/index.d.ts CHANGED
@@ -5,4 +5,4 @@
5
5
  */
6
6
  export { S3SecureBucket } from './s3-secure-bucket';
7
7
  export { S3SecureBucketType } from './bucket-types';
8
- export type { S3SecureBucketProps } from './bucket-types';
8
+ export type { AccessLogDeliveryScope, S3SecureBucketProps } from './bucket-types';
package/lib/index.js CHANGED
@@ -10,4 +10,4 @@ var s3_secure_bucket_1 = require("./s3-secure-bucket");
10
10
  Object.defineProperty(exports, "S3SecureBucket", { enumerable: true, get: function () { return s3_secure_bucket_1.S3SecureBucket; } });
11
11
  var bucket_types_1 = require("./bucket-types");
12
12
  Object.defineProperty(exports, "S3SecureBucketType", { enumerable: true, get: function () { return bucket_types_1.S3SecureBucketType; } });
13
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUE7Ozs7R0FJRztBQUNILHVEQUFvRDtBQUEzQyxrSEFBQSxjQUFjLE9BQUE7QUFDdkIsK0NBQW9EO0FBQTNDLGtIQUFBLGtCQUFrQixPQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBQdWJsaWMgZW50cnkgcG9pbnQgZm9yIHRoZSBgczMtc2VjdXJlLWJ1Y2tldGAgY29uc3RydWN0IGxpYnJhcnkuXG4gKlxuICogQHBhY2thZ2VEb2N1bWVudGF0aW9uXG4gKi9cbmV4cG9ydCB7IFMzU2VjdXJlQnVja2V0IH0gZnJvbSAnLi9zMy1zZWN1cmUtYnVja2V0JztcbmV4cG9ydCB7IFMzU2VjdXJlQnVja2V0VHlwZSB9IGZyb20gJy4vYnVja2V0LXR5cGVzJztcbmV4cG9ydCB0eXBlIHsgUzNTZWN1cmVCdWNrZXRQcm9wcyB9IGZyb20gJy4vYnVja2V0LXR5cGVzJztcbiJdfQ==
13
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUE7Ozs7R0FJRztBQUNILHVEQUFvRDtBQUEzQyxrSEFBQSxjQUFjLE9BQUE7QUFDdkIsK0NBQW9EO0FBQTNDLGtIQUFBLGtCQUFrQixPQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBQdWJsaWMgZW50cnkgcG9pbnQgZm9yIHRoZSBgczMtc2VjdXJlLWJ1Y2tldGAgY29uc3RydWN0IGxpYnJhcnkuXG4gKlxuICogQHBhY2thZ2VEb2N1bWVudGF0aW9uXG4gKi9cbmV4cG9ydCB7IFMzU2VjdXJlQnVja2V0IH0gZnJvbSAnLi9zMy1zZWN1cmUtYnVja2V0JztcbmV4cG9ydCB7IFMzU2VjdXJlQnVja2V0VHlwZSB9IGZyb20gJy4vYnVja2V0LXR5cGVzJztcbmV4cG9ydCB0eXBlIHsgQWNjZXNzTG9nRGVsaXZlcnlTY29wZSwgUzNTZWN1cmVCdWNrZXRQcm9wcyB9IGZyb20gJy4vYnVja2V0LXR5cGVzJztcbiJdfQ==
@@ -17,7 +17,8 @@ import { S3SecureBucketProps } from './bucket-types';
17
17
  *
18
18
  * Bucket-type-specific behavior:
19
19
  * - {@link S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET}: may attach a deploy-role policy when a non-default bootstrap qualifier is present.
20
- * - {@link S3SecureBucketType.ACCESS_LOG_BUCKET}: adds log-writer principals; see {@link S3SecureBucket#accessLogBucketPolicyDependable}.
20
+ * - {@link S3SecureBucketType.ACCESS_LOG_BUCKET}: adds log-writer principals; see {@link S3SecureBucket#accessLogBucketPolicyDependable}
21
+ * and {@link S3SecureBucketProps.accessLogDelivery}.
21
22
  * - {@link S3SecureBucketType.CLOUD_WATCH_LOG_ARCHIVE_BUCKET}: adds CloudWatch Logs export principals (`logs.<region>.amazonaws.com`).
22
23
  */
23
24
  export declare class S3SecureBucket extends s3.Bucket {
@@ -55,11 +55,12 @@ const bucket_types_1 = require("./bucket-types");
55
55
  *
56
56
  * Bucket-type-specific behavior:
57
57
  * - {@link S3SecureBucketType.DEPLOYMENT_PIPELINE_ARTIFACT_BUCKET}: may attach a deploy-role policy when a non-default bootstrap qualifier is present.
58
- * - {@link S3SecureBucketType.ACCESS_LOG_BUCKET}: adds log-writer principals; see {@link S3SecureBucket#accessLogBucketPolicyDependable}.
58
+ * - {@link S3SecureBucketType.ACCESS_LOG_BUCKET}: adds log-writer principals; see {@link S3SecureBucket#accessLogBucketPolicyDependable}
59
+ * and {@link S3SecureBucketProps.accessLogDelivery}.
59
60
  * - {@link S3SecureBucketType.CLOUD_WATCH_LOG_ARCHIVE_BUCKET}: adds CloudWatch Logs export principals (`logs.<region>.amazonaws.com`).
60
61
  */
61
62
  class S3SecureBucket extends s3.Bucket {
62
- static [JSII_RTTI_SYMBOL_1] = { fqn: "s3-secure-bucket.S3SecureBucket", version: "0.4.4" };
63
+ static [JSII_RTTI_SYMBOL_1] = { fqn: "s3-secure-bucket.S3SecureBucket", version: "0.5.0" };
63
64
  /**
64
65
  * Set only when {@link S3SecureBucketProps.bucketType} is {@link S3SecureBucketType.ACCESS_LOG_BUCKET}.
65
66
  * Use as a dependency target so load balancer access-log enablement runs after the bucket policy
@@ -107,12 +108,16 @@ class S3SecureBucket extends s3.Bucket {
107
108
  cfnBucket.addPropertyOverride('NotificationConfiguration.EventBridgeConfiguration.EventBridgeEnabled', true);
108
109
  }
109
110
  const stack = aws_cdk_lib_1.Stack.of(this);
111
+ if (props?.accessLogDelivery !== undefined && bucketType !== bucket_types_1.S3SecureBucketType.ACCESS_LOG_BUCKET) {
112
+ throw new Error('accessLogDelivery is only supported when bucketType is ACCESS_LOG_BUCKET');
113
+ }
110
114
  const policyResult = (0, bucket_policies_1.applyBucketPolicies)(bucketType, {
111
115
  bucket: this,
112
116
  stack,
117
+ accessLogDelivery: props?.accessLogDelivery,
113
118
  });
114
119
  this.accessLogBucketPolicyDependable = policyResult.accessLogBucketPolicyDependable;
115
120
  }
116
121
  }
117
122
  exports.S3SecureBucket = S3SecureBucket;
118
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiczMtc2VjdXJlLWJ1Y2tldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9zMy1zZWN1cmUtYnVja2V0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2Q0FBbUQ7QUFDbkQsdURBQXlDO0FBRXpDLHVEQUF3RDtBQUN4RCxpREFJd0I7QUFFeEI7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWtCRztBQUNILE1BQWEsY0FBZSxTQUFRLEVBQUUsQ0FBQyxNQUFNOztJQUMzQzs7Ozs7Ozs7T0FRRztJQUNhLCtCQUErQixDQUFlO0lBRTlEOzs7Ozs7O09BT0c7SUFDSCxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQTJCO1FBQ25FLE1BQU0sVUFBVSxHQUFHLEtBQUssRUFBRSxVQUFVLElBQUksaUNBQWtCLENBQUMsY0FBYyxDQUFDO1FBQzFFLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFO1lBQ2YsR0FBRyxLQUFLO1lBQ1IsYUFBYSxFQUFFLDJCQUFhLENBQUMsTUFBTTtZQUNuQyxVQUFVLEVBQUUsSUFBQSx1Q0FBd0IsRUFBQyxVQUFVLEVBQUUsS0FBSyxFQUFFLFVBQVUsQ0FBQztZQUNuRSxhQUFhLEVBQUUsQ0FBQyxHQUFHLEVBQUU7Z0JBQ25CLElBQUksQ0FBQyxLQUFLLEVBQUUsYUFBYSxFQUFFLENBQUM7b0JBQzFCLE9BQU8sRUFBRSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQztnQkFDeEMsQ0FBQztnQkFDRCxPQUFPLEtBQUssQ0FBQyxhQUFhLENBQUM7WUFDN0IsQ0FBQyxDQUFDLEVBQUU7WUFDSixrQkFBa0IsRUFBRSxTQUFTO1lBQzdCLGdCQUFnQixFQUFFLEtBQUs7WUFDdkIsaUJBQWlCLEVBQUUsRUFBRSxDQUFDLGlCQUFpQixDQUFDLFNBQVM7WUFDakQsVUFBVSxFQUFFLElBQUk7WUFDaEIsU0FBUyxFQUFFLEtBQUssRUFBRSxTQUFTLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJO1lBQ2xFLGVBQWUsRUFBRSxDQUFDLEdBQUcsRUFBRTtnQkFDckIsSUFBSSxLQUFLLEVBQUUsZUFBZSxFQUFFLENBQUM7b0JBQzNCLE9BQU8sS0FBSyxDQUFDLGVBQWUsQ0FBQztnQkFDL0IsQ0FBQztnQkFDRCxPQUFPLEVBQUUsQ0FBQyxlQUFlLENBQUMscUJBQXFCLENBQUM7WUFDbEQsQ0FBQyxDQUFDLEVBQUU7U0FDTCxDQUFDLENBQUM7UUFFSCxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFlBQTRCLENBQUM7UUFDekQsSUFBSSxLQUFLLEVBQUUsa0JBQWtCLEtBQUssSUFBSSxFQUFFLENBQUM7WUFDdkMsU0FBUyxDQUFDLG1CQUFtQixDQUFDLHVFQUF1RSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQy9HLENBQUM7UUFFRCxNQUFNLEtBQUssR0FBRyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3QixNQUFNLFlBQVksR0FBRyxJQUFBLHFDQUFtQixFQUFDLFVBQVUsRUFBRTtZQUNuRCxNQUFNLEVBQUUsSUFBSTtZQUNaLEtBQUs7U0FDTixDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsK0JBQStCLEdBQUcsWUFBWSxDQUFDLCtCQUErQixDQUFDO0lBQ3RGLENBQUM7O0FBeERILHdDQXlEQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJlbW92YWxQb2xpY3ksIFN0YWNrIH0gZnJvbSAnYXdzLWNkay1saWInO1xuaW1wb3J0ICogYXMgczMgZnJvbSAnYXdzLWNkay1saWIvYXdzLXMzJztcbmltcG9ydCB7IENvbnN0cnVjdCwgSURlcGVuZGFibGUgfSBmcm9tICdjb25zdHJ1Y3RzJztcbmltcG9ydCB7IGFwcGx5QnVja2V0UG9saWNpZXMgfSBmcm9tICcuL2J1Y2tldC1wb2xpY2llcyc7XG5pbXBvcnQge1xuICByZXNvbHZlRW5jcnlwdGlvbkRlZmF1bHQsXG4gIFMzU2VjdXJlQnVja2V0UHJvcHMsXG4gIFMzU2VjdXJlQnVja2V0VHlwZSxcbn0gZnJvbSAnLi9idWNrZXQtdHlwZXMnO1xuXG4vKipcbiAqIFMzIGJ1Y2tldCB3aXRoIG9waW5pb25hdGVkIHNlY3VyZSBkZWZhdWx0czogcHJpdmF0ZSBBQ0xzLCBibG9jayBwdWJsaWMgYWNjZXNzLCBUTFMtb25seSBhY2Nlc3MsXG4gKiBhbmQgZW5jcnlwdGlvbiAoUzMtbWFuYWdlZCBmb3IgbG9nL29yaWdpbi9hcmNoaXZlIHR5cGVzOyBLTVMtbWFuYWdlZCBieSBkZWZhdWx0IG90aGVyd2lzZSkuXG4gKlxuICogQHJlbWFya3NcbiAqIFNlY3VyZSBkZWZhdWx0cyBhcHBsaWVkIHJlZ2FyZGxlc3Mgb2YgYHByb3BzYDpcbiAqIC0gYHJlbW92YWxQb2xpY3lgOiB7QGxpbmsgUmVtb3ZhbFBvbGljeS5SRVRBSU59XG4gKiAtIGBwdWJsaWNSZWFkQWNjZXNzYDogYGZhbHNlYFxuICogLSBgYmxvY2tQdWJsaWNBY2Nlc3NgOiB7QGxpbmsgczMuQmxvY2tQdWJsaWNBY2Nlc3MuQkxPQ0tfQUxMfVxuICogLSBgZW5mb3JjZVNTTGA6IGB0cnVlYFxuICogLSBgdmVyc2lvbmVkYDogYHRydWVgIHVubGVzcyBleHBsaWNpdGx5IHNldCBpbiBgcHJvcHNgXG4gKiAtIGBvYmplY3RPd25lcnNoaXBgOiB7QGxpbmsgczMuT2JqZWN0T3duZXJzaGlwLkJVQ0tFVF9PV05FUl9FTkZPUkNFRH0gdW5sZXNzIG92ZXJyaWRkZW5cbiAqIC0gYGFjY2Vzc0NvbnRyb2xgOiB7QGxpbmsgczMuQnVja2V0QWNjZXNzQ29udHJvbC5QUklWQVRFfSB1bmxlc3Mgb3ZlcnJpZGRlblxuICpcbiAqIEJ1Y2tldC10eXBlLXNwZWNpZmljIGJlaGF2aW9yOlxuICogLSB7QGxpbmsgUzNTZWN1cmVCdWNrZXRUeXBlLkRFUExPWU1FTlRfUElQRUxJTkVfQVJUSUZBQ1RfQlVDS0VUfTogbWF5IGF0dGFjaCBhIGRlcGxveS1yb2xlIHBvbGljeSB3aGVuIGEgbm9uLWRlZmF1bHQgYm9vdHN0cmFwIHF1YWxpZmllciBpcyBwcmVzZW50LlxuICogLSB7QGxpbmsgUzNTZWN1cmVCdWNrZXRUeXBlLkFDQ0VTU19MT0dfQlVDS0VUfTogYWRkcyBsb2ctd3JpdGVyIHByaW5jaXBhbHM7IHNlZSB7QGxpbmsgUzNTZWN1cmVCdWNrZXQjYWNjZXNzTG9nQnVja2V0UG9saWN5RGVwZW5kYWJsZX0uXG4gKiAtIHtAbGluayBTM1NlY3VyZUJ1Y2tldFR5cGUuQ0xPVURfV0FUQ0hfTE9HX0FSQ0hJVkVfQlVDS0VUfTogYWRkcyBDbG91ZFdhdGNoIExvZ3MgZXhwb3J0IHByaW5jaXBhbHMgKGBsb2dzLjxyZWdpb24+LmFtYXpvbmF3cy5jb21gKS5cbiAqL1xuZXhwb3J0IGNsYXNzIFMzU2VjdXJlQnVja2V0IGV4dGVuZHMgczMuQnVja2V0IHtcbiAgLyoqXG4gICAqIFNldCBvbmx5IHdoZW4ge0BsaW5rIFMzU2VjdXJlQnVja2V0UHJvcHMuYnVja2V0VHlwZX0gaXMge0BsaW5rIFMzU2VjdXJlQnVja2V0VHlwZS5BQ0NFU1NfTE9HX0JVQ0tFVH0uXG4gICAqIFVzZSBhcyBhIGRlcGVuZGVuY3kgdGFyZ2V0IHNvIGxvYWQgYmFsYW5jZXIgYWNjZXNzLWxvZyBlbmFibGVtZW50IHJ1bnMgYWZ0ZXIgdGhlIGJ1Y2tldCBwb2xpY3lcbiAgICogZXhpc3RzIChFTEIgcGVyZm9ybXMgYW4gaW1tZWRpYXRlIHZhbGlkYXRpb24gYFB1dE9iamVjdGAgdGhhdCBmYWlscyBpZiB0aGUgcG9saWN5IGlzIG5vdCBhcHBsaWVkIHlldCkuXG4gICAqXG4gICAqIEV4YW1wbGU6IGBsb2FkQmFsYW5jZXIubm9kZS5hZGREZXBlbmRlbmN5KGJ1Y2tldC5hY2Nlc3NMb2dCdWNrZXRQb2xpY3lEZXBlbmRhYmxlISlgLlxuICAgKlxuICAgKiBAZGVmYXVsdCB1bmRlZmluZWQgd2hlbiBgYnVja2V0VHlwZWAgaXMgbm90IHtAbGluayBTM1NlY3VyZUJ1Y2tldFR5cGUuQUNDRVNTX0xPR19CVUNLRVR9LlxuICAgKi9cbiAgcHVibGljIHJlYWRvbmx5IGFjY2Vzc0xvZ0J1Y2tldFBvbGljeURlcGVuZGFibGU/OiBJRGVwZW5kYWJsZTtcblxuICAvKipcbiAgICogQ3JlYXRlcyBhIHNlY3VyZSBTMyBidWNrZXQgYWNjb3JkaW5nIHRvIGBidWNrZXRUeXBlYCBhbmQgbWVyZ2VkIGBwcm9wc2AuXG4gICAqXG4gICAqIEBwYXJhbSBzY29wZSAtIFBhcmVudCBjb25zdHJ1Y3QsIHR5cGljYWxseSBhIHtAbGluayBTdGFja30uXG4gICAqIEBwYXJhbSBpZCAtIENvbnN0cnVjdCBJRCAoc3RhYmxlIGxvZ2ljYWwgSUQgc2VnbWVudCkuXG4gICAqIEBwYXJhbSBwcm9wcyAtIE9wdGlvbmFsIHtAbGluayBTM1NlY3VyZUJ1Y2tldFByb3BzfTsgc2VjdXJlIGRlZmF1bHRzIG92ZXJyaWRlIHNldmVyYWwge0BsaW5rIHMzLkJ1Y2tldFByb3BzfSBmaWVsZHMuXG4gICAqIFdoZW4gYGV2ZW50QnJpZGdlRW5hYmxlZGAgaXMgYHRydWVgLCBFdmVudEJyaWRnZSBub3RpZmljYXRpb24gaXMgZW5hYmxlZCB2aWEgYW4gTDEgcHJvcGVydHkgb3ZlcnJpZGUuXG4gICAqL1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wcz86IFMzU2VjdXJlQnVja2V0UHJvcHMpIHtcbiAgICBjb25zdCBidWNrZXRUeXBlID0gcHJvcHM/LmJ1Y2tldFR5cGUgfHwgUzNTZWN1cmVCdWNrZXRUeXBlLkRFRkFVTFRfQlVDS0VUO1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgLi4ucHJvcHMsXG4gICAgICByZW1vdmFsUG9saWN5OiBSZW1vdmFsUG9saWN5LlJFVEFJTixcbiAgICAgIGVuY3J5cHRpb246IHJlc29sdmVFbmNyeXB0aW9uRGVmYXVsdChidWNrZXRUeXBlLCBwcm9wcz8uZW5jcnlwdGlvbiksXG4gICAgICBhY2Nlc3NDb250cm9sOiAoKCkgPT4ge1xuICAgICAgICBpZiAoIXByb3BzPy5hY2Nlc3NDb250cm9sKSB7XG4gICAgICAgICAgcmV0dXJuIHMzLkJ1Y2tldEFjY2Vzc0NvbnRyb2wuUFJJVkFURTtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gcHJvcHMuYWNjZXNzQ29udHJvbDtcbiAgICAgIH0pKCksXG4gICAgICBldmVudEJyaWRnZUVuYWJsZWQ6IHVuZGVmaW5lZCxcbiAgICAgIHB1YmxpY1JlYWRBY2Nlc3M6IGZhbHNlLFxuICAgICAgYmxvY2tQdWJsaWNBY2Nlc3M6IHMzLkJsb2NrUHVibGljQWNjZXNzLkJMT0NLX0FMTCxcbiAgICAgIGVuZm9yY2VTU0w6IHRydWUsXG4gICAgICB2ZXJzaW9uZWQ6IHByb3BzPy52ZXJzaW9uZWQgIT09IHVuZGVmaW5lZCA/IHByb3BzLnZlcnNpb25lZCA6IHRydWUsXG4gICAgICBvYmplY3RPd25lcnNoaXA6ICgoKSA9PiB7XG4gICAgICAgIGlmIChwcm9wcz8ub2JqZWN0T3duZXJzaGlwKSB7XG4gICAgICAgICAgcmV0dXJuIHByb3BzLm9iamVjdE93bmVyc2hpcDtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gczMuT2JqZWN0T3duZXJzaGlwLkJVQ0tFVF9PV05FUl9FTkZPUkNFRDtcbiAgICAgIH0pKCksXG4gICAgfSk7XG5cbiAgICBjb25zdCBjZm5CdWNrZXQgPSB0aGlzLm5vZGUuZGVmYXVsdENoaWxkIGFzIHMzLkNmbkJ1Y2tldDtcbiAgICBpZiAocHJvcHM/LmV2ZW50QnJpZGdlRW5hYmxlZCA9PT0gdHJ1ZSkge1xuICAgICAgY2ZuQnVja2V0LmFkZFByb3BlcnR5T3ZlcnJpZGUoJ05vdGlmaWNhdGlvbkNvbmZpZ3VyYXRpb24uRXZlbnRCcmlkZ2VDb25maWd1cmF0aW9uLkV2ZW50QnJpZGdlRW5hYmxlZCcsIHRydWUpO1xuICAgIH1cblxuICAgIGNvbnN0IHN0YWNrID0gU3RhY2sub2YodGhpcyk7XG4gICAgY29uc3QgcG9saWN5UmVzdWx0ID0gYXBwbHlCdWNrZXRQb2xpY2llcyhidWNrZXRUeXBlLCB7XG4gICAgICBidWNrZXQ6IHRoaXMsXG4gICAgICBzdGFjayxcbiAgICB9KTtcbiAgICB0aGlzLmFjY2Vzc0xvZ0J1Y2tldFBvbGljeURlcGVuZGFibGUgPSBwb2xpY3lSZXN1bHQuYWNjZXNzTG9nQnVja2V0UG9saWN5RGVwZW5kYWJsZTtcbiAgfVxufVxuIl19
123
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"s3-secure-bucket.js","sourceRoot":"","sources":["../src/s3-secure-bucket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAmD;AACnD,uDAAyC;AAEzC,uDAAwD;AACxD,iDAIwB;AAExB;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAa,cAAe,SAAQ,EAAE,CAAC,MAAM;;IAC3C;;;;;;;;OAQG;IACa,+BAA+B,CAAe;IAE9D;;;;;;;OAOG;IACH,YAAY,KAAgB,EAAE,EAAU,EAAE,KAA2B;QACnE,MAAM,UAAU,GAAG,KAAK,EAAE,UAAU,IAAI,iCAAkB,CAAC,cAAc,CAAC;QAC1E,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE;YACf,GAAG,KAAK;YACR,aAAa,EAAE,2BAAa,CAAC,MAAM;YACnC,UAAU,EAAE,IAAA,uCAAwB,EAAC,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC;YACnE,aAAa,EAAE,CAAC,GAAG,EAAE;gBACnB,IAAI,CAAC,KAAK,EAAE,aAAa,EAAE,CAAC;oBAC1B,OAAO,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBACxC,CAAC;gBACD,OAAO,KAAK,CAAC,aAAa,CAAC;YAC7B,CAAC,CAAC,EAAE;YACJ,kBAAkB,EAAE,SAAS;YAC7B,gBAAgB,EAAE,KAAK;YACvB,iBAAiB,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS;YACjD,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,KAAK,EAAE,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;YAClE,eAAe,EAAE,CAAC,GAAG,EAAE;gBACrB,IAAI,KAAK,EAAE,eAAe,EAAE,CAAC;oBAC3B,OAAO,KAAK,CAAC,eAAe,CAAC;gBAC/B,CAAC;gBACD,OAAO,EAAE,CAAC,eAAe,CAAC,qBAAqB,CAAC;YAClD,CAAC,CAAC,EAAE;SACL,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,YAA4B,CAAC;QACzD,IAAI,KAAK,EAAE,kBAAkB,KAAK,IAAI,EAAE,CAAC;YACvC,SAAS,CAAC,mBAAmB,CAAC,uEAAuE,EAAE,IAAI,CAAC,CAAC;QAC/G,CAAC;QAED,MAAM,KAAK,GAAG,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,KAAK,EAAE,iBAAiB,KAAK,SAAS,IAAI,UAAU,KAAK,iCAAkB,CAAC,iBAAiB,EAAE,CAAC;YAClG,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;QAC9F,CAAC;QACD,MAAM,YAAY,GAAG,IAAA,qCAAmB,EAAC,UAAU,EAAE;YACnD,MAAM,EAAE,IAAI;YACZ,KAAK;YACL,iBAAiB,EAAE,KAAK,EAAE,iBAAiB;SAC5C,CAAC,CAAC;QACH,IAAI,CAAC,+BAA+B,GAAG,YAAY,CAAC,+BAA+B,CAAC;IACtF,CAAC;;AA5DH,wCA6DC","sourcesContent":["import { RemovalPolicy, Stack } from 'aws-cdk-lib';\nimport * as s3 from 'aws-cdk-lib/aws-s3';\nimport { Construct, IDependable } from 'constructs';\nimport { applyBucketPolicies } from './bucket-policies';\nimport {\n  resolveEncryptionDefault,\n  S3SecureBucketProps,\n  S3SecureBucketType,\n} from './bucket-types';\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/archive types; KMS-managed by default otherwise).\n *\n * @remarks\n * Secure defaults applied regardless of `props`:\n * - `removalPolicy`: {@link RemovalPolicy.RETAIN}\n * - `publicReadAccess`: `false`\n * - `blockPublicAccess`: {@link s3.BlockPublicAccess.BLOCK_ALL}\n * - `enforceSSL`: `true`\n * - `versioned`: `true` unless explicitly set in `props`\n * - `objectOwnership`: {@link s3.ObjectOwnership.BUCKET_OWNER_ENFORCED} unless overridden\n * - `accessControl`: {@link s3.BucketAccessControl.PRIVATE} unless overridden\n *\n * Bucket-type-specific behavior:\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 S3SecureBucket#accessLogBucketPolicyDependable}\n *   and {@link S3SecureBucketProps.accessLogDelivery}.\n * - {@link S3SecureBucketType.CLOUD_WATCH_LOG_ARCHIVE_BUCKET}: adds CloudWatch Logs export principals (`logs.<region>.amazonaws.com`).\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 S3SecureBucketProps}; secure defaults override several {@link s3.BucketProps} fields.\n   * When `eventBridgeEnabled` is `true`, EventBridge notification is enabled via an L1 property override.\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: resolveEncryptionDefault(bucketType, props?.encryption),\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 stack = Stack.of(this);\n    if (props?.accessLogDelivery !== undefined && bucketType !== S3SecureBucketType.ACCESS_LOG_BUCKET) {\n      throw new Error('accessLogDelivery is only supported when bucketType is ACCESS_LOG_BUCKET');\n    }\n    const policyResult = applyBucketPolicies(bucketType, {\n      bucket: this,\n      stack,\n      accessLogDelivery: props?.accessLogDelivery,\n    });\n    this.accessLogBucketPolicyDependable = policyResult.accessLogBucketPolicyDependable;\n  }\n}\n"]}
package/package.json CHANGED
@@ -81,7 +81,7 @@
81
81
  "publishConfig": {
82
82
  "access": "public"
83
83
  },
84
- "version": "0.4.4",
84
+ "version": "0.5.0",
85
85
  "jest": {
86
86
  "coverageProvider": "v8",
87
87
  "testMatch": [