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

package/dist/components/acm-certificate/index.js

@@ -5,8 +5,13 @@ const pulumi = require("@pulumi/pulumi");
 const aws = require("@pulumi/aws");
 const common_tags_1 = require("../../shared/common-tags");
 class AcmCertificate extends pulumi.ComponentResource {
+    certificate;
+    certificateValidation;
     constructor(name, args, opts = {}) {
-        super('studion:acm-certificate:AcmCertificate', name, {}, Object.assign(Object.assign({}, opts), { aliases: [...(opts.aliases || []), { type: 'studion:acm:Certificate' }] }));
+        super('studion:acm-certificate:AcmCertificate', name, {}, {
+            ...opts,
+            aliases: [...(opts.aliases || []), { type: 'studion:acm:Certificate' }],
+        });
         this.certificate = new aws.acm.Certificate(`${args.domain}-certificate`, {
             domainName: args.domain,
             subjectAlternativeNames: args.subjectAlternativeNames,

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

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

package/dist/components/cloudfront/index.js

@@ -8,6 +8,9 @@ const acm_certificate_1 = require("../acm-certificate");
 const s3_cache_strategy_1 = require("./s3-cache-strategy");
 const lb_cache_strategy_1 = require("./lb-cache-strategy");
 class CloudFront extends pulumi.ComponentResource {
+    name;
+    distribution;
+    acmCertificate;
     constructor(name, args, opts = {}) {
         super('studion:cloudfront:CloudFront', name, {}, opts);
         this.name = name;
@@ -33,11 +36,14 @@ class CloudFront extends pulumi.ComponentResource {
             origins: this.createDistributionOrigins(behaviors),
             defaultCache: this.getCacheBehavior(defaultBehavior),
             orderedCaches: orderedBehaviors.length
-                ? orderedBehaviors.map((it, idx) => (Object.assign({ pathPattern: it.pathPattern }, this.getCacheBehavior(it, idx))))
+                ? orderedBehaviors.map((it, idx) => this.getCacheBehavior(it, idx).apply(behavior => ({
+                    pathPattern: it.pathPattern,
+                    ...behavior,
+                })))
                 : undefined,
             domain,
             certificate: certificate || this.acmCertificate
-                ? pulumi.output(certificate !== null && certificate !== void 0 ? certificate : this.acmCertificate.certificate)
+                ? pulumi.output(certificate ?? this.acmCertificate.certificate)
                 : undefined,
             certificateValidation: this.acmCertificate
                 ? this.acmCertificate.certificateValidation
@@ -53,7 +59,6 @@ class CloudFront extends pulumi.ComponentResource {
     createDistributionOrigins(behaviors) {
         return pulumi.output(behaviors).apply(entries => {
             const origins = entries.map(it => {
-                var _a;
                 if (isS3BehaviorType(it)) {
                     return getOriginWithDefaults({
                         originId: it.bucket.arn,
@@ -66,16 +71,18 @@ class CloudFront extends pulumi.ComponentResource {
                 else if (isLbBehaviorType(it)) {
                     return getOriginWithDefaults({
                         originId: it.loadBalancer.arn,
-                        domainName: (_a = it.dnsName) !== null && _a !== void 0 ? _a : it.loadBalancer.dnsName,
+                        domainName: it.dnsName ?? it.loadBalancer.dnsName,
                     });
                 }
                 else if (isCustomBehaviorType(it)) {
                     return getOriginWithDefaults({
                         originId: it.originId,
                         domainName: it.domainName,
-                        customOriginConfig: Object.assign({}, (it.originProtocolPolicy
-                            ? { originProtocolPolicy: it.originProtocolPolicy }
-                            : undefined)),
+                        customOriginConfig: {
+                            ...(it.originProtocolPolicy
+                                ? { originProtocolPolicy: it.originProtocolPolicy }
+                                : undefined),
+                        },
                     });
                 }
                 else {
@@ -87,7 +94,6 @@ class CloudFront extends pulumi.ComponentResource {
         });
     }
     getCacheBehavior(behavior, order) {
-        var _a, _b, _c, _d, _e;
         const isDefault = isDefaultBehavior(behavior);
         const getStrategyName = (backend) => {
             const suffix = isDefault ? 'default' : `ordered-${order}`;
@@ -99,35 +105,44 @@ class CloudFront extends pulumi.ComponentResource {
                 bucket: behavior.bucket,
                 cacheTtl: behavior.cacheTtl,
             }, { parent: this });
-            return strategy.config;
+            return pulumi.output(strategy.config);
         }
         else if (isLbBehaviorType(behavior)) {
             const strategy = new lb_cache_strategy_1.LbCacheStrategy(getStrategyName('lb'), {
                 pathPattern: behavior.pathPattern,
                 loadBalancer: behavior.loadBalancer,
             }, { parent: this });
-            return strategy.config;
+            return pulumi.output(strategy.config);
         }
         else if (isCustomBehaviorType(behavior)) {
-            return Object.assign(Object.assign({ targetOriginId: behavior.originId, allowedMethods: (_a = behavior.allowedMethods) !== null && _a !== void 0 ? _a : [
-                    'GET',
-                    'HEAD',
-                    'OPTIONS',
-                    'PUT',
-                    'POST',
-                    'PATCH',
-                    'DELETE',
-                ], cachedMethods: (_b = behavior.cachedMethods) !== null && _b !== void 0 ? _b : ['GET', 'HEAD'] }, (behavior.compress != null && { compress: behavior.compress })), { viewerProtocolPolicy: 'redirect-to-https', cachePolicyId: (_c = behavior.cachePolicyId) !== null && _c !== void 0 ? _c : aws.cloudfront
-                    .getCachePolicyOutput({ name: 'Managed-CachingDisabled' })
-                    .apply(p => p.id), originRequestPolicyId: (_d = behavior.originRequestPolicyId) !== null && _d !== void 0 ? _d : aws.cloudfront
-                    .getOriginRequestPolicyOutput({
-                    name: 'Managed-AllViewerExceptHostHeader',
-                })
-                    .apply(p => p.id), responseHeadersPolicyId: (_e = behavior.responseHeadersPolicyId) !== null && _e !== void 0 ? _e : aws.cloudfront
-                    .getResponseHeadersPolicyOutput({
-                    name: 'Managed-SecurityHeadersPolicy',
-                })
-                    .apply(p => p.id) });
+            return isS3Domain(behavior.domainName).apply(isS3 => ({
+                targetOriginId: behavior.originId,
+                allowedMethods: behavior.allowedMethods ??
+                    (isS3
+                        ? ['GET', 'HEAD']
+                        : ['GET', 'HEAD', 'OPTIONS', 'PUT', 'POST', 'PATCH', 'DELETE']),
+                cachedMethods: behavior.cachedMethods ?? ['GET', 'HEAD'],
+                ...(behavior.compress != null && { compress: behavior.compress }),
+                viewerProtocolPolicy: 'redirect-to-https',
+                cachePolicyId: behavior.cachePolicyId ??
+                    aws.cloudfront
+                        .getCachePolicyOutput({ name: 'Managed-CachingDisabled' })
+                        .apply(p => p.id),
+                originRequestPolicyId: behavior.originRequestPolicyId ??
+                    (isS3
+                        ? undefined
+                        : aws.cloudfront
+                            .getOriginRequestPolicyOutput({
+                            name: 'Managed-AllViewerExceptHostHeader',
+                        })
+                            .apply(p => p.id)),
+                responseHeadersPolicyId: behavior.responseHeadersPolicyId ??
+                    aws.cloudfront
+                        .getResponseHeadersPolicyOutput({
+                        name: 'Managed-SecurityHeadersPolicy',
+                    })
+                        .apply(p => p.id),
+            }));
         }
         else {
             throw new Error('Unknown CloudFront behavior encountered during mapping to distribution cache behaviors.');
@@ -141,34 +156,51 @@ class CloudFront extends pulumi.ComponentResource {
         }, { parent: this });
     }
     createDistribution({ origins, defaultCache, orderedCaches, domain, certificate, certificateValidation, defaultRootObject, tags, }) {
-        return new aws.cloudfront.Distribution(`${this.name}-distribution`, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ enabled: true, isIpv6Enabled: true, waitForDeployment: true, httpVersion: 'http2and3' }, (defaultRootObject && { defaultRootObject })), (certificate
-            ? {
-                aliases: domain
-                    ? [domain]
-                    : pulumi
-                        .all([
-                        certificate.domainName,
-                        certificate.subjectAlternativeNames,
-                    ])
-                        .apply(([dn, sans = []]) => [...new Set([dn, ...sans])]),
-                viewerCertificate: {
-                    acmCertificateArn: certificate.arn,
-                    sslSupportMethod: 'sni-only',
-                    minimumProtocolVersion: 'TLSv1.2_2021',
-                },
-            }
-            : {
-                viewerCertificate: {
-                    cloudfrontDefaultCertificate: true,
-                },
-            })), { origins, defaultCacheBehavior: defaultCache }), (orderedCaches && { orderedCacheBehaviors: orderedCaches })), { priceClass: 'PriceClass_100', restrictions: {
+        return new aws.cloudfront.Distribution(`${this.name}-distribution`, {
+            enabled: true,
+            isIpv6Enabled: true,
+            waitForDeployment: true,
+            httpVersion: 'http2and3',
+            ...(defaultRootObject && { defaultRootObject }),
+            ...(certificate
+                ? {
+                    aliases: domain
+                        ? [domain]
+                        : pulumi
+                            .all([
+                            certificate.domainName,
+                            certificate.subjectAlternativeNames,
+                        ])
+                            .apply(([dn, sans = []]) => [...new Set([dn, ...sans])]),
+                    viewerCertificate: {
+                        acmCertificateArn: certificate.arn,
+                        sslSupportMethod: 'sni-only',
+                        minimumProtocolVersion: 'TLSv1.2_2021',
+                    },
+                }
+                : {
+                    viewerCertificate: {
+                        cloudfrontDefaultCertificate: true,
+                    },
+                }),
+            origins,
+            defaultCacheBehavior: defaultCache,
+            ...(orderedCaches && { orderedCacheBehaviors: orderedCaches }),
+            priceClass: 'PriceClass_100',
+            restrictions: {
                 geoRestriction: { restrictionType: 'none' },
-            }, tags: Object.assign(Object.assign({}, common_tags_1.commonTags), tags) }), Object.assign({ parent: this, aliases: [{ name: `${this.name}-cloudfront` }] }, (certificateValidation
-            ? { dependsOn: [certificateValidation] }
-            : undefined)));
+            },
+            tags: { ...common_tags_1.commonTags, ...tags },
+        }, {
+            parent: this,
+            aliases: [{ name: `${this.name}-cloudfront` }],
+            ...(certificateValidation
+                ? { dependsOn: [certificateValidation] }
+                : undefined),
+        });
     }
     createAliasRecord({ hostedZoneId, }) {
-        return this.distribution.aliases.apply(aliases => aliases === null || aliases === void 0 ? void 0 : aliases.map((alias, index) => new aws.route53.Record(`${this.name}-cloudfront-alias-record-${index}`, {
+        return this.distribution.aliases.apply(aliases => aliases?.map((alias, index) => new aws.route53.Record(`${this.name}-dns-a-record-${index}`, {
             type: 'A',
             name: alias,
             zoneId: hostedZoneId,
@@ -194,6 +226,7 @@ exports.CloudFront = CloudFront;
         BehaviorType["CUSTOM"] = "custom";
     })(BehaviorType = CloudFront.BehaviorType || (CloudFront.BehaviorType = {}));
 })(CloudFront || (exports.CloudFront = CloudFront = {}));
+const S3_DOMAIN_REGEX = /\.s3(?:[.\-][a-z0-9]+(?:-[a-z0-9]+)*)*\.amazonaws\.com$/;
 function isDefaultBehavior(value) {
     return value.pathPattern === '*' || value.pathPattern === '/*';
 }
@@ -206,10 +239,19 @@ function isLbBehaviorType(value) {
 function isCustomBehaviorType(value) {
     return value.type === CloudFront.BehaviorType.CUSTOM;
 }
+function isS3Domain(domainName) {
+    return pulumi.output(domainName).apply(dn => S3_DOMAIN_REGEX.test(dn));
+}
 function getOriginWithDefaults({ originId, domainName, customOriginConfig, }) {
     return {
         originId,
         domainName,
-        customOriginConfig: Object.assign({ originProtocolPolicy: 'https-only', httpPort: 80, httpsPort: 443, originSslProtocols: ['TLSv1.2'] }, customOriginConfig),
+        customOriginConfig: {
+            originProtocolPolicy: 'https-only',
+            httpPort: 80,
+            httpsPort: 443,
+            originSslProtocols: ['TLSv1.2'],
+            ...customOriginConfig,
+        },
     };
 }

package/dist/components/cloudfront/lb-cache-strategy.js

@@ -4,6 +4,11 @@ exports.LbCacheStrategy = void 0;
 const aws = require("@pulumi/aws");
 const pulumi = require("@pulumi/pulumi");
 class LbCacheStrategy extends pulumi.ComponentResource {
+    name;
+    pathPattern;
+    config;
+    cachePolicy;
+    responseHeadersPolicy;
     constructor(name, args, opts = {}) {
         super('studion:cloudfront:LbCacheStrategy', name, {}, opts);
         this.name = name;
@@ -87,7 +92,10 @@ class LbCacheStrategy extends pulumi.ComponentResource {
         }, { parent: this });
     }
     getPathConfig() {
-        return Object.assign({ pathPattern: this.pathPattern }, this.config);
+        return {
+            pathPattern: this.pathPattern,
+            ...this.config,
+        };
     }
 }
 exports.LbCacheStrategy = LbCacheStrategy;

package/dist/components/cloudfront/s3-cache-strategy.js

@@ -4,6 +4,11 @@ exports.S3CacheStrategy = void 0;
 const aws = require("@pulumi/aws");
 const pulumi = require("@pulumi/pulumi");
 class S3CacheStrategy extends pulumi.ComponentResource {
+    name;
+    pathPattern;
+    config;
+    cachePolicy;
+    responseHeadersPolicy;
     constructor(name, args, opts = {}) {
         super('studion:cloudfront:S3CacheStrategy', name, {}, opts);
         this.name = name;
@@ -25,9 +30,9 @@ class S3CacheStrategy extends pulumi.ComponentResource {
     createCachePolicy(ttl) {
         const enableEncoding = pulumi.output(ttl).apply(val => val !== 0);
         return new aws.cloudfront.CachePolicy(`${this.name}-cache-policy`, {
-            defaultTtl: ttl !== null && ttl !== void 0 ? ttl : 86400, // default to 1 day
-            minTtl: ttl !== null && ttl !== void 0 ? ttl : 60, // default to 1 minute
-            maxTtl: ttl !== null && ttl !== void 0 ? ttl : 31536000, // default to 1 year
+            defaultTtl: ttl ?? 86400, // default to 1 day
+            minTtl: ttl ?? 60, // default to 1 minute
+            maxTtl: ttl ?? 31536000, // default to 1 year
             parametersInCacheKeyAndForwardedToOrigin: {
                 cookiesConfig: {
                     cookieBehavior: 'none',
@@ -73,7 +78,10 @@ class S3CacheStrategy extends pulumi.ComponentResource {
         }, { parent: this });
     }
     getPathConfig() {
-        return Object.assign({ pathPattern: this.pathPattern }, this.config);
+        return {
+            pathPattern: this.pathPattern,
+            ...this.config,
+        };
     }
 }
 exports.S3CacheStrategy = S3CacheStrategy;

package/dist/components/database/builder.js

@@ -4,6 +4,20 @@ exports.DatabaseBuilder = void 0;
 const _1 = require(".");
 const pulumi = require("@pulumi/pulumi");
 class DatabaseBuilder {
+    name;
+    instanceConfig;
+    credentialsConfig;
+    storageConfig;
+    vpc;
+    enableMonitoring;
+    snapshotIdentifier;
+    kmsKeyId;
+    parameterGroupName;
+    tags;
+    createReplica;
+    replicaConfig;
+    enableSSMConnect;
+    ssmConnectConfig;
     constructor(name) {
         this.name = name;
     }
@@ -54,20 +68,19 @@ class DatabaseBuilder {
         return this;
     }
     build(opts = {}) {
-        var _a, _b, _c, _d, _e;
-        if (!this.snapshotIdentifier && !((_a = this.instanceConfig) === null || _a === void 0 ? void 0 : _a.dbName)) {
+        if (!this.snapshotIdentifier && !this.instanceConfig?.dbName) {
             throw new Error('DbName not provided. Make sure to call DatabaseBuilder.withInstance() and set dbName.');
         }
-        if (!this.snapshotIdentifier && !((_b = this.credentialsConfig) === null || _b === void 0 ? void 0 : _b.username)) {
+        if (!this.snapshotIdentifier && !this.credentialsConfig?.username) {
             throw new Error('Username not provided. Make sure to call DatabaseBuilder.withCredentials() and set username.');
         }
-        if (this.snapshotIdentifier && ((_c = this.instanceConfig) === null || _c === void 0 ? void 0 : _c.dbName)) {
+        if (this.snapshotIdentifier && this.instanceConfig?.dbName) {
             throw new Error(`You can't set dbName when using snapshotIdentifier.`);
         }
-        if (this.snapshotIdentifier && ((_d = this.credentialsConfig) === null || _d === void 0 ? void 0 : _d.username)) {
+        if (this.snapshotIdentifier && this.credentialsConfig?.username) {
             throw new Error(`You can't set username when using snapshotIdentifier.`);
         }
-        if (this.createReplica && ((_e = this.replicaConfig) === null || _e === void 0 ? void 0 : _e.enableMonitoring)) {
+        if (this.createReplica && this.replicaConfig?.enableMonitoring) {
             if (!this.enableMonitoring && !this.replicaConfig.monitoringRole) {
                 throw new Error(`If you want enable monitoring on the replica instance either provide monitoring role or
           enable monitoring on the primary instance to reuse the same monitoring role.`);
@@ -76,7 +89,21 @@ class DatabaseBuilder {
         if (!this.vpc) {
             throw new Error('VPC not provided. Make sure to call DatabaseBuilder.withVpc().');
         }
-        return new _1.Database(this.name, Object.assign(Object.assign(Object.assign(Object.assign({}, this.instanceConfig), this.credentialsConfig), this.storageConfig), { vpc: this.vpc, enableMonitoring: this.enableMonitoring, snapshotIdentifier: this.snapshotIdentifier, kmsKeyId: this.kmsKeyId, parameterGroupName: this.parameterGroupName, tags: this.tags, createReplica: this.createReplica, replicaConfig: this.replicaConfig, enableSSMConnect: this.enableSSMConnect, ssmConnectConfig: this.ssmConnectConfig }), opts);
+        return new _1.Database(this.name, {
+            ...this.instanceConfig,
+            ...this.credentialsConfig,
+            ...this.storageConfig,
+            vpc: this.vpc,
+            enableMonitoring: this.enableMonitoring,
+            snapshotIdentifier: this.snapshotIdentifier,
+            kmsKeyId: this.kmsKeyId,
+            parameterGroupName: this.parameterGroupName,
+            tags: this.tags,
+            createReplica: this.createReplica,
+            replicaConfig: this.replicaConfig,
+            enableSSMConnect: this.enableSSMConnect,
+            ssmConnectConfig: this.ssmConnectConfig,
+        }, opts);
     }
 }
 exports.DatabaseBuilder = DatabaseBuilder;

package/dist/components/database/database-replica.js

@@ -16,14 +16,18 @@ const defaults = {
     engineVersion: '17.2',
 };
 class DatabaseReplica extends pulumi.ComponentResource {
+    name;
+    instance;
     constructor(name, args, opts = {}) {
-        super('studion:database:DatabaseReplica', name, {}, Object.assign(Object.assign({}, opts), { aliases: [...(opts.aliases || []), { type: 'studion:DatabaseReplica' }] }));
+        super('studion:database:DatabaseReplica', name, {}, {
+            ...opts,
+            aliases: [...(opts.aliases || []), { type: 'studion:DatabaseReplica' }],
+        });
         this.name = name;
         this.instance = this.createDatabaseInstance(args, opts);
         this.registerOutputs();
     }
     createDatabaseInstance(args, opts) {
-        var _a;
         const argsWithDefaults = (0, merge_with_defaults_1.mergeWithDefaults)(defaults, args);
         const monitoringOptions = argsWithDefaults.monitoringRole
             ? {
@@ -33,7 +37,27 @@ class DatabaseReplica extends pulumi.ComponentResource {
                 performanceInsightsRetentionPeriod: 7,
             }
             : {};
-        const instance = new aws.rds.Instance(`${this.name}-rds`, Object.assign(Object.assign({ identifierPrefix: `${this.name}-`, engine: 'postgres', engineVersion: argsWithDefaults.engineVersion, allocatedStorage: argsWithDefaults.allocatedStorage, maxAllocatedStorage: argsWithDefaults.maxAllocatedStorage, instanceClass: argsWithDefaults.instanceClass, vpcSecurityGroupIds: [argsWithDefaults.dbSecurityGroup.id], dbSubnetGroupName: (_a = argsWithDefaults.dbSubnetGroup) === null || _a === void 0 ? void 0 : _a.name, multiAz: argsWithDefaults.multiAz, applyImmediately: argsWithDefaults.applyImmediately, allowMajorVersionUpgrade: argsWithDefaults.allowMajorVersionUpgrade, autoMinorVersionUpgrade: argsWithDefaults.autoMinorVersionUpgrade, replicateSourceDb: argsWithDefaults.replicateSourceDb, parameterGroupName: argsWithDefaults.parameterGroupName, storageEncrypted: true, publiclyAccessible: false, skipFinalSnapshot: true }, monitoringOptions), { tags: Object.assign(Object.assign({}, common_tags_1.commonTags), argsWithDefaults.tags) }), { parent: this, dependsOn: opts.dependsOn });
+        const instance = new aws.rds.Instance(`${this.name}-rds`, {
+            identifierPrefix: `${this.name}-`,
+            engine: 'postgres',
+            engineVersion: argsWithDefaults.engineVersion,
+            allocatedStorage: argsWithDefaults.allocatedStorage,
+            maxAllocatedStorage: argsWithDefaults.maxAllocatedStorage,
+            instanceClass: argsWithDefaults.instanceClass,
+            vpcSecurityGroupIds: [argsWithDefaults.dbSecurityGroup.id],
+            dbSubnetGroupName: argsWithDefaults.dbSubnetGroup?.name,
+            multiAz: argsWithDefaults.multiAz,
+            applyImmediately: argsWithDefaults.applyImmediately,
+            allowMajorVersionUpgrade: argsWithDefaults.allowMajorVersionUpgrade,
+            autoMinorVersionUpgrade: argsWithDefaults.autoMinorVersionUpgrade,
+            replicateSourceDb: argsWithDefaults.replicateSourceDb,
+            parameterGroupName: argsWithDefaults.parameterGroupName,
+            storageEncrypted: true,
+            publiclyAccessible: false,
+            skipFinalSnapshot: true,
+            ...monitoringOptions,
+            tags: { ...common_tags_1.commonTags, ...argsWithDefaults.tags },
+        }, { parent: this, dependsOn: opts.dependsOn });
         return instance;
     }
 }

package/dist/components/database/ec2-ssm-connect.d.ts

@@ -4,6 +4,7 @@ import * as pulumi from '@pulumi/pulumi';
 export declare namespace Ec2SSMConnect {
     type Args = {
         vpc: pulumi.Input<awsx.ec2.Vpc>;
+        ami?: pulumi.Input<string>;
         instanceType?: pulumi.Input<string>;
         tags?: pulumi.Input<{
             [key: string]: pulumi.Input<string>;
@@ -19,7 +20,7 @@ export declare class Ec2SSMConnect extends pulumi.ComponentResource {
     ec2MessagesVpcEndpoint: aws.ec2.VpcEndpoint;
     ssmMessagesVpcEndpoint: aws.ec2.VpcEndpoint;
     ec2: aws.ec2.Instance;
-    ami: pulumi.Output<aws.ec2.GetAmiResult>;
+    amiResult?: pulumi.Output<aws.ec2.GetAmiResult>;
     constructor(name: string, args: Ec2SSMConnect.Args, opts?: pulumi.ComponentResourceOptions);
 }
 //# sourceMappingURL=ec2-ssm-connect.d.ts.map

package/dist/components/database/ec2-ssm-connect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ec2-ssm-connect.d.ts","sourceRoot":"","sources":["../../../src/components/database/ec2-ssm-connect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,IAAI,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAOzC,yBAAiB,aAAa,CAAC;IAC7B,KAAY,IAAI,GAAG;QACjB,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,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;AAMD,qBAAa,aAAc,SAAQ,MAAM,CAAC,iBAAiB;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC;IACxC,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;IACnB,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC;IACpC,cAAc,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;IACpC,sBAAsB,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;IAC5C,sBAAsB,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;IAC5C,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAGvC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,aAAa,CAAC,IAAI,EACxB,IAAI,GAAE,MAAM,CAAC,wBAA6B;CAoK7C"}
+{"version":3,"file":"ec2-ssm-connect.d.ts","sourceRoot":"","sources":["../../../src/components/database/ec2-ssm-connect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,IAAI,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAOzC,yBAAiB,aAAa,CAAC;IAC7B,KAAY,IAAI,GAAG;QACjB,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3B,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,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;AAMD,qBAAa,aAAc,SAAQ,MAAM,CAAC,iBAAiB;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC;IACxC,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;IACnB,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC;IACpC,cAAc,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;IACpC,sBAAsB,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;IAC5C,sBAAsB,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;IAC5C,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAG9C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,aAAa,CAAC,IAAI,EACxB,IAAI,GAAE,MAAM,CAAC,wBAA6B;CAqK7C"}

package/dist/components/database/ec2-ssm-connect.js

@@ -11,26 +11,39 @@ const defaults = {
     instanceType: 't4g.nano',
 };
 class Ec2SSMConnect extends pulumi.ComponentResource {
+    name;
+    ec2SecurityGroup;
+    role;
+    ssmProfile;
+    ssmVpcEndpoint;
+    ec2MessagesVpcEndpoint;
+    ssmMessagesVpcEndpoint;
+    ec2;
+    amiResult;
     constructor(name, args, opts = {}) {
-        super('studion:database:Ec2SSMConnect', name, {}, Object.assign(Object.assign({}, opts), { aliases: [
+        super('studion:database:Ec2SSMConnect', name, {}, {
+            ...opts,
+            aliases: [
                 ...(opts.aliases || []),
                 { type: 'studion:Ec2BastionSSMConnect' },
-            ] }));
-        const { vpc, instanceType, tags } = (0, merge_with_defaults_1.mergeWithDefaults)(defaults, args);
+            ],
+        });
+        const { vpc, ami, instanceType, tags } = (0, merge_with_defaults_1.mergeWithDefaults)(defaults, args);
         this.name = name;
         const vpcOutput = pulumi.output(vpc);
         const subnetId = vpcOutput.privateSubnetIds.apply(ids => ids[0]);
-        this.ami = aws.ec2.getAmiOutput({
-            filters: [
-                { name: 'architecture', values: ['arm64'] },
-                { name: 'root-device-type', values: ['ebs'] },
-                { name: 'virtualization-type', values: ['hvm'] },
-                { name: 'ena-support', values: ['true'] },
-            ],
-            owners: ['amazon'],
-            nameRegex: 'al2023-ami-2023\.[0-9]+\.[0-9]+\.[0-9]+-kernel-[0-9]+\.[0-9]+-arm64',
-            mostRecent: true,
-        });
+        const amiId = ami ??
+            (this.amiResult = aws.ec2.getAmiOutput({
+                filters: [
+                    { name: 'architecture', values: ['arm64'] },
+                    { name: 'root-device-type', values: ['ebs'] },
+                    { name: 'virtualization-type', values: ['hvm'] },
+                    { name: 'ena-support', values: ['true'] },
+                ],
+                owners: ['amazon'],
+                nameRegex: 'al2023-ami-2023\.[0-9]+\.[0-9]+\.[0-9]+-kernel-[0-9]+\.[0-9]+-arm64',
+                mostRecent: true,
+            })).id;
         this.ec2SecurityGroup = new aws.ec2.SecurityGroup(`${this.name}-ec2-security-group`, {
             ingress: [
                 {
@@ -76,13 +89,17 @@ class Ec2SSMConnect extends pulumi.ComponentResource {
             tags: common_tags_1.commonTags,
         }, { parent: this, dependsOn: [ssmPolicyAttachment] });
         this.ec2 = new aws.ec2.Instance(`${this.name}-ec2`, {
-            ami: this.ami.id,
+            ami: amiId,
             associatePublicIpAddress: false,
             instanceType,
             iamInstanceProfile: this.ssmProfile.name,
             subnetId,
             vpcSecurityGroupIds: [this.ec2SecurityGroup.id],
-            tags: Object.assign(Object.assign(Object.assign({}, common_tags_1.commonTags), { Name: `${this.name}-ec2` }), tags),
+            tags: {
+                ...common_tags_1.commonTags,
+                Name: `${this.name}-ec2`,
+                ...tags,
+            },
         }, { parent: this });
         this.ssmVpcEndpoint = new aws.ec2.VpcEndpoint(`${this.name}-ssm-vpc-endpoint`, {
             vpcId: vpcOutput.vpcId,

package/dist/components/database/index.js

@@ -21,8 +21,22 @@ const defaults = {
     engineVersion: '17.2',
 };
 class Database extends pulumi.ComponentResource {
+    name;
+    instance;
+    vpc;
+    dbSubnetGroup;
+    dbSecurityGroup;
+    password;
+    kmsKeyId;
+    monitoringRole;
+    encryptedSnapshotCopy;
+    replica;
+    ec2SSMConnect;
     constructor(name, args, opts = {}) {
-        super('studion:database:Database', name, {}, Object.assign(Object.assign({}, opts), { aliases: [...(opts.aliases || []), { type: 'studion:Database' }] }));
+        super('studion:database:Database', name, {}, {
+            ...opts,
+            aliases: [...(opts.aliases || []), { type: 'studion:Database' }],
+        });
         this.name = name;
         const argsWithDefaults = (0, merge_with_defaults_1.mergeWithDefaults)(defaults, args);
         const { vpc, kmsKeyId, enableMonitoring, snapshotIdentifier, createReplica, replicaConfig = {}, enableSSMConnect, ssmConnectConfig = {}, } = argsWithDefaults;
@@ -117,14 +131,21 @@ class Database extends pulumi.ComponentResource {
         const monitoringRole = config.enableMonitoring
             ? config.monitoringRole || this.monitoringRole
             : undefined;
-        const replica = new database_replica_1.DatabaseReplica(`${this.name}-replica`, Object.assign({ replicateSourceDb: this.instance.dbInstanceIdentifier.apply(id => id), dbSecurityGroup: this.dbSecurityGroup, monitoringRole }, config), { parent: this, dependsOn: [this.instance] });
+        const replica = new database_replica_1.DatabaseReplica(`${this.name}-replica`, {
+            replicateSourceDb: this.instance.dbInstanceIdentifier.apply(id => id),
+            dbSecurityGroup: this.dbSecurityGroup,
+            monitoringRole,
+            ...config,
+        }, { parent: this, dependsOn: [this.instance] });
         return replica;
     }
     createEc2SSMConnect(config = {}) {
-        return new ec2_ssm_connect_1.Ec2SSMConnect(`${this.name}-ssm-connect`, Object.assign({ vpc: this.vpc }, config), { parent: this });
+        return new ec2_ssm_connect_1.Ec2SSMConnect(`${this.name}-ssm-connect`, {
+            vpc: this.vpc,
+            ...config,
+        }, { parent: this });
     }
     createDatabaseInstance(args) {
-        var _a, _b;
         const monitoringOptions = args.enableMonitoring && this.monitoringRole
             ? {
                 monitoringInterval: 60,
@@ -133,11 +154,38 @@ class Database extends pulumi.ComponentResource {
                 performanceInsightsRetentionPeriod: 7,
             }
             : {};
-        const instance = new awsNative.rds.DbInstance(`${this.name}-rds`, Object.assign(Object.assign({ dbInstanceIdentifier: `${this.name}-db-instance`, engine: 'postgres', engineVersion: args.engineVersion, dbInstanceClass: args.instanceClass, dbName: args.dbName, masterUsername: args.username, masterUserPassword: this.password.value, dbSubnetGroupName: this.dbSubnetGroup.name, vpcSecurityGroups: [this.dbSecurityGroup.id], allocatedStorage: (_a = args.allocatedStorage) === null || _a === void 0 ? void 0 : _a.toString(), maxAllocatedStorage: args.maxAllocatedStorage, multiAz: args.multiAz, applyImmediately: args.applyImmediately, allowMajorVersionUpgrade: args.allowMajorVersionUpgrade, autoMinorVersionUpgrade: args.autoMinorVersionUpgrade, kmsKeyId: this.kmsKeyId, storageEncrypted: true, publiclyAccessible: false, preferredMaintenanceWindow: 'Mon:07:00-Mon:07:30', preferredBackupWindow: '06:00-06:30', backupRetentionPeriod: 14, caCertificateIdentifier: 'rds-ca-rsa2048-g1', dbParameterGroupName: args.parameterGroupName, dbSnapshotIdentifier: (_b = this.encryptedSnapshotCopy) === null || _b === void 0 ? void 0 : _b.targetDbSnapshotIdentifier }, monitoringOptions), { tags: pulumi
+        const instance = new awsNative.rds.DbInstance(`${this.name}-rds`, {
+            dbInstanceIdentifier: `${this.name}-db-instance`,
+            engine: 'postgres',
+            engineVersion: args.engineVersion,
+            dbInstanceClass: args.instanceClass,
+            dbName: args.dbName,
+            masterUsername: args.username,
+            masterUserPassword: this.password.value,
+            dbSubnetGroupName: this.dbSubnetGroup.name,
+            vpcSecurityGroups: [this.dbSecurityGroup.id],
+            allocatedStorage: args.allocatedStorage?.toString(),
+            maxAllocatedStorage: args.maxAllocatedStorage,
+            multiAz: args.multiAz,
+            applyImmediately: args.applyImmediately,
+            allowMajorVersionUpgrade: args.allowMajorVersionUpgrade,
+            autoMinorVersionUpgrade: args.autoMinorVersionUpgrade,
+            kmsKeyId: this.kmsKeyId,
+            storageEncrypted: true,
+            publiclyAccessible: false,
+            preferredMaintenanceWindow: 'Mon:07:00-Mon:07:30',
+            preferredBackupWindow: '06:00-06:30',
+            backupRetentionPeriod: 14,
+            caCertificateIdentifier: 'rds-ca-rsa2048-g1',
+            dbParameterGroupName: args.parameterGroupName,
+            dbSnapshotIdentifier: this.encryptedSnapshotCopy?.targetDbSnapshotIdentifier,
+            ...monitoringOptions,
+            tags: pulumi
                 .output(args.tags)
                 .apply(tags => [
-                ...Object.entries(Object.assign(Object.assign({}, common_tags_1.commonTags), tags)).map(([key, value]) => ({ key, value })),
-            ]) }), { parent: this, dependsOn: [this.password] });
+                ...Object.entries({ ...common_tags_1.commonTags, ...tags }).map(([key, value]) => ({ key, value })),
+            ]),
+        }, { parent: this, dependsOn: [this.password] });
         return instance;
     }
 }