@reventlessdev/reventless-aws 3.0.0-alpha.219 → 3.0.0-alpha.221

package/src/components/Api/AppSync_MergedApi.res

@@ -57,6 +57,12 @@ let make = (~name: string, ~opts: Pulumi.ComponentResource.options): t => {
     ~name=`${name}-merge-exec-role`,
     ~args={
       assumeRolePolicy: `{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":"appsync.amazonaws.com"},"Action":"sts:AssumeRole"}]}`->Pulumi.Input.make,
+      tags: AWS.Tags.make(
+        ~name=`${name}-merge-exec-role`,
+        ~kind=ReventlessCore.ComponentType.Platform,
+        ~role=Identity,
+        ~scope=Platform,
+      ),
     },
     ~opts=Some(customOpts),
   )
@@ -111,6 +117,12 @@ let make = (~name: string, ~opts: Pulumi.ComponentResource.options): t => {
       ]->Pulumi.Input.make,
       apiType: AppSync.GraphQLApi.MERGED->Pulumi.Input.make,
       mergedApiExecutionRoleArn: executionRole.arn->Pulumi.Output.asInput,
+      tags: AWS.Tags.make(
+        ~name,
+        ~kind=ReventlessCore.ComponentType.Platform,
+        ~role=Api,
+        ~scope=Platform,
+      ),
     },
     ~opts=Some(customOpts),
   )

package/src/components/Api/AppSync_MergedApi.res.mjs

@@ -4,6 +4,7 @@ import * as Pervasives from "@rescript/runtime/lib/es6/Pervasives.js";
 import * as Aws from "@pulumi/aws";
 import * as Output$Pulumi from "@reventlessdev/rescript-pulumi-pulumi/src/Output.res.mjs";
 import * as Pulumi from "@pulumi/pulumi";
+import * as AWS_Tags$ReventlessAws from "../../adapter/AWS_Tags.res.mjs";
 import * as PolicyDocument$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/PolicyDocument.res.mjs";
 import * as Auth_Cognito$ReventlessAws from "../../adapter/Auth/Auth_Cognito.res.mjs";
 import * as AppSync_Adapter$ReventlessAws from "./AppSync_Adapter.res.mjs";
