feat: remove tags

aws/stacks/Observability.ts

@@ -1,22 +1,29 @@
-import { Aspects, Stack, Tags, aws_s3 } from 'aws-cdk-lib'
-import { IConstruct } from 'constructs'
+import { Aspects, Stack, aws_s3 } from 'aws-cdk-lib'
+import { Construct, IConstruct } from 'constructs'
 import { EnableLambdaXRayTracing } from '../aspects/EnableLambdaXRayTracing'
 import { S3BucketAccessLogs } from '../aspects/S3BucketAccessLogs'
 
+export interface ObservabilityStackProps {
+  cover: IConstruct[]
+}
+
 export class ObservabilityStack extends Stack {
   bucketS3AccessLogs = new aws_s3.Bucket(this, 's3-access-logs')
 
-  constructor(scope: IConstruct, id: string) {
+  constructor(scope: IConstruct, id: string, props: ObservabilityStackProps) {
     super(scope, id)
 
-    Tags.of(this).add('custom:observability', 'true')
+    props.cover.forEach(node => {
+      this.enableS3AccessLogs(node)
+      this.enableLambdaXRayTracing(node)
+    })
   }
 
-  public enableS3AccessLogs(stack: Stack) {
-    Aspects.of(stack).add(new S3BucketAccessLogs({ bucket: this.bucketS3AccessLogs }))
+  public enableS3AccessLogs(node: Construct) {
+    Aspects.of(node).add(new S3BucketAccessLogs({ bucket: this.bucketS3AccessLogs }))
   }
 
-  public enableLambdaXRayTracing(stack: Stack) {
-    Aspects.of(stack).add(new EnableLambdaXRayTracing())
+  public enableLambdaXRayTracing(node: Construct) {
+    Aspects.of(node).add(new EnableLambdaXRayTracing())
   }
 }

aws/workloads/Example.ts

@@ -1,7 +1,4 @@
-import { Aspects } from 'aws-cdk-lib'
-import { IConstruct } from 'constructs'
-import { UnifiedTags } from '../aspects/UnifiedTags'
-import { Workload } from '../base/Workload'
+import { Construct, IConstruct } from 'constructs'
 import { ComputeStack } from '../stacks/Compute'
 import { ObservabilityStack } from '../stacks/Observability'
 import { StorageStack } from '../stacks/Storage'
@@ -10,20 +7,17 @@ export interface ExampleProps {
   enableObservability: boolean
 }
 
-export class Example extends Workload {
+export class Example extends Construct {
   constructor(scope: IConstruct, props: ExampleProps) {
     super(scope, 'example')
 
     const storage = new StorageStack(this, 'storage')
     const compute = new ComputeStack(this, 'compute')
 
     if (props.enableObservability) {
-      const obs = new ObservabilityStack(this, 'observability')
-
-      obs.enableS3AccessLogs(storage)
-      obs.enableLambdaXRayTracing(compute)
+      new ObservabilityStack(this, 'observability', {
+        cover: [storage, compute],
+      })
     }
-
-    Aspects.of(this).add(new UnifiedTags())
   }
 }

test/aws/workloads/Example.test.ts

@@ -21,10 +21,6 @@ describe('Stack', () => {
   })
 
   describe('Context', () => {
-    it('has workload context', () => {
-      expect(workload.node.getContext('workload')).toBe('example')
-    })
-
     it('has version context', () => {
       expect(workload.node.getContext('version')).toBe('v3.2.1-workload')
     })