@studion/infra-code-blocks 0.8.0-next.1 → 2.0.0-alpha.0

package/dist/components/web-server/index.js

@@ -0,0 +1,190 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebServer = void 0;
+const pulumi = require("@pulumi/pulumi");
+const aws = require("@pulumi/aws-v7");
+const common_tags_1 = require("../../shared/common-tags");
+const acm_certificate_1 = require("../acm-certificate");
+const ecs_service_1 = require("../ecs-service");
+const load_balancer_1 = require("./load-balancer");
+class WebServer extends pulumi.ComponentResource {
+    constructor(name, args, opts = {}) {
+        var _a;
+        super('studion:web-server:WebServer', name, args, Object.assign(Object.assign({}, opts), { aliases: [...(opts.aliases || []), { type: 'studion:WebServer' }] }));
+        const { vpc, domain, hostedZoneId, certificate } = args;
+        const hasCustomDomain = !!domain || !!certificate;
+        if (hasCustomDomain && !hostedZoneId) {
+            throw new Error('Provide `hostedZoneId` alongside `domain` and/or `certificate`.');
+        }
+        if (domain && hostedZoneId && !certificate) {
+            this.acmCertificate = this.createTlsCertificate({ domain, hostedZoneId });
+        }
+        this.name = name;
+        this.lb = new load_balancer_1.WebServerLoadBalancer(`${this.name}-lb`, {
+            vpc,
+            port: args.port,
+            certificate: certificate !== null && certificate !== void 0 ? certificate : (_a = this.acmCertificate) === null || _a === void 0 ? void 0 : _a.certificate,
+            healthCheckPath: args.healthCheckPath,
+            loadBalancingAlgorithmType: args.loadBalancingAlgorithmType,
+        }, Object.assign({ parent: this }, (this.acmCertificate
+            ? { dependsOn: [this.acmCertificate.certificateValidation] }
+            : undefined)));
+        this.serviceSecurityGroup = this.createSecurityGroup(vpc);
+        this.initContainers = this.getInitContainers(args);
+        this.sidecarContainers = this.getSidecarContainers(args);
+        this.container = this.createWebServerContainer(args);
+        this.ecsConfig = this.createEcsConfig(args);
+        this.volumes = this.getVolumes(args);
+        this.service = this.createEcsService(this.container, this.lb, this.ecsConfig, this.volumes, this.initContainers, this.sidecarContainers);
+        if (hasCustomDomain && hostedZoneId) {
+            this.dnsRecords = this.createDnsRecords(certificate !== null && certificate !== void 0 ? certificate : this.acmCertificate.certificate, hostedZoneId, domain);
+        }
+        this.registerOutputs();
+    }
+    getVolumes(args) {
+        return pulumi
+            .all([pulumi.output(args.volumes), args.otelCollector])
+            .apply(([passedVolumes, otelCollector]) => {
+            const volumes = [];
+            if (passedVolumes)
+                volumes.push(...passedVolumes);
+            if (otelCollector)
+                volumes.push({ name: otelCollector.configVolume });
+            return volumes;
+        });
+    }
+    getInitContainers(args) {
+        return pulumi
+            .all([pulumi.output(args.initContainers), args.otelCollector])
+            .apply(([passedInits, otelCollector]) => {
+            const containers = [];
+            if (passedInits)
+                containers.push(...passedInits);
+            if (otelCollector)
+                containers.push(otelCollector.configContainer);
+            return containers.map(container => (Object.assign(Object.assign({}, container), { essential: false })));
+        });
+    }
+    getSidecarContainers(args) {
+        return pulumi
+            .all([pulumi.output(args.sidecarContainers), args.otelCollector])
+            .apply(([passedSidecars, otelCollector]) => {
+            const containers = [];
+            if (passedSidecars)
+                containers.push(...passedSidecars);
+            if (otelCollector)
+                containers.push(otelCollector.container);
+            return containers.map(container => (Object.assign(Object.assign({}, container), { essential: true })));
+        });
+    }
+    getTaskRoleInlinePolicies(args) {
+        return pulumi
+            .all([
+            pulumi.output(args.taskExecutionRoleInlinePolicies),
+            args.otelCollector,
+        ])
+            .apply(([passedTaskRoleInlinePolicies, otelCollector]) => {
+            const inlinePolicies = [];
+            if (passedTaskRoleInlinePolicies)
+                inlinePolicies.push(...passedTaskRoleInlinePolicies);
+            if (otelCollector && otelCollector.taskRoleInlinePolicies) {
+                inlinePolicies.push(...otelCollector.taskRoleInlinePolicies);
+            }
+            return inlinePolicies;
+        });
+    }
+    createEcsConfig(args) {
+        return {
+            vpc: args.vpc,
+            cluster: args.cluster,
+            deploymentController: args.deploymentController,
+            desiredCount: args.desiredCount,
+            autoscaling: args.autoscaling,
+            size: args.size,
+            taskExecutionRoleInlinePolicies: args.taskExecutionRoleInlinePolicies,
+            taskRoleInlinePolicies: this.getTaskRoleInlinePolicies(args),
+            tags: args.tags,
+        };
+    }
+    createWebServerContainer(args) {
+        return {
+            image: args.image,
+            mountPoints: args.mountPoints,
+            environment: args.environment,
+            secrets: args.secrets,
+            port: args.port,
+        };
+    }
+    createTlsCertificate({ domain, hostedZoneId, }) {
+        return new acm_certificate_1.AcmCertificate(`${domain}-acm-certificate`, {
+            domain,
+            hostedZoneId,
+        }, { parent: this });
+    }
+    createSecurityGroup(vpc) {
+        const vpcId = pulumi.output(vpc).vpcId;
+        return new aws.ec2.SecurityGroup(`${this.name}-security-group`, {
+            vpcId,
+            ingress: [
+                {
+                    fromPort: 0,
+                    toPort: 0,
+                    protocol: '-1',
+                    securityGroups: [this.lb.securityGroup.id],
+                },
+            ],
+            egress: [
+                {
+                    fromPort: 0,
+                    toPort: 0,
+                    protocol: '-1',
+                    cidrBlocks: ['0.0.0.0/0'],
+                },
+            ],
+            tags: common_tags_1.commonTags,
+        }, { parent: this });
+    }
+    createEcsService(webServerContainer, lb, ecsConfig, volumes, initContainers, sidecarContainers) {
+        return pulumi
+            .all([
+            initContainers || pulumi.output([]),
+            sidecarContainers || pulumi.output([]),
+        ])
+            .apply(([inits, sidecars]) => {
+            return new ecs_service_1.EcsService(`${this.name}-ecs`, Object.assign(Object.assign({}, ecsConfig), { volumes, containers: [
+                    Object.assign(Object.assign({}, webServerContainer), { name: this.name, portMappings: [
+                            ecs_service_1.EcsService.createTcpPortMapping(webServerContainer.port),
+                        ], essential: true }),
+                    ...inits,
+                    ...sidecars,
+                ], enableServiceAutoDiscovery: false, loadBalancers: [
+                    {
+                        containerName: this.name,
+                        containerPort: webServerContainer.port,
+                        targetGroupArn: lb.targetGroup.arn,
+                    },
+                ], assignPublicIp: true, securityGroup: this.serviceSecurityGroup }), {
+                parent: this,
+                dependsOn: [lb, lb.targetGroup],
+            });
+        });
+    }
+    createDnsRecords(certificate, hostedZoneId, domain) {
+        const certOutput = pulumi.output(certificate);
+        return pulumi
+            .all([domain, certOutput.domainName, certOutput.subjectAlternativeNames])
+            .apply(([domain, certDomain, certSans = []]) => (domain ? [domain] : [...new Set([certDomain, ...certSans])]).map((alias, index) => new aws.route53.Record(`${this.name}-route53-record${index === 0 ? '' : `-${index}`}`, {
+            type: 'A',
+            name: alias,
+            zoneId: hostedZoneId,
+            aliases: [
+                {
+                    name: this.lb.lb.dnsName,
+                    zoneId: this.lb.lb.zoneId,
+                    evaluateTargetHealth: true,
+                },
+            ],
+        }, { parent: this })));
+    }
+}
+exports.WebServer = WebServer;

