Add tags to component resources

Author: ikovac

README.md

@@ -208,13 +208,32 @@ type DatabaseArgs = {
   allocatedStorage?: pulumi.Input<number>;
   maxAllocatedStorage?: pulumi.Input<number>;
   instanceClass?: pulumi.Input<string>;
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
 };
 ```
 
 ### Redis
 
 [Upstash](https://upstash.com) Redis instance.
 
+**Prerequisites**
+
+1. Stack Config
+
+| Name              |     Description     | Secret |
+| :---------------- | :-----------------: | :----: |
+| upstash:email \*  | Upstash user email. |  true  |
+| upstash:apiKey \* |  Upstash API key.   |  true  |
+
+```bash
+$ pulumi config set --secret upstash:email [email protected]
+$ pulumi config set --secret upstash:apiKey my-api-key
+```
+
+<br>
+
 ```ts
 new Redis(name: string, args: RedisArgs, opts: RedisOptions);
 ```
@@ -263,6 +282,9 @@ new StaticSite(name: string, args: StaticSiteArgs, opts?: pulumi.ComponentResour
 type StaticSiteArgs = {
   domain: pulumi.Input<string>;
   hostedZoneId: pulumi.Input<string>;
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
 };
 ```
 
@@ -308,6 +330,9 @@ export type WebServerArgs = {
     pulumi.Input<RoleInlinePolicy>[]
   >;
   taskRoleInlinePolicies?: pulumi.Input<pulumi.Input<RoleInlinePolicy>[]>;
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
 };
 ```
 

src/components/database.ts

@@ -39,6 +39,12 @@ export type DatabaseArgs = {
    * The instance type of the RDS instance.
    */
   instanceClass?: pulumi.Input<string>;
+  /**
+   * A map of tags to assign to the resource.
+   */
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
 };
 
 const defaults = {
@@ -124,6 +130,7 @@ export class Database extends pulumi.ComponentResource {
         finalSnapshotIdentifier: `${name}-final-snapshot`,
         backupWindow: '06:00-06:30',
         backupRetentionPeriod: 14,
+        tags: argsWithDefaults.tags,
       },
       { parent: this },
     );

src/components/ec2-ssm-connect.ts

@@ -8,6 +8,9 @@ const awsRegion = config.require('region');
 export type Ec2SSMConnectArgs = {
   vpc: awsx.ec2.Vpc;
   sshPublicKey: pulumi.Input<string>;
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
 };
 
 export class Ec2SSMConnect extends pulumi.ComponentResource {
@@ -114,6 +117,7 @@ export class Ec2SSMConnect extends pulumi.ComponentResource {
         vpcSecurityGroupIds: [this.ec2SecurityGroup.id],
         tags: {
           Name: `${name}-ec2`,
+          ...args.tags,
         },
       },
       { parent: this },

src/components/project.ts

@@ -20,21 +20,24 @@ type ServiceArgs = {
 };
 
 export type DatabaseService = { type: 'DATABASE' } & ServiceArgs &
-  Omit<DatabaseArgs, 'vpc'>;
+  Omit<DatabaseArgs, 'vpc' | 'tags'>;
 
 export type RedisService = { type: 'REDIS' } & ServiceArgs &
   Pick<RedisArgs, 'dbName' | 'region'>;
 
 export type StaticSiteService = { type: 'STATIC_SITE' } & ServiceArgs &
-  Omit<StaticSiteArgs, 'hostedZoneId'>;
+  Omit<StaticSiteArgs, 'hostedZoneId' | 'tags'>;
 
 export type WebServerService = {
   type: 'WEB_SERVER';
   environment?:
     | aws.ecs.KeyValuePair[]
     | ((services: Services) => aws.ecs.KeyValuePair[]);
 } & ServiceArgs &
-  Omit<WebServerArgs, 'cluster' | 'vpc' | 'hostedZoneId' | 'environment'>;
+  Omit<
+    WebServerArgs,
+    'cluster' | 'vpc' | 'hostedZoneId' | 'environment' | 'tags'
+  >;
 
 export type Environment = (typeof Environment)[keyof typeof Environment];
 
@@ -89,6 +92,9 @@ export class Project extends pulumi.ComponentResource {
       this.ec2SSMConnect = new Ec2SSMConnect(`${name}-ssm-connect`, {
         vpc: this.vpc,
         sshPublicKey: sshConfig.require('publicKey'),
+        tags: {
+          Env: this.environment,
+        },
       });
     }
 
@@ -102,6 +108,9 @@ export class Project extends pulumi.ComponentResource {
         numberOfAvailabilityZones: 2,
         enableDnsHostnames: true,
         enableDnsSupport: true,
+        tags: {
+          Env: this.environment,
+        },
       },
       { parent: this },
     );
@@ -133,7 +142,12 @@ export class Project extends pulumi.ComponentResource {
   private createWebServerPrerequisites() {
     this.cluster = new aws.ecs.Cluster(
       `${this.name}-cluster`,
-      { name: this.name },
+      {
+        name: this.name,
+        tags: {
+          Env: this.environment,
+        },
+      },
       { parent: this },
     );
   }
@@ -145,6 +159,9 @@ export class Project extends pulumi.ComponentResource {
       {
         ...databaseOptions,
         vpc: this.vpc,
+        tags: {
+          Env: this.environment,
+        },
       },
       { parent: this },
     );
@@ -169,6 +186,9 @@ export class Project extends pulumi.ComponentResource {
       {
         ...staticSiteOptions,
         hostedZoneId: this.hostedZoneId,
+        tags: {
+          Env: this.environment,
+        },
       },
       { parent: this },
     );
@@ -193,6 +213,9 @@ export class Project extends pulumi.ComponentResource {
         vpc: this.vpc,
         hostedZoneId: this.hostedZoneId,
         environment: parsedEnv,
+        tags: {
+          Env: this.environment,
+        },
       },
       { parent: this },
     );

src/components/static-site.ts

@@ -12,6 +12,12 @@ export type StaticSiteArgs = {
    * The ID of the hosted zone.
    */
   hostedZoneId: pulumi.Input<string>;
+  /**
+   * A map of tags to assign to the resource.
+   */
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
 };
 
 export class StaticSite extends pulumi.ComponentResource {
@@ -43,6 +49,7 @@ export class StaticSite extends pulumi.ComponentResource {
           indexDocument: 'index.html',
           errorDocument: 'index.html',
         },
+        tags: args.tags,
       },
       { parent: this },
     );
@@ -128,6 +135,7 @@ export class StaticSite extends pulumi.ComponentResource {
         restrictions: {
           geoRestriction: { restrictionType: 'none' },
         },
+        tags: args.tags,
       },
       { parent: this },
     );

src/components/web-server.ts

@@ -93,6 +93,12 @@ export type WebServerArgs = {
     pulumi.Input<RoleInlinePolicy>[]
   >;
   taskRoleInlinePolicies?: pulumi.Input<pulumi.Input<RoleInlinePolicy>[]>;
+  /**
+   * A map of tags to assign to the resource.
+   */
+  tags?: pulumi.Input<{
+    [key: string]: pulumi.Input<string>;
+  }>;
 };
 
 const defaults = {
@@ -276,7 +282,7 @@ export class WebServer extends pulumi.ComponentResource {
     );
 
     const execCmdInlinePolicy = {
-      name: 'ecs-exec',
+      name: `${name}-ecs-exec`,
       policy: JSON.stringify({
         Version: '2012-10-17',
         Statement: [
@@ -368,6 +374,7 @@ export class WebServer extends pulumi.ComponentResource {
               ] as ContainerDefinition[]);
             },
           ),
+        tags: argsWithDefaults.tags,
       },
       { parent: this },
     );
@@ -417,6 +424,7 @@ export class WebServer extends pulumi.ComponentResource {
           subnets: argsWithDefaults.vpc.publicSubnetIds,
           securityGroups: [this.serviceSecurityGroup.id],
         },
+        tags: argsWithDefaults.tags,
       },
       {
         parent: this,