Merge branch 'main' into bobertzh/logging

.projenrc.ts

@@ -144,4 +144,7 @@ project.eslint?.addRules({
 // Allow PR backports to all releasable branches
 new github.PullRequestBackport(project);
 
+project.addDevDeps('madge');
+project.postCompileTask.exec('madge lib/index.js --circular');
+
 project.synth();

lib/private/handlers/client-options.ts

@@ -0,0 +1,11 @@
+import type { AwsDestination } from '@aws-cdk/cloud-assembly-schema';
+import type { ClientOptions } from '../../aws';
+
+export function destinationToClientOptions(destination: AwsDestination): ClientOptions {
+  return {
+    assumeRoleArn: destination.assumeRoleArn,
+    assumeRoleExternalId: destination.assumeRoleExternalId,
+    assumeRoleAdditionalOptions: destination.assumeRoleAdditionalOptions,
+    region: destination.region,
+  };
+}

lib/private/handlers/container-images.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { DockerImageDestination } from '@aws-cdk/cloud-assembly-schema';
-import { destinationToClientOptions } from '.';
+import { destinationToClientOptions } from './client-options';
 import { DockerImageManifestEntry } from '../../asset-manifest';
 import type { IECRClient } from '../../aws';
 import { EventType } from '../../progress';

lib/private/handlers/files.ts

@@ -2,7 +2,7 @@ import { createReadStream, promises as fs } from 'fs';
 import * as path from 'path';
 import { FileAssetPackaging, FileSource } from '@aws-cdk/cloud-assembly-schema';
 import * as mime from 'mime';
-import { destinationToClientOptions } from '.';
+import { destinationToClientOptions } from './client-options';
 import { FileManifestEntry } from '../../asset-manifest';
 import { IS3Client } from '../../aws';
 import { PutObjectCommandInput } from '../../aws-types';

lib/private/handlers/index.ts

@@ -1,4 +1,3 @@
-import type { AwsDestination } from '@aws-cdk/cloud-assembly-schema';
 import { ContainerImageAssetHandler } from './container-images';
 import { FileAssetHandler } from './files';
 import {
@@ -7,7 +6,6 @@ import {
   FileManifestEntry,
   type IManifestEntry,
 } from '../../asset-manifest';
-import type { ClientOptions } from '../../aws';
 import type { IAssetHandler, IHandlerHost, IHandlerOptions } from '../asset-handler';
 
 export function makeAssetHandler(
@@ -25,12 +23,3 @@ export function makeAssetHandler(
 
   throw new Error(`Unrecognized asset type: '${asset}'`);
 }
-
-export function destinationToClientOptions(destination: AwsDestination): ClientOptions {
-  return {
-    assumeRoleArn: destination.assumeRoleArn,
-    assumeRoleExternalId: destination.assumeRoleExternalId,
-    assumeRoleAdditionalOptions: destination.assumeRoleAdditionalOptions,
-    region: destination.region,
-  };
-}

test/docker-images.test.ts

@@ -297,10 +297,11 @@ test('logging in twice for two repository domains (containing account id & regio
   });
 
   mockEcr.on(DescribeRepositoriesCommand).callsFake((input) => {
-    const url = {
+    const repos: Record<string, string> = {
       repo: '12345.amazonaws.com/repo',
       repo2: '12346.amazonaws.com/repo2',
-    }[input.repositoryNames[0]];
+    };
+    const url = repos[input.repositoryNames[0]];
     if (!url) {
       throw new Error(`Unexpected repo: ${JSON.stringify(input)}`);
     }