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

package/dist/components/static-site/s3-assets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"s3-assets.d.ts","sourceRoot":"","sources":["../../../src/components/static-site/s3-assets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAGnC,yBAAiB,QAAQ,CAAC;IACxB,KAAY,IAAI,GAAG;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC,aAAa,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;YAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;SACrC,CAAC,CAAC;KACJ,CAAC;CACH;AAED,qBAAa,QAAS,SAAQ,MAAM,CAAC,iBAAiB;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC;IACtB,aAAa,EAAE,GAAG,CAAC,EAAE,CAAC,0BAA0B,CAAC;gBAG/C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,IAAI,GAAE,MAAM,CAAC,wBAA6B;IAqB5C,OAAO,CAAC,wBAAwB;IAwBhC,OAAO,CAAC,mBAAmB;CA+B5B"}

package/dist/components/static-site/s3-assets.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.S3Assets = void 0;
+const pulumi = require("@pulumi/pulumi");
+const aws = require("@pulumi/aws");
+const common_tags_1 = require("../../shared/common-tags");
+class S3Assets extends pulumi.ComponentResource {
+    constructor(name, args, opts = {}) {
+        super('studion:static-site:S3Assets', name, args, opts);
+        this.name = name;
+        const { indexDocument = 'index.html', errorDocument = 'index.html', tags, } = args;
+        const [bucket, websiteConfig] = this.createWebsiteBucket(indexDocument, errorDocument, tags);
+        this.bucket = bucket;
+        this.websiteConfig = websiteConfig;
+    }
+    setupWebsiteBucketAccess(bucket) {
+        const bucketPublicAccessBlock = new aws.s3.BucketPublicAccessBlock(`${this.name}-bucket-access-block`, {
+            bucket: bucket.id,
+            blockPublicAcls: false,
+            blockPublicPolicy: false,
+            ignorePublicAcls: false,
+            restrictPublicBuckets: false,
+        }, { parent: this });
+        const policy = bucket.bucket.apply(getWebsiteBucketPolicy);
+        new aws.s3.BucketPolicy(`${this.name}-bucket-policy`, {
+            bucket: bucket.id,
+            policy: policy.json,
+        }, { parent: this, dependsOn: [bucketPublicAccessBlock] });
+    }
+    createWebsiteBucket(indexDocument, errorDocument, tags) {
+        const bucket = new aws.s3.Bucket(`${this.name}-bucket`, {
+            bucketPrefix: `${this.name}-`,
+            tags: Object.assign(Object.assign({}, common_tags_1.commonTags), tags),
+        }, { parent: this });
+        const config = new aws.s3.BucketWebsiteConfiguration(`${this.name}-bucket-website-config`, {
+            bucket: bucket.id,
+            indexDocument: {
+                suffix: indexDocument,
+            },
+            errorDocument: {
+                key: errorDocument,
+            },
+        }, { parent: this });
+        this.setupWebsiteBucketAccess(bucket);
+        return [bucket, config];
+    }
+}
+exports.S3Assets = S3Assets;
+const getWebsiteBucketPolicy = (bucketName) => aws.iam.getPolicyDocument({
+    statements: [
+        {
+            effect: 'Allow',
+            principals: [
+                {
+                    type: '*',
+                    identifiers: ['*'],
+                },
+            ],
+            actions: ['s3:GetObject'],
+            resources: [`arn:aws:s3:::${bucketName}/*`],
+        },
+    ],
+});

package/dist/components/vpc/index.d.ts

@@ -0,0 +1,20 @@
+import * as pulumi from '@pulumi/pulumi';
+import * as awsx from '@pulumi/awsx';
+export type VpcArgs = {
+    /**
+     * Number of availability zones to which the subnets defined in subnetSpecs will be deployed
+     * @default '2'
+     */
+    numberOfAvailabilityZones?: number;
+    tags?: pulumi.Input<{
+        [key: string]: pulumi.Input<string>;
+    }>;
+};
+export declare const defaults: {
+    numberOfAvailabilityZones: number;
+};
+export declare class Vpc extends pulumi.ComponentResource {
+    vpc: awsx.ec2.Vpc;
+    constructor(name: string, args: VpcArgs, opts?: pulumi.ComponentResourceOptions);
+}
+//# sourceMappingURL=index.d.ts.map

