@studion/infra-code-blocks 2.0.0-alpha.4 → 2.0.0-alpha.6

package/dist/components/ecs-service/index.js

@@ -39,8 +39,21 @@ const defaults = {
     },
 };
 class EcsService extends pulumi.ComponentResource {
+    name;
+    vpc;
+    logGroup;
+    taskDefinition;
+    taskExecutionRole;
+    taskRole;
+    service;
+    securityGroups;
+    serviceDiscoveryService;
+    persistentStorage;
     constructor(name, args, opts = {}) {
-        super('studion:ecs-service:EcsService', name, {}, Object.assign(Object.assign({}, opts), { aliases: [...(opts.aliases || []), { type: 'studion:ecs:Service' }] }));
+        super('studion:ecs-service:EcsService', name, {}, {
+            ...opts,
+            aliases: [...(opts.aliases || []), { type: 'studion:ecs:Service' }],
+        });
         const argsWithDefaults = (0, merge_with_defaults_1.mergeWithDefaults)(defaults, args);
         const taskExecutionRoleInlinePolicies = pulumi.output(args.taskExecutionRoleInlinePolicies ||
             defaults.taskExecutionRoleInlinePolicies);
@@ -56,7 +69,7 @@ class EcsService extends pulumi.ComponentResource {
                 this.persistentStorage = this.createPersistentStorage(this.vpc);
             }
         });
-        this.taskDefinition = this.createTaskDefinition(argsWithDefaults.containers, pulumi.output(argsWithDefaults.volumes), this.taskExecutionRole, this.taskRole, argsWithDefaults.family, argsWithDefaults.size, Object.assign(Object.assign({}, common_tags_1.commonTags), argsWithDefaults.tags));
+        this.taskDefinition = this.createTaskDefinition(argsWithDefaults.containers, pulumi.output(argsWithDefaults.volumes), this.taskExecutionRole, this.taskRole, argsWithDefaults.family, argsWithDefaults.size, { ...common_tags_1.commonTags, ...argsWithDefaults.tags });
         if (argsWithDefaults.enableServiceAutoDiscovery) {
             this.serviceDiscoveryService = this.createServiceDiscovery();
         }