package/dist/{v2/components → components}/web-server/load-balancer.d.ts

@@ -1,12 +1,13 @@
 import * as pulumi from '@pulumi/pulumi';
-import * as aws from '@pulumi/aws';
-import * as awsx from '@pulumi/awsx';
+import * as aws from '@pulumi/aws-v7';
+import * as awsx from '@pulumi/awsx-v3';
 export declare namespace WebServerLoadBalancer {
     type Args = {
         vpc: pulumi.Input<awsx.ec2.Vpc>;
         port: pulumi.Input<number>;
-        certificate?: aws.acm.Certificate;
+        certificate?: pulumi.Input<aws.acm.Certificate>;
         healthCheckPath?: pulumi.Input<string>;
+        loadBalancingAlgorithmType?: pulumi.Input<string>;
     };
 }
 export declare class WebServerLoadBalancer extends pulumi.ComponentResource {

package/dist/components/web-server/load-balancer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"load-balancer.d.ts","sourceRoot":"","sources":["../../../src/components/web-server/load-balancer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAC;AACtC,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAIxC,yBAAiB,qBAAqB,CAAC;IACrC,KAAY,IAAI,GAAG;QACjB,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3B,WAAW,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChD,eAAe,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACvC,0BAA0B,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACnD,CAAC;CACH;AA+BD,qBAAa,qBAAsB,SAAQ,MAAM,CAAC,iBAAiB;IACjE,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC;IACxB,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC;IAChC,YAAY,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC;IAC9B,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,QAAQ,GAAG,SAAS,CAAC;IACzC,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC;gBAGnC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,qBAAqB,CAAC,IAAI,EAChC,IAAI,GAAE,MAAM,CAAC,wBAA6B;IAgD5C,OAAO,CAAC,mBAAmB;IAyB3B,OAAO,CAAC,oBAAoB;IAgC5B,OAAO,CAAC,mBAAmB;IA4B3B,OAAO,CAAC,qBAAqB;CAa9B"}

package/dist/{v2/components → components}/web-server/load-balancer.js

@@ -2,36 +2,43 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebServerLoadBalancer = void 0;
 const pulumi = require("@pulumi/pulumi");
-const aws = require("@pulumi/aws");
-const constants_1 = require("../../../constants");
+const aws = require("@pulumi/aws-v7");
+const common_tags_1 = require("../../shared/common-tags");
+const merge_with_defaults_1 = require("../../shared/merge-with-defaults");
 const webServerLoadBalancerNetworkConfig = {
-    ingress: [{
+    ingress: [
+        {
             protocol: 'tcp',
             fromPort: 80,
             toPort: 80,
             cidrBlocks: ['0.0.0.0/0'],
-        }, {
+        },
+        {
             protocol: 'tcp',
             fromPort: 443,
             toPort: 443,
             cidrBlocks: ['0.0.0.0/0'],
-        }],
-    egress: [{
+        },
+    ],
+    egress: [
+        {
             fromPort: 0,
             toPort: 0,
             protocol: '-1',
             cidrBlocks: ['0.0.0.0/0'],
-        }]
+        },
+    ],
 };
 const defaults = {
     healthCheckPath: '/healthcheck',
 };
 class WebServerLoadBalancer extends pulumi.ComponentResource {
     constructor(name, args, opts = {}) {
-        super('studion:WebServerLoadBalancer', name, args, opts);
+        super('studion:web-server:WebServerLoadBalancer', name, args, opts);
         this.name = name;
         const vpc = pulumi.output(args.vpc);
-        const { port, certificate, healthCheckPath } = args;
+        const argsWithDefaults = (0, merge_with_defaults_1.mergeWithDefaults)(defaults, args);
+        const { port, certificate, healthCheckPath, loadBalancingAlgorithmType } = argsWithDefaults;
         this.securityGroup = this.createLbSecurityGroup(vpc.vpcId);
         this.lb = new aws.lb.LoadBalancer(this.name, {
             namePrefix: 'lb-',
@@ -40,12 +47,13 @@ class WebServerLoadBalancer extends pulumi.ComponentResource {
             securityGroups: [this.securityGroup.id],
             internal: false,
             ipAddressType: 'ipv4',
-            tags: Object.assign(Object.assign({}, constants_1.commonTags), { Name: name }),
+            tags: Object.assign(Object.assign({}, common_tags_1.commonTags), { Name: name }),
         }, { parent: this });
-        this.targetGroup = this.createLbTargetGroup(port, vpc.vpcId, healthCheckPath);
+        this.targetGroup = this.createLbTargetGroup(port, vpc.vpcId, healthCheckPath, loadBalancingAlgorithmType);
         this.httpListener = this.createLbHttpListener(this.lb, this.targetGroup, !!certificate);
-        this.tlsListener = certificate &&
-            this.createLbTlsListener(this.lb, this.targetGroup, certificate);
+        this.tlsListener =
+            certificate &&
+                this.createLbTlsListener(this.lb, this.targetGroup, pulumi.output(certificate));
         this.registerOutputs();
     }
     createLbTlsListener(lb, lbTargetGroup, certificate) {
@@ -53,13 +61,15 @@ class WebServerLoadBalancer extends pulumi.ComponentResource {
             loadBalancerArn: lb.arn,
             port: 443,
             protocol: 'HTTPS',
-            sslPolicy: 'ELBSecurityPolicy-2016-08',
+            sslPolicy: 'ELBSecurityPolicy-TLS13-1-2-2021-06',
             certificateArn: certificate.arn,
-            defaultActions: [{
+            defaultActions: [
+                {
                     type: 'forward',
                     targetGroupArn: lbTargetGroup.arn,
-                }],
-            tags: constants_1.commonTags,
+                },
+            ],
+            tags: common_tags_1.commonTags,
         }, { parent: this, dependsOn: [certificate] });
     }
     createLbHttpListener(lb, lbTargetGroup, redirectToHttps) {
@@ -71,36 +81,39 @@ class WebServerLoadBalancer extends pulumi.ComponentResource {
                 statusCode: 'HTTP_301',
             },
         };
-        const defaultAction = redirectToHttps ? httpsRedirectAction : {
-            type: 'forward',
-            targetGroupArn: lbTargetGroup.arn,
-        };
+        const defaultAction = redirectToHttps
+            ? httpsRedirectAction
+            : {
+                type: 'forward',
+                targetGroupArn: lbTargetGroup.arn,
+            };
         return new aws.lb.Listener(`${this.name}-listener-80`, {
             loadBalancerArn: lb.arn,
             port: 80,
             defaultActions: [defaultAction],
-            tags: constants_1.commonTags,
+            tags: common_tags_1.commonTags,
         }, { parent: this });
     }
-    createLbTargetGroup(port, vpcId, healthCheckPath) {
+    createLbTargetGroup(port, vpcId, healthCheckPath, loadBalancingAlgorithmType) {
         return new aws.lb.TargetGroup(`${this.name}-tg`, {
             namePrefix: 'lb-tg-',
             port,
             protocol: 'HTTP',
             targetType: 'ip',
             vpcId,
+            loadBalancingAlgorithmType,
             healthCheck: {
                 healthyThreshold: 3,
                 unhealthyThreshold: 2,
                 interval: 60,
                 timeout: 5,
-                path: healthCheckPath || defaults.healthCheckPath,
+                path: healthCheckPath,
             },
-            tags: Object.assign(Object.assign({}, constants_1.commonTags), { Name: `${this.name}-target-group` }),
+            tags: Object.assign(Object.assign({}, common_tags_1.commonTags), { Name: `${this.name}-target-group` }),
         }, { parent: this, dependsOn: [this.lb] });
     }
     createLbSecurityGroup(vpcId) {
-        return new aws.ec2.SecurityGroup(`${this.name}-security-group`, Object.assign(Object.assign({}, webServerLoadBalancerNetworkConfig), { vpcId, tags: constants_1.commonTags }), { parent: this });
+        return new aws.ec2.SecurityGroup(`${this.name}-security-group`, Object.assign(Object.assign({}, webServerLoadBalancerNetworkConfig), { vpcId, tags: common_tags_1.commonTags }), { parent: this });
     }
 }
 exports.WebServerLoadBalancer = WebServerLoadBalancer;

package/dist/index.d.ts

@@ -1,12 +1,25 @@
-export * from './components/web-server';
-export * from './components/mongo';
-export * from './components/static-site';
-export * from './components/database';
-export * from './components/database-replica';
-export * from './components/redis';
-export * from './components/project';
-export * from './components/ec2-ssm-connect';
-export * from './components/ecs-service';
-export * from './components/nuxt-ssr';
-export * as next from './v2';
+export { EcsService } from './components/ecs-service';
+export { WebServer } from './components/web-server';
+export { WebServerBuilder } from './components/web-server/builder';
+export { WebServerLoadBalancer } from './components/web-server/load-balancer';
+export { ElastiCacheRedis } from './components/redis/elasticache-redis';
+export { UpstashRedis } from './components/redis/upstash-redis';
+export { Vpc } from './components/vpc';
+export { Database } from './components/database';
+export { DatabaseBuilder } from './components/database/builder';
+export { DatabaseReplica } from './components/database/database-replica';
+export { Ec2SSMConnect } from './components/database/ec2-ssm-connect';
+export { AcmCertificate } from './components/acm-certificate';
+export { Password } from './components/password';
+export { CloudFront } from './components/cloudfront';
+export { StaticSite } from './components/static-site';
+export { S3Assets } from './components/static-site/s3-assets';
+import { OtelCollectorBuilder } from './otel/builder';
+import { OtelCollector } from './otel';
+export declare const openTelemetry: {
+    OtelCollector: typeof OtelCollector;
+    OtelCollectorBuilder: typeof OtelCollectorBuilder;
+};
+export * as grafana from './components/grafana';
+export * as prometheus from './components/prometheus';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAE9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,eAAO,MAAM,aAAa;;;CAA0C,CAAC;AAErE,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,UAAU,MAAM,yBAAyB,CAAC"}

package/dist/index.js

@@ -1,28 +1,40 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.next = void 0;
-__exportStar(require("./components/web-server"), exports);
-__exportStar(require("./components/mongo"), exports);
-__exportStar(require("./components/static-site"), exports);
-__exportStar(require("./components/database"), exports);
-__exportStar(require("./components/database-replica"), exports);
-__exportStar(require("./components/redis"), exports);
-__exportStar(require("./components/project"), exports);
-__exportStar(require("./components/ec2-ssm-connect"), exports);
-__exportStar(require("./components/ecs-service"), exports);
-__exportStar(require("./components/nuxt-ssr"), exports);
-exports.next = require("./v2");
+exports.prometheus = exports.grafana = exports.openTelemetry = exports.S3Assets = exports.StaticSite = exports.CloudFront = exports.Password = exports.AcmCertificate = exports.Ec2SSMConnect = exports.DatabaseReplica = exports.DatabaseBuilder = exports.Database = exports.Vpc = exports.UpstashRedis = exports.ElastiCacheRedis = exports.WebServerLoadBalancer = exports.WebServerBuilder = exports.WebServer = exports.EcsService = void 0;
+var ecs_service_1 = require("./components/ecs-service");
+Object.defineProperty(exports, "EcsService", { enumerable: true, get: function () { return ecs_service_1.EcsService; } });
+var web_server_1 = require("./components/web-server");
+Object.defineProperty(exports, "WebServer", { enumerable: true, get: function () { return web_server_1.WebServer; } });
+var builder_1 = require("./components/web-server/builder");
+Object.defineProperty(exports, "WebServerBuilder", { enumerable: true, get: function () { return builder_1.WebServerBuilder; } });
+var load_balancer_1 = require("./components/web-server/load-balancer");
+Object.defineProperty(exports, "WebServerLoadBalancer", { enumerable: true, get: function () { return load_balancer_1.WebServerLoadBalancer; } });
+var elasticache_redis_1 = require("./components/redis/elasticache-redis");
+Object.defineProperty(exports, "ElastiCacheRedis", { enumerable: true, get: function () { return elasticache_redis_1.ElastiCacheRedis; } });
+var upstash_redis_1 = require("./components/redis/upstash-redis");
+Object.defineProperty(exports, "UpstashRedis", { enumerable: true, get: function () { return upstash_redis_1.UpstashRedis; } });
+var vpc_1 = require("./components/vpc");
+Object.defineProperty(exports, "Vpc", { enumerable: true, get: function () { return vpc_1.Vpc; } });
+var database_1 = require("./components/database");
+Object.defineProperty(exports, "Database", { enumerable: true, get: function () { return database_1.Database; } });
+var builder_2 = require("./components/database/builder");
+Object.defineProperty(exports, "DatabaseBuilder", { enumerable: true, get: function () { return builder_2.DatabaseBuilder; } });
+var database_replica_1 = require("./components/database/database-replica");
+Object.defineProperty(exports, "DatabaseReplica", { enumerable: true, get: function () { return database_replica_1.DatabaseReplica; } });
+var ec2_ssm_connect_1 = require("./components/database/ec2-ssm-connect");
+Object.defineProperty(exports, "Ec2SSMConnect", { enumerable: true, get: function () { return ec2_ssm_connect_1.Ec2SSMConnect; } });
+var acm_certificate_1 = require("./components/acm-certificate");
+Object.defineProperty(exports, "AcmCertificate", { enumerable: true, get: function () { return acm_certificate_1.AcmCertificate; } });
+var password_1 = require("./components/password");
+Object.defineProperty(exports, "Password", { enumerable: true, get: function () { return password_1.Password; } });
+var cloudfront_1 = require("./components/cloudfront");
+Object.defineProperty(exports, "CloudFront", { enumerable: true, get: function () { return cloudfront_1.CloudFront; } });
+var static_site_1 = require("./components/static-site");
+Object.defineProperty(exports, "StaticSite", { enumerable: true, get: function () { return static_site_1.StaticSite; } });
+var s3_assets_1 = require("./components/static-site/s3-assets");
+Object.defineProperty(exports, "S3Assets", { enumerable: true, get: function () { return s3_assets_1.S3Assets; } });
+const builder_3 = require("./otel/builder");
+const otel_1 = require("./otel");
+exports.openTelemetry = { OtelCollector: otel_1.OtelCollector, OtelCollectorBuilder: builder_3.OtelCollectorBuilder };
+exports.grafana = require("./components/grafana");
+exports.prometheus = require("./components/prometheus");

package/dist/otel/batch-processor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"batch-processor.d.ts","sourceRoot":"","sources":["../../src/otel/batch-processor.ts"],"names":[],"mappings":"AAAA,yBAAiB,cAAc,CAAC;IAC9B,KAAY,MAAM,GAAG;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED,eAAO,MAAM,QAAQ;;;;;CAKpB,CAAC"}