package/dist/components/vpc/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/vpc/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,IAAI,MAAM,cAAc,CAAC;AAKrC,MAAM,MAAM,OAAO,GAAG;IACpB;;;OAGG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;QAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACrC,CAAC,CAAC;CACJ,CAAC;AAEF,eAAO,MAAM,QAAQ;;CAEpB,CAAC;AAEF,qBAAa,GAAI,SAAQ,MAAM,CAAC,iBAAiB;IAC/C,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;gBAGhB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,EACb,IAAI,GAAE,MAAM,CAAC,wBAA6B;CAyB7C"}

package/dist/components/vpc/index.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Vpc = exports.defaults = void 0;
+const pulumi = require("@pulumi/pulumi");
+const awsx = require("@pulumi/awsx");
+const common_tags_1 = require("../../shared/common-tags");
+const types_1 = require("@pulumi/awsx/types");
+const merge_with_defaults_1 = require("../../shared/merge-with-defaults");
+exports.defaults = {
+    numberOfAvailabilityZones: 2,
+};
+class Vpc extends pulumi.ComponentResource {
+    constructor(name, args, opts = {}) {
+        super('studion:vpc:Vpc', name, {}, opts);
+        const argsWithDefaults = (0, merge_with_defaults_1.mergeWithDefaults)(exports.defaults, args);
+        this.vpc = new awsx.ec2.Vpc(`${name}-vpc`, {
+            numberOfAvailabilityZones: argsWithDefaults.numberOfAvailabilityZones,
+            enableDnsHostnames: true,
+            enableDnsSupport: true,
+            subnetStrategy: types_1.enums.ec2.SubnetAllocationStrategy.Auto,
+            subnetSpecs: [
+                { type: awsx.ec2.SubnetType.Public, cidrMask: 24 },
+                { type: awsx.ec2.SubnetType.Private, cidrMask: 24 },
+                { type: awsx.ec2.SubnetType.Isolated, cidrMask: 24 },
+            ],
+            tags: Object.assign(Object.assign({}, common_tags_1.commonTags), argsWithDefaults.tags),
+        }, { parent: this });
+        this.registerOutputs();
+    }
+}
+exports.Vpc = Vpc;

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

