Replace cluster resource with id and name properties

Author: ikovac

README.md

@@ -479,7 +479,8 @@ new WebServer(name: string, args: WebServerArgs, opts?: pulumi.ComponentResource
 export type WebServerArgs = {
   image: pulumi.Input<string>;
   port: pulumi.Input<number>;
-  cluster: aws.ecs.Cluster;
+  clusterId: pulumi.Input<string>;
+  clusterName: pulumi.Input<string>;
   vpcId: pulumi.Input<string>;
   vpcCidrBlock: pulumi.Input<string>;
   publicSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
@@ -534,7 +535,8 @@ new NuxtSSR(name: string, args: NuxtSSRArgs, opts?: pulumi.ComponentResourceOpti
 export type NuxtSSRArgs = {
   image: pulumi.Input<string>;
   port: pulumi.Input<number>;
-  cluster: aws.ecs.Cluster;
+  clusterId: pulumi.Input<string>;
+  clusterName: pulumi.Input<string>;
   vpcId: pulumi.Input<string>;
   vpcCidrBlock: pulumi.Input<string>;
   publicSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
@@ -581,7 +583,8 @@ new Mongo(name: string, args: MongoArgs, opts?: pulumi.ComponentResourceOptions
 
 ```ts
 export type MongoArgs = {
-  cluster: aws.ecs.Cluster;
+  clusterId: pulumi.Input<string>;
+  clusterName: pulumi.Input<string>;
   vpcId: pulumi.Input<string>;
   vpcCidrBlock: pulumi.Input<string>;
   privateSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
@@ -627,7 +630,8 @@ new EcsService(name: string, args: EcsServiceArgs, opts?: pulumi.ComponentResour
 export type EcsServiceArgs = {
   image: pulumi.Input<string>;
   port: pulumi.Input<number>;
-  cluster: aws.ecs.Cluster;
+  clusterId: pulumi.Input<string>;
+  clusterName: pulumi.Input<string>;
   vpcId: pulumi.Input<string>;
   vpcCidrBlock: pulumi.Input<string>;
   subnetIds: pulumi.Input<pulumi.Input<string>[]>;

src/components/ecs-service.ts

@@ -42,9 +42,13 @@ export type EcsServiceArgs = {
    */
   port: pulumi.Input<number>;
   /**
-   * The aws.ecs.Cluster resource.
+   * The aws.ecs.Cluster id.
    */
-  cluster: aws.ecs.Cluster;
+  clusterId: pulumi.Input<string>;
+  /**
+   * The aws.ecs.Cluster name.
+   */
+  clusterName: pulumi.Input<string>;
   vpcId: pulumi.Input<string>;
   /**
    * The IPv4 CIDR block for the VPC.
@@ -494,7 +498,7 @@ export class EcsService extends pulumi.ComponentResource {
       `${this.name}-service`,
       {
         name: this.name,
-        cluster: argsWithDefaults.cluster.id,
+        cluster: argsWithDefaults.clusterId,
         launchType: 'FARGATE',
         desiredCount: argsWithDefaults.desiredCount,
         taskDefinition: this.taskDefinition.arn,
@@ -537,7 +541,7 @@ export class EcsService extends pulumi.ComponentResource {
       {
         minCapacity: argsWithDefaults.autoscaling.minCount,
         maxCapacity: argsWithDefaults.autoscaling.maxCount,
-        resourceId: pulumi.interpolate`service/${argsWithDefaults.cluster.name}/${this.service.name}`,
+        resourceId: pulumi.interpolate`service/${argsWithDefaults.clusterName}/${this.service.name}`,
         serviceNamespace: 'ecs',
         scalableDimension: 'ecs:service:DesiredCount',
         tags: commonTags,

src/components/mongo.ts

@@ -6,7 +6,7 @@ import { EcsService, EcsServiceArgs } from './ecs-service';
 
 export type MongoArgs = Pick<
   EcsServiceArgs,
-  'size' | 'cluster' | 'vpcId' | 'vpcCidrBlock' | 'tags'
+  'size' | 'clusterId' | 'clusterName' | 'vpcId' | 'vpcCidrBlock' | 'tags'
 > & {
   /**
    * Username for the master DB user.

src/components/nuxt-ssr.ts

@@ -9,7 +9,8 @@ export type NuxtSSRArgs = Pick<
   EcsServiceArgs,
   | 'image'
   | 'port'
-  | 'cluster'
+  | 'clusterId'
+  | 'clusterName'
   | 'vpcId'
   | 'vpcCidrBlock'
   | 'desiredCount'

src/components/project.ts

@@ -46,7 +46,8 @@ export type WebServerServiceOptions = {
 } & ServiceArgs &
   Omit<
     WebServerArgs,
-    | 'cluster'
+    | 'clusterId'
+    | 'clusterName'
     | 'vpcId'
     | 'vpcCidrBlock'
     | 'publicSubnetIds'
@@ -63,7 +64,8 @@ export type NuxtSSRServiceOptions = {
 } & ServiceArgs &
   Omit<
     NuxtSSRArgs,
-    | 'cluster'
+    | 'clusterId'
+    | 'clusterName'
     | 'vpcId'
     | 'vpcCidrBlock'
     | 'publicSubnetIds'
@@ -76,7 +78,8 @@ export type MongoServiceOptions = {
 } & ServiceArgs &
   Omit<
     MongoArgs,
-    | 'cluster'
+    | 'clusterId'
+    | 'clusterName'
     | 'vpcId'
     | 'vpcCidrBlock'
     | 'privateSubnetIds'
@@ -93,7 +96,8 @@ export type EcsServiceOptions = {
 } & ServiceArgs &
   Omit<
     EcsServiceArgs,
-    | 'cluster'
+    | 'clusterId'
+    | 'clusterName'
     | 'vpcId'
     | 'vpcCidrBlock'
     | 'subnetIds'
@@ -263,7 +267,8 @@ export class Project extends pulumi.ComponentResource {
       serviceName,
       {
         ...ecsOptions,
-        cluster: this.cluster,
+        clusterId: this.cluster.id,
+        clusterName: this.cluster.name,
         vpcId: this.vpc.vpcId,
         vpcCidrBlock: this.vpc.vpc.cidrBlock,
         publicSubnetIds: this.vpc.publicSubnetIds,
@@ -291,7 +296,8 @@ export class Project extends pulumi.ComponentResource {
       serviceName,
       {
         ...ecsOptions,
-        cluster: this.cluster,
+        clusterId: this.cluster.id,
+        clusterName: this.cluster.name,
         vpcId: this.vpc.vpcId,
         vpcCidrBlock: this.vpc.vpc.cidrBlock,
         publicSubnetIds: this.vpc.publicSubnetIds,
@@ -312,7 +318,8 @@ export class Project extends pulumi.ComponentResource {
       serviceName,
       {
         ...mongoOptions,
-        cluster: this.cluster,
+        clusterId: this.cluster.id,
+        clusterName: this.cluster.name,
         vpcId: this.vpc.vpcId,
         vpcCidrBlock: this.vpc.vpc.cidrBlock,
         privateSubnetIds: this.vpc.privateSubnetIds,
@@ -338,7 +345,8 @@ export class Project extends pulumi.ComponentResource {
       serviceName,
       {
         ...ecsOptions,
-        cluster: this.cluster,
+        clusterId: this.cluster.id,
+        clusterName: this.cluster.name,
         vpcId: this.vpc.vpcId,
         vpcCidrBlock: this.vpc.vpc.cidrBlock,
         subnetIds: ecsOptions.assignPublicIp

src/components/web-server.ts

@@ -8,7 +8,8 @@ export type WebServerArgs = Pick<
   EcsServiceArgs,
   | 'image'
   | 'port'
-  | 'cluster'
+  | 'clusterId'
+  | 'clusterName'
   | 'vpcId'
   | 'vpcCidrBlock'
   | 'desiredCount'