@@ -76,7 +89,7 @@ class EcsService extends pulumi.ComponentResource {
     createLogGroup(namePrefix) {
         const logGroup = new aws.cloudwatch.LogGroup(`${this.name}-log-group`, {
             retentionInDays: 14,
-            namePrefix: namePrefix !== null && namePrefix !== void 0 ? namePrefix : `/ecs/${this.name}-`,
+            namePrefix: namePrefix ?? `/ecs/${this.name}-`,
             tags: common_tags_1.commonTags,
         }, { parent: this });
         return logGroup;
@@ -90,8 +103,18 @@ class EcsService extends pulumi.ComponentResource {
         const taskDefinitionVolumes = this.createTaskDefinitionVolumes(volumes);
         return pulumi.all(containerDefinitions).apply(containerDefinitions => {
             return taskDefinitionVolumes.apply(volumes => {
-                return new aws.ecs.TaskDefinition(`${this.name}-task-definition`, Object.assign(Object.assign({ family: family !== null && family !== void 0 ? family : `${this.name}-task-definition-${stack}`, networkMode: 'awsvpc', executionRoleArn: taskExecutionRole.arn, taskRoleArn: taskRole.arn, cpu,
-                    memory, requiresCompatibilities: ['FARGATE'], containerDefinitions: JSON.stringify(containerDefinitions) }, ((volumes === null || volumes === void 0 ? void 0 : volumes.length) ? { volumes } : {})), { tags: Object.assign(Object.assign({}, common_tags_1.commonTags), tags) }), { parent: this });
+                return new aws.ecs.TaskDefinition(`${this.name}-task-definition`, {
+                    family: family ?? `${this.name}-task-definition-${stack}`,
+                    networkMode: 'awsvpc',
+                    executionRoleArn: taskExecutionRole.arn,
+                    taskRoleArn: taskRole.arn,
+                    cpu,
+                    memory,
+                    requiresCompatibilities: ['FARGATE'],
+                    containerDefinitions: JSON.stringify(containerDefinitions),
+                    ...(volumes?.length ? { volumes } : {}),
+                    tags: { ...common_tags_1.commonTags, ...tags },
+                }, { parent: this });
             });
         });
     }
@@ -113,26 +136,31 @@ class EcsService extends pulumi.ComponentResource {
         });
     }
     createContainerDefinition(container) {
-        return this.logGroup.name.apply(logGroupName => (Object.assign(Object.assign(Object.assign(Object.assign({}, container), { readonlyRootFilesystem: false }), (container.mountPoints && {
-            mountPoints: container.mountPoints.map(mountPoint => pulumi
-                .all([
-                mountPoint.sourceVolume,
-                mountPoint.containerPath,
-                mountPoint.readOnly,
-            ])
-                .apply(([sourceVolume, containerPath, readOnly]) => ({
-                containerPath,
-                sourceVolume,
-                readOnly: readOnly !== null && readOnly !== void 0 ? readOnly : false,
-            }))),
-        })), { logConfiguration: {
+        return this.logGroup.name.apply(logGroupName => ({
+            ...container,
+            readonlyRootFilesystem: false,
+            ...(container.mountPoints && {
+                mountPoints: container.mountPoints.map(mountPoint => pulumi
+                    .all([
+                    mountPoint.sourceVolume,
+                    mountPoint.containerPath,
+                    mountPoint.readOnly,
+                ])
+                    .apply(([sourceVolume, containerPath, readOnly]) => ({
+                    containerPath,
+                    sourceVolume,
+                    readOnly: readOnly ?? false,
+                }))),
+            }),
+            logConfiguration: {
                 logDriver: 'awslogs',
                 options: {
                     'awslogs-group': logGroupName,
                     'awslogs-region': awsRegion,
                     'awslogs-stream-prefix': 'ecs',
                 },
-            } })));
+            },
+        }));
     }
     createTaskExecutionRole(inlinePolicies) {
         const secretManagerSecretsInlinePolicy = {
@@ -221,7 +249,6 @@ class EcsService extends pulumi.ComponentResource {
         this.addSecurityGroup(securityGroup);
     }
     createEcsService(ecsServiceArgs) {
-        var _a;
         if (ecsServiceArgs.securityGroup) {
             this.addSecurityGroup(ecsServiceArgs.securityGroup);
         }
@@ -237,13 +264,25 @@ class EcsService extends pulumi.ComponentResource {
                 .all(this.securityGroups)
                 .apply(groups => groups.map(it => it.id)),
         };
-        return new aws.ecs.Service(`${this.name}-service`, Object.assign(Object.assign(Object.assign({ name: (_a = ecsServiceArgs.name) !== null && _a !== void 0 ? _a : this.name, cluster: pulumi.output(ecsServiceArgs.cluster).id, launchType: 'FARGATE', deploymentController: { type: ecsServiceArgs.deploymentController }, desiredCount: ecsServiceArgs.desiredCount, taskDefinition: this.taskDefinition.arn, enableExecuteCommand: true, networkConfiguration }, (ecsServiceArgs.loadBalancers && {
-            loadBalancers: ecsServiceArgs.loadBalancers,
-        })), (this.serviceDiscoveryService && {
-            serviceRegistries: {
-                registryArn: this.serviceDiscoveryService.arn,
-            },
-        })), { tags: Object.assign(Object.assign({}, common_tags_1.commonTags), ecsServiceArgs.tags) }), { parent: this });
+        return new aws.ecs.Service(`${this.name}-service`, {
+            name: ecsServiceArgs.name ?? this.name,
+            cluster: pulumi.output(ecsServiceArgs.cluster).id,
+            launchType: 'FARGATE',
+            deploymentController: { type: ecsServiceArgs.deploymentController },
+            desiredCount: ecsServiceArgs.desiredCount,
+            taskDefinition: this.taskDefinition.arn,
+            enableExecuteCommand: true,
+            networkConfiguration,
+            ...(ecsServiceArgs.loadBalancers && {
+                loadBalancers: ecsServiceArgs.loadBalancers,
+            }),
+            ...(this.serviceDiscoveryService && {
+                serviceRegistries: {
+                    registryArn: this.serviceDiscoveryService.arn,
+                },
+            }),
+            tags: { ...common_tags_1.commonTags, ...ecsServiceArgs.tags },
+        }, { parent: this });
     }
     createServiceDiscovery() {
         const privateDnsNamespace = this.createPrivateDnsNameSpace();
@@ -316,7 +355,10 @@ class EcsService extends pulumi.ComponentResource {
             ],
             performanceMode: 'generalPurpose',
             throughputMode: 'bursting',
-            tags: Object.assign(Object.assign({}, common_tags_1.commonTags), { Name: `${this.name}-data` }),
+            tags: {
+                ...common_tags_1.commonTags,
+                Name: `${this.name}-data`,
+            },
         }, { parent: this });
         const securityGroup = new aws.ec2.SecurityGroup(`${this.name}-persistent-storage-security-group`, {
             vpcId: vpc.vpcId,

package/dist/components/grafana/dashboards/panels.js

@@ -22,14 +22,17 @@ function createStatPercentagePanel(title, position, dataSource, metric) {
             },
         ],
         fieldConfig: {
-            defaults: Object.assign(Object.assign({}, percentageFieldConfig), (metric.thresholds
-                ? {
-                    thresholds: {
-                        mode: 'absolute',
-                        steps: metric.thresholds,
-                    },
-                }
-                : {})),
+            defaults: {
+                ...percentageFieldConfig,
+                ...(metric.thresholds
+                    ? {
+                        thresholds: {
+                            mode: 'absolute',
+                            steps: metric.thresholds,
+                        },
+                    }
+                    : {}),
+            },
         },
     };
 }