package/dist/{v2/otel → otel}/batch-processor.js

@@ -5,5 +5,5 @@ exports.defaults = {
     name: 'batch',
     size: 8192,
     maxSize: 10000,
-    timeout: '5s'
+    timeout: '5s',
 };

package/dist/{v2/otel → otel}/builder.d.ts

@@ -1,7 +1,17 @@
 import * as pulumi from '@pulumi/pulumi';
-import * as aws from '@pulumi/aws';
+import * as aws from '@pulumi/aws-v7';
 import { OtelCollector } from '.';
 import { OTLPReceiver } from './otlp-receiver';
+import { PrometheusRemoteWriteExporter } from './prometheus-remote-write-exporter';
+export declare namespace OtelCollectorBuilder {
+    type WithDefaultArgs = {
+        prometheusNamespace: PrometheusRemoteWriteExporter.Config['namespace'];
+        prometheusWorkspace: aws.amp.Workspace;
+        region: string;
+        logGroupName: OtelCollector.AwsCloudWatchLogsExporterConfig['log_group_name'];
+        logStreamName: OtelCollector.AwsCloudWatchLogsExporterConfig['log_stream_name'];
+    };
+}
 export declare class OtelCollectorBuilder {
     private readonly _serviceName;
     private readonly _env;
@@ -12,6 +22,7 @@ export declare class OtelCollectorBuilder {
     withBatchProcessor(name?: string, size?: number, maxSize?: number, timeout?: string): this;
     withMemoryLimiterProcessor(checkInterval?: string, limitPercentage?: number, spikeLimitPercentage?: number): this;
     withAWSXRayExporter(region: string): this;
+    withCloudWatchLogsExporter(region: OtelCollector.AwsCloudWatchLogsExporterConfig['region'], logGroupName: OtelCollector.AwsCloudWatchLogsExporterConfig['log_group_name'], logStreamName: OtelCollector.AwsCloudWatchLogsExporterConfig['log_stream_name'], logRetention?: OtelCollector.AwsCloudWatchLogsExporterConfig['log_retention']): this;
     withHealthCheckExtension(endpoint?: string): this;
     withPprofExtension(endpoint?: string): this;
     withAPS(namespace: pulumi.Input<string>, workspace: aws.amp.Workspace, region: string): this;
@@ -19,9 +30,11 @@ export declare class OtelCollectorBuilder {
     withTelemetry(logLevel?: 'debug' | 'warn' | 'error', metricsVerbosity?: 'basic' | 'normal' | 'detailed'): this;
     withMetricsPipeline(receivers: OtelCollector.ReceiverType[], processors: OtelCollector.ProcessorType[], exporters: OtelCollector.ExporterType[]): this;
     withTracesPipeline(receivers: OtelCollector.ReceiverType[], processors: OtelCollector.ProcessorType[], exporters: OtelCollector.ExporterType[]): this;
-    withDefault(prometheusNamespace: pulumi.Input<string>, prometheusWorkspace: aws.amp.Workspace, awsRegion: string): this;
+    withLogsPipeline(receivers: OtelCollector.ReceiverType[], processors: OtelCollector.ProcessorType[], exporters: OtelCollector.ExporterType[]): this;
+    withDefault({ prometheusNamespace, prometheusWorkspace, region, logGroupName, logStreamName, }: OtelCollectorBuilder.WithDefaultArgs): this;
     build(): OtelCollector;
     private createAPSInlinePolicy;
     private createAWSXRayPolicy;
+    private createCloudWatchLogsPolicy;
 }
 //# sourceMappingURL=builder.d.ts.map

package/dist/otel/builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/otel/builder.ts"],"names":[],"mappings":"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"}

package/dist/{v2/otel → otel}/builder.js

@@ -30,6 +30,11 @@ class OtelCollectorBuilder {
         this.createAWSXRayPolicy();
         return this;
     }
+    withCloudWatchLogsExporter(region, logGroupName, logStreamName, logRetention) {
+        this._configBuilder.withCloudWatchLogsExporter(region, logGroupName, logStreamName, logRetention);
+        this.createCloudWatchLogsPolicy(logGroupName);
+        return this;
+    }
     withHealthCheckExtension(endpoint = '0.0.0.0:13133') {
         this._configBuilder.withHealthCheckExtension(endpoint);
         return this;
@@ -59,39 +64,51 @@ class OtelCollectorBuilder {
         this._configBuilder.withTracesPipeline(receivers, processors, exporters);
         return this;
     }
-    withDefault(prometheusNamespace, prometheusWorkspace, awsRegion) {
-        this._configBuilder.withDefault(pulumi.output(prometheusNamespace), pulumi.interpolate `${prometheusWorkspace.prometheusEndpoint}api/v1/remote_write`, awsRegion);
+    withLogsPipeline(receivers, processors, exporters) {
+        this._configBuilder.withLogsPipeline(receivers, processors, exporters);
+        return this;
+    }
+    withDefault({ prometheusNamespace, prometheusWorkspace, region, logGroupName, logStreamName, }) {
+        this._configBuilder.withDefault({
+            prometheusNamespace,
+            prometheusEndpoint: pulumi.interpolate `${prometheusWorkspace.prometheusEndpoint}api/v1/remote_write`,
+            region,
+            logGroupName,
+            logStreamName,
+        });
         this.createAPSInlinePolicy(prometheusWorkspace);
         this.createAWSXRayPolicy();
+        this.createCloudWatchLogsPolicy(logGroupName);
         return this;
     }
     build() {
         return new _1.OtelCollector(this._serviceName, this._env, this._configBuilder.build(), { taskRoleInlinePolicies: this._taskRoleInlinePolicies });
     }
     createAPSInlinePolicy(workspace) {
-        const policy = pulumi.all(([
-            this._serviceName,
-            workspace.arn
-        ])).apply(([serviceName, workspaceArn]) => ({
+        const policy = pulumi
+            .all([this._serviceName, workspace.arn])
+            .apply(([serviceName, workspaceArn]) => ({
             name: `${serviceName}-task-role-aps-write`,
             policy: JSON.stringify({
                 Version: '2012-10-17',
-                Statement: [{
+                Statement: [
+                    {
                         Effect: 'Allow',
                         Action: ['aps:RemoteWrite'],
                         Resource: workspaceArn,
-                    }],
+                    },
+                ],
             }),
         }));
         this._taskRoleInlinePolicies.push(policy);
     }
     createAWSXRayPolicy() {
-        const policy = this._serviceName
-            .apply(serviceName => ({
+        const policy = this._serviceName.apply(serviceName => ({
             name: `${serviceName}-task-role-xray`,
             policy: JSON.stringify({
                 Version: '2012-10-17',
-                Statement: [{
+                Statement: [
+                    {
                         Effect: 'Allow',
                         Action: [
                             'xray:PutTraceSegments',
@@ -101,10 +118,40 @@ class OtelCollectorBuilder {
                             'xray:GetSamplingStatisticSummaries',
                         ],
                         Resource: '*',
-                    }],
+                    },
+                ],
             }),
         }));
         this._taskRoleInlinePolicies.push(policy);
     }
+    createCloudWatchLogsPolicy(logGroupName) {
+        const policy = pulumi
+            .all([this._serviceName, logGroupName])
+            .apply(([serviceName, logGroupName]) => {
+            return {
+                name: `${serviceName}-task-role-cloudwatch-logs`,
+                policy: JSON.stringify({
+                    Version: '2012-10-17',
+                    Statement: [
+                        {
+                            Effect: 'Allow',
+                            Action: ['logs:CreateLogGroup', 'logs:PutRetentionPolicy'],
+                            Resource: '*',
+                        },
+                        {
+                            Effect: 'Allow',
+                            Action: [
+                                'logs:CreateLogStream',
+                                'logs:DescribeLogStreams',
+                                'logs:PutLogEvents',
+                            ],
+                            Resource: `arn:aws:logs:*:*:log-group:${logGroupName}:*`,
+                        },
+                    ],
+                }),
+            };
+        });
+        this._taskRoleInlinePolicies.push(policy);
+    }
 }
 exports.OtelCollectorBuilder = OtelCollectorBuilder;