@@ -36,7 +37,8 @@ function make(name, opts) {
     parent: customOpts_parent
   };
   let executionRole = new (Aws.iam.Role)(name + `-merge-exec-role`, {
-    assumeRolePolicy: `{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":"appsync.amazonaws.com"},"Action":"sts:AssumeRole"}]}`
+    assumeRolePolicy: `{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"Service":"appsync.amazonaws.com"},"Action":"sts:AssumeRole"}]}`,
+    tags: AWS_Tags$ReventlessAws.make(name + `-merge-exec-role`, "Platform", "Identity", "Platform", undefined, undefined, undefined, undefined)
   }, customOpts);
   new (Aws.iam.RolePolicy)(name + `-merge-exec-policy`, {
     policy: PolicyDocument$PulumiAws.toJsonString(PolicyDocument$PulumiAws.make(undefined, name + `-merge-exec-policy`, [{
@@ -63,7 +65,8 @@ function make(name, opts) {
         authenticationType: "AWS_IAM"
       }],
     apiType: "MERGED",
-    mergedApiExecutionRoleArn: executionRole.arn
+    mergedApiExecutionRoleArn: executionRole.arn,
+    tags: AWS_Tags$ReventlessAws.make(name, "Platform", "Api", "Platform", undefined, undefined, undefined, undefined)
   }, customOpts);
   return {
     api: Pulumi.output(mergedApi),

package/src/components/AutomationSlice_Builder.res.mjs

@@ -15,6 +15,8 @@ function Make(Api) {
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+    extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+    extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({

package/src/components/ExtensionPoint_Builder.res.mjs

@@ -17,6 +17,8 @@ function Make(Spec) {
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+    extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+    extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({

package/src/components/ForeignReadModel_Builder.res.mjs

@@ -12,6 +12,8 @@ let EventCollectorRuntimeBuilder = EventCollectorRuntime_Builder_PerEventCollect
   groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
   extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
   extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+  extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+  extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
   asEventHandler: prim => prim,
   asEffectHandler: prim => prim
 })({
@@ -25,6 +27,8 @@ function Make(Spec) {
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+    extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+    extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({

package/src/components/OutboundTranslationSlice_Builder.res.mjs

@@ -22,6 +22,8 @@ function Make(Api) {
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+    extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+    extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({

package/src/components/Plugin.res.mjs

@@ -34,6 +34,8 @@ function Make(HooksConfig) {
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+    extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+    extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({

package/src/components/ReadModel_Builder_NoResolver.res.mjs

@@ -15,6 +15,8 @@ function Make(Spec) {
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
       extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+      extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+      extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })({

package/src/components/ReadModel_Builder_NoResolver_Stream.res.mjs

@@ -17,6 +17,8 @@ function Make(Spec) {
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
       extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+      extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+      extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(QueryDbStorage$ReventlessAws.SelectableStream)(QueryDbResolvers_AppSync_NoOp$ReventlessAws)({

package/src/components/ReadModel_Builder_PerReadModel.res.mjs

@@ -15,6 +15,8 @@ function Make(Spec) {
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
       extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+      extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+      extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })({

package/src/components/ReadModel_Builder_Single.res.mjs

@@ -17,6 +17,8 @@ function Make(Spec) {
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
       extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+      extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+      extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(QueryDbStorage$ReventlessAws.Selectable)(QueryDbResolvers$ReventlessAws.Selectable)({

package/src/components/ReadModel_Builder_Single_Stream.res.mjs

@@ -17,6 +17,8 @@ function Make(Spec) {
       groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
       extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+      extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+      extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
     })(QueryDbStorage$ReventlessAws.SelectableStream)(QueryDbResolvers$ReventlessAws.Selectable)({

package/src/components/SideEffectHandler_PerSideEffectHandler.res.mjs

@@ -11,6 +11,8 @@ let EventCollectorRuntimeBuilder = EventCollectorRuntime_Builder_PerEventCollect
   groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
   extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
   extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+  extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+  extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
   asEventHandler: prim => prim,
   asEffectHandler: prim => prim
 })({
@@ -23,6 +25,8 @@ let include = SideEffectHandler_Builder$ReventlessCore.Make({
   groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
   extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
   extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+  extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+  extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
   asEventHandler: prim => prim,
   asEffectHandler: prim => prim
 })({
@@ -33,6 +37,8 @@ let include = SideEffectHandler_Builder$ReventlessCore.Make({
   groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
   extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
   extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+  extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+  extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
   asEventHandler: prim => prim,
   asEffectHandler: prim => prim
 })({

package/src/components/SideEffectHandler_Single.res.mjs

@@ -13,6 +13,8 @@ function Make($star) {
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+    extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+    extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({
@@ -23,6 +25,8 @@ function Make($star) {
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+    extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+    extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({

package/src/components/StateViewSlice_Builder.res.mjs

@@ -17,6 +17,8 @@ function Make(Api) {
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+    extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+    extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })(QueryDbStorage$ReventlessAws.Selectable)(QueryDbResolvers$ReventlessAws.Selectable)({

package/src/components/StateViewSlice_Builder_Stream.res.mjs

@@ -17,6 +17,8 @@ function Make(Api) {
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+    extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+    extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })(QueryDbStorage$ReventlessAws.SelectableStream)(QueryDbResolvers$ReventlessAws.Selectable)({

package/src/components/Task_Builder_PerBucket.res.mjs

@@ -13,6 +13,8 @@ let EventCollectorRuntimeBuilder = EventCollectorRuntime_Builder_PerEventCollect
   groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
   extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
   extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+  extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+  extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
   asEventHandler: prim => prim,
   asEffectHandler: prim => prim
 })({
@@ -31,6 +33,8 @@ function Make(Spec) {
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+    extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+    extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({

package/src/components/Vpc.res

@@ -44,7 +44,16 @@ let construct: construct = (self, name, availabilityZone) => {
 
   let vpc = PulumiAws.EC2.Vpc.make(
     ~name=name ++ "VPC",
-    ~args={cidrBlock: "172.31.0.0/16", enableDnsHostnames: true},
+    ~args={
+      cidrBlock: "172.31.0.0/16",
+      enableDnsHostnames: true,
+      tags: AWS.Tags.makeDict(
+        ~name=name ++ "VPC",
+        ~kind=ReventlessCore.ComponentType.Vpc,
+        ~role=Network,
+        ~scope=Platform,
+      ),
+    },
     ~opts,
   )
 

package/src/components/Vpc.res.mjs

@@ -5,6 +5,7 @@ import * as Aws from "@pulumi/aws";
 import * as EC2_Eip$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/EC2/EC2_Eip.res.mjs";
 import * as EC2_Vpc$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/EC2/EC2_Vpc.res.mjs";
 import * as EC2_Subnet$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/EC2/EC2_Subnet.res.mjs";
+import * as AWS_Tags$ReventlessAws from "../adapter/AWS_Tags.res.mjs";
 import * as EC2_NatGateway$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/EC2/EC2_NatGateway.res.mjs";
 import * as EC2_RouteTable$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/EC2/EC2_RouteTable.res.mjs";
 import * as EC2_VpcEndpoint$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/EC2/EC2_VpcEndpoint.res.mjs";
@@ -20,7 +21,8 @@ function construct(self, name, availabilityZone) {
   };
   let vpc = EC2_Vpc$PulumiAws.make(name + "VPC", {
     cidrBlock: "172.31.0.0/16",
-    enableDnsHostnames: true
+    enableDnsHostnames: true,
+    tags: AWS_Tags$ReventlessAws.makeDict(name + "VPC", "Vpc", "Network", "Platform", undefined, undefined, undefined, undefined)
   }, opts);
   let securityGroup = EC2_SecurityGroup$PulumiAws.make(name + "SecurityGroup", {
     name: name + "SecurityGroup",

package/src/plugin/cloner/ClonerRunner_Fargate.res

@@ -28,6 +28,12 @@ let make: ReventlessCore.Cloner.Adapter.runnerMaker<api> = (
           ~actions=["logs:PutLogEvents", "logs:CreateLogGroup", "logs:CreateLogStream"],
         ),
       ]->Pulumi.Input.make,
+      tags: AWS.Tags.make(
+        ~name=name ++ "TaskExecution",
+        ~kind=ReventlessCore.Cloner.componentType,
+        ~role=Identity,
+        ~component=name,
+      ),
     },
   )
 
@@ -54,6 +60,12 @@ let make: ReventlessCore.Cloner.Adapter.runnerMaker<api> = (
       policy: secretsManagerPolicyDocument
       ->PolicyDocument.toJsonString
       ->Pulumi.Input.make,
+      tags: AWS.Tags.make(
+        ~name="secretsManagerAccess",
+        ~kind=ReventlessCore.Cloner.componentType,
+        ~role=Identity,
+        ~component=name,
+      ),
     },
   )
 
@@ -74,6 +86,12 @@ let make: ReventlessCore.Cloner.Adapter.runnerMaker<api> = (
       policy: taskRunnerPolicyDocument
       ->PolicyDocument.toJsonString
       ->Pulumi.Input.make,
+      tags: AWS.Tags.make(
+        ~name="taskRunner",
+        ~kind=ReventlessCore.Cloner.componentType,
+        ~role=Identity,
+        ~component=name,
+      ),
     },
   )
 
@@ -198,6 +216,7 @@ export const handler = async (event) => {
       let lambdaRole = PulumiAws.IAM.Role.makeWithDefaultPolicy(
         ~name,
         ~servicePrincipal=AWS.AppSync.principal->Pulumi.Output.make,
+        ~tags=AWS.Tags.make(~name, ~kind=ReventlessCore.Cloner.componentType, ~role=Identity),
         ~opts?,
       )
 
@@ -212,7 +231,7 @@ export const handler = async (event) => {
           memorySize: 1024->Pulumi.Input.make,
           timeout: 180->Pulumi.Input.make,
           layers,
-          tags: AWS.Tags.make(~name, ReventlessCore.Cloner.componentType),
+          tags: AWS.Tags.make(~name, ~kind=ReventlessCore.Cloner.componentType, ~role=DataTransfer),
           environment: (
             {
               Lambda.Function.variables: Dict.fromArray([
@@ -287,6 +306,12 @@ export const handler = async (event) => {
       let dataSourceRole = IAM.Role.makeWithDefaultPolicy(
         ~name=name ++ "DS",
         ~servicePrincipal=AWS.AppSync.principal->Pulumi.Output.make,
+        ~tags=AWS.Tags.make(
+          ~name=name ++ "DS",
+          ~kind=ReventlessCore.Cloner.componentType,
+          ~role=Identity,
+          ~component=name,
+        ),
         ~opts?,
       )
 

package/src/plugin/cloner/ClonerRunner_Fargate.res.mjs

@@ -26,7 +26,8 @@ function make(name, api, fullQualifiedStackName, reventlessCiSecretUrn, secretUr
         "logs:PutLogEvents",
         "logs:CreateLogGroup",
         "logs:CreateLogStream"
-      ])]
+      ])],
+    tags: AWS_Tags$ReventlessAws.make(name + "TaskExecution", Cloner$ReventlessCore.componentType, "Identity", undefined, name, undefined, undefined, undefined)
   });
   let secretsManagerPolicyDocument = PolicyDocument$PulumiAws.make(undefined, name + "SecretsManagerPolicy", [{
       Sid: "AllowManageSecrets",
@@ -40,7 +41,8 @@ function make(name, api, fullQualifiedStackName, reventlessCiSecretUrn, secretUr
       ]
     }]);
   let secretsManagerAccessPolicy = new (Aws.iam.Policy)("secretsManagerAccess", {
-    policy: PolicyDocument$PulumiAws.toJsonString(secretsManagerPolicyDocument)
+    policy: PolicyDocument$PulumiAws.toJsonString(secretsManagerPolicyDocument),
+    tags: AWS_Tags$ReventlessAws.make("secretsManagerAccess", Cloner$ReventlessCore.componentType, "Identity", undefined, name, undefined, undefined, undefined)
   });
   let taskRunnerPolicyDocument = PolicyDocument$PulumiAws.make(undefined, name + "TaskRunnerPolicy", [{
       Sid: "AllowRunTask",
@@ -51,7 +53,8 @@ function make(name, api, fullQualifiedStackName, reventlessCiSecretUrn, secretUr
       ]
     }]);
   let taskRunnerPolicy = new (Aws.iam.Policy)("taskRunner", {
-    policy: PolicyDocument$PulumiAws.toJsonString(taskRunnerPolicyDocument)
+    policy: PolicyDocument$PulumiAws.toJsonString(taskRunnerPolicyDocument),
+    tags: AWS_Tags$ReventlessAws.make("taskRunner", Cloner$ReventlessCore.componentType, "Identity", undefined, name, undefined, undefined, undefined)
   });
   new (Aws.iam.RolePolicyAttachment)("ClonerTaskExecutionSecretsManagerAccess", {
     policyArn: secretsManagerAccessPolicy.arn,
@@ -130,7 +133,7 @@ export const handler = async (event) => {
       requiresCompatibilities: ["FARGATE"],
       executionRoleArn: taskExecutionRole.arn
     }, opts !== undefined ? Primitive_option.valFromOption(opts) : undefined);
-    let lambdaRole = IAM$PulumiAws.Role.makeWithDefaultPolicy(name, Pulumi.output(AWS$ReventlessAws.AppSync.principal), opts);
+    let lambdaRole = IAM$PulumiAws.Role.makeWithDefaultPolicy(name, Pulumi.output(AWS$ReventlessAws.AppSync.principal), AWS_Tags$ReventlessAws.make(name, Cloner$ReventlessCore.componentType, "Identity", undefined, undefined, undefined, undefined, undefined), opts);
     let lambda = new (Aws.lambda.Function)(name, {
       handler: "index.handler",
       runtime: "nodejs22.x",
@@ -139,7 +142,7 @@ export const handler = async (event) => {
       memorySize: 1024,
       timeout: 180,
       layers: layers,
-      tags: AWS_Tags$ReventlessAws.make(name, Cloner$ReventlessCore.componentType),
+      tags: AWS_Tags$ReventlessAws.make(name, Cloner$ReventlessCore.componentType, "DataTransfer", undefined, undefined, undefined, undefined, undefined),
       environment: {
         variables: Object.fromEntries([
           [
@@ -205,7 +208,7 @@ export const handler = async (event) => {
         });
       });
     });
-    let dataSourceRole = IAM$PulumiAws.Role.makeWithDefaultPolicy(name + "DS", Pulumi.output(AWS$ReventlessAws.AppSync.principal), opts);
+    let dataSourceRole = IAM$PulumiAws.Role.makeWithDefaultPolicy(name + "DS", Pulumi.output(AWS$ReventlessAws.AppSync.principal), AWS_Tags$ReventlessAws.make(name + "DS", Cloner$ReventlessCore.componentType, "Identity", undefined, name, undefined, undefined, undefined), opts);
     new (Aws.iam.RolePolicy)(name + "DS", {
       policy: lambda.arn.apply(lambdaArn => PolicyDocument$PulumiAws.toJsonString(PolicyDocument$PulumiAws.make(undefined, name + "LambdaPolicy", [{
           Sid: "AllowInvokeLambda",

package/src/plugin/heartbeat/HeartbeatRunner_CloudWatchEvents.res

@@ -16,6 +16,12 @@ let make: ReventlessCore.Heartbeat_Adapter.runnerMaker<runtimeParts> = (
       ~args={
         description: "Send a heartbeat to the Core Plugin ExtensionPoint"->Pulumi.Input.make,
         scheduleExpression: EventRule.ScheduleExpression.every(timeout->Minutes),
+        tags: AWS.Tags.make(
+          ~name=Pulumi.Pulumi.getStackName() ++ ("-" ++ name),
+          ~kind=ReventlessCore.Heartbeat.componentType,
+          ~role=Scheduler,
+          ~component=name,
+        ),
       },
       ~opts,
     )

package/src/plugin/heartbeat/HeartbeatRunner_CloudWatchEvents.res.mjs

@@ -6,8 +6,10 @@ import * as Pulumi from "@pulumi/pulumi";
 import * as Lambda$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/Lambda/Lambda.res.mjs";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as AWS$ReventlessAws from "../../adapter/AWS.res.mjs";
+import * as AWS_Tags$ReventlessAws from "../../adapter/AWS_Tags.res.mjs";
 import * as Adapter$ReventlessCore from "@reventlessdev/reventless-core/src/adapter/Adapter.res.mjs";
 import * as Util_SQS$ReventlessAws from "../../util/Util_SQS.res.mjs";
+import * as Heartbeat$ReventlessCore from "@reventlessdev/reventless-core/src/components/Heartbeat/Heartbeat.res.mjs";
 import * as PolicyDocument$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/PolicyDocument.res.mjs";
 import * as Util_Lambda$ReventlessAws from "../../util/Util_Lambda.res.mjs";
 import * as Util_Pulumi$ReventlessCore from "@reventlessdev/reventless-core/src/util/Util_Pulumi.res.mjs";
@@ -22,7 +24,8 @@ function make(name, remoteChannel, timeout, runtime, opts) {
     scheduleExpression: Primitive_option.some(Cloudwatch_EventRule$PulumiAws.ScheduleExpression.every({
       TAG: "Minutes",
       _0: timeout
-    }))
+    })),
+    tags: AWS_Tags$ReventlessAws.make(Pulumi.getStack() + ("-" + name), Heartbeat$ReventlessCore.componentType, "Scheduler", undefined, name, undefined, undefined, undefined)
   }, opts$1);
   let lambda = runtime.parts.lambda;
   let lambdaRole = runtime.parts.lambdaRole;

package/src/plugin/runtime/PluginExtensionPointRuntime_Builder.res

@@ -103,6 +103,7 @@ let forCommandTopic = (
   let runtime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
     ~name,
     ~unitKind=ReventlessCore.Monitoring.CommandHandler,
+    ~componentKind=ReventlessCore.ComponentType.ExtensionPoint,
     ~code,
     ~sourceCodeHash,
     ~envVars,

package/src/plugin/runtime/PluginExtensionPointRuntime_Builder.res.mjs

@@ -66,7 +66,7 @@ function forCommandTopic(param, connect, memorySizeOpt, timeoutOpt, param$1, par
   });
   envVars["HANDLER_CONFIG"] = handlerConfigJson;
   let match = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Runtime/PluginExtensionPointEntryPoint.mjs", {}, undefined);
-  return connect(RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(name, "CommandHandler", match.code, match.sourceCodeHash, envVars, memorySize, timeout, undefined, undefined, undefined, undefined, undefined, opts));
+  return connect(RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(name, "CommandHandler", "ExtensionPoint", match.code, match.sourceCodeHash, envVars, memorySize, timeout, undefined, undefined, undefined, undefined, undefined, opts));
 }
 
 function finish() {

package/src/plugin/runtime/PluginRuntime_Builder.res

@@ -495,6 +495,7 @@ module Make = (
     let runtime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
       ~name,
       ~unitKind=ReventlessCore.Monitoring.EventCollector,
+      ~componentKind=ReventlessCore.ComponentType.EventCollector,
       ~code=codeOutput->Obj.magic,
       ~sourceCodeHash=sourceCodeHashOutput->Obj.magic,
       ~envVars,
@@ -733,6 +734,7 @@ module Make = (
       let runtime = RuntimeEnvironment_Lambda.makeFromCodeAsset(
         ~name,
         ~unitKind=ReventlessCore.Monitoring.Scheduler,
+        ~componentKind=ReventlessCore.ComponentType.Scheduler,
         ~code,
         ~sourceCodeHash,
         ~envVars,

package/src/plugin/runtime/PluginRuntime_Builder.res.mjs

@@ -310,7 +310,7 @@ function Make(EventCollectorChannel) {
     });
     let codeOutput = bundleOutput.apply(b => b.code);
     let sourceCodeHashOutput = bundleOutput.apply(b => b.sourceCodeHash);
-    let runtime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(name, "EventCollector", codeOutput, sourceCodeHashOutput, envVars, memorySize, timeout, undefined, undefined, undefined, undefined, undefined, opts);
+    let runtime = RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(name, "EventCollector", "EventCollector", codeOutput, sourceCodeHashOutput, envVars, memorySize, timeout, undefined, undefined, undefined, undefined, undefined, opts);
     EventCollectorChannel.connect(name, [{
         channel: eventCollector.channel,
         eventTopics: eventTopics,
@@ -422,7 +422,7 @@ function Make(EventCollectorChannel) {
     envVars["PLUGIN_ID"] = Pulumi.output(hbConfig.pluginId);
     envVars["HEARTBEAT_TIMEOUT"] = Pulumi.output(hbConfig.heartbeatTimeout.toString());
     let match = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Runtime/HeartbeatEntryPoint.mjs", {}, undefined);
-    connect(RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(name, "Scheduler", match.code, match.sourceCodeHash, envVars, memorySize, timeout, undefined, undefined, undefined, undefined, undefined, opts));
+    connect(RuntimeEnvironment_Lambda$ReventlessAws.makeFromCodeAsset(name, "Scheduler", "Scheduler", match.code, match.sourceCodeHash, envVars, memorySize, timeout, undefined, undefined, undefined, undefined, undefined, opts));
   };
   let forDcbCommandTopic = (param, connect, memorySizeOpt, timeoutOpt, dcbCommandTopic) => {
     let memorySize = memorySizeOpt !== undefined ? memorySizeOpt : 0;

package/src/plugin/stack/Plugin_ExtensionPoint_Builder.res.mjs

@@ -21,6 +21,8 @@ function MakeWithConfig(Config) {
     groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+    extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+    extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
   })({
@@ -44,6 +46,8 @@ let Make = PluginExtensionPoint_Builder$ReventlessCore.Make({
   groupBySource: RuntimeEnvironment_Lambda$ReventlessAws.groupBySource,
   extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
   extractCausationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCausationId,
+  extractSentTimestamp: RuntimeEnvironment_Lambda$ReventlessAws.extractSentTimestamp,
+  extractRetryCount: RuntimeEnvironment_Lambda$ReventlessAws.extractRetryCount,
   asEventHandler: prim => prim,
   asEffectHandler: prim => prim
 })({

package/src/plugin/stack/Plugin_Stack.res

@@ -155,7 +155,18 @@ let makeUiBundleDistribution = (
   // shell, where blue/green between versions is wanted.
   let name = stableName ? pluginId : pluginId ++ "-" ++ bundleVersion
 
-  let bucket = PulumiAws.S3.Bucket.make(~name=name ++ "-bundle")
+  let bucket = PulumiAws.S3.Bucket.make(
+    ~name=name ++ "-bundle",
+    ~args={
+      tags: AWS.Tags.make(
+        ~name=name ++ "-bundle",
+        ~kind=ReventlessCore.ComponentType.Plugin,
+        ~role=Hosting,
+        ~scope=Plugin,
+        ~plugin=pluginId,
+      ),
+    },
+  )
 
   let _ = PulumiAws.S3.BucketPublicAccessBlock.make(
     ~name=name ++ "-bundle-pab",
@@ -234,6 +245,13 @@ let makeUiBundleDistribution = (
       ~args={
         domainName: Pulumi.Input.make(fqdn),
         validationMethod: Pulumi.Input.make("DNS"),
+        tags: AWS.Tags.make(
+          ~name=pluginId ++ "-domain-cert",
+          ~kind=ReventlessCore.ComponentType.Plugin,
+          ~role=Hosting,
+          ~scope=Plugin,
+          ~plugin=pluginId,
+        ),
       },
       ~opts={provider: usEast1},
     )
@@ -317,6 +335,13 @@ let makeUiBundleDistribution = (
       comment: Pulumi.Input.make(pluginId ++ " UI bundle CDN"),
       defaultRootObject: Pulumi.Input.make(indexDocument),
       customErrorResponses: Pulumi.Input.make(customErrorResponses),
+      tags: AWS.Tags.make(
+        ~name=name ++ "-cdn",
+        ~kind=ReventlessCore.ComponentType.Plugin,
+        ~role=Hosting,
+        ~scope=Plugin,
+        ~plugin=pluginId,
+      ),
     },
   )
 

package/src/plugin/stack/Plugin_Stack.res.mjs

@@ -9,6 +9,7 @@ import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 import * as Logger$ReventlessCore from "@reventlessdev/reventless-core/src/util/Logger.res.mjs";
+import * as AWS_Tags$ReventlessAws from "../../adapter/AWS_Tags.res.mjs";
 import * as ClientCloudfront from "@aws-sdk/client-cloudfront";
 import * as Util_StaticBundle$ReventlessAws from "../../util/Util_StaticBundle.res.mjs";
 
@@ -73,7 +74,9 @@ function makeUiBundleDistribution(pluginId, bundleVersion, assetsDir, spaFallbac
   let stableName = stableNameOpt !== undefined ? stableNameOpt : false;
   let excludeFiles = excludeFilesOpt !== undefined ? excludeFilesOpt : [];
   let name = stableName ? pluginId : pluginId + "-" + bundleVersion;
-  let bucket = new (Aws.s3.Bucket)(name + "-bundle");
+  let bucket = new (Aws.s3.Bucket)(name + "-bundle", {
+    tags: AWS_Tags$ReventlessAws.make(name + "-bundle", "Plugin", "Hosting", "Plugin", undefined, undefined, pluginId, undefined)
+  });
   new (Aws.s3.BucketPublicAccessBlock)(name + "-bundle-pab", {
     bucket: bucket.id,
     blockPublicAcls: true,
@@ -124,7 +127,8 @@ function makeUiBundleDistribution(pluginId, bundleVersion, assetsDir, spaFallbac
     let usEast1 = _getUsEast1Provider();
     let cert = new (Aws.acm.Certificate)(pluginId + "-domain-cert", {
       domainName: customDomain.fqdn,
-      validationMethod: "DNS"
+      validationMethod: "DNS",
+      tags: AWS_Tags$ReventlessAws.make(pluginId + "-domain-cert", "Plugin", "Hosting", "Plugin", undefined, undefined, pluginId, undefined)
     }, {
       provider: Primitive_option.some(usEast1)
     });
@@ -186,7 +190,8 @@ function makeUiBundleDistribution(pluginId, bundleVersion, assetsDir, spaFallbac
     viewerCertificate: viewerCertificate,
     comment: pluginId + " UI bundle CDN",
     customErrorResponses: customErrorResponses,
-    defaultRootObject: indexDocument
+    defaultRootObject: indexDocument,
+    tags: AWS_Tags$ReventlessAws.make(name + "-cdn", "Plugin", "Hosting", "Plugin", undefined, undefined, pluginId, undefined)
   });
   if (customDomain !== undefined) {
     new (Aws.route53.Record)(pluginId + "-domain-alias", {

package/src/util/Util_CognitoGroupUser.res

@@ -33,6 +33,12 @@ let makeAddRemoveUserToGroupPolicy = (
         )
         ->toJsonString
         ->Pulumi.Input.make,
+        tags: AWS.Tags.make(
+          ~name=name ++ "AddRemoveUserToGroup",
+          ~kind=ReventlessCore.ComponentType.Platform,
+          ~role=Identity,
+          ~scope=Platform,
+        ),
       },
       ~opts?,
     )