@@ -49,16 +52,19 @@ function createTimeSeriesPanel(title, position, dataSource, metric, unit, min, m
             },
         ],
         fieldConfig: {
-            defaults: Object.assign({ unit,
+            defaults: {
+                unit,
                 min,
-                max }, (metric.thresholds
-                ? {
-                    thresholds: {
-                        mode: 'absolute',
-                        steps: metric.thresholds,
-                    },
-                }
-                : {})),
+                max,
+                ...(metric.thresholds
+                    ? {
+                        thresholds: {
+                            mode: 'absolute',
+                            steps: metric.thresholds,
+                        },
+                    }
+                    : {}),
+            },
         },
     };
 }

package/dist/components/grafana/dashboards/web-server-slo.js

@@ -5,8 +5,11 @@ const grafana = require("@pulumiverse/grafana");
 const prometheus_1 = require("../../prometheus");
 const panels_1 = require("./panels");
 class WebServerSloDashboardBuilder {
+    name;
+    title;
+    panels = [];
+    tags;
     constructor(name, args) {
-        this.panels = [];
         this.name = name;
         this.title = pulumi.output(args.title);
     }

package/dist/components/password/index.js

@@ -6,8 +6,14 @@ const pulumi = require("@pulumi/pulumi");
 const random = require("@pulumi/random");
 const common_tags_1 = require("../../shared/common-tags");
 class Password extends pulumi.ComponentResource {
+    name;
+    value;
+    secret;
     constructor(name, args = {}, opts = {}) {
-        super('studion:password:Password', name, {}, Object.assign(Object.assign({}, opts), { aliases: [...(opts.aliases || []), { type: 'studion:Password' }] }));
+        super('studion:password:Password', name, {}, {
+            ...opts,
+            aliases: [...(opts.aliases || []), { type: 'studion:Password' }],
+        });
         this.name = name;
         if (args.value) {
             this.value = pulumi.secret(args.value);

package/dist/components/prometheus/queries.test.js

@@ -1,46 +1,37 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_test_1 = require("node:test");
 const assert = require("node:assert/strict");
 const queries_1 = require("./queries");
-(0, node_test_1.describe)('Prometheus Query Builders', () => __awaiter(void 0, void 0, void 0, function* () {
+(0, node_test_1.describe)('Prometheus Query Builders', async () => {
     const namespace = 'app';
     const timeRange = '2m';
     const apiRouteFilter = 'http_route=~"/api/.*"';
-    (0, node_test_1.describe)('getAvailabilityQuery', () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, node_test_1.describe)('getAvailabilityQuery', async () => {
         (0, node_test_1.it)('should build correct query', () => {
             const result = (0, queries_1.getAvailabilityQuery)(namespace, timeRange);
             const expected = `(sum(rate(${namespace}_http_server_duration_milliseconds_count{http_status_code!~"5.."}[${timeRange}]))) / ` +
                 `(sum(rate(${namespace}_http_server_duration_milliseconds_count[${timeRange}]))) * 100`;
             assert.equal(result, expected);
         });
-    }));
-    (0, node_test_1.describe)('getSuccessRateQuery', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    (0, node_test_1.describe)('getSuccessRateQuery', async () => {
         (0, node_test_1.it)('should build correct query', () => {
             const result = (0, queries_1.getSuccessRateQuery)(namespace, timeRange, apiRouteFilter);
             const expected = `(sum(rate(${namespace}_http_server_duration_milliseconds_count{http_status_code=~"[2-4]..",${apiRouteFilter}}[2m]))) / ` +
                 `(sum(rate(${namespace}_http_server_duration_milliseconds_count{${apiRouteFilter}}[2m]))) * 100`;
             assert.equal(result, expected);
         });
-    }));
-    (0, node_test_1.describe)('getPercentileLatencyQuery', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    (0, node_test_1.describe)('getPercentileLatencyQuery', async () => {
         (0, node_test_1.it)('should build correct query', () => {
             const percentile = 0.95;
             const result = (0, queries_1.getPercentileLatencyQuery)(namespace, timeRange, percentile, apiRouteFilter);
             const expected = `histogram_quantile(${percentile}, sum by(le) (rate(${namespace}_http_server_duration_milliseconds_bucket{${apiRouteFilter}}[${timeRange}])))`;
             assert.equal(result, expected);
         });
-    }));
-    (0, node_test_1.describe)('getLatencyPercentageQuery', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    (0, node_test_1.describe)('getLatencyPercentageQuery', async () => {
         (0, node_test_1.it)('should build correct query', () => {
             const threshold = 200;
             const result = (0, queries_1.getLatencyPercentageQuery)(namespace, timeRange, threshold, apiRouteFilter);
@@ -48,5 +39,5 @@ const queries_1 = require("./queries");
                 `(sum(rate(${namespace}_http_server_duration_milliseconds_count{${apiRouteFilter}}[2m]))) * 100`;
             assert.equal(result, expected);
         });
-    }));
-}));
+    });
+});

package/dist/components/redis/elasticache-redis.js

@@ -11,6 +11,11 @@ const defaults = {
     parameterGroupName: 'default.redis7',
 };
 class ElastiCacheRedis extends pulumi.ComponentResource {
+    name;
+    vpc;
+    cluster;
+    securityGroup;
+    subnetGroup;
     constructor(name, args, opts = {}) {
         super('studion:redis:ElastiCacheRedis', name, {}, opts);
         const argsWithDefaults = (0, merge_with_defaults_1.mergeWithDefaults)(defaults, args);
@@ -31,7 +36,7 @@ class ElastiCacheRedis extends pulumi.ComponentResource {
             subnetGroupName: this.subnetGroup.name,
             parameterGroupName: parameterGroupName,
             port: 6379,
-            tags: Object.assign(Object.assign({}, common_tags_1.commonTags), tags),
+            tags: { ...common_tags_1.commonTags, ...tags },
         }, { parent: this });
     }
     createSubnetGroup() {

package/dist/components/redis/upstash-redis.js

@@ -10,10 +10,16 @@ const defaults = {
     primaryRegion: 'us-east-1',
 };
 class UpstashRedis extends pulumi.ComponentResource {
+    name;
+    instance;
+    password;
     constructor(name, args, opts = {}) {
-        super('studion:redis:UpstashRedis', name, {}, Object.assign(Object.assign({}, opts), { aliases: [...(opts.aliases || []), { type: 'studion:Redis' }] }));
+        super('studion:redis:UpstashRedis', name, {}, {
+            ...opts,
+            aliases: [...(opts.aliases || []), { type: 'studion:Redis' }],
+        });
         const dbName = `${pulumi.getProject()}-${pulumi.getStack()}`;
-        const argsWithDefaults = (0, merge_with_defaults_1.mergeWithDefaults)(Object.assign(Object.assign({}, defaults), { dbName }), args);
+        const argsWithDefaults = (0, merge_with_defaults_1.mergeWithDefaults)({ ...defaults, dbName }, args);
         this.name = name;
         this.instance = new upstash.RedisDatabase(`${this.name}-database`, {
             databaseName: argsWithDefaults.dbName,

package/dist/components/static-site/index.js

@@ -6,8 +6,14 @@ const cache_rule_ttl_1 = require("./cache-rule-ttl");
 const s3_assets_1 = require("./s3-assets");
 const cloudfront_1 = require("../cloudfront");
 class StaticSite extends pulumi.ComponentResource {
+    name;
+    s3Assets;
+    cf;
     constructor(name, args, opts = {}) {
-        super('studion:static-site:StaticSite', name, {}, Object.assign(Object.assign({}, opts), { aliases: [...(opts.aliases || []), { type: 'studion:StaticSite' }] }));
+        super('studion:static-site:StaticSite', name, {}, {
+            ...opts,
+            aliases: [...(opts.aliases || []), { type: 'studion:StaticSite' }],
+        });
         const { domain, hostedZoneId, certificate, bucketPrefix, indexDocument, errorDocument, cacheRules, tags, } = args;
         if (!domain && !certificate) {
             throw new Error('Provide either domain or certificate, or both');

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

@@ -5,6 +5,9 @@ const pulumi = require("@pulumi/pulumi");
 const aws = require("@pulumi/aws");
 const common_tags_1 = require("../../shared/common-tags");
 class S3Assets extends pulumi.ComponentResource {
+    name;
+    bucket;
+    websiteConfig;
     constructor(name, args, opts = {}) {
         super('studion:static-site:S3Assets', name, {}, opts);
         this.name = name;
@@ -30,7 +33,7 @@ class S3Assets extends pulumi.ComponentResource {
     createWebsiteBucket(bucketPrefix, indexDocument, errorDocument, tags) {
         const bucket = new aws.s3.Bucket(`${this.name}-bucket`, {
             bucketPrefix,
-            tags: Object.assign(Object.assign({}, common_tags_1.commonTags), tags),
+            tags: { ...common_tags_1.commonTags, ...tags },
         }, { parent: this });
         const config = new aws.s3.BucketWebsiteConfiguration(`${this.name}-bucket-website-config`, {
             bucket: bucket.id,

package/dist/components/vpc/index.js

@@ -10,6 +10,7 @@ exports.defaults = {
     numberOfAvailabilityZones: 2,
 };
 class Vpc extends pulumi.ComponentResource {
+    vpc;
     constructor(name, args, opts = {}) {
         super('studion:vpc:Vpc', name, {}, opts);
         const argsWithDefaults = (0, merge_with_defaults_1.mergeWithDefaults)(exports.defaults, args);
@@ -26,7 +27,7 @@ class Vpc extends pulumi.ComponentResource {
                 { type: awsx.ec2.SubnetType.Public, cidrMask: 24 },
                 { type: awsx.ec2.SubnetType.Isolated, cidrMask: 24 },
             ],
-            tags: Object.assign(Object.assign({}, common_tags_1.commonTags), argsWithDefaults.tags),
+            tags: { ...common_tags_1.commonTags, ...argsWithDefaults.tags },
         }, { parent: this });
         this.registerOutputs();
     }

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

@@ -4,15 +4,28 @@ exports.WebServerBuilder = void 0;
 const pulumi = require("@pulumi/pulumi");
 const _1 = require(".");
 class WebServerBuilder {
+    _name;
+    _container;
+    _vpc;
+    _ecsConfig;
+    _domain;
+    _hostedZoneId;
+    _certificate;
+    _healthCheckPath;
+    _loadBalancingAlgorithmType;
+    _otelCollector;
+    _initContainers = [];
+    _sidecarContainers = [];
+    _volumes = [];
     constructor(name) {
-        this._initContainers = [];
-        this._sidecarContainers = [];
-        this._volumes = [];
         this._name = name;
     }
     withContainer(image, port, config = {}) {
-        this._container = Object.assign({ image,
-            port }, config);
+        this._container = {
+            image,
+            port,
+            ...config,
+        };
         return this;
     }
     withEcsConfig(config) {
@@ -80,7 +93,20 @@ 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, 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);
+        return new _1.WebServer(this._name, {
+            ...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/components/web-server/index.js

@@ -8,9 +8,22 @@ 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 {
+    name;
+    container;
+    ecsConfig;
+    service;
+    serviceSecurityGroup;
+    lb;
+    initContainers;
+    sidecarContainers;
+    volumes;
+    acmCertificate;
+    dnsRecords;
     constructor(name, args, opts = {}) {
-        var _a;
-        super('studion:web-server:WebServer', name, {}, Object.assign(Object.assign({}, opts), { aliases: [...(opts.aliases || []), { type: 'studion:WebServer' }] }));
+        super('studion:web-server:WebServer', name, {}, {
+            ...opts,
+            aliases: [...(opts.aliases || []), { type: 'studion:WebServer' }],
+        });
         const { vpc, domain, hostedZoneId, certificate } = args;
         const hasCustomDomain = !!domain || !!certificate;
         if (hasCustomDomain && !hostedZoneId) {
@@ -23,12 +36,15 @@ class WebServer extends pulumi.ComponentResource {
         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,
+            certificate: certificate ?? this.acmCertificate?.certificate,
             healthCheckPath: args.healthCheckPath,
             loadBalancingAlgorithmType: args.loadBalancingAlgorithmType,
-        }, Object.assign({ parent: this }, (this.acmCertificate
-            ? { dependsOn: [this.acmCertificate.certificateValidation] }
-            : undefined)));
+        }, {
+            parent: this,
+            ...(this.acmCertificate
+                ? { dependsOn: [this.acmCertificate.certificateValidation] }
+                : undefined),
+        });
         this.serviceSecurityGroup = this.createSecurityGroup(vpc);
         this.initContainers = this.getInitContainers(args);
         this.sidecarContainers = this.getSidecarContainers(args);
@@ -37,7 +53,7 @@ class WebServer extends pulumi.ComponentResource {
         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.dnsRecords = this.createDnsRecords(certificate ?? this.acmCertificate.certificate, hostedZoneId, domain);
         }
         this.registerOutputs();
     }
@@ -62,7 +78,10 @@ class WebServer extends pulumi.ComponentResource {
                 containers.push(...passedInits);
             if (otelCollector)
                 containers.push(otelCollector.configContainer);
-            return containers.map(container => (Object.assign(Object.assign({}, container), { essential: false })));
+            return containers.map(container => ({
+                ...container,
+                essential: false,
+            }));
         });
     }
     getSidecarContainers(args) {
@@ -74,7 +93,7 @@ class WebServer extends pulumi.ComponentResource {
                 containers.push(...passedSidecars);
             if (otelCollector)
                 containers.push(otelCollector.container);
-            return containers.map(container => (Object.assign(Object.assign({}, container), { essential: true })));
+            return containers.map(container => ({ ...container, essential: true }));
         });
     }
     getTaskRoleInlinePolicies(args) {
@@ -154,19 +173,32 @@ class WebServer extends pulumi.ComponentResource {
             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: [
+            return new ecs_service_1.EcsService(`${this.name}-ecs`, {
+                ...ecsConfig,
+                volumes,
+                containers: [
+                    {
+                        ...webServerContainer,
+                        name: this.name,
+                        portMappings: [
                             ecs_service_1.EcsService.createTcpPortMapping(webServerContainer.port),
-                        ], essential: true }),
+                        ],
+                        essential: true,
+                    },
                     ...inits,
                     ...sidecars,
-                ], enableServiceAutoDiscovery: false, loadBalancers: [
+                ],
+                enableServiceAutoDiscovery: false,
+                loadBalancers: [
                     {
                         containerName: this.name,
                         containerPort: webServerContainer.port,
                         targetGroupArn: lb.targetGroup.arn,
                     },
-                ], assignPublicIp: true, securityGroup: this.serviceSecurityGroup }), {
+                ],
+                assignPublicIp: true,
+                securityGroup: this.serviceSecurityGroup,
+            }, {
                 parent: this,
                 dependsOn: [lb, lb.targetGroup],
             });
@@ -176,7 +208,7 @@ class WebServer extends pulumi.ComponentResource {
         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}`}`, {
+            .apply(([domain, certDomain, certSans = []]) => (domain ? [domain] : [...new Set([certDomain, ...certSans])]).map((alias, index) => new aws.route53.Record(`${this.name}-dns-a-record-${index}`, {
             type: 'A',
             name: alias,
             zoneId: hostedZoneId,

package/dist/components/web-server/load-balancer.js

@@ -33,6 +33,12 @@ const defaults = {
     healthCheckPath: '/healthcheck',
 };
 class WebServerLoadBalancer extends pulumi.ComponentResource {
+    name;
+    lb;
+    targetGroup;
+    httpListener;
+    tlsListener;
+    securityGroup;
     constructor(name, args, opts = {}) {
         super('studion:web-server:WebServerLoadBalancer', name, {}, opts);
         this.name = name;
@@ -47,7 +53,7 @@ class WebServerLoadBalancer extends pulumi.ComponentResource {
             securityGroups: [this.securityGroup.id],
             internal: false,
             ipAddressType: 'ipv4',
-            tags: Object.assign(Object.assign({}, common_tags_1.commonTags), { Name: name }),
+            tags: { ...common_tags_1.commonTags, Name: name },
         }, { parent: this });
         this.targetGroup = this.createLbTargetGroup(port, vpc.vpcId, healthCheckPath, loadBalancingAlgorithmType);
         this.httpListener = this.createLbHttpListener(this.lb, this.targetGroup, !!certificate);
@@ -109,11 +115,15 @@ class WebServerLoadBalancer extends pulumi.ComponentResource {
                 timeout: 5,
                 path: healthCheckPath,
             },
-            tags: Object.assign(Object.assign({}, common_tags_1.commonTags), { Name: `${this.name}-target-group` }),
+            tags: { ...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: common_tags_1.commonTags }), { parent: this });
+        return new aws.ec2.SecurityGroup(`${this.name}-security-group`, {
+            ...webServerLoadBalancerNetworkConfig,
+            vpcId,
+            tags: common_tags_1.commonTags,
+        }, { parent: this });
     }
 }
 exports.WebServerLoadBalancer = WebServerLoadBalancer;

package/dist/otel/builder.js

@@ -7,8 +7,11 @@ const memoryLimiterProcessor = require("./memory-limiter-processor");
 const _1 = require(".");
 const config_1 = require("./config");
 class OtelCollectorBuilder {
+    _serviceName;
+    _env;
+    _configBuilder;
+    _taskRoleInlinePolicies = [];
     constructor(serviceName, env) {
-        this._taskRoleInlinePolicies = [];
         this._serviceName = pulumi.output(serviceName);
         this._env = pulumi.output(env);
         this._configBuilder = new config_1.OtelCollectorConfigBuilder();