@drunk-pulumi/azure-components 1.1.35 → 1.1.38
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/AppResources.d.ts +2 -2
- package/apim/ApimApi.js +10 -2
- package/apim/openApiHelper.d.ts +1 -1
- package/apim/openApiHelper.js +37 -9
- package/database/MySql.d.ts +1 -0
- package/database/MySql.js +11 -5
- package/database/Postgres.d.ts +2 -1
- package/database/Postgres.js +15 -5
- package/database/Redis.js +25 -22
- package/package.json +1 -1
package/AppResources.d.ts
CHANGED
|
@@ -21,8 +21,8 @@ export interface AppResourcesArgs extends CommonBaseArgs, types.WithNetworkArgs,
|
|
|
21
21
|
logicApp?: types.WithName & Partial<LogicAppArgs> & Pick<LogicAppArgs, 'integrationAccount' | 'workflow'>;
|
|
22
22
|
signalR?: types.WithName & Partial<SignalRArgs> & Pick<SignalRArgs, 'sku'>;
|
|
23
23
|
azSql?: types.WithName & Partial<AzSqlArgs> & Pick<AzSqlArgs, 'administrators'>;
|
|
24
|
-
mySql?: types.WithName & Partial<MySqlArgs> & Pick<MySqlArgs, 'sku' | 'administratorLogin' | 'enableAzureADAdmin'>;
|
|
25
|
-
postgres?: types.WithName & Partial<PostgresArgs> & Pick<PostgresArgs, 'sku' | 'administratorLogin' | 'enableAzureADAdmin'>;
|
|
24
|
+
mySql?: types.WithName & Partial<MySqlArgs> & Pick<MySqlArgs, 'sku' | 'administratorLogin' | 'enableAzureADAdmin' | 'version'>;
|
|
25
|
+
postgres?: types.WithName & Partial<PostgresArgs> & Pick<PostgresArgs, 'sku' | 'administratorLogin' | 'enableAzureADAdmin' | 'version'>;
|
|
26
26
|
redis?: types.WithName & Partial<RedisArgs> & Pick<RedisArgs, 'sku' | 'disableAccessKeyAuthentication'>;
|
|
27
27
|
}
|
|
28
28
|
export declare class AppResources extends BaseComponent<AppResourcesArgs> {
|
package/apim/ApimApi.js
CHANGED
|
@@ -84,7 +84,15 @@ class ApimApi extends base_1.BaseResourceComponent {
|
|
|
84
84
|
? pulumi.interpolate `${serviceUrl}/${apiVersion}`
|
|
85
85
|
: `https://${helpers_1.stackInfo.organization}.com/${apiVersion}`,
|
|
86
86
|
format: openSpecUrl ? apim.ContentFormat.Openapi_json : undefined,
|
|
87
|
-
value: openSpecUrl
|
|
87
|
+
value: openSpecUrl
|
|
88
|
+
? pulumi.output(openApi.getImportConfig(openSpecUrl, apiVersion)).apply((v) => {
|
|
89
|
+
if (v === undefined) {
|
|
90
|
+
console.error(`APIM-openApi: Not able to load spec from: ${openSpecUrl}`);
|
|
91
|
+
}
|
|
92
|
+
// ApiArgs.value does not allow undefined, so keep prior empty-string fallback behavior.
|
|
93
|
+
return v ?? '';
|
|
94
|
+
})
|
|
95
|
+
: undefined,
|
|
88
96
|
}, {
|
|
89
97
|
...this.opts,
|
|
90
98
|
parent: this,
|
|
@@ -191,4 +199,4 @@ class ApimApi extends base_1.BaseResourceComponent {
|
|
|
191
199
|
}
|
|
192
200
|
}
|
|
193
201
|
exports.ApimApi = ApimApi;
|
|
194
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
202
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBpbUFwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcGltL0FwaW1BcGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0NBQWdFO0FBQ2hFLHlFQUEyRDtBQUMzRCx1REFBeUM7QUFDekMseURBQTJDO0FBQzNDLDJEQUF3RDtBQUN4RCx3Q0FBaUQ7QUFzQ2pELE1BQWEsT0FBUSxTQUFRLDRCQUFrQztJQUM3QyxFQUFFLENBQXdCO0lBQzFCLFlBQVksQ0FBd0I7SUFFcEQsWUFBWSxJQUFZLEVBQUUsSUFBaUIsRUFBRSxJQUFzQztRQUNqRixLQUFLLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFbkMsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQzNCLElBQUksQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDekIsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzdCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUMzQixJQUFJLENBQUMsZUFBZSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRTFCLElBQUksQ0FBQyxFQUFFLEdBQUcsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUNqQixJQUFJLENBQUMsWUFBWSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUM7UUFDN0IsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO0lBQ3pCLENBQUM7SUFFTSxVQUFVO1FBQ2YsT0FBTztZQUNMLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUNYLFlBQVksRUFBRSxJQUFJLENBQUMsWUFBWTtZQUMvQixpQkFBaUIsRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLGlCQUFpQixDQUFDO1NBQ3RF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
|
package/apim/openApiHelper.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const getImportConfig: (specUrl: string, version: string) => Promise<string>;
|
|
1
|
+
export declare const getImportConfig: (specUrl: string, version: string) => Promise<string | undefined>;
|
package/apim/openApiHelper.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getImportConfig = void 0;
|
|
4
|
+
const promises_1 = require("node:fs/promises");
|
|
5
|
+
const node_fs_1 = require("node:fs");
|
|
4
6
|
const removeVersion = (data, version) => {
|
|
5
7
|
if (!data?.paths) {
|
|
6
8
|
console.error(`APIM-removeVersion: There is no paths found in`, data);
|
|
@@ -15,22 +17,48 @@ const removeVersion = (data, version) => {
|
|
|
15
17
|
data.paths = newPaths;
|
|
16
18
|
return data;
|
|
17
19
|
};
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
.
|
|
20
|
+
const isHttpSpecUrl = (specUrl) => /^https?:\/\//i.test(specUrl);
|
|
21
|
+
const downloadRemoteSpecFile = async (fileUrl) => {
|
|
22
|
+
try {
|
|
23
|
+
const response = await fetch(fileUrl, { method: 'GET' });
|
|
24
|
+
if (!response.ok) {
|
|
25
|
+
console.error(`Not able to get spec file from: ${fileUrl}. Status: ${response.status}`);
|
|
26
|
+
return undefined;
|
|
27
|
+
}
|
|
28
|
+
return (await response.json());
|
|
29
|
+
}
|
|
30
|
+
catch (error) {
|
|
23
31
|
console.error(`Not able to get spec file from: ${fileUrl}`, error);
|
|
24
32
|
return undefined;
|
|
25
|
-
}
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
const downloadLocalSpecFile = async (filePath) => {
|
|
36
|
+
try {
|
|
37
|
+
await (0, promises_1.access)(filePath, node_fs_1.constants.F_OK);
|
|
38
|
+
const fileContent = await (0, promises_1.readFile)(filePath, 'utf8');
|
|
39
|
+
try {
|
|
40
|
+
return JSON.parse(fileContent);
|
|
41
|
+
}
|
|
42
|
+
catch (error) {
|
|
43
|
+
console.error(`Invalid JSON in spec file: ${filePath}`, error);
|
|
44
|
+
return undefined;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
catch (error) {
|
|
48
|
+
console.error(`Not able to read spec file from: ${filePath}`, error);
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
const downloadSpecFile = async (specUrl) => {
|
|
53
|
+
return isHttpSpecUrl(specUrl) ? downloadRemoteSpecFile(specUrl) : downloadLocalSpecFile(specUrl);
|
|
26
54
|
};
|
|
27
55
|
const getImportConfig = async (specUrl, version) => {
|
|
28
56
|
const spec = await downloadSpecFile(specUrl);
|
|
29
57
|
if (!spec)
|
|
30
|
-
return
|
|
31
|
-
//Remove
|
|
58
|
+
return undefined;
|
|
59
|
+
// Remove version prefix from paths.
|
|
32
60
|
const data = removeVersion(spec, version);
|
|
33
61
|
return JSON.stringify(data);
|
|
34
62
|
};
|
|
35
63
|
exports.getImportConfig = getImportConfig;
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3BlbkFwaUhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcGltL29wZW5BcGlIZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsK0NBQW9EO0FBQ3BELHFDQUFvQztBQUVwQyxNQUFNLGFBQWEsR0FBRyxDQUFDLElBQWMsRUFBRSxPQUFlLEVBQVksRUFBRTtJQUNsRSxJQUFJLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ2pCLE9BQU8sQ0FBQyxLQUFLLENBQUMsZ0RBQWdELEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDdEUsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsTUFBTSxRQUFRLEdBQUcsRUFBUyxDQUFDO0lBRTNCLDJCQUEyQjtJQUMzQixNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNwQyxNQUFNLE1BQU0sR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksT0FBTyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDNUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbkMsQ0FBQyxDQUFDLENBQUM7SUFFSCxJQUFJLENBQUMsS0FBSyxHQUFHLFFBQVEsQ0FBQztJQUN0QixPQUFPLElBQUksQ0FBQztBQUNkLENBQUMsQ0FBQztBQUVGLE1BQU0sYUFBYSxHQUFHLENBQUMsT0FBZSxFQUFXLEVBQUUsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBRWxGLE1BQU0sc0JBQXNCLEdBQUcsS0FBSyxFQUFFLE9BQWUsRUFBaUMsRUFBRTtJQUN0RixJQUFJLENBQUM7UUFDSCxNQUFNLFFBQVEsR0FBRyxNQUFNLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ2pCLE9BQU8sQ0FBQyxLQUFLLENBQUMsbUNBQW1DLE9BQU8sYUFBYSxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztZQUN4RixPQUFPLFNBQVMsQ0FBQztRQUNuQixDQUFDO1FBRUQsT0FBTyxDQUFDLE1BQU0sUUFBUSxDQUFDLElBQUksRUFBRSxDQUFhLENBQUM7SUFDN0MsQ0FBQztJQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7UUFDZixPQUFPLENBQUMsS0FBSyxDQUFDLG1DQUFtQyxPQUFPLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUNuRSxPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO0FBQ0gsQ0FBQyxDQUFDO0FBRUYsTUFBTSxxQkFBcUIsR0FBRyxLQUFLLEVBQUUsUUFBZ0IsRUFBaUMsRUFBRTtJQUN0RixJQUFJLENBQUM7UUFDSCxNQUFNLElBQUEsaUJBQU0sRUFBQyxRQUFRLEVBQUUsbUJBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN2QyxNQUFNLFdBQVcsR0FBRyxNQUFNLElBQUEsbUJBQVEsRUFBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFFckQsSUFBSSxDQUFDO1lBQ0gsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBYSxDQUFDO1FBQzdDLENBQUM7UUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1lBQ2YsT0FBTyxDQUFDLEtBQUssQ0FBQyw4QkFBOEIsUUFBUSxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDL0QsT0FBTyxTQUFTLENBQUM7UUFDbkIsQ0FBQztJQUNILENBQUM7SUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1FBQ2YsT0FBTyxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsUUFBUSxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDckUsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztBQUNILENBQUMsQ0FBQztBQUVGLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxFQUFFLE9BQWUsRUFBaUMsRUFBRTtJQUNoRixPQUFPLGFBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsc0JBQXNCLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLHFCQUFxQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBQ25HLENBQUMsQ0FBQztBQUVLLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFBRSxPQUFlLEVBQUUsT0FBZSxFQUErQixFQUFFO0lBQ3JHLE1BQU0sSUFBSSxHQUFHLE1BQU0sZ0JBQWdCLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDN0MsSUFBSSxDQUFDLElBQUk7UUFBRSxPQUFPLFNBQVMsQ0FBQztJQUU1QixvQ0FBb0M7SUFDcEMsTUFBTSxJQUFJLEdBQUcsYUFBYSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQztJQUMxQyxPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7QUFDOUIsQ0FBQyxDQUFDO0FBUFcsUUFBQSxlQUFlLG1CQU8xQiJ9
|
package/database/MySql.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import * as pulumi from '@pulumi/pulumi';
|
|
|
3
3
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
4
4
|
import * as types from '../types';
|
|
5
5
|
export interface MySqlArgs extends CommonBaseArgs, types.WithEncryptionEnabler, types.WithNetworkArgs, Pick<mysql.ServerArgs, 'administratorLogin'>, Partial<Pick<mysql.ServerArgs, 'version' | 'storage' | 'maintenanceWindow' | 'backup' | 'highAvailability' | 'availabilityZone'>> {
|
|
6
|
+
version?: pulumi.Input<string | mysql.ServerVersion>;
|
|
6
7
|
sku: {
|
|
7
8
|
/**
|
|
8
9
|
* The name of the sku, e.g. Standard_D32s_v3.
|
package/database/MySql.js
CHANGED
|
@@ -73,7 +73,6 @@ class MySql extends base_1.BaseResourceComponent {
|
|
|
73
73
|
//serverName: this.name,
|
|
74
74
|
administratorLogin: adminLogin,
|
|
75
75
|
administratorLoginPassword: password.value,
|
|
76
|
-
version: this.args.version ?? mysql.ServerVersion.ServerVersion_8_0_21,
|
|
77
76
|
storage: this.args.storage ?? { storageSizeGB: 30 },
|
|
78
77
|
identity: enableResourceIdentity
|
|
79
78
|
? {
|
|
@@ -181,9 +180,16 @@ class MySql extends base_1.BaseResourceComponent {
|
|
|
181
180
|
serverName: server.name,
|
|
182
181
|
databaseName: d.name,
|
|
183
182
|
}, { dependsOn: server, parent: this });
|
|
184
|
-
//
|
|
185
|
-
const
|
|
186
|
-
|
|
183
|
+
// Create connection strings in multiple formats for different platforms
|
|
184
|
+
const connStrings = {};
|
|
185
|
+
// .NET / ADO.NET format
|
|
186
|
+
connStrings[`${this.name}-${d.name}-mysql-conn-dotnet`] = pulumi.interpolate `Server=${cred.host};Database=${d.name};Uid=${cred.username};Pwd=${cred.password};SslMode=Require;Encrypt=True;TrustServerCertificate=true`;
|
|
187
|
+
// Node.js / JavaScript format
|
|
188
|
+
connStrings[`${this.name}-${d.name}-mysql-conn-nodejs`] = pulumi.interpolate `mysql://${cred.username}:${cred.password}@${cred.host}:${cred.port}/${d.name}?ssl=true&tls=true`;
|
|
189
|
+
// Generic/standard format
|
|
190
|
+
connStrings[`${this.name}-${d.name}-mysql-conn`] = pulumi.interpolate `Server=${cred.host};Database=${d.name};Uid=${cred.username};Pwd=${cred.password};SslMode=Require;Encrypt=True;TrustServerCertificate=true`;
|
|
191
|
+
// Add all connection strings at once
|
|
192
|
+
this.addSecrets(connStrings);
|
|
187
193
|
return db;
|
|
188
194
|
});
|
|
189
195
|
}
|
|
@@ -195,4 +201,4 @@ class MySql extends base_1.BaseResourceComponent {
|
|
|
195
201
|
}
|
|
196
202
|
}
|
|
197
203
|
exports.MySql = MySql;
|
|
198
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
204
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"MySql.js","sourceRoot":"","sources":["../../src/database/MySql.ts"],"names":[],"mappings":"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"}
|
package/database/Postgres.d.ts
CHANGED
|
@@ -2,7 +2,8 @@ import * as postgresql from '@pulumi/azure-native/dbforpostgresql';
|
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
3
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
4
4
|
import * as types from '../types';
|
|
5
|
-
export interface PostgresArgs extends CommonBaseArgs, types.WithEncryptionEnabler, types.WithNetworkArgs, Pick<postgresql.ServerArgs, 'administratorLogin'>, Partial<Pick<postgresql.ServerArgs, '
|
|
5
|
+
export interface PostgresArgs extends CommonBaseArgs, types.WithEncryptionEnabler, types.WithNetworkArgs, Pick<postgresql.ServerArgs, 'administratorLogin'>, Partial<Pick<postgresql.ServerArgs, 'storage' | 'maintenanceWindow' | 'backup' | 'highAvailability' | 'availabilityZone'>> {
|
|
6
|
+
version: pulumi.Input<string | postgresql.PostgresMajorVersion>;
|
|
6
7
|
sku: {
|
|
7
8
|
/** The name of postgres: Standard_B2ms, */
|
|
8
9
|
name: pulumi.Input<string>;
|
package/database/Postgres.js
CHANGED
|
@@ -69,7 +69,6 @@ class Postgres extends base_1.BaseResourceComponent {
|
|
|
69
69
|
const server = new postgresql.Server(this.name, {
|
|
70
70
|
...this.args,
|
|
71
71
|
...rsGroup,
|
|
72
|
-
version: this.args.version ?? postgresql.PostgresMajorVersion.PostgresMajorVersion_16,
|
|
73
72
|
administratorLogin: adminLogin,
|
|
74
73
|
administratorLoginPassword: password.value,
|
|
75
74
|
storage: this.args.storage ?? { storageSizeGB: 32 },
|
|
@@ -166,9 +165,20 @@ class Postgres extends base_1.BaseResourceComponent {
|
|
|
166
165
|
serverName: server.name,
|
|
167
166
|
databaseName: d.name,
|
|
168
167
|
}, { dependsOn: server, parent: this });
|
|
169
|
-
//
|
|
170
|
-
const
|
|
171
|
-
|
|
168
|
+
// Create connection strings in multiple formats for different platforms
|
|
169
|
+
const connStrings = {};
|
|
170
|
+
// .NET / ADO.NET format
|
|
171
|
+
connStrings[`${this.name}-${d.name}-postgres-conn-dotnet`] = pulumi.interpolate `Host=${cred.host};Database=${d.name};Username=${cred.username};Password=${cred.password};SslMode=Require;Ssl=true;TrustServerCertificate=true`;
|
|
172
|
+
// Node.js / JavaScript URI format
|
|
173
|
+
connStrings[`${this.name}-${d.name}-postgres-conn-nodejs`] = pulumi.interpolate `postgresql://${cred.username}:${cred.password}@${cred.host}:${cred.port}/${d.name}?sslmode=require`;
|
|
174
|
+
// Python / psycopg2 format
|
|
175
|
+
//connStrings[`${this.name}-${d.name}-postgres-conn-python`] = pulumi.interpolate`postgresql://${cred.username}:${cred.password}@${cred.host}:${cred.port}/${d.name}`;
|
|
176
|
+
// JDBC / Java format
|
|
177
|
+
//connStrings[`${this.name}-${d.name}-postgres-conn-jdbc`] = pulumi.interpolate`jdbc:postgresql://${cred.host}:${cred.port}/${d.name}?user=${cred.username}&password=${cred.password}&sslmode=require`;
|
|
178
|
+
// Generic/standard format
|
|
179
|
+
connStrings[`${this.name}-${d.name}-postgres-conn`] = pulumi.interpolate `Host=${cred.host};Database=${d.name};Username=${cred.username};Password=${cred.password};SslMode=Require;Ssl=true;TrustServerCertificate=true`;
|
|
180
|
+
// Add all connection strings at once
|
|
181
|
+
this.addSecrets(connStrings);
|
|
172
182
|
return db;
|
|
173
183
|
});
|
|
174
184
|
}
|
|
@@ -180,4 +190,4 @@ class Postgres extends base_1.BaseResourceComponent {
|
|
|
180
190
|
}
|
|
181
191
|
}
|
|
182
192
|
exports.Postgres = Postgres;
|
|
183
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
193
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Postgres.js","sourceRoot":"","sources":["../../src/database/Postgres.ts"],"names":[],"mappings":"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"}
|
package/database/Redis.js
CHANGED
|
@@ -36,7 +36,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
exports.Redis = void 0;
|
|
37
37
|
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
38
38
|
const redis = __importStar(require("@pulumi/azure-native/redis"));
|
|
39
|
-
const vault = __importStar(require("../vault"));
|
|
40
39
|
const vnet = __importStar(require("../vnet"));
|
|
41
40
|
const base_1 = require("../base");
|
|
42
41
|
const helpers_1 = require("./helpers");
|
|
@@ -171,28 +170,32 @@ class Redis extends base_1.BaseResourceComponent {
|
|
|
171
170
|
name: server.name,
|
|
172
171
|
resourceGroupName: rsGroup.resourceGroupName,
|
|
173
172
|
});
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
}
|
|
173
|
+
// Create connection strings in multiple formats for different platforms
|
|
174
|
+
const secrets = {
|
|
175
|
+
[`${this.name}-redis-host`]: h,
|
|
176
|
+
[`${this.name}-redis-pass`]: keys.primaryKey,
|
|
177
|
+
[`${this.name}-redis-port`]: '6380',
|
|
178
|
+
};
|
|
179
|
+
// Node.js / JavaScript format
|
|
180
|
+
secrets[`${this.name}-redis-conn-nodejs`] = disableAccessKeyAuthentication
|
|
181
|
+
? pulumi.interpolate `rediss://${h}:6380`
|
|
182
|
+
: pulumi.interpolate `rediss://:${keys.primaryKey}@${h}:6380`;
|
|
183
|
+
// .NET / StackExchange.Redis format
|
|
184
|
+
secrets[`${this.name}-redis-conn-dotnet`] = disableAccessKeyAuthentication
|
|
185
|
+
? pulumi.interpolate `${h}:6380,ssl=True,abortConnect=False`
|
|
186
|
+
: pulumi.interpolate `${h}:6380,password=${keys.primaryKey},ssl=True,abortConnect=False`;
|
|
187
|
+
// Python format
|
|
188
|
+
secrets[`${this.name}-redis-conn-python`] = disableAccessKeyAuthentication
|
|
189
|
+
? pulumi.interpolate `rediss://${h}:6380`
|
|
190
|
+
: pulumi.interpolate `rediss://:${keys.primaryKey}@${h}:6380`;
|
|
191
|
+
// Generic format
|
|
192
|
+
secrets[`${this.name}-redis-conn`] = disableAccessKeyAuthentication
|
|
193
|
+
? pulumi.interpolate `${h}:6380,ssl=True,abortConnect=False`
|
|
194
|
+
: pulumi.interpolate `${h}:6380,password=${keys.primaryKey},ssl=True,abortConnect=False`;
|
|
195
|
+
// Add all secrets at once
|
|
196
|
+
this.addSecrets(secrets);
|
|
194
197
|
});
|
|
195
198
|
}
|
|
196
199
|
}
|
|
197
200
|
exports.Redis = Redis;
|
|
198
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
201
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Redis.js","sourceRoot":"","sources":["../../src/database/Redis.ts"],"names":[],"mappings":"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"}
|