@studion/infra-code-blocks 2.0.0-alpha.3 → 2.0.0-alpha.5

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

@@ -4,24 +4,40 @@ 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;
     }
-    configureWebServer(image, port, config = {}) {
-        this._container = Object.assign({ image,
-            port }, config);
+    withContainer(image, port, config = {}) {
+        this._container = {
+            image,
+            port,
+            ...config,
+        };
         return this;
     }
-    configureEcs(config) {
+    withEcsConfig(config) {
         this._ecsConfig = {
             cluster: config.cluster,
+            name: config.name,
             deploymentController: config.deploymentController,
             desiredCount: config.desiredCount,
             autoscaling: config.autoscaling,
+            family: config.family,
             size: config.size,
+            logGroupNamePrefix: config.logGroupNamePrefix,
             taskExecutionRoleInlinePolicies: config.taskExecutionRoleInlinePolicies,
             taskRoleInlinePolicies: config.taskRoleInlinePolicies,
             tags: config.tags,
@@ -47,11 +63,11 @@ class WebServerBuilder {
         this._domain = domain;
         return this;
     }
-    withInitContainer(container) {
+    addInitContainer(container) {
         this._initContainers.push(container);
         return this;
     }
-    withSidecarContainer(container) {
+    addSidecarContainer(container) {
         this._sidecarContainers.push(container);
         return this;
     }
@@ -69,15 +85,28 @@ class WebServerBuilder {
     }
     build(opts = {}) {
         if (!this._container) {
-            throw new Error('Web server not configured. Make sure to call WebServerBuilder.configureWebServer().');
+            throw new Error('Web server not configured. Make sure to call WebServerBuilder.withContainer().');
         }
         if (!this._ecsConfig) {
-            throw new Error('ECS not configured. Make sure to call WebServerBuilder.configureEcs().');
+            throw new Error('ECS not configured. Make sure to call WebServerBuilder.withEcsConfig().');
         }
         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.d.ts

@@ -8,7 +8,7 @@ export declare namespace WebServer {
     type Container = Pick<EcsService.Container, 'image' | 'environment' | 'secrets' | 'mountPoints'> & {
         port: pulumi.Input<number>;
     };
-    type EcsConfig = Pick<EcsService.Args, 'cluster' | 'vpc' | 'volumes' | 'deploymentController' | 'desiredCount' | 'autoscaling' | 'size' | 'taskExecutionRoleInlinePolicies' | 'taskRoleInlinePolicies' | 'tags'>;
+    type EcsConfig = Pick<EcsService.Args, 'cluster' | 'vpc' | 'volumes' | 'name' | 'deploymentController' | 'desiredCount' | 'autoscaling' | 'family' | 'size' | 'logGroupNamePrefix' | 'taskExecutionRoleInlinePolicies' | 'taskRoleInlinePolicies' | 'tags'>;
     type InitContainer = Omit<EcsService.Container, 'essential'>;
     type SidecarContainer = Omit<EcsService.Container, 'essential' | 'healthCheck'> & Required<Pick<EcsService.Container, 'healthCheck'>>;
     type Args = EcsConfig & Container & {

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

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

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) {
@@ -97,10 +116,13 @@ class WebServer extends pulumi.ComponentResource {
         return {
             vpc: args.vpc,
             cluster: args.cluster,
+            name: args.name,
             deploymentController: args.deploymentController,
             desiredCount: args.desiredCount,
             autoscaling: args.autoscaling,
+            family: args.family,
             size: args.size,
+            logGroupNamePrefix: args.logGroupNamePrefix,
             taskExecutionRoleInlinePolicies: args.taskExecutionRoleInlinePolicies,
             taskRoleInlinePolicies: this.getTaskRoleInlinePolicies(args),
             tags: args.tags,
@@ -151,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],
             });

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();

package/dist/otel/config.js

@@ -3,15 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OtelCollectorConfigBuilder = void 0;
 const otlp_receiver_1 = require("./otlp-receiver");
 class OtelCollectorConfigBuilder {
-    constructor() {
-        this._receivers = {};
-        this._processors = {};
-        this._exporters = {};
-        this._extensions = {};
-        this._service = {
-            pipelines: {},
-        };
-    }
+    _receivers = {};
+    _processors = {};
+    _exporters = {};
+    _extensions = {};
+    _service = {
+        pipelines: {},
+    };
     withOTLPReceiver(protocols = ['http']) {
         if (!protocols.length) {
             throw new Error('At least one OTLP receiver protocol should be provided');
@@ -21,7 +19,7 @@ class OtelCollectorConfigBuilder {
             if (!protocolConfig) {
                 throw new Error(`OTLP receiver protocol ${current} is not supported`);
             }
-            return Object.assign(Object.assign({}, all), { [current]: protocolConfig });
+            return { ...all, [current]: protocolConfig };
         }, {});
         this._receivers.otlp = { protocols: protocolsConfig };
         return this;
@@ -159,18 +157,17 @@ class OtelCollectorConfigBuilder {
         }
     }
     validatePipelineComponents(pipelineType) {
-        var _a, _b, _c;
-        (_a = this._service.pipelines[pipelineType]) === null || _a === void 0 ? void 0 : _a.receivers.forEach(receiver => {
+        this._service.pipelines[pipelineType]?.receivers.forEach(receiver => {
             if (!this._receivers[receiver]) {
                 throw new Error(`Receiver '${receiver}' is used in ${pipelineType} pipeline but not defined`);
             }
         });
-        (_b = this._service.pipelines[pipelineType]) === null || _b === void 0 ? void 0 : _b.processors.forEach(processor => {
+        this._service.pipelines[pipelineType]?.processors.forEach(processor => {
             if (!this._processors[processor]) {
                 throw new Error(`Processor '${processor}' is used in ${pipelineType} pipeline but not defined`);
             }
         });
-        (_c = this._service.pipelines[pipelineType]) === null || _c === void 0 ? void 0 : _c.exporters.forEach(exporter => {
+        this._service.pipelines[pipelineType]?.exporters.forEach(exporter => {
             if (!this._exporters[exporter]) {
                 throw new Error(`Exporter '${exporter}' is used in ${pipelineType} pipeline but not defined`);
             }

package/dist/otel/index.js

@@ -4,6 +4,11 @@ exports.OtelCollector = void 0;
 const pulumi = require("@pulumi/pulumi");
 const yaml = require("yaml");
 class OtelCollector {
+    config;
+    configVolume;
+    container;
+    configContainer;
+    taskRoleInlinePolicies;
     constructor(serviceName, env, config, opts = {}) {
         const containerName = opts.containerName || pulumi.interpolate `${serviceName}-otel-collector`;
         const configVolumeName = opts.configVolumeName || 'otel-collector-config-volume';
@@ -45,9 +50,8 @@ class OtelCollector {
         ];
     }
     getCollectorPortMappings(config) {
-        var _a, _b;
-        const hasOTLPGRpcReceiver = !!((_a = config.receivers.otlp) === null || _a === void 0 ? void 0 : _a.protocols.grpc);
-        const hasOTLPHttpReceiver = !!((_b = config.receivers.otlp) === null || _b === void 0 ? void 0 : _b.protocols.http);
+        const hasOTLPGRpcReceiver = !!config.receivers.otlp?.protocols.grpc;
+        const hasOTLPHttpReceiver = !!config.receivers.otlp?.protocols.http;
         const protocol = 'tcp';
         return [
             ...(hasOTLPGRpcReceiver

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studion/infra-code-blocks",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.5",
   "description": "Studion common infra components",
   "keywords": [
     "infrastructure",
@@ -35,60 +35,50 @@
   },
   "prettier": "@studion/prettier-config",
   "dependencies": {
-    "@pulumi/aws": "^7.15.0",
-    "@pulumi/aws-native": "^1.38.0",
-    "@pulumi/awsx": "^3.1.0",
-    "@pulumi/pulumi": "^3.146.0",
-    "@pulumi/random": "^4.17.0",
-    "@pulumiverse/grafana": "^0.16.3",
+    "@pulumi/aws": "^7.21.0",
+    "@pulumi/aws-native": "^1.56.0",
+    "@pulumi/awsx": "^3.2.1",
+    "@pulumi/pulumi": "^3.225.0",
+    "@pulumi/random": "^4.19.1",
+    "@pulumiverse/grafana": "^2.21.0",
     "@upstash/pulumi": "^0.5.0",
-    "yaml": "^2.7.1"
+    "yaml": "^2.8.2"
   },
   "devDependencies": {
-    "@aws-sdk/client-acm": "^3.973.5",
-    "@aws-sdk/client-application-auto-scaling": "^3.973.5",
-    "@aws-sdk/client-cloudfront": "^3.973.5",
-    "@aws-sdk/client-cloudwatch-logs": "^3.973.5",
-    "@aws-sdk/client-ec2": "^3.973.5",
-    "@aws-sdk/client-ecs": "^3.973.5",
-    "@aws-sdk/client-efs": "^3.973.5",
-    "@aws-sdk/client-elastic-load-balancing-v2": "^3.764.5",
-    "@aws-sdk/client-elasticache": "^3.901.5",
-    "@aws-sdk/client-iam": "^3.973.5",
-    "@aws-sdk/client-kms": "^3.973.5",
-    "@aws-sdk/client-rds": "^3.973.5",
-    "@aws-sdk/client-route-53": "^3.973.5",
-    "@aws-sdk/client-s3": "^3.982.0",
-    "@aws-sdk/client-secrets-manager": "^3.973.5",
-    "@aws-sdk/client-servicediscovery": "^3.973.5",
-    "@aws-sdk/client-ssm": "^3.986.0",
-    "@aws-sdk/client-xray": "^3.989.0",
+    "@aws-sdk/client-acm": "^3.1002.0",
+    "@aws-sdk/client-application-auto-scaling": "^3.1002.0",
+    "@aws-sdk/client-cloudfront": "^3.1002.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.1002.0",
+    "@aws-sdk/client-ec2": "^3.1002.0",
+    "@aws-sdk/client-ecs": "^3.1002.0",
+    "@aws-sdk/client-efs": "^3.1002.0",
+    "@aws-sdk/client-elastic-load-balancing-v2": "^3.1002.0",
+    "@aws-sdk/client-elasticache": "^3.1002.0",
+    "@aws-sdk/client-iam": "^3.1002.0",
+    "@aws-sdk/client-kms": "^3.1002.0",
+    "@aws-sdk/client-rds": "^3.1002.0",
+    "@aws-sdk/client-route-53": "^3.1002.0",
+    "@aws-sdk/client-s3": "^3.1002.0",
+    "@aws-sdk/client-secrets-manager": "^3.1002.0",
+    "@aws-sdk/client-servicediscovery": "^3.1002.0",
+    "@aws-sdk/client-ssm": "^3.1002.0",
+    "@aws-sdk/client-xray": "^3.1002.0",
     "@studion/prettier-config": "^0.1.0",
-    "@types/node": "^22",
-    "exponential-backoff": "^3.1.2",
+    "@types/node": "^25",
+    "exponential-backoff": "^3.1.3",
     "http-status": "^2.1.0",
     "husky": "^9.1.7",
-    "ioredis": "^5.8.1",
-    "lint-staged": "^16.1.2",
+    "ioredis": "^5.10.0",
+    "lint-staged": "^16.3.2",
     "mime": "^4.1.0",
     "nanospinner": "^1.2.2",
     "pathe": "^2.0.3",
-    "prettier": "^3.4.2",
+    "prettier": "^3.8.1",
     "release-it": "^19.2.4",
-    "tstyche": "^4.0.0-beta.9",
+    "tstyche": "^6.2.0",
     "tsx": "^4.21.0",
-    "typescript": "^5.7.3",
-    "undici": "^6.21.2"
-  },
-  "overrides": {
-    "@pulumi/pulumi": {
-      "glob": "10.5.0",
-      "minimatch": "10.2.2",
-      "tar": "7.5.9"
-    },
-    "@aws-sdk/core": {
-      "fast-xml-parser": "5.3.6"
-    }
+    "typescript": "^5.9.3",
+    "undici": "^7.22.0"
   },
   "publishConfig": {
     "access": "public"