style: fix prettier and ruff formatting for CI

Author: weklund

modules/sagemaker/sagemaker-model-cicd/lib/code-pipeline/mlops-code-pipeline-stack.ts

@@ -79,7 +79,11 @@ export class MLOpsCodePipelineStack extends cdk.Stack {
         // this pipeline will already be updated during `seedfarmer apply`
         selfMutation: false,
         crossAccountKeys: true,
-        artifactBucket: utils.createPipelineArtifactsBucket(this, s3AccessLogsBucketArn, `${projectName}-infra-pipeline-artifacts/`),
+        artifactBucket: utils.createPipelineArtifactsBucket(
+          this,
+          s3AccessLogsBucketArn,
+          `${projectName}-infra-pipeline-artifacts/`,
+        ),
         synth: new cdk.pipelines.CodeBuildStep('Synth', {
           input: cdk.pipelines.CodePipelineSource.codeCommit(
             this.infraRepo,

modules/sagemaker/sagemaker-model-cicd/lib/code-pipeline/model-build-support/model-build-support-stack.ts

@@ -101,14 +101,17 @@ export class ModelBuildSupportStack extends cdk.Stack {
       autoDeleteObjects: true,
       enforceSSL: true,
       serverAccessLogsBucket: accessLogsBucket,
-      serverAccessLogsPrefix: accessLogsBucket ? `${sagemakerArtifactsBucketName}-logs/` : undefined,
+      serverAccessLogsPrefix: accessLogsBucket
+        ? `${sagemakerArtifactsBucketName}-logs/`
+        : undefined,
     });
 
     if (!accessLogsBucket) {
       NagSuppressions.addResourceSuppressions(logsBucket, [
         {
           id: 'AwsSolutions-S1',
-          reason: 'This is itself a logging bucket; enabling access logs would create a circular dependency.',
+          reason:
+            'This is itself a logging bucket; enabling access logs would create a circular dependency.',
         },
       ]);
     }

modules/sagemaker/sagemaker-model-cicd/lib/code-pipeline/model-build/model-build-code-pipeline-stack.ts

@@ -119,7 +119,11 @@ export class ModelBuildCodePipelineStack extends cdk.Stack {
 
     const buildPipeline = new codepipeline.Pipeline(this, 'BuildPipeline', {
       pipelineName,
-      artifactBucket: utils.createPipelineArtifactsBucket(this, props.s3AccessLogsBucketArn, `${pipelineName}-artifacts/`),
+      artifactBucket: utils.createPipelineArtifactsBucket(
+        this,
+        props.s3AccessLogsBucketArn,
+        `${pipelineName}-artifacts/`,
+      ),
     });
     this.pipeline = buildPipeline;
 

modules/sagemaker/sagemaker-model-cicd/lib/code-pipeline/model-deploy/model-deploy-code-pipeline-stack.ts

@@ -90,7 +90,11 @@ export class ModelDeployCodePipelineStack extends cdk.Stack {
       // this pipeline will be updated by project-infra pipeline
       selfMutation: false,
       crossAccountKeys: true,
-      artifactBucket: utils.createPipelineArtifactsBucket(this, props.s3AccessLogsBucketArn, `${pipelineName}-artifacts/`),
+      artifactBucket: utils.createPipelineArtifactsBucket(
+        this,
+        props.s3AccessLogsBucketArn,
+        `${pipelineName}-artifacts/`,
+      ),
       synth: new cdk.pipelines.CodeBuildStep('Synth', {
         input: cdk.pipelines.CodePipelineSource.codeCommit(
           infraRepo,

modules/sagemaker/sagemaker-model-cicd/lib/utils/pipeline-artifacts-bucket.ts

@@ -22,7 +22,11 @@ export function createPipelineArtifactsBucket(
   );
 
   const accessLogsBucket = s3AccessLogsBucketArn
-    ? s3.Bucket.fromBucketArn(scope, 'PipelineAccessLogsBucket', s3AccessLogsBucketArn)
+    ? s3.Bucket.fromBucketArn(
+        scope,
+        'PipelineAccessLogsBucket',
+        s3AccessLogsBucketArn,
+      )
     : undefined;
 
   const pipelineArtifactsBucket = new s3.Bucket(
@@ -35,7 +39,9 @@ export function createPipelineArtifactsBucket(
       bucketKeyEnabled: true,
       enforceSSL: true,
       serverAccessLogsBucket: accessLogsBucket,
-      serverAccessLogsPrefix: accessLogsBucket ? (logsPrefix || 'pipeline-artifacts/') : undefined,
+      serverAccessLogsPrefix: accessLogsBucket
+        ? logsPrefix || 'pipeline-artifacts/'
+        : undefined,
     },
   );
   if (!accessLogsBucket) {

modules/sagemaker/sagemaker-model-cicd/test/model-build-support-stack.test.ts

@@ -61,5 +61,7 @@ test('ModelBuildSupportStack without s3AccessLogsBucketArn has no LoggingConfigu
   const logsBucket = Object.values(buckets).find(
     (b: any) => !b.Properties.BucketName,
   );
-  expect(logsBucket?.Properties.LoggingConfiguration?.DestinationBucketName).toBeUndefined();
+  expect(
+    logsBucket?.Properties.LoggingConfiguration?.DestinationBucketName,
+  ).toBeUndefined();
 });

modules/sagemaker/sagemaker-templates/tests/test_stack.py

@@ -249,9 +249,7 @@ def test_s3_access_logging_configured(stack_with_logging: cdk.Stack, project_tem
         if logging_config:
             prefix = logging_config.get("LogFilePrefix", "")
             assert prefix, f"Bucket {logical_id} has empty log prefix"
-            assert "xgboost-1" in prefix, (
-                f"Bucket {logical_id} log prefix missing project name: {prefix}"
-            )
+            assert "xgboost-1" in prefix, f"Bucket {logical_id} log prefix missing project name: {prefix}"
             buckets_with_logging.append(logical_id)
 
     assert len(buckets_with_logging) == expected_count, (
@@ -377,9 +375,9 @@ def check_statement_for_duplicates(statement: dict, logical_id: str, statement_s
             aws_principals = principal.get("AWS", [])
             if isinstance(aws_principals, list):
                 principal_strs = [stringify_principal(p) for p in aws_principals]
-                assert len(principal_strs) == len(
-                    set(principal_strs)
-                ), f"Duplicate principals in {logical_id} statement '{statement_sid}': {aws_principals}"
+                assert len(principal_strs) == len(set(principal_strs)), (
+                    f"Duplicate principals in {logical_id} statement '{statement_sid}': {aws_principals}"
+                )
 
     template = Template.from_stack(stack_single_account)
     model_package_groups = template.find_resources("AWS::SageMaker::ModelPackageGroup")
@@ -432,9 +430,9 @@ def check_statement_for_duplicates(statement: dict, logical_id: str, statement_s
             aws_principals = principal.get("AWS", [])
             if isinstance(aws_principals, list):
                 principal_strs = [stringify_principal(p) for p in aws_principals]
-                assert len(principal_strs) == len(
-                    set(principal_strs)
-                ), f"Duplicate principals in KMS key {logical_id} statement '{statement_sid}': {aws_principals}"
+                assert len(principal_strs) == len(set(principal_strs)), (
+                    f"Duplicate principals in KMS key {logical_id} statement '{statement_sid}': {aws_principals}"
+                )
 
     template = Template.from_stack(stack_single_account)
     kms_keys = template.find_resources("AWS::KMS::Key")