@drunk-pulumi/azure 0.0.43 → 0.0.45
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/VdiBuilder.d.ts +4 -0
- package/Builder/VdiBuilder.js +105 -0
- package/Builder/VnetBuilder.js +24 -14
- package/Builder/index.d.ts +1 -0
- package/Builder/index.js +4 -2
- package/Builder/types/apimBuilder.d.ts +2 -3
- package/Builder/types/index.d.ts +1 -0
- package/Builder/types/index.js +2 -1
- package/Builder/types/vdiBuilder.d.ts +71 -0
- package/Builder/types/vdiBuilder.js +3 -0
- package/Builder/types/vnetBuilder.d.ts +4 -1
- package/Cdn/index.d.ts +1 -1
- package/Cdn/index.js +4 -4
- 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 +4 -2
- package/Common/Naming/index.js +12 -7
- package/Common/ResourceEnv.d.ts +1 -11
- package/Common/ResourceEnv.js +24 -20
- package/Common/index.d.ts +6 -5
- package/Common/index.js +5 -1
- 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/FirewallPolicies/CloudPCFirewallPolicy.d.ts +2 -1
- package/VNet/FirewallPolicies/CloudPCFirewallPolicy.js +66 -2
- 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/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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2lnbmFsUi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkRBQStDO0FBRy9DLDZDQUEwRTtBQU0xRSw4RUFBc0Q7QUFDdEQsMkRBQTJEO0FBZ0IzRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsV0FBVyxFQUNYLElBQUksR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxPQUFPLEVBQ2hELEdBQUcsR0FBRztJQUNKLElBQUksRUFBRSxhQUFhO0lBQ25CLElBQUksRUFBRSxNQUFNLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxRQUFRO0lBQ25ELFFBQVEsRUFBRSxDQUFDO0NBQ1osRUFDRCxjQUFjLEdBQ1IsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLElBQUEsdUJBQWMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU1QixNQUFNLE9BQU8sR0FBRyxJQUFJLE1BQU0sQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRTtRQUN0RCxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFDUixJQUFJO1FBRUosSUFBSSxFQUFFLEVBQUUsY0FBYyxFQUFFO1FBQ3hCLFFBQVEsRUFBRTtZQUNSLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFO1lBQ3pDLHVEQUF1RDtTQUN4RDtRQUNELFdBQVcsRUFBRSxXQUFXO1lBQ3RCLENBQUMsQ0FBQztnQkFDRSxhQUFhLEVBQUUsTUFBTSxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsS0FBSztnQkFDcEQsYUFBYSxFQUFFO29CQUNiLEtBQUssRUFBRSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCLENBQUM7b0JBQ2xFLElBQUksRUFBRTt3QkFDSixNQUFNLENBQUMsY0FBYyxDQUFDLGtCQUFrQixDQUFDLGdCQUFnQjt3QkFDekQsTUFBTSxDQUFDLGNBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPO3FCQUNqRDtpQkFDRjtnQkFDRCxnQkFBZ0IsRUFBRTtvQkFDaEI7d0JBQ0UsSUFBSSxFQUFFLElBQUEsK0JBQXNCLEVBQUMsSUFBSSxDQUFDO3dCQUNsQyxLQUFLLEVBQUU7NEJBQ0wsTUFBTSxDQUFDLGNBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0I7NEJBQ3pELE1BQU0sQ0FBQyxjQUFjLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCOzRCQUN6RCxNQUFNLENBQUMsY0FBYyxDQUFDLGtCQUFrQixDQUFDLE9BQU87eUJBQ2pEO3FCQUNGO2lCQUNGO2FBQ0Y7WUFDSCxDQUFDLENBQUM7Z0JBQ0UsYUFBYSxFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUMsU0FBUyxDQUFDLEtBQUs7Z0JBQ3BELGFBQWEsRUFBRTtvQkFDYixLQUFLLEVBQUU7d0JBQ0wsTUFBTSxDQUFDLGNBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0I7d0JBQ3pELE1BQU0sQ0FBQyxjQUFjLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCO3dCQUN6RCxNQUFNLENBQUMsY0FBYyxDQUFDLGtCQUFrQixDQUFDLE9BQU87cUJBQ2pEO2lCQUNGO2FBQ0Y7UUFDTCxHQUFHO0tBQ0osQ0FBQyxDQUFDO0lBRUgsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixvRUFBb0U7UUFDcEUsSUFBQSx5QkFBZSxFQUFDO1lBQ2QsWUFBWSxFQUFFLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLE9BQU8sQ0FBQyxFQUFFLEVBQUU7WUFDM0Qsa0JBQWtCLEVBQUUsaUNBQWlDO1lBQ3JELFNBQVMsRUFBRSxXQUFXLENBQUMsU0FBUztZQUNoQyxtQkFBbUIsRUFBRSxDQUFDLFNBQVMsQ0FBQztTQUNqQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUNqQyxJQUFJLENBQUMsQ0FBQztnQkFBRSxPQUFPO1lBRWYsTUFBTSxJQUFJLEdBQUcsTUFBTSxNQUFNLENBQUMsY0FBYyxDQUFDLGVBQWUsQ0FBQztnQkFDdkQsWUFBWSxFQUFFLElBQUk7Z0JBQ2xCLGlCQUFpQixFQUFFLEtBQUssQ0FBQyxpQkFBaUI7YUFDM0MsQ0FBQyxDQUFDO1lBRUgsSUFBQSw4QkFBZSxFQUFDO2dCQUNkLElBQUksRUFBRSxHQUFHLElBQUksT0FBTztnQkFDcEIsS0FBSyxFQUFFLENBQUM7Z0JBQ1IsU0FBUztnQkFDVCxXQUFXLEVBQUUsU0FBUzthQUN2QixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSxhQUFhO2dCQUMxQixLQUFLLEVBQUUsSUFBSSxDQUFDLFVBQVUsSUFBSSxFQUFFO2dCQUM1QixTQUFTO2dCQUNULFdBQVcsRUFBRSxTQUFTO2FBQ3ZCLENBQUMsQ0FBQztZQUVILElBQUEsOEJBQWUsRUFBQztnQkFDZCxJQUFJLEVBQUUsR0FBRyxJQUFJLG9CQUFvQjtnQkFDakMsS0FBSyxFQUFFLElBQUksQ0FBQyx1QkFBdUIsSUFBSSxFQUFFO2dCQUN6QyxTQUFTO2dCQUNULFdBQVcsRUFBRSxTQUFTO2FBQ3ZCLENBQUMsQ0FBQztZQUVILElBQUEsOEJBQWUsRUFBQztnQkFDZCxJQUFJLEVBQUUsR0FBRyxJQUFJLGVBQWU7Z0JBQzVCLEtBQUssRUFBRSxJQUFJLENBQUMsWUFBWSxJQUFJLEVBQUU7Z0JBQzlCLFNBQVM7Z0JBQ1QsV0FBVyxFQUFFLFNBQVM7YUFDdkIsQ0FBQyxDQUFDO1lBRUgsSUFBQSw4QkFBZSxFQUFDO2dCQUNkLElBQUksRUFBRSxHQUFHLElBQUksc0JBQXNCO2dCQUNuQyxLQUFLLEVBQUUsSUFBSSxDQUFDLHlCQUF5QixJQUFJLEVBQUU7Z0JBQzNDLFNBQVM7Z0JBQ1QsV0FBVyxFQUFFLFNBQVM7YUFDdkIsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTyxPQUFPLENBQUM7QUFDakIsQ0FBQyxDQUFDIn0=
|
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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
|
|
@@ -11,6 +11,7 @@ interface Props {
|
|
|
11
11
|
allowsK8sTools?: boolean;
|
|
12
12
|
allowsSearch?: boolean;
|
|
13
13
|
allowsOffice365?: boolean;
|
|
14
|
+
allowsWindows365?: boolean;
|
|
14
15
|
}
|
|
15
|
-
declare const _default: ({ name, priority, subnetSpaces, allowsOffice365, allowsAzure, allowsAzDevOps, allowsK8sTools, allowIpCheckApi, allowsSearch, allowAllOutbound, }: Props) => FirewallPolicyRuleCollectionResults;
|
|
16
|
+
declare const _default: ({ name, priority, subnetSpaces, allowsOffice365, allowsWindows365, allowsAzure, allowsAzDevOps, allowsK8sTools, allowIpCheckApi, allowsSearch, allowAllOutbound, }: Props) => FirewallPolicyRuleCollectionResults;
|
|
16
17
|
export default _default;
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const AzureEnv_1 = require("../../Common/AzureEnv");
|
|
4
4
|
const FirewallPolicy_1 = require("../FirewallPolicy");
|
|
5
|
-
|
|
5
|
+
//https://www.robtex.com/dns-lookup/global.azure-devices-provisioning.net
|
|
6
|
+
exports.default = ({ name = "cloud-pc", priority, subnetSpaces, allowsOffice365, allowsWindows365, allowsAzure, allowsAzDevOps, allowsK8sTools, allowIpCheckApi, allowsSearch, allowAllOutbound, }) => {
|
|
6
7
|
const netRules = new Array();
|
|
7
8
|
const appRules = new Array();
|
|
8
9
|
if (allowAllOutbound) {
|
|
@@ -162,6 +163,69 @@ exports.default = ({ name = "cloud-pc", priority, subnetSpaces, allowsOffice365,
|
|
|
162
163
|
protocols: [{ protocolType: "Https", port: 443 }],
|
|
163
164
|
});
|
|
164
165
|
}
|
|
166
|
+
if (allowsWindows365) {
|
|
167
|
+
appRules.push({
|
|
168
|
+
ruleType: "ApplicationRule",
|
|
169
|
+
name: `${name}-app-allow-win365`,
|
|
170
|
+
description: "Allows Windows365",
|
|
171
|
+
sourceAddresses: subnetSpaces,
|
|
172
|
+
fqdnTags: ["Windows365", "MicrosoftIntune"],
|
|
173
|
+
protocols: [{ protocolType: "Https", port: 443 }],
|
|
174
|
+
});
|
|
175
|
+
netRules.push({
|
|
176
|
+
ruleType: "NetworkRule",
|
|
177
|
+
name: `${name}-net-allow-win365-windows-net`,
|
|
178
|
+
description: "CloudPc allows Windows 365 windows.net",
|
|
179
|
+
ipProtocols: ["TCP"],
|
|
180
|
+
sourceAddresses: subnetSpaces,
|
|
181
|
+
//destinationFqdns: ["azkms.core.windows.net"],
|
|
182
|
+
destinationAddresses: [
|
|
183
|
+
"40.83.235.53",
|
|
184
|
+
//"2a01:111:f100:3000::a83e:1b30"
|
|
185
|
+
],
|
|
186
|
+
destinationPorts: ["1688"],
|
|
187
|
+
}, {
|
|
188
|
+
ruleType: "NetworkRule",
|
|
189
|
+
name: `${name}-net-allow-win365-azure-devices`,
|
|
190
|
+
description: "CloudPc allows Windows 365 azure-devices",
|
|
191
|
+
ipProtocols: ["TCP"],
|
|
192
|
+
sourceAddresses: subnetSpaces,
|
|
193
|
+
// destinationFqdns: [
|
|
194
|
+
// "global.azure-devices-provisioning.net",
|
|
195
|
+
// "hm-iot-in-prod-preu01.azure-devices.net",
|
|
196
|
+
// "hm-iot-in-prod-prap01.azure-devices.net",
|
|
197
|
+
// "hm-iot-in-prod-prna01.azure-devices.net",
|
|
198
|
+
// "hm-iot-in-prod-prau01.azure-devices.net",
|
|
199
|
+
// "hm-iot-in-prod-prna02.azure-devices.net",
|
|
200
|
+
// "hm-iot-in-2-prod-prna01.azure-devices.net",
|
|
201
|
+
// "hm-iot-in-3-prod-prna01.azure-devices.net",
|
|
202
|
+
// "hm-iot-in-2-prod-preu01.azure-devices.net",
|
|
203
|
+
// "hm-iot-in-3-prod-preu01.azure-devices.net",
|
|
204
|
+
// "hm-iot-in-4-prod-prna01.azure-devices.net",
|
|
205
|
+
// ],
|
|
206
|
+
destinationAddresses: [
|
|
207
|
+
"23.98.104.204",
|
|
208
|
+
"40.78.238.4",
|
|
209
|
+
"20.150.179.224",
|
|
210
|
+
"52.236.189.131",
|
|
211
|
+
"13.69.71.14",
|
|
212
|
+
"13.69.71.2",
|
|
213
|
+
"13.70.74.193",
|
|
214
|
+
"13.86.221.39",
|
|
215
|
+
"13.86.221.36",
|
|
216
|
+
"13.86.221.43",
|
|
217
|
+
],
|
|
218
|
+
destinationPorts: ["443", "5671"],
|
|
219
|
+
}, {
|
|
220
|
+
ruleType: "NetworkRule",
|
|
221
|
+
name: `${name}-net-allow-win365-udp-tcp`,
|
|
222
|
+
description: "CloudPc allows Windows 365 udp tcp",
|
|
223
|
+
ipProtocols: ["UDP", "TCP"],
|
|
224
|
+
sourceAddresses: subnetSpaces,
|
|
225
|
+
destinationAddresses: ["20.202.0.0/16"],
|
|
226
|
+
destinationPorts: ["443", "3478"],
|
|
227
|
+
});
|
|
228
|
+
}
|
|
165
229
|
if (allowsSearch) {
|
|
166
230
|
appRules.push({
|
|
167
231
|
ruleType: "ApplicationRule",
|
|
@@ -188,4 +252,4 @@ exports.default = ({ name = "cloud-pc", priority, subnetSpaces, allowsOffice365,
|
|
|
188
252
|
action: "Allow",
|
|
189
253
|
});
|
|
190
254
|
};
|
|
191
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
255
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2xvdWRQQ0ZpcmV3YWxsUG9saWN5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL1ZOZXQvRmlyZXdhbGxQb2xpY2llcy9DbG91ZFBDRmlyZXdhbGxQb2xpY3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSxvREFBMEQ7QUFNMUQsc0RBQXdEO0FBZ0J4RCx5RUFBeUU7QUFFekUsa0JBQWUsQ0FBQyxFQUNkLElBQUksR0FBRyxVQUFVLEVBQ2pCLFFBQVEsRUFDUixZQUFZLEVBQ1osZUFBZSxFQUNmLGdCQUFnQixFQUNoQixXQUFXLEVBQ1gsY0FBYyxFQUNkLGNBQWMsRUFDZCxlQUFlLEVBQ2YsWUFBWSxFQUNaLGdCQUFnQixHQUNWLEVBQXVDLEVBQUU7SUFDL0MsTUFBTSxRQUFRLEdBQUcsSUFBSSxLQUFLLEVBQTBCLENBQUM7SUFDckQsTUFBTSxRQUFRLEdBQUcsSUFBSSxLQUFLLEVBQThCLENBQUM7SUFFekQsSUFBSSxnQkFBZ0IsRUFBRSxDQUFDO1FBQ3JCLFFBQVEsQ0FBQyxJQUFJLENBQUM7WUFDWixRQUFRLEVBQUUsYUFBYTtZQUN2QixJQUFJLEVBQUUsR0FBRyxJQUFJLHlCQUF5QjtZQUN0QyxXQUFXLEVBQUUsNkJBQTZCO1lBQzFDLFdBQVcsRUFBRSxDQUFDLEtBQUssQ0FBQztZQUNwQixlQUFlLEVBQUUsWUFBWTtZQUM3QixvQkFBb0IsRUFBRSxDQUFDLEdBQUcsQ0FBQztZQUMzQixnQkFBZ0IsRUFBRSxDQUFDLEtBQUssQ0FBQztTQUMxQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsa0JBQWtCO0lBQ2xCLFFBQVEsQ0FBQyxJQUFJLENBQUM7UUFDWixRQUFRLEVBQUUsaUJBQWlCO1FBQzNCLElBQUksRUFBRSxHQUFHLElBQUkscUJBQXFCO1FBQ2xDLFdBQVcsRUFBRSx3QkFBd0I7UUFDckMsZUFBZSxFQUFFLFlBQVk7UUFDN0IsUUFBUSxFQUFFLENBQUMsZUFBZSxFQUFFLG9CQUFvQixDQUFDO1FB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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>;
|
package/VNet/Helper.js
CHANGED
|
@@ -34,10 +34,7 @@ exports.gatewaySubnetName = "GatewaySubnet";
|
|
|
34
34
|
exports.azFirewallSubnet = "AzureFirewallSubnet";
|
|
35
35
|
exports.azFirewallManagementSubnet = "AzureFirewallManagementSubnet";
|
|
36
36
|
exports.azBastionSubnetName = "AzureBastionSubnet";
|
|
37
|
-
const getIpsRange = (prefix) =>
|
|
38
|
-
//console.debug('getIpsRange', block);
|
|
39
|
-
return new netmask.Netmask(prefix);
|
|
40
|
-
};
|
|
37
|
+
const getIpsRange = (prefix) => new netmask.Netmask(prefix);
|
|
41
38
|
exports.getIpsRange = getIpsRange;
|
|
42
39
|
/** Convert IP address and IP address group into range */
|
|
43
40
|
const convertToIpRange = (ipAddress) => ipAddress.map((ip) => {
|
|
@@ -75,9 +72,9 @@ const getIpAddressResource = ({ name, groupName, }) => {
|
|
|
75
72
|
});
|
|
76
73
|
};
|
|
77
74
|
exports.getIpAddressResource = getIpAddressResource;
|
|
78
|
-
const getVnetInfo = (groupName) => {
|
|
79
|
-
const vnetName = (0, Naming_1.getVnetName)(groupName);
|
|
80
|
-
const rsName = (0, Naming_1.getResourceGroupName)(groupName);
|
|
75
|
+
const getVnetInfo = (groupName, region = AzureEnv_1.currentCountryCode) => {
|
|
76
|
+
const vnetName = (0, Naming_1.getVnetName)(groupName, { region });
|
|
77
|
+
const rsName = (0, Naming_1.getResourceGroupName)(groupName, { region });
|
|
81
78
|
return {
|
|
82
79
|
vnetName,
|
|
83
80
|
resourceGroupName: rsName,
|
|
@@ -85,8 +82,8 @@ const getVnetInfo = (groupName) => {
|
|
|
85
82
|
};
|
|
86
83
|
};
|
|
87
84
|
exports.getVnetInfo = getVnetInfo;
|
|
88
|
-
const getVnetIdByName = (groupName) => {
|
|
89
|
-
const info = (0, exports.getVnetInfo)(groupName);
|
|
85
|
+
const getVnetIdByName = (groupName, region = AzureEnv_1.currentCountryCode) => {
|
|
86
|
+
const info = (0, exports.getVnetInfo)(groupName, region);
|
|
90
87
|
return (0, pulumi_1.interpolate) `/subscriptions/${info.subscriptionId}/resourceGroups/${info.resourceGroupName}/providers/Microsoft.Network/virtualNetworks/${info.vnetName}`;
|
|
91
88
|
};
|
|
92
89
|
exports.getVnetIdByName = getVnetIdByName;
|
|
@@ -113,4 +110,4 @@ const getFirewallIpAddressByGroupName = (groupName) => {
|
|
|
113
110
|
return (0, exports.getFirewallIpAddress)(fireWallName, { resourceGroupName: rsName });
|
|
114
111
|
};
|
|
115
112
|
exports.getFirewallIpAddressByGroupName = getFirewallIpAddressByGroupName;
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBQ3hELDJDQUFvRTtBQUNwRSxpREFBbUM7QUFDbkMsaURBSTRCO0FBQzVCLDZDQUswQjtBQUliLFFBQUEsb0JBQW9CLEdBQUcsYUFBYSxDQUFDO0FBQ3JDLFFBQUEsaUJBQWlCLEdBQUcsZUFBZSxDQUFDO0FBQ3BDLFFBQUEsZ0JBQWdCLEdBQUcscUJBQXFCLENBQUM7QUFDekMsUUFBQSwwQkFBMEIsR0FBRywrQkFBK0IsQ0FBQztBQUM3RCxRQUFBLG1CQUFtQixHQUFHLG9CQUFvQixDQUFDO0FBRWpELE1BQU0sV0FBVyxHQUFHLENBQUMsTUFBYyxFQUFFLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7QUFBOUQsUUFBQSxXQUFXLGVBQW1EO0FBRTNFLHlEQUF5RDtBQUNsRCxNQUFNLGdCQUFnQixHQUFHLENBQzlCLFNBQW1CLEVBQ29CLEVBQUUsQ0FDekMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFO0lBQ25CLElBQUksRUFBRSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ3JCLE1BQU0sS0FBSyxHQUFHLElBQUEsbUJBQVcsRUFBQyxFQUFFLENBQUMsQ0FBQztRQUM5QixPQUFPLEVBQUUsS0FBSyxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEtBQUssQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNyRCxDQUFDO0lBQ0QsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxDQUFDO0FBQ2hDLENBQUMsQ0FBQyxDQUFDO0FBVFEsUUFBQSxnQkFBZ0Isb0JBU3hCO0FBRUUsTUFBTSxxQkFBcUIs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
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import { BasicArgs, PrivateLinkPropsType, ResourceInfo } from "../types";
|
|
2
|
+
export type PrivateEndpointProps = Pick<PrivateLinkPropsType, "subnetIds"> & Pick<BasicArgs, "dependsOn"> & {
|
|
3
|
+
resourceInfo: ResourceInfo;
|
|
4
|
+
/** check the private link DNS Zone here https://learn.microsoft.com/en-us/azure/private-link/private-endpoint-dns */
|
|
5
5
|
privateDnsZoneName: string;
|
|
6
6
|
linkServiceGroupIds: string[];
|
|
7
|
-
}
|
|
8
|
-
declare const _default: ({
|
|
7
|
+
};
|
|
8
|
+
declare const _default: ({ resourceInfo, subnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }: PrivateEndpointProps) => import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint[];
|
|
9
9
|
export default _default;
|
package/VNet/PrivateEndpoint.js
CHANGED
|
@@ -28,27 +28,28 @@ const pulumi_1 = require("@pulumi/pulumi");
|
|
|
28
28
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
29
29
|
const Naming_1 = require("../Common/Naming");
|
|
30
30
|
const Builder_1 = require("../Builder");
|
|
31
|
-
exports.default = ({
|
|
32
|
-
name = (0, Naming_1.getPrivateEndpointName)(
|
|
31
|
+
exports.default = ({ resourceInfo, subnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }) => {
|
|
32
|
+
const name = (0, Naming_1.getPrivateEndpointName)(resourceInfo.resourceName);
|
|
33
33
|
const endpoints = subnetIds.map((s, index) => new network.PrivateEndpoint(`${name}-${index}`, {
|
|
34
34
|
privateEndpointName: `${name}-${index}`,
|
|
35
|
-
...group,
|
|
35
|
+
...resourceInfo.group,
|
|
36
36
|
subnet: { id: s },
|
|
37
37
|
privateLinkServiceConnections: [
|
|
38
38
|
{
|
|
39
39
|
groupIds: linkServiceGroupIds,
|
|
40
40
|
name: `${name}-conn`,
|
|
41
|
-
privateLinkServiceId:
|
|
41
|
+
privateLinkServiceId: resourceInfo.id,
|
|
42
42
|
},
|
|
43
43
|
],
|
|
44
|
-
}));
|
|
44
|
+
}, { dependsOn }));
|
|
45
45
|
//Get IpAddress in
|
|
46
46
|
const ipAddresses = (0, pulumi_1.output)(endpoints.map((e) => e.customDnsConfigs.apply((c) => c.flatMap((i) => i.ipAddresses)))).apply((a) => a.flatMap((i) => i));
|
|
47
|
-
(0, pulumi_1.output)([
|
|
47
|
+
(0, pulumi_1.output)([resourceInfo.id, ipAddresses]).apply(([id, ip]) => {
|
|
48
48
|
const resourceInfo = (0, AzureEnv_1.parseResourceInfoFromId)(id);
|
|
49
49
|
return (0, Builder_1.PrivateDnsZoneBuilder)({
|
|
50
50
|
name: `${resourceInfo.name}.${privateDnsZoneName}`,
|
|
51
|
-
group,
|
|
51
|
+
group: resourceInfo.group,
|
|
52
|
+
dependsOn,
|
|
52
53
|
})
|
|
53
54
|
.withARecord({ ipAddresses: ip, recordName: "@" })
|
|
54
55
|
.linkTo({ subnetIds, registrationEnabled: false })
|
|
@@ -56,4 +57,4 @@ exports.default = ({ name, group, resourceId, subnetIds, privateDnsZoneName, lin
|
|
|
56
57
|
});
|
|
57
58
|
return endpoints;
|
|
58
59
|
};
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUVuZHBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvUHJpdmF0ZUVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFDeEQsMkNBQXdDO0FBRXhDLGlEQUE2RDtBQUM3RCw2Q0FBMEQ7QUFDMUQsd0NBQW1EO0FBVW5ELGtCQUFlLENBQUMsRUFDZCxZQUFZLEVBQ1osU0FBUyxFQUNULGtCQUFrQixFQUNsQixtQkFBbUIsRUFDbkIsU0FBUyxHQUNZLEVBQUUsRUFBRTtJQUN6QixNQUFNLElBQUksR0FBRyxJQUFBLCtCQUFzQixFQUFDLFlBQVksQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUUvRCxNQUFNLFNBQVMsR0FBRyxTQUFTLENBQUMsR0FBRyxDQUM3QixDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUNYLElBQUksT0FBTyxDQUFDLGVBQWUsQ0FDekIsR0FBRyxJQUFJLElBQUksS0FBSyxFQUFFLEVBQ2xCO1FBQ0UsbUJBQW1CLEVBQUUsR0FBRyxJQUFJLElBQUksS0FBSyxFQUFFO1FBQ3ZDLEdBQUcsWUFBWSxDQUFDLEtBQUs7UUFDckIsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRTtRQUNqQiw2QkFBNkIsRUFBRTtZQUM3QjtnQkFDRSxRQUFRLEVBQUUsbUJBQW1CO2dCQUM3QixJQUFJLEVBQUUsR0FBRyxJQUFJLE9BQU87Z0JBQ3BCLG9CQUFvQixFQUFFLFlBQVksQ0FBQyxFQUFFO2FBQ3RDO1NBQ0Y7S0FDRixFQUNELEVBQUUsU0FBUyxFQUFFLENBQ2QsQ0FDSixDQUFDO0lBRUYsa0JBQWtCO0lBQ2xCLE1BQU0sV0FBVyxHQUFHLElBQUEsZUFBTSxFQUN4QixTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDbEIsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLFdBQVksQ0FBQyxDQUFDLENBQ25FLENBQ0YsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUUsQ0FBQyxDQUFDLENBQUM7SUFFckMsSUFBQSxlQUFNLEVBQUMsQ0FBQyxZQUFZLENBQUMsRUFBRSxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUN4RCxNQUFNLFlBQVksR0FBRyxJQUFBLGtDQUF1QixFQUFDLEVBQVksQ0FBQyxDQUFDO1FBQzNELE9BQU8sSUFBQSwrQkFBcUIsRUFBQztZQUMzQixJQUFJLEVBQUUsR0FBRyxZQUFhLENBQUMsSUFBSSxJQUFJLGtCQUFrQixFQUFFO1lBQ25ELEtBQUssRUFBRSxZQUFhLENBQUMsS0FBSztZQUMxQixTQUFTO1NBQ1YsQ0FBQzthQUNDLFdBQVcsQ0FBQyxFQUFFLFdBQVcsRUFBRSxFQUFjLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxDQUFDO2FBQzdELE1BQU0sQ0FBQyxFQUFFLFNBQVMsRUFBRSxtQkFBbUIsRUFBRSxLQUFLLEVBQUUsQ0FBQzthQUNqRCxLQUFLLEVBQUUsQ0FBQztJQUNiLENBQUMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQyxDQUFDIn0=
|
package/Web/AppConfig.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import * as appConfig from "@pulumi/azure-native/appconfiguration";
|
|
2
|
-
import { KeyVaultInfo,
|
|
2
|
+
import { KeyVaultInfo, PrivateLinkPropsType, ResourceGroupInfo, ResourceInfo } from "../types";
|
|
3
3
|
export type AppConfigProps = {
|
|
4
4
|
name: string;
|
|
5
5
|
group: ResourceGroupInfo;
|
|
6
|
-
privateLink?:
|
|
6
|
+
privateLink?: PrivateLinkPropsType;
|
|
7
7
|
disableLocalAuth?: boolean;
|
|
8
8
|
vaultInfo: KeyVaultInfo;
|
|
9
9
|
};
|
package/Web/AppConfig.js
CHANGED
|
@@ -77,11 +77,9 @@ exports.default = ({ group, name, vaultInfo, disableLocalAuth, privateLink, }) =
|
|
|
77
77
|
//Private Link
|
|
78
78
|
if (privateLink) {
|
|
79
79
|
(0, PrivateEndpoint_1.default)({
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
privateDnsZoneName: `${name}.privatelink.azconfig.io`,
|
|
80
|
+
resourceInfo: { resourceName: name, group, id: app.id },
|
|
81
|
+
privateDnsZoneName: "privatelink.azconfig.io",
|
|
83
82
|
linkServiceGroupIds: ["appConfig"],
|
|
84
|
-
resourceId: app.id,
|
|
85
83
|
...privateLink,
|
|
86
84
|
});
|
|
87
85
|
}
|
|
@@ -92,4 +90,4 @@ exports.default = ({ group, name, vaultInfo, disableLocalAuth, privateLink, }) =
|
|
|
92
90
|
instance: app,
|
|
93
91
|
};
|
|
94
92
|
};
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlGQUFtRTtBQUNuRSxpREFBMkM7QUFDM0MsNkNBQTRFO0FBTzVFLDhFQUFzRDtBQUN0RCwyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixFQUNoQixXQUFXLEdBQ0ksRUFFZixFQUFFO0lBQ0YsSUFBSSxHQUFHLElBQUEseUJBQWdCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUIsTUFBTSw4QkFBOEIsR0FBRyxHQUFHLElBQUksaUNBQWlDLENBQUM7SUFDaEYsTUFBTSxnQ0FBZ0MsR0FBRyxHQUFHLElBQUksbUNBQW1DLENBQUM7SUFFcEYsTUFBTSxHQUFHLEdBQUcsSUFBSSxTQUFTLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFO1FBQ2pELGVBQWUsRUFBRSxJQUFJO1FBQ3JCLEdBQUcsS0FBSztRQUNSLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRTtRQUNwQyxxQkFBcUIsRUFBRSxnQkFBSztRQUM1Qix5QkFBeUIsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEMsZ0JBQWdCO1FBQ2hCLG1CQUFtQixFQUFFLFdBQVc7WUFDOUIsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRO1lBQ3hDLENBQUMsQ0FBQyxTQUFTLENBQUMsbUJBQW1CLENBQUMsT0FBTztRQUV6QyxHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFO0tBQzFCLENBQUMsQ0FBQztJQUVILGFBQWE7SUFDYixJQUFJLFNBQVMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDbkMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ3hCLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFDaEIsMkJBQTJCO1lBQzNCLE1BQU0sSUFBSSxHQUFHLE1BQU0sU0FBUyxDQUFDLDBCQUEwQixDQUFDO2dCQUN0RCxlQUFlLEVBQUUsSUFBSTtnQkFDckIsR0FBRyxLQUFLO2FBQ1QsQ0FBQyxDQUFDO1lBRUgsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2YsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtvQkFDckIsa0NBQWtDO29CQUNsQyxJQUFJLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQzt3QkFDakIsSUFBQSw4QkFBZSxFQUFDOzRCQUNkLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUM7Z0NBQ2hDLENBQUMsQ0FBQyw4QkFBOEI7Z0NBQ2hDLENBQUMsQ0FBQyxnQ0FBZ0M7NEJBQ3BDLEtBQUssRUFBRSxHQUFHLENBQUMsZ0JBQWdCOzRCQUMzQixXQUFXLEVBQUUsYUFBYSxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksRUFBRTs0QkFDNUMsU0FBUzt5QkFDVixDQUFDLENBQUM7b0JBQ0wsQ0FBQztnQkFDSCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxjQUFjO0lBQ2QsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixJQUFBLHlCQUFlLEVBQUM7WUFDZCxZQUFZLEVBQUUsRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsR0FBRyxDQUFDLEVBQUUsRUFBRTtZQUN2RCxrQkFBa0IsRUFBRSx5QkFBeUI7WUFDN0MsbUJBQW1CLEVBQUUsQ0FBQyxXQUFXLENBQUM7WUFDbEMsR0FBRyxXQUFXO1NBQ2YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU87UUFDTCxZQUFZLEVBQUUsSUFBSTtRQUNsQixLQUFLO1FBQ0wsRUFBRSxFQUFFLEdBQUcsQ0FBQyxFQUFFO1FBQ1YsUUFBUSxFQUFFLEdBQUc7S0FDZCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
|