@studion/infra-code-blocks 0.2.3 → 0.3.0

package/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>[]>;

package/dist/components/ecs-service.d.ts

@@ -23,9 +23,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.

package/dist/components/ecs-service.js

@@ -261,7 +261,7 @@ class EcsService extends pulumi.ComponentResource {
                 ],
                 tags: constants_1.commonTags,
             }, { parent: this });
-        const service = new aws.ecs.Service(`${this.name}-service`, Object.assign(Object.assign(Object.assign(Object.assign({ name: this.name, cluster: argsWithDefaults.cluster.id, launchType: 'FARGATE', desiredCount: argsWithDefaults.desiredCount, taskDefinition: this.taskDefinition.arn, enableExecuteCommand: true }, (argsWithDefaults.lbTargetGroupArn && {
+        const service = new aws.ecs.Service(`${this.name}-service`, Object.assign(Object.assign(Object.assign(Object.assign({ name: this.name, cluster: argsWithDefaults.clusterId, launchType: 'FARGATE', desiredCount: argsWithDefaults.desiredCount, taskDefinition: this.taskDefinition.arn, enableExecuteCommand: true }, (argsWithDefaults.lbTargetGroupArn && {
             loadBalancers: [
                 {
                     containerName: this.name,
@@ -289,7 +289,7 @@ class EcsService extends pulumi.ComponentResource {
         const autoscalingTarget = new aws.appautoscaling.Target(`${this.name}-autoscale-target`, {
             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: constants_1.commonTags,

package/dist/components/mongo.d.ts

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

package/dist/components/nuxt-ssr.d.ts

@@ -2,7 +2,7 @@ import * as pulumi from '@pulumi/pulumi';
 import * as aws from '@pulumi/aws';
 import { AcmCertificate } from './acm-certificate';
 import { EcsService, EcsServiceArgs } from './ecs-service';
-export type NuxtSSRArgs = Pick<EcsServiceArgs, 'image' | 'port' | 'cluster' | 'vpcId' | 'vpcCidrBlock' | 'desiredCount' | 'autoscaling' | 'size' | 'environment' | 'secrets' | 'tags'> & {
+export type NuxtSSRArgs = Pick<EcsServiceArgs, 'image' | 'port' | 'clusterId' | 'clusterName' | 'vpcId' | 'vpcCidrBlock' | 'desiredCount' | 'autoscaling' | 'size' | 'environment' | 'secrets' | 'tags'> & {
     publicSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
     /**
      * The domain which will be used to access the service.

package/dist/components/project.d.ts

@@ -31,20 +31,20 @@ export type WebServerServiceOptions = {
     type: 'WEB_SERVER';
     environment?: aws.ecs.KeyValuePair[] | ((services: Services) => aws.ecs.KeyValuePair[]);
     secrets?: aws.ecs.Secret[] | ((services: Services) => aws.ecs.Secret[]);
-} & ServiceArgs & Omit<WebServerArgs, 'cluster' | 'vpcId' | 'vpcCidrBlock' | 'publicSubnetIds' | 'environment' | 'secrets'>;
+} & ServiceArgs & Omit<WebServerArgs, 'clusterId' | 'clusterName' | 'vpcId' | 'vpcCidrBlock' | 'publicSubnetIds' | 'environment' | 'secrets'>;
 export type NuxtSSRServiceOptions = {
     type: 'NUXT_SSR';
     environment?: aws.ecs.KeyValuePair[] | ((services: Services) => aws.ecs.KeyValuePair[]);
     secrets?: aws.ecs.Secret[] | ((services: Services) => aws.ecs.Secret[]);
-} & ServiceArgs & Omit<NuxtSSRArgs, 'cluster' | 'vpcId' | 'vpcCidrBlock' | 'publicSubnetIds' | 'environment' | 'secrets'>;
+} & ServiceArgs & Omit<NuxtSSRArgs, 'clusterId' | 'clusterName' | 'vpcId' | 'vpcCidrBlock' | 'publicSubnetIds' | 'environment' | 'secrets'>;
 export type MongoServiceOptions = {
     type: 'MONGO';
-} & ServiceArgs & Omit<MongoArgs, 'cluster' | 'vpcId' | 'vpcCidrBlock' | 'privateSubnetIds' | 'environment' | 'secrets'>;
+} & ServiceArgs & Omit<MongoArgs, 'clusterId' | 'clusterName' | 'vpcId' | 'vpcCidrBlock' | 'privateSubnetIds' | 'environment' | 'secrets'>;
 export type EcsServiceOptions = {
     type: 'ECS_SERVICE';
     environment?: aws.ecs.KeyValuePair[] | ((services: Services) => aws.ecs.KeyValuePair[]);
     secrets?: aws.ecs.Secret[] | ((services: Services) => aws.ecs.Secret[]);
-} & ServiceArgs & Omit<EcsServiceArgs, 'cluster' | 'vpcId' | 'vpcCidrBlock' | 'subnetIds' | 'environment' | 'secrets'>;
+} & ServiceArgs & Omit<EcsServiceArgs, 'clusterId' | 'clusterName' | 'vpcId' | 'vpcCidrBlock' | 'subnetIds' | 'environment' | 'secrets'>;
 export type ProjectArgs = {
     services: (DatabaseServiceOptions | RedisServiceOptions | StaticSiteServiceOptions | WebServerServiceOptions | NuxtSSRServiceOptions | MongoServiceOptions | EcsServiceOptions)[];
     enableSSMConnect?: pulumi.Input<boolean>;

package/dist/components/project.js

@@ -133,7 +133,7 @@ class Project extends pulumi.ComponentResource {
             ? environment(this.services)
             : environment;
         const parsedSecrets = typeof secrets === 'function' ? secrets(this.services) : secrets;
-        const service = new web_server_1.WebServer(serviceName, Object.assign(Object.assign({}, ecsOptions), { cluster: this.cluster, vpcId: this.vpc.vpcId, vpcCidrBlock: this.vpc.vpc.cidrBlock, publicSubnetIds: this.vpc.publicSubnetIds, environment: parsedEnv, secrets: parsedSecrets }), { parent: this });
+        const service = new web_server_1.WebServer(serviceName, Object.assign(Object.assign({}, ecsOptions), { clusterId: this.cluster.id, clusterName: this.cluster.name, vpcId: this.vpc.vpcId, vpcCidrBlock: this.vpc.vpc.cidrBlock, publicSubnetIds: this.vpc.publicSubnetIds, environment: parsedEnv, secrets: parsedSecrets }), { parent: this });
         this.services[options.serviceName] = service;
     }
     createNuxtSSRService(options) {
@@ -144,14 +144,14 @@ class Project extends pulumi.ComponentResource {
             ? environment(this.services)
             : environment;
         const parsedSecrets = typeof secrets === 'function' ? secrets(this.services) : secrets;
-        const service = new nuxt_ssr_1.NuxtSSR(serviceName, Object.assign(Object.assign({}, ecsOptions), { cluster: this.cluster, vpcId: this.vpc.vpcId, vpcCidrBlock: this.vpc.vpc.cidrBlock, publicSubnetIds: this.vpc.publicSubnetIds, environment: parsedEnv, secrets: parsedSecrets }), { parent: this });
+        const service = new nuxt_ssr_1.NuxtSSR(serviceName, Object.assign(Object.assign({}, ecsOptions), { clusterId: this.cluster.id, clusterName: this.cluster.name, vpcId: this.vpc.vpcId, vpcCidrBlock: this.vpc.vpc.cidrBlock, publicSubnetIds: this.vpc.publicSubnetIds, environment: parsedEnv, secrets: parsedSecrets }), { parent: this });
         this.services[options.serviceName] = service;
     }
     createMongoService(options) {
         if (!this.cluster)
             throw new MissingEcsCluster();
         const { serviceName } = options, mongoOptions = __rest(options, ["serviceName"]);
-        const service = new mongo_1.Mongo(serviceName, Object.assign(Object.assign({}, mongoOptions), { cluster: this.cluster, vpcId: this.vpc.vpcId, vpcCidrBlock: this.vpc.vpc.cidrBlock, privateSubnetIds: this.vpc.privateSubnetIds }), { parent: this });
+        const service = new mongo_1.Mongo(serviceName, Object.assign(Object.assign({}, mongoOptions), { clusterId: this.cluster.id, clusterName: this.cluster.name, vpcId: this.vpc.vpcId, vpcCidrBlock: this.vpc.vpc.cidrBlock, privateSubnetIds: this.vpc.privateSubnetIds }), { parent: this });
         this.services[options.serviceName] = service;
     }
     createEcsService(options) {
@@ -162,7 +162,7 @@ class Project extends pulumi.ComponentResource {
             ? environment(this.services)
             : environment;
         const parsedSecrets = typeof secrets === 'function' ? secrets(this.services) : secrets;
-        const service = new ecs_service_1.EcsService(serviceName, Object.assign(Object.assign({}, ecsOptions), { cluster: this.cluster, vpcId: this.vpc.vpcId, vpcCidrBlock: this.vpc.vpc.cidrBlock, subnetIds: ecsOptions.assignPublicIp
+        const service = new ecs_service_1.EcsService(serviceName, Object.assign(Object.assign({}, ecsOptions), { clusterId: this.cluster.id, clusterName: this.cluster.name, vpcId: this.vpc.vpcId, vpcCidrBlock: this.vpc.vpc.cidrBlock, subnetIds: ecsOptions.assignPublicIp
                 ? this.vpc.publicSubnetIds
                 : this.vpc.privateSubnetIds, environment: parsedEnv, secrets: parsedSecrets }), { parent: this });
         this.services[options.serviceName] = service;

package/dist/components/web-server.d.ts

@@ -2,7 +2,7 @@ import * as pulumi from '@pulumi/pulumi';
 import * as aws from '@pulumi/aws';
 import { AcmCertificate } from './acm-certificate';
 import { EcsService, EcsServiceArgs } from './ecs-service';
-export type WebServerArgs = Pick<EcsServiceArgs, 'image' | 'port' | 'cluster' | 'vpcId' | 'vpcCidrBlock' | 'desiredCount' | 'autoscaling' | 'size' | 'environment' | 'secrets' | 'taskExecutionRoleInlinePolicies' | 'taskRoleInlinePolicies' | 'tags'> & {
+export type WebServerArgs = Pick<EcsServiceArgs, 'image' | 'port' | 'clusterId' | 'clusterName' | 'vpcId' | 'vpcCidrBlock' | 'desiredCount' | 'autoscaling' | 'size' | 'environment' | 'secrets' | 'taskExecutionRoleInlinePolicies' | 'taskRoleInlinePolicies' | 'tags'> & {
     publicSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
     /**
      * The domain which will be used to access the service.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studion/infra-code-blocks",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "Studion common infra components",
   "keywords": [
     "infrastructure",