@drunk-pulumi/azure 1.0.58 → 1.0.59
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Builder/PostgreSqlBuilder.js +26 -26
- package/package.json +1 -1
|
@@ -46,7 +46,7 @@ const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
|
46
46
|
const Helper_2 = require("../VNet/Helper");
|
|
47
47
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
48
48
|
const VNet_1 = require("../VNet");
|
|
49
|
-
const
|
|
49
|
+
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
50
50
|
class PostgreSqlBuilder extends types_1.Builder {
|
|
51
51
|
args;
|
|
52
52
|
_instanceName;
|
|
@@ -88,28 +88,9 @@ class PostgreSqlBuilder extends types_1.Builder {
|
|
|
88
88
|
return this;
|
|
89
89
|
}
|
|
90
90
|
buildLogin() {
|
|
91
|
-
const { name
|
|
92
|
-
if (!this._generateLogin)
|
|
93
|
-
//The username and password already provided.
|
|
94
|
-
//Just add them to key vault
|
|
95
|
-
if (vaultInfo) {
|
|
96
|
-
(0, KeyVault_1.addCustomSecrets)({
|
|
97
|
-
vaultInfo, dependsOn,
|
|
98
|
-
items: [{
|
|
99
|
-
name: `${this._instanceName}-host}`,
|
|
100
|
-
value: `${this._instanceName}.postgres.database.azure.com`,
|
|
101
|
-
}, {
|
|
102
|
-
name: `${this._instanceName}-username}`,
|
|
103
|
-
value: this._loginInfo.adminLogin,
|
|
104
|
-
},
|
|
105
|
-
{
|
|
106
|
-
name: `${this._instanceName}-pass`,
|
|
107
|
-
value: this._loginInfo.password
|
|
108
|
-
}]
|
|
109
|
-
});
|
|
110
|
-
}
|
|
91
|
+
const { name } = this.args;
|
|
92
|
+
if (!this._generateLogin)
|
|
111
93
|
return;
|
|
112
|
-
}
|
|
113
94
|
const login = (0, Random_1.randomLogin)({
|
|
114
95
|
name: this._instanceName,
|
|
115
96
|
loginPrefix: name,
|
|
@@ -119,10 +100,8 @@ class PostgreSqlBuilder extends types_1.Builder {
|
|
|
119
100
|
policy: 'yearly',
|
|
120
101
|
options: { lower: true, upper: true, special: false, numeric: true },
|
|
121
102
|
},
|
|
122
|
-
vaultInfo,
|
|
123
103
|
});
|
|
124
104
|
this._loginInfo = { adminLogin: login.userName, password: login.password };
|
|
125
|
-
login.userName.apply((u) => console.log(`[${this._instanceName}]: The login is ${u}.`));
|
|
126
105
|
}
|
|
127
106
|
buildUID() {
|
|
128
107
|
const { group, vaultInfo, envRoles, dependsOn } = this.args;
|
|
@@ -200,6 +179,27 @@ class PostgreSqlBuilder extends types_1.Builder {
|
|
|
200
179
|
ignoreChanges: [...ignoreChanges, 'administratorLogin'],
|
|
201
180
|
});
|
|
202
181
|
}
|
|
182
|
+
buildSecrets() {
|
|
183
|
+
const { vaultInfo, dependsOn } = this.args;
|
|
184
|
+
//The username and password already provided.
|
|
185
|
+
//Just add them to key vault
|
|
186
|
+
if (vaultInfo) {
|
|
187
|
+
(0, CustomHelper_1.addCustomSecrets)({
|
|
188
|
+
vaultInfo, dependsOn,
|
|
189
|
+
items: [{
|
|
190
|
+
name: `${this._instanceName}-host}`,
|
|
191
|
+
value: this._sqlInstance.fullyQualifiedDomainName,
|
|
192
|
+
}, {
|
|
193
|
+
name: `${this._instanceName}-username}`,
|
|
194
|
+
value: this._loginInfo.adminLogin,
|
|
195
|
+
},
|
|
196
|
+
{
|
|
197
|
+
name: `${this._instanceName}-pass`,
|
|
198
|
+
value: this._loginInfo.password
|
|
199
|
+
}]
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
203
|
buildNetwork() {
|
|
204
204
|
const { group } = this.args;
|
|
205
205
|
if (this._network?.ipAddresses) {
|
|
@@ -243,7 +243,7 @@ class PostgreSqlBuilder extends types_1.Builder {
|
|
|
243
243
|
this.buildLogin();
|
|
244
244
|
this.buildUID();
|
|
245
245
|
this.buildPostgreSql();
|
|
246
|
-
|
|
246
|
+
this.buildSecrets();
|
|
247
247
|
this.buildNetwork();
|
|
248
248
|
this.buildDatabases();
|
|
249
249
|
return {
|
|
@@ -254,4 +254,4 @@ class PostgreSqlBuilder extends types_1.Builder {
|
|
|
254
254
|
}
|
|
255
255
|
}
|
|
256
256
|
exports.default = (props) => new PostgreSqlBuilder(props);
|
|
257
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
257
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PostgreSqlBuilder.js","sourceRoot":"","sources":["../../src/Builder/PostgreSqlBuilder.ts"],"names":[],"mappings":"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"}
|