@studion/infra-code-blocks 0.6.7 → 0.6.8

package/dist/components/database.d.ts

@@ -52,6 +52,11 @@ export type DatabaseArgs = {
      * Set this to true to enable database monitoring. Defaults to false.
      */
     enableMonitoring?: pulumi.Input<boolean>;
+    /**
+     * Set this to true to allow major version upgrades, for example when creating
+     * db from the snapshot. Defaults to false.
+     */
+    allowMajorVersionUpgrade?: pulumi.Input<boolean>;
     /**
      * The name of custom aws.rds.ParameterGroup. Setting this param will apply custom
      * DB parameters to this instance.

package/dist/components/database.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Database = void 0;
 const aws = require("@pulumi/aws");
 const pulumi = require("@pulumi/pulumi");
-const random = require("@pulumi/random");
 const password_1 = require("./password");
 const constants_1 = require("../constants");
 const defaults = {
@@ -14,6 +13,7 @@ const defaults = {
     maxAllocatedStorage: 100,
     instanceClass: 'db.t4g.micro',
     enableMonitoring: false,
+    allowMajorVersionUpgrade: false,
 };
 class Database extends pulumi.ComponentResource {
     constructor(name, args, opts = {}) {
@@ -91,13 +91,9 @@ class Database extends pulumi.ComponentResource {
         return monitoringRole;
     }
     createEncryptedSnapshotCopy(snapshotIdentifier) {
-        const targetDbSnapshotIdentifier = new random.RandomString(`${this.name}-snapshot-copy-identifier-sufix`, {
-            length: 10,
-            special: false,
-        }, { parent: this }).result.apply(sufix => `${snapshotIdentifier}-${sufix}`);
         const encryptedSnapshotCopy = new aws.rds.SnapshotCopy(`${this.name}-encrypted-snapshot-copy`, {
             sourceDbSnapshotIdentifier: snapshotIdentifier,
-            targetDbSnapshotIdentifier,
+            targetDbSnapshotIdentifier: `${snapshotIdentifier}-encrypted-copy`,
             kmsKeyId: this.kms.arn,
         }, { parent: this });
         return encryptedSnapshotCopy;
@@ -114,7 +110,7 @@ class Database extends pulumi.ComponentResource {
                 performanceInsightsRetentionPeriod: 7,
             }
             : {};
-        const instance = new aws.rds.Instance(`${this.name}-rds`, Object.assign(Object.assign({ identifierPrefix: `${this.name}-`, engine: 'postgres', engineVersion: '15.5', allocatedStorage: argsWithDefaults.allocatedStorage, maxAllocatedStorage: argsWithDefaults.maxAllocatedStorage, instanceClass: argsWithDefaults.instanceClass, dbName: argsWithDefaults.dbName, username: argsWithDefaults.username, password: this.password.value, dbSubnetGroupName: this.dbSubnetGroup.name, vpcSecurityGroupIds: [this.dbSecurityGroup.id], storageEncrypted: true, kmsKeyId: this.kms.arn, multiAz: argsWithDefaults.multiAz, publiclyAccessible: false, skipFinalSnapshot: argsWithDefaults.skipFinalSnapshot, applyImmediately: argsWithDefaults.applyImmediately, autoMinorVersionUpgrade: true, maintenanceWindow: 'Mon:07:00-Mon:07:30', finalSnapshotIdentifier: `${this.name}-final-snapshot-${stack}`, backupWindow: '06:00-06:30', backupRetentionPeriod: 14, caCertIdentifier: 'rds-ca-rsa2048-g1', parameterGroupName: argsWithDefaults.parameterGroupName, allowMajorVersionUpgrade: Boolean(argsWithDefaults.snapshotIdentifier), snapshotIdentifier: (_a = this.encryptedSnapshotCopy) === null || _a === void 0 ? void 0 : _a.targetDbSnapshotIdentifier }, monitoringOptions), { tags: Object.assign(Object.assign({}, constants_1.commonTags), argsWithDefaults.tags) }), { parent: this, dependsOn: [this.password] });
+        const instance = new aws.rds.Instance(`${this.name}-rds`, Object.assign(Object.assign({ identifierPrefix: `${this.name}-`, engine: 'postgres', engineVersion: '15.5', allocatedStorage: argsWithDefaults.allocatedStorage, maxAllocatedStorage: argsWithDefaults.maxAllocatedStorage, instanceClass: argsWithDefaults.instanceClass, dbName: argsWithDefaults.dbName, username: argsWithDefaults.username, password: this.password.value, dbSubnetGroupName: this.dbSubnetGroup.name, vpcSecurityGroupIds: [this.dbSecurityGroup.id], storageEncrypted: true, kmsKeyId: this.kms.arn, multiAz: argsWithDefaults.multiAz, publiclyAccessible: false, skipFinalSnapshot: argsWithDefaults.skipFinalSnapshot, applyImmediately: argsWithDefaults.applyImmediately, autoMinorVersionUpgrade: true, maintenanceWindow: 'Mon:07:00-Mon:07:30', finalSnapshotIdentifier: `${this.name}-final-snapshot-${stack}`, backupWindow: '06:00-06:30', backupRetentionPeriod: 14, caCertIdentifier: 'rds-ca-rsa2048-g1', parameterGroupName: argsWithDefaults.parameterGroupName, allowMajorVersionUpgrade: argsWithDefaults.allowMajorVersionUpgrade, snapshotIdentifier: (_a = this.encryptedSnapshotCopy) === null || _a === void 0 ? void 0 : _a.targetDbSnapshotIdentifier }, monitoringOptions), { tags: Object.assign(Object.assign({}, constants_1.commonTags), argsWithDefaults.tags) }), { parent: this, dependsOn: [this.password] });
         return instance;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studion/infra-code-blocks",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "description": "Studion common infra components",
   "keywords": [
     "infrastructure",