fix: change names to remove s3 prefix

aws-quickstart · Feb 12, 2025 · f290016 · f290016
1 parent 2acba43
commit f290016
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/examples/blueprint-construct/index.ts b/examples/blueprint-construct/index.ts
@@ -271,7 +271,7 @@ export default class BlueprintConstruct {
       new addons.OpaGatekeeperAddOn(),
       new addons.PrometheusNodeExporterAddOn(),
       new addons.S3CSIDriverAddOn({
-        s3BucketName: "s3-csi-driver-for-blueprints-xbucket",
+        bucketNames: ["s3-csi-driver-for-blueprints-xbucket"],
       }),
       new addons.SecretsStoreAddOn(),
       new addons.SSMAgentAddOn(),

diff --git a/lib/addons/s3-csi-driver/iam-policy.ts b/lib/addons/s3-csi-driver/iam-policy.ts
@@ -1,9 +1,9 @@
 import * as iam from 'aws-cdk-lib/aws-iam';
 
-export function getS3DriverPolicyStatements(s3BucketNames: string[]): iam.PolicyStatement[] {
+export function getS3DriverPolicyStatements(bucketNames: string[]): iam.PolicyStatement[] {
     // new IAM policy to grand access to S3 bucket
     // https://github.com/awslabs/mountpoint-s3/blob/main/doc/CONFIGURATION.md#iam-permissions
-    const s3BucketArns = s3BucketNames.map((name) => `arn:aws:s3:::${name}`);
+    const s3BucketArns = bucketNames.map((name) => `arn:aws:s3:::${name}`);
     return [
         new iam.PolicyStatement({
             sid: 'S3MountpointFullBucketAccess',

diff --git a/lib/addons/s3-csi-driver/index.ts b/lib/addons/s3-csi-driver/index.ts
@@ -18,7 +18,7 @@ export interface S3CSIDriverAddOnProps extends HelmAddOnUserProps {
     /**
      * The names of the S3 buckets to be used by the driver
      */
-    s3BucketNames: string[];
+    bucketNames: string[];
     /**
      * Create Namespace with the provided one (will not if namespace is kube-system)
      */
@@ -36,7 +36,7 @@ const defaultProps: HelmAddOnUserProps & S3CSIDriverAddOnProps = {
   version: "v1.11.0",
   repository: "https://awslabs.github.io/mountpoint-s3-csi-driver",
   createNamespace: false,
-  s3BucketNames: []
+  bucketNames: []
 };
 
 @supportsALL
@@ -59,7 +59,7 @@ export class S3CSIDriverAddOn extends HelmAddOn {
 
         const s3BucketPolicy = new iam.Policy(cluster, S3_DRIVER_POLICY, {
             statements:
-                getS3DriverPolicyStatements(this.options.s3BucketNames)
+                getS3DriverPolicyStatements(this.options.bucketNames)
         });
         serviceAccount.role.attachInlinePolicy(s3BucketPolicy);