@drunk-pulumi/azure 0.0.43 → 0.0.44
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/Apps/LogicApp.d.ts +4 -11
- package/Apps/LogicApp.js +9 -13
- package/AzAd/Group.d.ts +1 -1
- package/AzAd/RoleAssignment.d.ts +1 -1
- package/AzAd/RoleAssignment.js +12 -7
- package/Builder/ApimBuilder.js +9 -5
- package/Builder/ResourceBuilder.js +1 -2
- package/Builder/VaultBuilder.js +1 -2
- package/Builder/VnetBuilder.js +24 -14
- package/Builder/types/apimBuilder.d.ts +2 -3
- package/Builder/types/vnetBuilder.d.ts +4 -1
- package/Common/AzureEnv.d.ts +1 -2
- package/Common/AzureEnv.js +1 -1
- package/Common/Helpers.d.ts +13 -0
- package/Common/Helpers.js +43 -5
- package/Common/Naming/index.d.ts +3 -2
- package/Common/Naming/index.js +10 -7
- package/Common/ResourceEnv.d.ts +1 -11
- package/Common/ResourceEnv.js +24 -20
- package/ContainerRegistry/index.d.ts +2 -2
- package/ContainerRegistry/index.js +7 -8
- package/KeyVault/index.d.ts +5 -9
- package/KeyVault/index.js +12 -10
- package/MySql/index.d.ts +2 -9
- package/MySql/index.js +14 -10
- package/Postgresql/index.d.ts +2 -9
- package/Postgresql/index.js +13 -10
- package/RedisCache/index.d.ts +9 -5
- package/RedisCache/index.js +42 -31
- package/ServiceBus/index.d.ts +2 -6
- package/ServiceBus/index.js +10 -12
- package/SignalR/index.d.ts +2 -2
- package/SignalR/index.js +21 -27
- package/Sql/index.d.ts +2 -6
- package/Sql/index.js +25 -26
- package/Storage/index.js +3 -5
- package/VNet/Helper.d.ts +2 -2
- package/VNet/Helper.js +7 -10
- package/VNet/PrivateEndpoint.d.ts +6 -6
- package/VNet/PrivateEndpoint.js +9 -8
- package/Web/AppConfig.d.ts +2 -2
- package/Web/AppConfig.js +3 -5
- package/package.json +1 -1
- package/types.d.ts +19 -10
package/RedisCache/index.js
CHANGED
|
@@ -22,52 +22,63 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
25
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
const
|
|
29
|
+
const cache = __importStar(require("@pulumi/azure-native/cache"));
|
|
27
30
|
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
28
31
|
const to_words_1 = require("to-words");
|
|
29
32
|
const Helper_1 = require("../VNet/Helper");
|
|
30
33
|
const Naming_1 = require("../Common/Naming");
|
|
31
34
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
32
35
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
36
|
+
const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
33
37
|
const toWord = new to_words_1.ToWords();
|
|
34
|
-
exports.default = ({ name, group,
|
|
38
|
+
exports.default = ({ name, group, network, vaultInfo, sku = { name: "Basic", family: "C", capacity: 0 }, }) => {
|
|
35
39
|
name = (0, Naming_1.getRedisCacheName)(name);
|
|
36
|
-
const redis = new
|
|
40
|
+
const redis = new cache.Redis(name, {
|
|
37
41
|
name,
|
|
38
42
|
...group,
|
|
39
|
-
minimumTlsVersion:
|
|
43
|
+
minimumTlsVersion: "1.2",
|
|
44
|
+
enableNonSslPort: false,
|
|
45
|
+
identity: { type: cache.ManagedServiceIdentityType.SystemAssigned },
|
|
40
46
|
sku,
|
|
41
|
-
zones: AzureEnv_1.isPrd && sku.name ===
|
|
47
|
+
zones: AzureEnv_1.isPrd && sku.name === "Premium" ? ["1", "2", "3"] : undefined,
|
|
48
|
+
subnetId: network?.subnetId,
|
|
49
|
+
publicNetworkAccess: network?.privateLink ? "Disabled" : "Enabled",
|
|
42
50
|
});
|
|
43
|
-
//
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
(0, Helper_1.convertToIpRange)(allowsIpAddresses).map((range, i) => {
|
|
56
|
-
const n = `allow_Ip_${toWord.convert(i)}`.toLowerCase();
|
|
57
|
-
return new native.cache.FirewallRule(n, {
|
|
58
|
-
ruleName: n,
|
|
59
|
-
cacheName: redis.name,
|
|
60
|
-
...group,
|
|
61
|
-
startIP: range.start,
|
|
62
|
-
endIP: range.end,
|
|
51
|
+
//Whitelist IpAddress
|
|
52
|
+
if (network?.ipAddresses) {
|
|
53
|
+
pulumi.output(network.ipAddresses).apply((ips) => {
|
|
54
|
+
(0, Helper_1.convertToIpRange)(ips).map((range, i) => {
|
|
55
|
+
const n = `allow_Ip_${toWord.convert(i)}`.toLowerCase();
|
|
56
|
+
return new cache.FirewallRule(n, {
|
|
57
|
+
ruleName: n,
|
|
58
|
+
cacheName: redis.name,
|
|
59
|
+
...group,
|
|
60
|
+
startIP: range.start,
|
|
61
|
+
endIP: range.end,
|
|
62
|
+
});
|
|
63
63
|
});
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
|
+
//Private Link
|
|
67
|
+
if (network?.privateLink) {
|
|
68
|
+
(0, PrivateEndpoint_1.default)({
|
|
69
|
+
resourceInfo: { resourceName: name, group, id: redis.id },
|
|
70
|
+
privateDnsZoneName: "privatelink.redis.cache.windows.net",
|
|
71
|
+
subnetIds: network.privateLink.subnetIds,
|
|
72
|
+
linkServiceGroupIds: network.privateLink.type
|
|
73
|
+
? [network.privateLink.type]
|
|
74
|
+
: ["redisCache"],
|
|
75
|
+
});
|
|
76
|
+
}
|
|
66
77
|
if (vaultInfo) {
|
|
67
78
|
pulumi.all([redis.name, redis.hostName]).apply(async ([n, h]) => {
|
|
68
79
|
if (!h)
|
|
69
80
|
return;
|
|
70
|
-
const keys = await
|
|
81
|
+
const keys = await cache.listRedisKeys({
|
|
71
82
|
name: n,
|
|
72
83
|
resourceGroupName: group.resourceGroupName,
|
|
73
84
|
});
|
|
@@ -75,28 +86,28 @@ exports.default = ({ name, group, allowsIpAddresses, vaultInfo, sku = { name: 'B
|
|
|
75
86
|
name: `${name}-primary-key`,
|
|
76
87
|
value: keys.primaryKey,
|
|
77
88
|
vaultInfo,
|
|
78
|
-
contentType:
|
|
89
|
+
contentType: "Redis Cache",
|
|
79
90
|
});
|
|
80
91
|
(0, CustomHelper_1.addCustomSecret)({
|
|
81
92
|
name: `${name}-secondary-key`,
|
|
82
93
|
value: keys.secondaryKey,
|
|
83
94
|
vaultInfo,
|
|
84
|
-
contentType:
|
|
95
|
+
contentType: "Redis Cache",
|
|
85
96
|
});
|
|
86
97
|
(0, CustomHelper_1.addCustomSecret)({
|
|
87
98
|
name: `${name}-primary-connection`,
|
|
88
99
|
value: `${name}.redis.cache.windows.net:6380,password=${keys.primaryKey},ssl=True,abortConnect=False`,
|
|
89
100
|
vaultInfo,
|
|
90
|
-
contentType:
|
|
101
|
+
contentType: "Redis Cache",
|
|
91
102
|
});
|
|
92
103
|
(0, CustomHelper_1.addCustomSecret)({
|
|
93
104
|
name: `${name}-secondary-connection`,
|
|
94
105
|
value: `${name}.redis.cache.windows.net:6380,password=${keys.secondaryKey},ssl=True,abortConnect=False`,
|
|
95
106
|
vaultInfo,
|
|
96
|
-
contentType:
|
|
107
|
+
contentType: "Redis Cache",
|
|
97
108
|
});
|
|
98
109
|
});
|
|
99
110
|
}
|
|
100
111
|
return redis;
|
|
101
112
|
};
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUmVkaXNDYWNoZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0VBQW9EO0FBQ3BELHVEQUF5QztBQUl6Qyx1Q0FBbUM7QUFDbkMsMkNBQWtEO0FBQ2xELDZDQUFxRDtBQUNyRCxpREFBMkM7QUFDM0MsMkRBQTJEO0FBQzNELDhFQUE2RDtBQUU3RCxNQUFNLE1BQU0sR0FBRyxJQUFJLGtCQUFPLEVBQUUsQ0FBQztBQVk3QixrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxPQUFPLEVBQ1AsU0FBUyxFQUNULEdBQUcsR0FBRyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsQ0FBQyxFQUFFLEdBQzNDLEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxJQUFBLDBCQUFpQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQy9CLE1BQU0sS0FBSyxHQUFHLElBQUksS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUU7UUFDbEMsSUFBSTtRQUNKLEdBQUcsS0FBSztRQUNSLGlCQUFpQixFQUFFLEtBQUs7UUFDeEIsZ0JBQWdCLEVBQUUsS0FBSztRQUN2QixRQUFRLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLDBCQUEwQixDQUFDLGNBQWMsRUFBRTtRQUNuRSxHQUFHO1FBQ0gsS0FBSyxFQUFFLGdCQUFLLElBQUksR0FBRyxDQUFDLElBQUksS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUztRQUNwRSxRQUFRLEVBQUUsT0FBTyxFQUFFLFFBQVE7UUFDM0IsbUJBQW1CLEVBQUUsT0FBTyxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENB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
|
package/ServiceBus/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as bus from "@pulumi/azure-native/servicebus";
|
|
2
2
|
import * as pulumi from "@pulumi/pulumi";
|
|
3
|
-
import { BasicArgs, BasicMonitorArgs, BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, ResourceGroupInfo } from "../types";
|
|
3
|
+
import { BasicArgs, BasicMonitorArgs, BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, NetworkPropsType, ResourceGroupInfo } from "../types";
|
|
4
4
|
import { BusConnectionTypes } from "./ServiceBusHelper";
|
|
5
5
|
type TransportTypes = "AmqpWebSockets" | "Amqp" | null;
|
|
6
6
|
type OptionsType = {
|
|
@@ -61,11 +61,7 @@ interface Props extends BasicResourceArgs, Pick<ConnCreatorProps, "removeEntityP
|
|
|
61
61
|
alternateName: pulumi.Input<string>;
|
|
62
62
|
partnerNamespace: pulumi.Input<string>;
|
|
63
63
|
};
|
|
64
|
-
network?:
|
|
65
|
-
whitelistIps?: Array<pulumi.Input<string>>;
|
|
66
|
-
enablePrivateLink?: boolean;
|
|
67
|
-
subnetId?: pulumi.Input<string>;
|
|
68
|
-
};
|
|
64
|
+
network?: NetworkPropsType;
|
|
69
65
|
monitoring?: BasicMonitorArgs;
|
|
70
66
|
sku?: bus.SkuName;
|
|
71
67
|
vaultInfo?: KeyVaultInfo;
|
package/ServiceBus/index.js
CHANGED
|
@@ -360,14 +360,13 @@ exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultI
|
|
|
360
360
|
}));
|
|
361
361
|
}
|
|
362
362
|
if (network && sku === bus.SkuName.Premium) {
|
|
363
|
-
if (
|
|
364
|
-
(network.subnetId || network.whitelistIps)) {
|
|
363
|
+
if (network.subnetId || network.ipAddresses) {
|
|
365
364
|
new bus.NamespaceNetworkRuleSet(name, {
|
|
366
365
|
namespaceName: namespace.name,
|
|
367
366
|
...group,
|
|
368
367
|
defaultAction: "Deny",
|
|
369
|
-
ipRules: network.
|
|
370
|
-
? network.
|
|
368
|
+
ipRules: network.ipAddresses
|
|
369
|
+
? network.ipAddresses.map((i) => ({
|
|
371
370
|
ipMask: i,
|
|
372
371
|
action: bus.NetworkRuleIPAction.Allow,
|
|
373
372
|
}))
|
|
@@ -382,14 +381,13 @@ exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultI
|
|
|
382
381
|
: undefined,
|
|
383
382
|
});
|
|
384
383
|
}
|
|
385
|
-
|
|
384
|
+
if (network.privateLink) {
|
|
386
385
|
(0, PrivateEndpoint_1.default)({
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
linkServiceGroupIds: ["namespace"],
|
|
386
|
+
resourceInfo: { resourceName: name, group, id: namespace.id },
|
|
387
|
+
subnetIds: network.privateLink.subnetIds,
|
|
388
|
+
linkServiceGroupIds: network.privateLink.type
|
|
389
|
+
? [network.privateLink.type]
|
|
390
|
+
: ["namespace"],
|
|
393
391
|
privateDnsZoneName: "privatelink.servicebus.windows.net",
|
|
394
392
|
});
|
|
395
393
|
}
|
|
@@ -406,4 +404,4 @@ exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultI
|
|
|
406
404
|
diagnostic,
|
|
407
405
|
};
|
|
408
406
|
};
|
|
409
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ServiceBus/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAAuD;AAYvD,yDAO4B;AAC5B,iDAA2C;AAC3C,8EAA8C;AAC9C,6CAA6E;AAC7E,8EAAsD;AACtD,2DAA2D;AAC3D,+CAA+C;AAG/C,MAAM,qBAAqB,GAAG,gBAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;AAEtD,MAAM,aAAa,GAAG;IACpB,gBAAgB,EAAE,EAAE;IACpB,uBAAuB,EAAE,IAAI;IAC7B,iBAAiB,EAAE,gBAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;IACzC,wBAAwB,EAAE,gBAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;IAChD,gCAAgC,EAAE,IAAI;IACtC,kBAAkB,EAAE,IAAI;IACxB,YAAY,EAAE,MAAM;IAEpB,yCAAyC;IACzC,2BAA2B;IAC3B,2FAA2F;CAC5F,CAAC;AAoBF,MAAM,wBAAwB,GAAG,CAAC,EAChC,aAAa,EACb,SAAS,EACT,SAAS,EACT,cAAc,EACd,aAAa,GAAG,gBAAgB,EAChC,iBAAiB,EACjB,gBAAgB,EAChB,SAAS,EACT,SAAS,GACQ,EAAE,EAAE;IACrB,MAAM,IAAI,GAAG,CAAC,SAAS,IAAI,SAAS,CAAE,CAAC;IACvC,MAAM,GAAG,GAAG,IAAI;QACd,CAAC,CAAC,IAAA,2CAAwB,EAAC;YACvB,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,aAAa;YAChC,cAAc;SACf,CAAC;QACJ,CAAC,CAAC,IAAA,wCAAqB,EAAC;YACpB,iBAAiB,EAAE,aAAa;YAChC,cAAc;SACf,CAAC,CAAC;IAEP,MAAM,WAAW,GAAG,GAAG,GAAG,UAAU,CAAC;IACrC,MAAM,aAAa,GAAG,GAAG,GAAG,YAAY,CAAC;IAEzC,MAAM,MAAM,GACV,cAAc,IAAI,qCAAkB,CAAC,MAAM;QACzC,CAAC,CAAC;YACE,GAAG,CAAC,YAAY,CAAC,IAAI;YACrB,GAAG,CAAC,YAAY,CAAC,MAAM;YACvB,GAAG,CAAC,YAAY,CAAC,MAAM;SACxB;QACH,CAAC,CAAC,cAAc,IAAI,qCAAkB,CAAC,IAAI;YACzC,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC;YACzB,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAElC,MAAM,IAAI,GAAG,SAAS;QACpB,CAAC,CAAC,IAAI,GAAG,CAAC,sBAAsB,CAC5B,GAAG,EACH;YACE,qBAAqB,EAAE,GAAG;YAC1B,SAAS;YACT,aAAa;YACb,iBAAiB;YAEjB,MAAM;SACP,EACD,EAAE,SAAS,EAAE,CACd;QACH,CAAC,CAAC,SAAS;YACT,CAAC,CAAC,IAAI,GAAG,CAAC,sBAAsB,CAC5B,GAAG,EACH;gBACE,qBAAqB,EAAE,GAAG;gBAC1B,SAAS;gBACT,aAAa;gBACb,iBAAiB;gBAEjB,MAAM;aACP,EACD,EAAE,SAAS,EAAE,CACd;YACH,CAAC,CAAC,IAAI,GAAG,CAAC,0BAA0B,CAChC,GAAG,EACH;gBACE,qBAAqB,EAAE,GAAG;gBAC1B,aAAa;gBACb,iBAAiB;gBAEjB,MAAM;aACP,EACD,EAAE,SAAS,EAAE,CACd,CAAC;IAER,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACzB,IAAI,CAAC,EAAE;YAAE,OAAO;QAEhB,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS;YAC3B,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC;gBAChB,qBAAqB,EAAE,GAAG;gBAC1B,aAAa;gBACb,iBAAiB;gBACjB,SAAS;aACV,CAAC;YACJ,CAAC,CAAC,SAAS;gBACT,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC;oBAChB,qBAAqB,EAAE,GAAG;oBAC1B,aAAa;oBACb,iBAAiB;oBACjB,SAAS;iBACV,CAAC;gBACJ,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC;oBACpB,qBAAqB,EAAE,GAAG;oBAC1B,aAAa;oBACb,iBAAiB;iBAClB,CAAC,CAAC,CAAC;QAEV,IAAI,WAAW,GAAG,gBAAgB;YAChC,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,eAAe,IAAI,EAAE,EAAE,EAAE,CAAC;YACjE,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC;QAEjC,IAAI,OAAO,aAAa,KAAK,QAAQ;YACnC,WAAW,IAAI,kBAAkB,aAAa,GAAG,CAAC;QAEpD,IAAA,8BAAe,EAAC;YACd,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,WAAW;YAClB,SAAS;YACT,WAAW,EAAE,cAAc,aAAa,IAAI,IAAI,EAAE;YAClD,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QAEH,IAAI,UAAU,GAAG,gBAAgB;YAC/B,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,eAAe,IAAI,EAAE,EAAE,EAAE,CAAC;YACnE,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC;QAEnC,IAAI,OAAO,aAAa,KAAK,QAAQ;YACnC,UAAU,IAAI,kBAAkB,aAAa,GAAG,CAAC;QAEnD,IAAA,8BAAe,EAAC;YACd,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,UAAU;YACjB,SAAS;YACT,WAAW,EAAE,cAAc,aAAa,IAAI,IAAI,EAAE;YAClD,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;AACxC,CAAC,CAAC;AAiBF,oBAAoB;AACpB,MAAM,YAAY,GAAG,CAAC,EACpB,KAAK,EACL,iBAAiB,EACjB,aAAa,EACb,SAAS,EACT,SAAS,EACT,OAAO,EACP,iBAAiB,EACjB,SAAS,EACT,OAAO,GAAG;IACR,mCAAmC,EAAE,qBAAqB;IAC1D,0BAA0B,EAAE,IAAI;IAChC,kBAAkB,EAAE,IAAI;CACzB,EACD,GAAG,MAAM,EACE,EAAE,EAAE;IACf,MAAM,SAAS,GAAG,IAAA,+BAAY,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAEnD,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,KAAK,CACzB,SAAS,EACT;QACE,SAAS;QACT,aAAa,EAAE,iBAAiB;QAChC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAE1C,GAAG,aAAa;QAChB,GAAG,OAAO;KACX,EACD,EAAE,SAAS,EAAE,CACd,CAAC;IAEF,IAAI,qBAAqB,GAET,SAAS,CAAC;IAC1B,IAAI,uBAAuB,GAEX,SAAS,CAAC;IAC1B,IAAI,SAAS,IAAI,iBAAiB,EAAE,CAAC;QACnC,UAAU;QACV,qBAAqB,GAAG,wBAAwB,CAAC;YAC/C,SAAS;YACT,aAAa,EAAE,iBAAiB;YAChC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,SAAS;YACT,cAAc,EAAE,qCAAkB,CAAC,IAAI;YACvC,SAAS,EAAE,KAAK;YAChB,GAAG,MAAM;SACV,CAAC,CAAC;QAEH,YAAY;QACZ,uBAAuB,GAAG,wBAAwB,CAAC;YACjD,SAAS;YACT,aAAa,EAAE,iBAAiB;YAChC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,SAAS;YACT,cAAc,EAAE,qCAAkB,CAAC,MAAM;YACzC,SAAS,EAAE,KAAK;YAChB,GAAG,MAAM;SACV,CAAC,CAAC;QAEH,YAAY;QACZ,6BAA6B;QAC7B,eAAe;QACf,sCAAsC;QACtC,gDAAgD;QAChD,eAAe;QACf,+CAA+C;QAC/C,sBAAsB;QACtB,eAAe;QACf,MAAM;IACR,CAAC;IAED,IAAI,IAAI,GACN,SAAS,CAAC;IAEZ,sBAAsB;IACtB,IAAI,aAAa,EAAE,CAAC;QAClB,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC7B,mBAAmB,CAAC;YAClB,SAAS,EAAE,CAAC,CAAC,aAAa;gBACxB,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,iBAAiB,EAAE,IAAI,OAAO,UAAU;gBACtE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,iBAAiB,EAAE,IAAI,OAAO,EAAE;YAChE,iBAAiB;YACjB,aAAa,EAAE,KAAK,CAAC,IAAI;YACzB,aAAa,EAAE,CAAC,CAAC,aAAa;YAC9B,KAAK;YACL,SAAS,EAAE,KAAK;SACjB,CAAC,CACH,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,SAAS;QACf,KAAK;QACL,IAAI;QACJ,UAAU,EAAE,EAAE,qBAAqB,EAAE,uBAAuB,EAAE;KAC/D,CAAC;AACJ,CAAC,CAAC;AAUF,2BAA2B;AAC3B,MAAM,mBAAmB,GAAG,CAAC,EAC3B,KAAK,EACL,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,SAAS,GACA,EAAE,EAAE;IACb,MAAM,IAAI,GAAG,IAAA,sCAAmB,EAAC,SAAS,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,YAAY,CACnC,IAAI,EACJ;QACE,gBAAgB,EAAE,IAAI;QACtB,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAC1C,SAAS,EAAE,aAAa;QACxB,aAAa,EAAE,iBAAiB;QAChC,eAAe,EAAE,aAAa;QAE9B,GAAG,aAAa;KACjB,EACD,EAAE,SAAS,EAAE,CACd,CAAC;IAEF,OAAO;QACL,IAAI;QACJ,QAAQ;KACT,CAAC;AACJ,CAAC,CAAC;AAyBF,oBAAoB;AACpB,MAAM,YAAY,GAAG,CAAC,EACpB,KAAK,EACL,iBAAiB,EACjB,SAAS,EACT,SAAS,EACT,OAAO,EACP,iBAAiB,EACjB,OAAO,GAAG;IACR,0BAA0B,EAAE,KAAK;IACjC,kBAAkB,EAAE,IAAI;CACzB,EACD,SAAS,EACT,GAAG,MAAM,EACE,EAAE,EAAE;IACf,MAAM,IAAI,GAAG,IAAA,+BAAY,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAE9C,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,KAAK,CACzB,IAAI,EACJ;QACE,SAAS,EAAE,IAAI;QACf,aAAa,EAAE,iBAAiB;QAChC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAE1C,GAAG,aAAa;QAChB,GAAG,OAAO;KACX,EACD,EAAE,SAAS,EAAE,CACd,CAAC;IAEF,IAAI,qBAAqB,GAET,SAAS,CAAC;IAC1B,IAAI,uBAAuB,GAEX,SAAS,CAAC;IAE1B,IAAI,SAAS,IAAI,iBAAiB,EAAE,CAAC;QACnC,UAAU;QACV,qBAAqB,GAAG,wBAAwB,CAAC;YAC/C,SAAS,EAAE,IAAI;YACf,aAAa,EAAE,iBAAiB;YAChC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,SAAS;YACT,cAAc,EAAE,qCAAkB,CAAC,IAAI;YACvC,SAAS,EAAE,KAAK;YAChB,GAAG,MAAM;SACV,CAAC,CAAC;QAEH,YAAY;QACZ,uBAAuB,GAAG,wBAAwB,CAAC;YACjD,SAAS,EAAE,IAAI;YACf,aAAa,EAAE,iBAAiB;YAChC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,SAAS;YACT,cAAc,EAAE,qCAAkB,CAAC,MAAM;YACzC,SAAS,EAAE,KAAK;YAChB,GAAG,MAAM;SACV,CAAC,CAAC;QAEH,YAAY;QACZ,6BAA6B;QAC7B,qBAAqB;QACrB,sCAAsC;QACtC,gDAAgD;QAChD,eAAe;QACf,+CAA+C;QAC/C,sBAAsB;QACtB,eAAe;QACf,MAAM;IACR,CAAC;IAED,OAAO;QACL,IAAI;QACJ,KAAK;QACL,UAAU,EAAE,EAAE,qBAAqB,EAAE,uBAAuB,EAAE;KAC/D,CAAC;AACJ,CAAC,CAAC;AA6BF,wBAAwB;AACxB,kBAAe,CAAC,EACd,IAAI,EACJ,KAAK,EACL,MAAM,EACN,MAAM,EACN,QAAQ,EACR,OAAO,GAAG,EAAE,EACZ,SAAS,EACT,0BAA0B,EAC1B,sBAAsB,EACtB,sBAAsB,EACtB,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EACvB,UAAU,EACV,GAAG,MAAM,EACH,EAAE,EAAE;IACV,IAAI,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,CAAC;IAE/B,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAA,yBAAO,EAAC,GAAG,CAAC,SAAS,EAAE;QACtD,aAAa,EAAE,IAAI;QACnB,GAAG,KAAK;QACR,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE;QAE7B,GAAG,MAAM;QAET,UAAU,EAAE,UAAU;YACpB,CAAC,CAAC;gBACE,GAAG,UAAU;gBACb,cAAc,EAAE,CAAC,iBAAiB,CAAC;aACpC;YACH,CAAC,CAAC,SAAS;KAC6B,CAAC,CAAC;IAE9C,MAAM,SAAS,GAAG,QAAyB,CAAC;IAE5C,IAAI,QAAQ,IAAI,GAAG,KAAK,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC5C,IAAI,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE;YACnC,aAAa,EAAE,SAAS,CAAC,IAAI;YAC7B,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,GAAG,QAAQ;SACZ,CAAC,CAAC;IACL,CAAC;IAED,IAAI,qBAAqB,GAET,SAAS,CAAC;IAC1B,IAAI,uBAAuB,GAEX,SAAS,CAAC;IAC1B,aAAa;IACb,IAAI,SAAS,IAAI,0BAA0B,EAAE,CAAC;QAC5C,UAAU;QACV,6BAA6B;QAC7B,yBAAyB;QACzB,gDAAgD;QAChD,eAAe;QACf,6CAA6C;QAC7C,yBAAyB;QACzB,eAAe;QACf,MAAM;QAEN,YAAY;QACZ,qBAAqB,GAAG,wBAAwB,CAAC;YAC/C,aAAa,EAAE,IAAI;YACnB,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,SAAS;YACT,cAAc,EAAE,qCAAkB,CAAC,MAAM;YACzC,SAAS,EAAE,QAAQ;YACnB,GAAG,MAAM;SACV,CAAC,CAAC;QAEH,YAAY;QACZ,uBAAuB,GAAG,wBAAwB,CAAC;YACjD,aAAa,EAAE,IAAI;YACnB,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,SAAS;YACT,cAAc,EAAE,qCAAkB,CAAC,MAAM;YACzC,SAAS,EAAE,QAAQ;YACnB,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;IAED,0BAA0B;IAC1B,IAAI,GAAG,GAAwC,SAAS,CAAC;IACzD,IAAI,MAAM,EAAE,CAAC;QACX,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACrB,YAAY,CAAC;YACX,KAAK;YACL,iBAAiB,EAAE,IAAI;YACvB,SAAS;YAET,SAAS,EAAE,QAAQ;YACnB,iBAAiB,EAAE,sBAAsB;YACzC,GAAG,MAAM;YACT,GAAG,CAAC;SACL,CAAC,CACH,CAAC;IACJ,CAAC;IAED,IAAI,GAAG,GAAwC,SAAS,CAAC;IACzD,IAAI,MAAM,EAAE,CAAC;QACX,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACrB,YAAY,CAAC;YACX,KAAK;YACL,iBAAiB,EAAE,IAAI;YACvB,SAAS;YAET,SAAS,EAAE,QAAQ;YACnB,iBAAiB,EAAE,sBAAsB;YACzC,GAAG,MAAM;YACT,GAAG,CAAC;SACL,CAAC,CACH,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,IAAI,GAAG,KAAK,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3C,IACE,CAAC,OAAO,CAAC,iBAAiB;YAC1B,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,EAC1C,CAAC;YACD,IAAI,GAAG,CAAC,uBAAuB,CAAC,IAAI,EAAE;gBACpC,aAAa,EAAE,SAAS,CAAC,IAAI;gBAC7B,GAAG,KAAK;gBACR,aAAa,EAAE,MAAM;gBAErB,OAAO,EAAE,OAAO,CAAC,YAAY;oBAC3B,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBAC/B,MAAM,EAAE,CAAC;wBACT,MAAM,EAAE,GAAG,CAAC,mBAAmB,CAAC,KAAK;qBACtC,CAAC,CAAC;oBACL,CAAC,CAAC,SAAS;gBAEb,mBAAmB,EAAE,OAAO,CAAC,QAAQ;oBACnC,CAAC,CAAC;wBACE;4BACE,gCAAgC,EAAE,KAAK;4BACvC,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,QAAQ,EAAE;yBACjC;qBACF;oBACH,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,CAAC,iBAAiB,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACzD,IAAA,yBAAe,EAAC;gBACd,IAAI,EAAE,IAAA,+BAAsB,EAAC,IAAI,CAAC;gBAClC,KAAK;gBACL,SAAS,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;gBAC7B,6CAA6C;gBAC7C,UAAU,EAAE,SAAS,CAAC,EAAE;gBACxB,mBAAmB,EAAE,CAAC,WAAW,CAAC;gBAClC,kBAAkB,EAAE,oCAAoC;aACzD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI;QACJ,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,GAAG;QACX,MAAM,EAAE,GAAG;QACX,UAAU,EAAE,EAAE,qBAAqB,EAAE,uBAAuB,EAAE;QAC9D,mBAAmB,EAAE,CAAC,IAAY,EAAE,EAAE,CACpC,SAAS;YACP,CAAC,CAAC,IAAA,kBAAS,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YACrD,CAAC,CAAC,SAAS;QACf,UAAU;KACX,CAAC;AACJ,CAAC,CAAC"}
|
|
407
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ServiceBus/index.ts"],"names":[],"mappings":"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"}
|
package/SignalR/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as native from "@pulumi/azure-native";
|
|
2
2
|
import * as pulumi from "@pulumi/pulumi";
|
|
3
|
-
import { BasicResourceArgs, KeyVaultInfo,
|
|
3
|
+
import { BasicResourceArgs, KeyVaultInfo, PrivateLinkPropsType } from "../types";
|
|
4
4
|
interface ResourceSkuArgs {
|
|
5
5
|
capacity?: 1 | 2 | 5 | 10 | 20 | 50 | 100;
|
|
6
6
|
name: "Standard_S1" | "Free_F1";
|
|
@@ -9,7 +9,7 @@ interface ResourceSkuArgs {
|
|
|
9
9
|
interface Props extends BasicResourceArgs {
|
|
10
10
|
vaultInfo?: KeyVaultInfo;
|
|
11
11
|
allowedOrigins?: pulumi.Input<pulumi.Input<string>[]>;
|
|
12
|
-
privateLink?:
|
|
12
|
+
privateLink?: PrivateLinkPropsType;
|
|
13
13
|
kind?: native.signalrservice.ServiceKind;
|
|
14
14
|
sku?: pulumi.Input<ResourceSkuArgs>;
|
|
15
15
|
}
|
package/SignalR/index.js
CHANGED
|
@@ -27,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
const native = __importStar(require("@pulumi/azure-native"));
|
|
30
|
-
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
31
30
|
const Naming_1 = require("../Common/Naming");
|
|
32
31
|
const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
33
32
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
@@ -36,7 +35,6 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrs
|
|
|
36
35
|
tier: native.signalrservice.SignalRSkuTier.Standard,
|
|
37
36
|
capacity: 1,
|
|
38
37
|
}, allowedOrigins, }) => {
|
|
39
|
-
const privateEndpointName = (0, Naming_1.getPrivateEndpointName)(name);
|
|
40
38
|
name = (0, Naming_1.getSignalRName)(name);
|
|
41
39
|
const signalR = new native.signalrservice.SignalR(name, {
|
|
42
40
|
resourceName: name,
|
|
@@ -50,27 +48,16 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrs
|
|
|
50
48
|
networkACLs: privateLink
|
|
51
49
|
? {
|
|
52
50
|
defaultAction: native.signalrservice.ACLAction.Allow,
|
|
53
|
-
publicNetwork:
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
//deny: [native.signalrservice.SignalRRequestType.RESTAPI],
|
|
61
|
-
}
|
|
62
|
-
: {
|
|
63
|
-
allow: [
|
|
64
|
-
native.signalrservice.SignalRRequestType.ClientConnection,
|
|
65
|
-
],
|
|
66
|
-
deny: [
|
|
67
|
-
native.signalrservice.SignalRRequestType.ServerConnection,
|
|
68
|
-
native.signalrservice.SignalRRequestType.RESTAPI,
|
|
69
|
-
],
|
|
70
|
-
},
|
|
51
|
+
publicNetwork: {
|
|
52
|
+
allow: [native.signalrservice.SignalRRequestType.ClientConnection],
|
|
53
|
+
deny: [
|
|
54
|
+
native.signalrservice.SignalRRequestType.ServerConnection,
|
|
55
|
+
native.signalrservice.SignalRRequestType.RESTAPI,
|
|
56
|
+
],
|
|
57
|
+
},
|
|
71
58
|
privateEndpoints: [
|
|
72
59
|
{
|
|
73
|
-
name:
|
|
60
|
+
name: (0, Naming_1.getPrivateEndpointName)(name),
|
|
74
61
|
allow: [
|
|
75
62
|
native.signalrservice.SignalRRequestType.ClientConnection,
|
|
76
63
|
native.signalrservice.SignalRRequestType.ServerConnection,
|
|
@@ -79,18 +66,25 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrs
|
|
|
79
66
|
},
|
|
80
67
|
],
|
|
81
68
|
}
|
|
82
|
-
:
|
|
69
|
+
: {
|
|
70
|
+
defaultAction: native.signalrservice.ACLAction.Allow,
|
|
71
|
+
publicNetwork: {
|
|
72
|
+
allow: [
|
|
73
|
+
native.signalrservice.SignalRRequestType.ClientConnection,
|
|
74
|
+
native.signalrservice.SignalRRequestType.ServerConnection,
|
|
75
|
+
native.signalrservice.SignalRRequestType.RESTAPI,
|
|
76
|
+
],
|
|
77
|
+
},
|
|
78
|
+
},
|
|
83
79
|
sku,
|
|
84
80
|
});
|
|
85
81
|
if (privateLink) {
|
|
86
82
|
//The Private Zone will create in Dev and reuse for sandbox and prd.
|
|
87
83
|
(0, PrivateEndpoint_1.default)({
|
|
88
|
-
name:
|
|
89
|
-
group,
|
|
84
|
+
resourceInfo: { resourceName: name, group, id: signalR.id },
|
|
90
85
|
privateDnsZoneName: "privatelink.service.signalr.net",
|
|
91
|
-
|
|
86
|
+
subnetIds: privateLink.subnetIds,
|
|
92
87
|
linkServiceGroupIds: ["signalr"],
|
|
93
|
-
resourceId: signalR.id,
|
|
94
88
|
});
|
|
95
89
|
}
|
|
96
90
|
if (vaultInfo) {
|
|
@@ -135,4 +129,4 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrs
|
|
|
135
129
|
}
|
|
136
130
|
return signalR;
|
|
137
131
|
};
|
|
138
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
132
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2lnbmFsUi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkRBQStDO0FBRy9DLDZDQUEwRTtBQU0xRSw4RUFBc0Q7QUFDdEQsMkRBQTJEO0FBZ0IzRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsV0FBVyxFQUNYLElBQUksR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxPQUFPLEVBQ2hELEdBQUcsR0FBRztJQUNKLElBQUksRUFBRSxhQUFhO0lBQ25CLElBQUksRUFBRSxNQUFNLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxRQUFRO0lBQ25ELFFBQVEsRUFBRSxDQUFDO0NBQ1osRUFDRCxjQUFjLEdBQ1IsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLElBQUEsdUJBQWMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU1QixNQUFNLE9BQU8sR0FBRyxJQUFJLE1BQU0sQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRTtRQUN0RCxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFDUixJQUFJO1FBRUosSUFBSSxFQUFFLEVBQUUsY0FBYyxFQUFFO1FBQ3hCLFFBQVEsRUFBRTtZQUNSLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFO1lBQ3pDLHVEQUF1RDtTQUN4RDtRQUNELFdBQVcsRUFBRSxXQUFXO1lBQ3RCLENBQUMsQ0FBQztnQkFDRSxhQUFhLEVBQUUsTUFBTSxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsS0FBSztnQkFDcEQsYUFBYSxFQUFFO29CQUNiLEtBQUssRUFBRSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCLENBQUM7b0JBQ2xFLElBQUksRUFBRTt3QkFD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
|
package/Sql/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as sql from "@pulumi/azure-native/sql";
|
|
2
2
|
import { Input } from "@pulumi/pulumi";
|
|
3
3
|
import { EnvRolesResults } from "../AzAd/EnvRoles";
|
|
4
|
-
import { BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, ResourceInfo } from "../types";
|
|
4
|
+
import { BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, NetworkPropsType, ResourceInfo } from "../types";
|
|
5
5
|
import { SqlDbSku } from "./SqlDb";
|
|
6
6
|
type ElasticPoolCapacityProps = 50 | 100 | 200 | 300 | 400 | 800 | 1200;
|
|
7
7
|
export type SqlAuthType = {
|
|
@@ -10,12 +10,8 @@ export type SqlAuthType = {
|
|
|
10
10
|
adminLogin: Input<string>;
|
|
11
11
|
password: Input<string>;
|
|
12
12
|
};
|
|
13
|
-
export type SqlNetworkType = {
|
|
13
|
+
export type SqlNetworkType = NetworkPropsType & {
|
|
14
14
|
acceptAllPublicConnect?: boolean;
|
|
15
|
-
subnetId?: Input<string>;
|
|
16
|
-
ipAddresses?: Input<string>[];
|
|
17
|
-
/** To enable Private Link need to ensure the subnetId is provided. */
|
|
18
|
-
asPrivateLink?: boolean;
|
|
19
15
|
};
|
|
20
16
|
export type SqlElasticPoolType = {
|
|
21
17
|
name: "Standard" | "Basic";
|
package/Sql/index.js
CHANGED
|
@@ -88,7 +88,7 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
|
|
|
88
88
|
sid: adminGroup?.objectId,
|
|
89
89
|
login: adminGroup?.displayName,
|
|
90
90
|
},
|
|
91
|
-
publicNetworkAccess: network?.
|
|
91
|
+
publicNetworkAccess: network?.privateLink
|
|
92
92
|
? sql.ServerNetworkAccessFlag.Disabled
|
|
93
93
|
: sql.ServerNetworkAccessFlag.Enabled,
|
|
94
94
|
}, {
|
|
@@ -109,27 +109,27 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
|
|
|
109
109
|
sku: elasticPool,
|
|
110
110
|
})
|
|
111
111
|
: undefined;
|
|
112
|
+
//Subnet
|
|
112
113
|
if (network?.subnetId) {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
}
|
|
114
|
+
//Link to Vnet
|
|
115
|
+
new sql.VirtualNetworkRule(sqlName, {
|
|
116
|
+
virtualNetworkRuleName: `${sqlName}-vnetRule`,
|
|
117
|
+
serverName: sqlServer.name,
|
|
118
|
+
...group,
|
|
119
|
+
virtualNetworkSubnetId: network.subnetId,
|
|
120
|
+
ignoreMissingVnetServiceEndpoint: false,
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
//Private Link
|
|
124
|
+
if (network?.privateLink) {
|
|
125
|
+
(0, PrivateEndpoint_1.default)({
|
|
126
|
+
resourceInfo: { resourceName: name, group, id: sqlServer.id },
|
|
127
|
+
privateDnsZoneName: "privatelink.database.windows.net",
|
|
128
|
+
subnetIds: network.privateLink.subnetIds,
|
|
129
|
+
linkServiceGroupIds: network.privateLink.type
|
|
130
|
+
? [network.privateLink.type]
|
|
131
|
+
: ["sqlServer"],
|
|
132
|
+
});
|
|
133
133
|
}
|
|
134
134
|
//Allow Public Ip Accessing
|
|
135
135
|
if (network?.acceptAllPublicConnect) {
|
|
@@ -164,7 +164,6 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
|
|
|
164
164
|
scope: vulnerabilityAssessment.logStorageId,
|
|
165
165
|
});
|
|
166
166
|
}
|
|
167
|
-
//Default Alert Policy
|
|
168
167
|
//ServerSecurityAlertPolicy
|
|
169
168
|
const alertPolicy = new sql.ServerSecurityAlertPolicy(name, {
|
|
170
169
|
securityAlertPolicyName: "default",
|
|
@@ -244,9 +243,9 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
|
|
|
244
243
|
elasticPoolId: ep ? ep.resource.id : undefined,
|
|
245
244
|
});
|
|
246
245
|
if (vaultInfo) {
|
|
247
|
-
const connectionString = auth?.
|
|
248
|
-
? (0, pulumi_1.interpolate) `Data Source=${sqlName}.database.windows.net;Initial Catalog=${d.name};
|
|
249
|
-
: (0, pulumi_1.interpolate) `Data Source=${sqlName}.database.windows.net;Initial Catalog=${d.name};
|
|
246
|
+
const connectionString = auth?.azureAdOnlyAuthentication
|
|
247
|
+
? (0, pulumi_1.interpolate) `Data Source=${sqlName}.database.windows.net;Initial Catalog=${d.name};Authentication=Active Directory Integrated;;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=120;`
|
|
248
|
+
: (0, pulumi_1.interpolate) `Data Source=${sqlName}.database.windows.net;Initial Catalog=${d.name};User Id=${auth.adminLogin};Password=${auth.password};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=120;`;
|
|
250
249
|
(0, CustomHelper_1.addCustomSecret)({
|
|
251
250
|
name: d.name,
|
|
252
251
|
value: connectionString,
|
|
@@ -276,4 +275,4 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
|
|
|
276
275
|
databases: dbs,
|
|
277
276
|
};
|
|
278
277
|
};
|
|
279
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
278
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
|
package/Storage/index.js
CHANGED
|
@@ -111,11 +111,9 @@ exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileS
|
|
|
111
111
|
if (network?.privateEndpoint) {
|
|
112
112
|
//Create Private Endpoints
|
|
113
113
|
(0, PrivateEndpoint_1.default)({
|
|
114
|
-
name,
|
|
115
|
-
group,
|
|
116
|
-
resourceId: stg.id,
|
|
114
|
+
resourceInfo: { resourceName: name, group, id: stg.id },
|
|
117
115
|
subnetIds: network.privateEndpoint.subnetIds,
|
|
118
|
-
privateDnsZoneName:
|
|
116
|
+
privateDnsZoneName: `privatelink.${network.privateEndpoint.type}.core.windows.net`,
|
|
119
117
|
linkServiceGroupIds: [network.privateEndpoint.type],
|
|
120
118
|
});
|
|
121
119
|
}
|
|
@@ -230,4 +228,4 @@ exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileS
|
|
|
230
228
|
getConnectionString: (name = primaryConnectionKeyName) => (0, Helper_1.getSecret)({ name, nameFormatted: true, vaultInfo }),
|
|
231
229
|
};
|
|
232
230
|
};
|
|
233
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
231
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3RvcmFnZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0Esc0VBQXdEO0FBR3hELCtDQUF1RTtBQUN2RSxpREFBMkM7QUFDM0MsNkNBSTBCO0FBQzFCLDJEQUE0RDtBQUM1RCw0REFBb0M7QUFDcEMsOEVBQXNEO0FBQ3RELHVEQUkyQjtBQUMzQiwyQ0FBMEQ7QUFpRDFELHNCQUFzQjtBQUN0QixrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsVUFBVSxHQUFHLEVBQUUsRUFDZixNQUFNLEdBQUcsRUFBRSxFQUNYLFVBQVUsR0FBRyxFQUFFLEVBQ2YsT0FBTyxFQUNQLFlBQVksR0FBRyxFQUFFLEVBQ2pCLFFBQVEsR0FBRyxFQUFFLHlCQUF5QixFQUFFLEdBQUcsRUFBRSxFQUM3QyxJQUFJLEdBQUcsSUFBSSxHQUNFLEVBQWtCLEVBQUU7SUFDakMsSUFBSSxHQUFHLElBQUEsdUJBQWMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU1QixNQUFNLGNBQWMsR0FBRyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ25ELE1BQU0sZ0JBQWdCLEdBQUcsSUFBQSxtQkFBVSxFQUFDLElBQUksRUFBRSxXQUFXLENBQUMsQ0FBQztJQUN2RCxNQUFNLHdCQUF3QixHQUFHLElBQUEsMEJBQWlCLEVBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3BFLE1BQU0sdUJBQXVCLEdBQUcsSUFBQSwwQkFBaUIsRUFBQyxJQUFJLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDckUsTUFBTSxhQUFhLEdBQUcsWUFBWSxDQUFDLHdCQUF3QjtRQUN6RCxDQUFDLENBQUMsSUFBQSwrQkFBc0IsRUFBQyxJQUFJLEVBQUUsU0FBUyxDQUFDO1FBQ3pDLENBQUMsQ0FBQyxTQUFT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
|
package/VNet/Helper.d.ts
CHANGED
|
@@ -29,8 +29,8 @@ export declare const getIpAddressResource: ({ name, groupName, }: {
|
|
|
29
29
|
name: string;
|
|
30
30
|
groupName: string;
|
|
31
31
|
}) => Promise<network.GetPublicIPAddressResult>;
|
|
32
|
-
export declare const getVnetInfo: (groupName: string) => VnetInfoType;
|
|
33
|
-
export declare const getVnetIdByName: (groupName: string) => Output<string>;
|
|
32
|
+
export declare const getVnetInfo: (groupName: string, region?: string) => VnetInfoType;
|
|
33
|
+
export declare const getVnetIdByName: (groupName: string, region?: string) => Output<string>;
|
|
34
34
|
export declare const parseVnetInfoFromId: (vnetId: Input<string>) => Output<VnetInfoType>;
|
|
35
35
|
export declare const getFirewallIpAddress: (name: string, group: ResourceGroupInfo) => Output<string>;
|
|
36
36
|
export declare const getFirewallIpAddressByGroupName: (groupName: string) => Output<string>;
|