Fix cdk local docker image ecr publishing

Signed-off-by: Andre Kurait <akurait@amazon.com>

deployment/cdk/opensearch-service-migration/lib/common-utilities.ts

@@ -1,10 +1,11 @@
 import {Effect, PolicyStatement, Role, ServicePrincipal} from "aws-cdk-lib/aws-iam";
 import {Construct} from "constructs";
-import {CpuArchitecture} from "aws-cdk-lib/aws-ecs";
+import {ContainerImage, CpuArchitecture} from "aws-cdk-lib/aws-ecs";
 import {RemovalPolicy, Stack} from "aws-cdk-lib";
 import { IStringParameter, StringParameter } from "aws-cdk-lib/aws-ssm";
 import * as forge from 'node-forge';
 import { ClusterYaml } from "./migration-services-yaml";
+import { DockerImageAsset } from "aws-cdk-lib/aws-ecr-assets";
 
 export function getSecretAccessPolicy(secretArn: string): PolicyStatement {
     return new PolicyStatement({
@@ -15,6 +16,9 @@ export function getSecretAccessPolicy(secretArn: string): PolicyStatement {
         ]
     })
 }
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
 
 export function appendArgIfNotInExtraArgs(
     baseCommand: string,
@@ -435,3 +439,25 @@ export function isStackInGovCloud(stack: Stack): boolean {
 export function isRegionGovCloud(region: string): boolean {
     return region.startsWith('us-gov-');
 }
+
+/**
+ * Creates a Docker image asset from the specified image name.
+ *
+ * This function creates a Docker image asset from the specified image name.
+ * It can use a local or remote image.
+ *
+ * @param {string} imageName - The name of the Docker image to use as the base image.
+ * @returns {ContainerImage} - A `ContainerImage` object representing the Docker image asset.
+ */
+export function makeDockerImageAsset(imageName: string): ContainerImage {
+    const sanitizedImageName = imageName.replace(/[^a-zA-Z0-9-_]/g, '_');
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'docker-build-' + sanitizedImageName));
+    const dockerfilePath = path.join(tempDir, 'Dockerfile');
+    const dockerfileContent = `
+        FROM ${imageName}
+    `;
+    fs.writeFileSync(dockerfilePath, dockerfileContent);
+
+    return ContainerImage.fromAsset(tempDir);
+}
+

deployment/cdk/opensearch-service-migration/lib/service-stacks/migration-service-core.ts

@@ -15,11 +15,10 @@ import {
     ContainerDependencyCondition,
     ServiceManagedVolume
 } from "aws-cdk-lib/aws-ecs";
-import {DockerImageAsset} from "aws-cdk-lib/aws-ecr-assets";
 import {Duration, RemovalPolicy, Stack} from "aws-cdk-lib";
 import {LogGroup, RetentionDays} from "aws-cdk-lib/aws-logs";
 import {PolicyStatement, Role} from "aws-cdk-lib/aws-iam";
-import {createDefaultECSTaskRole} from "../common-utilities";
+import {createDefaultECSTaskRole, makeDockerImageAsset} from "../common-utilities";
 import {OtelCollectorSidecar} from "./migration-otel-collector-sidecar";
 import { IApplicationTargetGroup, INetworkTargetGroup } from "aws-cdk-lib/aws-elasticloadbalancingv2";
 
@@ -29,7 +28,6 @@ export interface MigrationServiceCoreProps extends StackPropsExt {
     readonly vpc: IVpc,
     readonly securityGroups: ISecurityGroup[],
     readonly cpuArchitecture: CpuArchitecture,
-    readonly dockerFilePath?: string,
     readonly dockerImageRegistryName: string,
     readonly dockerImageCommand?: string[],
     readonly dockerBuildArgs?: {
@@ -81,7 +79,7 @@ export class MigrationServiceCore extends Stack {
             props.volumes.forEach(vol => serviceTaskDef.addVolume(vol))
         }
 
-        let serviceImage = ContainerImage.fromRegistry(props.dockerImageRegistryName)
+        const serviceImage = makeDockerImageAsset(props.dockerImageRegistryName)
 
         const serviceLogGroup = new LogGroup(this, 'ServiceLogGroup',  {
             retention: RetentionDays.ONE_MONTH,

deployment/cdk/opensearch-service-migration/lib/service-stacks/reindex-from-snapshot-stack.ts

@@ -167,7 +167,7 @@ export class ReindexFromSnapshotStack extends MigrationServiceCore {
         this.createService({
             serviceName: 'reindex-from-snapshot',
             taskInstanceCount: 0,
-            dockerImageRegistryName: "migrations/reindex-from-snapshot:latest",
+            dockerImageRegistryName: "migrations/reindex_from_snapshot:latest",
             dockerImageCommand: ['/bin/sh', '-c', "/rfs-app/entrypoint.sh"],
             securityGroups: securityGroups,
             volumes: volumes,