@@ -5,7 +5,7 @@ import { WebServer } from '.';
 import { OtelCollector } from '../../otel';
 export declare namespace WebServerBuilder {
     type EcsConfig = Omit<WebServer.EcsConfig, 'vpc' | 'volumes'>;
-    type Args = Omit<WebServer.Args, 'vpc' | 'publicSubnetIds' | 'cluster' | 'volumes' | 'domain' | 'hostedZoneId' | 'otelCollectorConfig'>;
+    type Args = Omit<WebServer.Args, 'vpc' | 'cluster' | 'volumes' | 'domain' | 'hostedZoneId' | 'otelCollectorConfig'>;
 }
 export declare class WebServerBuilder {
     private _name;
@@ -14,7 +14,9 @@ export declare class WebServerBuilder {
     private _ecsConfig?;
     private _domain?;
     private _hostedZoneId?;
+    private _certificate?;
     private _healthCheckPath?;
+    private _loadBalancingAlgorithmType?;
     private _otelCollector?;
     private _initContainers;
     private _sidecarContainers;
@@ -25,10 +27,12 @@ export declare class WebServerBuilder {
     withVpc(vpc: pulumi.Input<awsx.ec2.Vpc>): this;
     withVolume(volume: EcsService.PersistentStorageVolume): this;
     withCustomDomain(domain: pulumi.Input<string>, hostedZoneId: pulumi.Input<string>): this;
+    withCertificate(certificate: WebServerBuilder.Args['certificate'], hostedZoneId: pulumi.Input<string>, domain?: pulumi.Input<string>): this;
     withInitContainer(container: WebServer.InitContainer): this;
     withSidecarContainer(container: WebServer.SidecarContainer): this;
     withOtelCollector(collector: OtelCollector): this;
     withCustomHealthCheckPath(path: WebServer.Args['healthCheckPath']): this;
+    withLoadBalancingAlgorithm(algorithm: pulumi.Input<string>): this;
     build(opts?: pulumi.ComponentResourceOptions): WebServer;
 }
 //# sourceMappingURL=builder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../src/components/web-server/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,KAAK,IAAI,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,yBAAiB,gBAAgB,CAAC;IAChC,KAAY,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAC;IAErE,KAAY,IAAI,GAAG,IAAI,CACrB,SAAS,CAAC,IAAI,EACZ,KAAK,GACL,SAAS,GACT,SAAS,GACT,QAAQ,GACR,cAAc,GACd,qBAAqB,CACxB,CAAC;CACH;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,UAAU,CAAC,CAAsB;IACzC,OAAO,CAAC,IAAI,CAAC,CAA8B;IAC3C,OAAO,CAAC,UAAU,CAAC,CAA6B;IAChD,OAAO,CAAC,OAAO,CAAC,CAAuB;IACvC,OAAO,CAAC,aAAa,CAAC,CAAuB;IAC7C,OAAO,CAAC,YAAY,CAAC,CAAoC;IACzD,OAAO,CAAC,gBAAgB,CAAC,CAAuB;IAChD,OAAO,CAAC,2BAA2B,CAAC,CAAuB;IAC3D,OAAO,CAAC,cAAc,CAAC,CAA8B;IACrD,OAAO,CAAC,eAAe,CAA+C;IACtE,OAAO,CAAC,kBAAkB,CAAkD;IAC5E,OAAO,CAAC,QAAQ,CAA4C;gBAEhD,IAAI,EAAE,MAAM;IAIjB,kBAAkB,CACvB,KAAK,EAAE,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EACnC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,EACjC,MAAM,GAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,OAAO,GAAG,MAAM,CAAM,GACvD,IAAI;IAUA,YAAY,CAAC,MAAM,EAAE,gBAAgB,CAAC,SAAS,GAAG,IAAI;IAetD,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI;IAM9C,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,uBAAuB,GAAG,IAAI;IAM5D,gBAAgB,CACrB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAC5B,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GACjC,IAAI;IAOA,eAAe,CACpB,WAAW,EAAE,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,EACjD,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAClC,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAC5B,IAAI;IAQA,iBAAiB,CAAC,SAAS,EAAE,SAAS,CAAC,aAAa,GAAG,IAAI;IAM3D,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC,gBAAgB,GAAG,IAAI;IAMjE,iBAAiB,CAAC,SAAS,EAAE,aAAa,GAAG,IAAI;IAMjD,yBAAyB,CAC9B,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,GACtC,IAAI;IAMA,0BAA0B,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;IAM1D,KAAK,CAAC,IAAI,GAAE,MAAM,CAAC,wBAA6B,GAAG,SAAS;CAoCpE"}

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

@@ -41,6 +41,12 @@ class WebServerBuilder {
         this._hostedZoneId = hostedZoneId;
         return this;
     }
+    withCertificate(certificate, hostedZoneId, domain) {
+        this._certificate = certificate;
+        this._hostedZoneId = hostedZoneId;
+        this._domain = domain;
+        return this;
+    }
     withInitContainer(container) {
         this._initContainers.push(container);
         return this;
@@ -57,6 +63,10 @@ class WebServerBuilder {
         this._healthCheckPath = path;
         return this;
     }
+    withLoadBalancingAlgorithm(algorithm) {
+        this._loadBalancingAlgorithmType = algorithm;
+        return this;
+    }
     build(opts = {}) {
         if (!this._container) {
             throw new Error('Web server not configured. Make sure to call WebServerBuilder.configureWebServer().');
@@ -67,7 +77,7 @@ class WebServerBuilder {
         if (!this._vpc) {
             throw new Error('VPC not provided. Make sure to call WebServerBuilder.withVpc().');
         }
-        return new _1.WebServer(this._name, Object.assign(Object.assign(Object.assign({}, this._ecsConfig), this._container), { vpc: this._vpc, volumes: this._volumes, publicSubnetIds: this._vpc.publicSubnetIds, domain: this._domain, hostedZoneId: this._hostedZoneId, healthCheckPath: this._healthCheckPath, otelCollector: this._otelCollector, initContainers: this._initContainers, sidecarContainers: this._sidecarContainers }), opts);
+        return new _1.WebServer(this._name, Object.assign(Object.assign(Object.assign({}, this._ecsConfig), this._container), { vpc: this._vpc, volumes: this._volumes, domain: this._domain, hostedZoneId: this._hostedZoneId, certificate: this._certificate, healthCheckPath: this._healthCheckPath, loadBalancingAlgorithmType: this._loadBalancingAlgorithmType, otelCollector: this._otelCollector, initContainers: this._initContainers, sidecarContainers: this._sidecarContainers }), opts);
     }
 }
 exports.WebServerBuilder = WebServerBuilder;

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

@@ -1,6 +1,6 @@
 import * as pulumi from '@pulumi/pulumi';
 import * as aws from '@pulumi/aws';
-import { AcmCertificate } from '../../../components/acm-certificate';
+import { AcmCertificate } from '../acm-certificate';
 import { EcsService } from '../ecs-service';
 import { WebServerLoadBalancer } from './load-balancer';
 import { OtelCollector } from '../../otel';
@@ -12,12 +12,33 @@ export declare namespace WebServer {
     type InitContainer = Omit<EcsService.Container, 'essential'>;
     type SidecarContainer = Omit<EcsService.Container, 'essential' | 'healthCheck'> & Required<Pick<EcsService.Container, 'healthCheck'>>;
     type Args = EcsConfig & Container & {
-        publicSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
         /**
-         * The domain which will be used to access the service.
-         * The domain or subdomain must belong to the provided hostedZone.
+         * Domain name for CloudFront distribution. Implies creation of certificate
+         * and alias record. Must belong to the provided hosted zone.
+         * Providing the `certificate` argument has following effects:
+         * - Certificate creation is skipped
+         * - Provided certificate must cover the domain name
+         * Responsibility to ensure mentioned requirements in on the consumer, and
+         * falling to do so will result in unexpected behavior.
          */
         domain?: pulumi.Input<string>;
+        /**
+         * Certificate for CloudFront distribution. Domain and alternative domains
+         * are automatically pulled from the certificate and translated into alias
+         * records. Domains covered by the certificate, must belong to the provided
+         * hosted zone. The certificate must be in `us-east-1` region. In a case
+         * of wildcard certificate the `domain` argument is required.
+         * Providing the `domain` argument has following effects:
+         * - Alias records creation, from automatically pulled domains, is skipped
+         * - Certificate must cover the provided domain name
+         * Responsibility to ensure mentioned requirements in on the consumer, and
+         * falling to do so will result in unexpected behavior.
+         */
+        certificate?: pulumi.Input<aws.acm.Certificate>;
+        /**
+         * ID of hosted zone is needed when the `domain` or the `certificate`
+         * arguments are provided.
+         */
         hostedZoneId?: pulumi.Input<string>;
         /**
          * Path for the load balancer target group health check request.
@@ -26,6 +47,7 @@ export declare namespace WebServer {
          * "/healthcheck"
          */
         healthCheckPath?: pulumi.Input<string>;
+        loadBalancingAlgorithmType?: pulumi.Input<string>;
         initContainers?: pulumi.Input<pulumi.Input<WebServer.InitContainer>[]>;
         sidecarContainers?: pulumi.Input<pulumi.Input<WebServer.SidecarContainer>[]>;
         otelCollector?: pulumi.Input<OtelCollector>;
@@ -41,8 +63,8 @@ export declare class WebServer extends pulumi.ComponentResource {
     initContainers?: pulumi.Output<EcsService.Container[]>;
     sidecarContainers?: pulumi.Output<EcsService.Container[]>;
     volumes?: pulumi.Output<EcsService.PersistentStorageVolume[]>;
-    certificate?: AcmCertificate;
-    dnsRecord?: aws.route53.Record;
+    acmCertificate?: AcmCertificate;
+    dnsRecords?: pulumi.Output<aws.route53.Record[]>;
     constructor(name: string, args: WebServer.Args, opts?: pulumi.ComponentResourceOptions);
     private getVolumes;
     private getInitContainers;
@@ -53,6 +75,6 @@ export declare class WebServer extends pulumi.ComponentResource {
     private createTlsCertificate;
     private createSecurityGroup;
     private createEcsService;
-    private createDnsRecord;
+    private createDnsRecords;
 }
 //# sourceMappingURL=index.d.ts.map

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

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

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

@@ -3,43 +3,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebServer = void 0;
 const pulumi = require("@pulumi/pulumi");
 const aws = require("@pulumi/aws");
-const constants_1 = require("../../../constants");
-const acm_certificate_1 = require("../../../components/acm-certificate");
+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:WebServer', name, args, opts);
-        const { vpc, domain, hostedZoneId } = args;
-        if (domain && !hostedZoneId) {
-            throw new Error('WebServer:hostedZoneId must be provided when the domain is specified');
+        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`.');
         }
-        const hasCustomDomain = !!domain && !!hostedZoneId;
-        if (hasCustomDomain) {
-            this.certificate = this.createTlsCertificate({ domain, hostedZoneId });
+        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: (_a = this.certificate) === null || _a === void 0 ? void 0 : _a.certificate,
+            certificate: certificate !== null && certificate !== void 0 ? certificate : (_a = this.acmCertificate) === null || _a === void 0 ? void 0 : _a.certificate,
             healthCheckPath: args.healthCheckPath,
-        }, { parent: this });
+            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);
-        // TODO: Move output mapping to createEcsService
-        this.service = pulumi
-            .all([this.initContainers, this.sidecarContainers])
-            .apply(([initContainers, sidecarContainers]) => {
-            return this.createEcsService(this.container, this.lb, this.ecsConfig, this.volumes, [...initContainers, ...sidecarContainers]);
-        });
-        if (hasCustomDomain) {
-            this.dnsRecord = this.createDnsRecord({ domain, hostedZoneId });
+        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();
     }
@@ -143,30 +141,41 @@ class WebServer extends pulumi.ComponentResource {
                     cidrBlocks: ['0.0.0.0/0'],
                 },
             ],
-            tags: constants_1.commonTags,
+            tags: common_tags_1.commonTags,
         }, { parent: this });
     }
-    createEcsService(webServerContainer, lb, ecsConfig, volumes, containers) {
-        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 }),
-                ...(containers || []),
-            ], enableServiceAutoDiscovery: false, loadBalancers: [
-                {
-                    containerName: this.name,
-                    containerPort: webServerContainer.port,
-                    targetGroupArn: lb.targetGroup.arn,
-                },
-            ], assignPublicIp: true, securityGroup: this.serviceSecurityGroup }), {
-            parent: this,
-            dependsOn: [lb, lb.targetGroup],
+    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],
+            });
         });
     }
-    createDnsRecord({ domain, hostedZoneId, }) {
-        return new aws.route53.Record(`${this.name}-route53-record`, {
+    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: domain,
+            name: alias,
             zoneId: hostedZoneId,
             aliases: [
                 {
@@ -175,7 +184,7 @@ class WebServer extends pulumi.ComponentResource {
                     evaluateTargetHealth: true,
                 },
             ],
-        }, { parent: this });
+        }, { parent: this })));
     }
 }
 exports.WebServer = WebServer;

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

@@ -5,8 +5,9 @@ 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,aAAa,CAAC;AACnC,OAAO,KAAK,IAAI,MAAM,cAAc,CAAC;AAIrC,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

@@ -3,7 +3,8 @@ 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 common_tags_1 = require("../../shared/common-tags");
+const merge_with_defaults_1 = require("../../shared/merge-with-defaults");
 const webServerLoadBalancerNetworkConfig = {
     ingress: [
         {
@@ -33,10 +34,11 @@ const defaults = {
 };
 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-',
@@ -45,13 +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.createLbTlsListener(this.lb, this.targetGroup, pulumi.output(certificate));
         this.registerOutputs();
     }
     createLbTlsListener(lb, lbTargetGroup, certificate) {
@@ -59,7 +61,7 @@ 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: [
                 {
@@ -67,7 +69,7 @@ class WebServerLoadBalancer extends pulumi.ComponentResource {
                     targetGroupArn: lbTargetGroup.arn,
                 },
             ],
-            tags: constants_1.commonTags,
+            tags: common_tags_1.commonTags,
         }, { parent: this, dependsOn: [certificate] });
     }
     createLbHttpListener(lb, lbTargetGroup, redirectToHttps) {
@@ -89,28 +91,29 @@ class WebServerLoadBalancer extends pulumi.ComponentResource {
             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"}