@drunk-pulumi/azure 0.0.41 → 0.0.43
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/Aks/Helper.d.ts +0 -3
- package/Aks/Helper.js +43 -18
- package/Aks/Identity.js +5 -2
- package/Aks/VmSetAutoScale/index.js +25 -2
- package/Aks/VmSetMonitor/index.js +26 -3
- package/Aks/index.d.ts +2 -2
- package/Aks/index.js +35 -6
- package/Apim/ApiProduct/SwaggerHelper.d.ts +0 -5
- package/Apim/ApiProduct/SwaggerHelper.js +7 -12
- package/Apim/Helpers.d.ts +2 -0
- package/Apim/Helpers.js +17 -1
- package/Apps/LogicApp.js +29 -3
- package/Automation/index.js +29 -3
- package/AzAd/B2C.js +25 -2
- package/AzAd/EnvRoles.Consts.d.ts +1 -1
- package/AzAd/EnvRoles.Consts.js +38 -35
- package/AzAd/EnvRoles.js +5 -2
- package/AzAd/Group.js +25 -2
- package/AzAd/Identities/AzDevOpsIdentity.js +5 -2
- package/AzAd/Identities/AzDevOpsManagedIdentity.js +5 -2
- package/AzAd/Identities/AzUserAdRevertSync.js +5 -2
- package/AzAd/Identities/index.js +7 -4
- package/AzAd/Identity.js +26 -3
- package/AzAd/Role.js +5 -2
- package/AzAd/RoleAssignment.js +29 -26
- package/AzAd/RoleDefinitions/JustInTimeRequestRole.js +25 -2
- package/AzAd/UserAssignedIdentity.js +25 -2
- package/Builder/AksBuilder.js +6 -3
- package/Builder/ApimApiBuilder.d.ts +22 -0
- package/Builder/ApimApiBuilder.js +198 -0
- package/Builder/ApimBuilder.d.ts +3 -0
- package/Builder/ApimBuilder.js +325 -0
- package/Builder/ApimPolicyBuilder.d.ts +51 -0
- package/Builder/ApimPolicyBuilder.js +384 -0
- package/Builder/ApimProductBuilder.d.ts +21 -0
- package/Builder/ApimProductBuilder.js +153 -0
- package/Builder/ApimRootBuilder.d.ts +9 -0
- package/Builder/ApimRootBuilder.js +26 -0
- package/Builder/ApimWorkspaceBuilder.d.ts +10 -0
- package/Builder/ApimWorkspaceBuilder.js +57 -0
- package/Builder/CdnBuilder.d.ts +13 -0
- package/Builder/CdnBuilder.js +39 -0
- package/Builder/DnsZoneBuilder.d.ts +4 -0
- package/Builder/DnsZoneBuilder.js +109 -0
- package/Builder/PrivateDnsZoneBuilder.d.ts +4 -0
- package/Builder/PrivateDnsZoneBuilder.js +99 -0
- package/Builder/ResourceBuilder.js +20 -5
- package/Builder/SqlBuilder.js +21 -6
- package/Builder/StorageBuilder.d.ts +3 -0
- package/Builder/StorageBuilder.js +101 -0
- package/Builder/VaultBuilder.js +25 -2
- package/Builder/VmBuilder.js +16 -3
- package/Builder/VnetBuilder.js +21 -20
- package/Builder/index.d.ts +6 -0
- package/Builder/index.js +23 -8
- package/Builder/types/apimBuilder.d.ts +71 -0
- package/Builder/types/apimBuilder.js +3 -0
- package/Builder/types/apimPolicyBuilder.d.ts +84 -0
- package/Builder/types/apimPolicyBuilder.js +11 -0
- package/Builder/types/apimProductBuilder.d.ts +56 -0
- package/Builder/types/apimProductBuilder.js +3 -0
- package/Builder/types/apimWorkspaceBuilder.d.ts +2 -0
- package/Builder/types/apimWorkspaceBuilder.js +3 -0
- package/Builder/types/askBuilder.d.ts +11 -15
- package/Builder/types/cdnBuilder.d.ts +7 -0
- package/Builder/types/cdnBuilder.js +3 -0
- package/Builder/types/dnsZoneBuilder.d.ts +11 -0
- package/Builder/types/dnsZoneBuilder.js +3 -0
- package/Builder/types/genericBuilder.d.ts +9 -9
- package/Builder/types/genericBuilder.js +1 -1
- package/Builder/types/index.d.ts +7 -0
- package/Builder/types/index.js +8 -1
- package/Builder/types/privateDnsZoneBuilder.d.ts +13 -0
- package/Builder/types/privateDnsZoneBuilder.js +3 -0
- package/Builder/types/resourceBuilder.d.ts +17 -15
- package/Builder/types/sqlBuilder.d.ts +10 -5
- package/Builder/types/storageBuilder.d.ts +24 -0
- package/Builder/types/storageBuilder.js +3 -0
- package/Builder/types/vaultBuilder.d.ts +7 -7
- package/Builder/types/vmBuilder.d.ts +9 -7
- package/Builder/types/vnetBuilder.d.ts +17 -17
- package/Cdn/CdnEndpoint.d.ts +13 -0
- package/Cdn/CdnEndpoint.js +94 -0
- package/{Storage → Cdn}/CdnRules.d.ts +2 -2
- package/Cdn/CdnRules.js +133 -0
- package/Cdn/index.d.ts +7 -6
- package/Cdn/index.js +45 -33
- package/Certificate/index.js +27 -4
- package/Certificate/p12.js +25 -2
- package/Common/AzureEnv.js +25 -2
- package/Common/ConfigHelper.js +25 -2
- package/Common/GlobalEnv.d.ts +2 -8
- package/Common/GlobalEnv.js +12 -16
- package/Common/StackEnv.js +25 -2
- package/Common/index.js +29 -6
- package/ContainerRegistry/Helper.js +29 -3
- package/ContainerRegistry/index.js +31 -5
- package/Core/Locker.js +25 -2
- package/Core/Random.js +25 -2
- package/Core/ResourceCreator.js +5 -2
- package/Core/ResourceGroup.js +5 -2
- package/CosmosDb/index.js +29 -3
- package/CustomRoles/index.js +25 -2
- package/IOT/Hub/index.js +25 -2
- package/KeyVault/Helper.js +25 -2
- package/KeyVault/index.js +29 -3
- package/Logs/AppInsight.d.ts +4 -4
- package/Logs/AppInsight.js +35 -9
- package/Logs/Helpers.d.ts +12 -9
- package/Logs/Helpers.js +57 -14
- package/Logs/LogAnalytics.js +25 -2
- package/Logs/WebTest.d.ts +1 -1
- package/Logs/WebTest.js +35 -12
- package/Logs/index.d.ts +1 -10
- package/Logs/index.js +36 -8
- package/MySql/index.js +30 -4
- package/Postgresql/index.js +30 -4
- package/RedisCache/index.js +26 -3
- package/ServiceBus/index.js +30 -4
- package/SignalR/index.js +29 -3
- package/Sql/SqlDb.js +25 -2
- package/Sql/index.d.ts +9 -9
- package/Sql/index.js +49 -20
- package/Storage/Helper.d.ts +4 -4
- package/Storage/Helper.js +25 -2
- package/Storage/ManagementRules.js +25 -2
- package/Storage/index.d.ts +37 -39
- package/Storage/index.js +71 -97
- package/VM/AzureDevOpsExtension.js +5 -2
- package/VM/Extension.js +25 -2
- package/VM/GlobalSchedule.js +25 -2
- package/VM/index.d.ts +7 -6
- package/VM/index.js +33 -6
- package/VNet/Bastion.js +29 -3
- package/VNet/Firewall.js +31 -5
- package/VNet/FirewallPolicies/index.js +8 -5
- package/VNet/FirewallPolicy.js +25 -2
- package/VNet/GlobalNetworkPeering.js +25 -2
- package/VNet/Helper.js +26 -3
- package/VNet/IpAddress.js +30 -4
- package/VNet/IpAddressPrefix.js +30 -4
- package/VNet/NSGRules/ApimSecurityRule.d.ts +7 -0
- package/VNet/NSGRules/ApimSecurityRule.js +34 -0
- package/VNet/NSGRules/AzADSecurityRule.d.ts +2 -2
- package/VNet/NSGRules/AzADSecurityRule.js +2 -2
- package/VNet/NSGRules/BastionSecurityRule.d.ts +1 -2
- package/VNet/NSGRules/BastionSecurityRule.js +2 -2
- package/VNet/NSGRules/index.d.ts +4 -0
- package/VNet/NSGRules/index.js +15 -0
- package/VNet/NatGateway.js +25 -2
- package/VNet/NetworkPeering.js +25 -2
- package/VNet/PrivateEndpoint.js +32 -27
- package/VNet/RouteTable.js +25 -2
- package/VNet/SecurityGroup.js +25 -2
- package/VNet/Subnet.js +25 -2
- package/VNet/VPNGateway.js +29 -3
- package/VNet/VirtualWAN.js +29 -3
- package/VNet/Vnet.d.ts +2 -2
- package/VNet/Vnet.js +35 -6
- package/VNet/index.d.ts +3 -0
- package/VNet/index.js +34 -8
- package/Web/AppCertOrder.js +29 -3
- package/Web/AppConfig.d.ts +8 -11
- package/Web/AppConfig.js +51 -33
- package/Web/AppGateway.js +29 -3
- package/Web/FuncApp.js +25 -2
- package/Web/Helpers.js +25 -2
- package/Web/WebAppPlan.js +25 -2
- package/index.d.ts +1 -0
- package/index.js +18 -0
- package/package.json +5 -4
- package/types.d.ts +0 -6
- package/z_tests/_tools/Mocks.js +25 -2
- package/Apim/ApiProduct/Api.d.ts +0 -35
- package/Apim/ApiProduct/Api.js +0 -131
- package/Apim/ApiProduct/PolicyBuilder.d.ts +0 -79
- package/Apim/ApiProduct/PolicyBuilder.js +0 -359
- package/Apim/ApiProduct/Product.d.ts +0 -8
- package/Apim/ApiProduct/Product.js +0 -63
- package/Apim/ApiProduct/index.d.ts +0 -9
- package/Apim/ApiProduct/index.js +0 -21
- package/Apim/HookProxy/index.d.ts +0 -20
- package/Apim/HookProxy/index.js +0 -27
- package/Apim/index.d.ts +0 -22
- package/Apim/index.js +0 -115
- package/Storage/CdnEndpoint.d.ts +0 -12
- package/Storage/CdnEndpoint.js +0 -61
- package/Storage/CdnRules.js +0 -134
- package/VNet/PrivateDns.d.ts +0 -31
- package/VNet/PrivateDns.js +0 -68
- package/VNet/PublicDns.d.ts +0 -21
- package/VNet/PublicDns.js +0 -59
package/VNet/SecurityGroup.js
CHANGED
|
@@ -1,7 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
26
|
const Naming_1 = require("../Common/Naming");
|
|
4
|
-
const network = require("@pulumi/azure-native/network");
|
|
27
|
+
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
5
28
|
exports.default = ({ name, group, securityRules = [] }) => {
|
|
6
29
|
const sName = (0, Naming_1.getNetworkSecurityGroupName)(name);
|
|
7
30
|
return new network.NetworkSecurityGroup(sName, {
|
|
@@ -14,4 +37,4 @@ exports.default = ({ name, group, securityRules = [] }) => {
|
|
|
14
37
|
})),
|
|
15
38
|
});
|
|
16
39
|
};
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VjdXJpdHlHcm91cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1NlY3VyaXR5R3JvdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVBLDZDQUErRDtBQUMvRCxzRUFBd0Q7QUFPeEQsa0JBQWUsQ0FBQyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsYUFBYSxHQUFHLEVBQUUsRUFBUyxFQUFFLEVBQUU7SUFDNUQsTUFBTSxLQUFLLEdBQUcsSUFBQSxvQ0FBMkIsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUVoRCxPQUFPLElBQUksT0FBTyxDQUFDLG9CQUFvQixDQUFDLEtBQUssRUFBRTtRQUM3Qyx3QkFBd0IsRUFBRSxLQUFLO1FBQy9CLEdBQUcsS0FBSztRQUNSLGFBQWEsRUFBRSxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ3ZDLEdBQUcsQ0FBQztZQUNKLEdBQUcsS0FBSztZQUNSLHdCQUF3QixFQUFFLEtBQUs7U0FDaEMsQ0FBQyxDQUFDO0tBQ0osQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDIn0=
|
package/VNet/Subnet.js
CHANGED
|
@@ -1,6 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const network = require("@pulumi/azure-native/network");
|
|
26
|
+
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
4
27
|
const defaultServicesEndpoints = [
|
|
5
28
|
"Microsoft.AzureActiveDirectory",
|
|
6
29
|
"Microsoft.AzureCosmosDB",
|
|
@@ -46,4 +69,4 @@ exports.default = ({ group, subnet, vnetName, routeTable, natGateway, securityGr
|
|
|
46
69
|
: undefined,
|
|
47
70
|
};
|
|
48
71
|
};
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3VibmV0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvU3VibmV0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFQSxzRUFBd0Q7QUFHeEQsTUFBTSx3QkFBd0IsR0FBRztJQUMvQixnQ0FBZ0M7SUFDaEMseUJBQXlCO0lBQ3pCLDZCQUE2QjtJQUM3QixvQkFBb0I7SUFDcEIsb0JBQW9CO0lBQ3BCLHNCQUFzQjtJQUN0QixlQUFlO0lBQ2YsbUJBQW1CO0lBQ25CLGVBQWU7Q0FDaEIsQ0FBQztBQTJCRixrQkFBZSxDQUFDLEVBQ2QsS0FBSyxFQUNMLE1BQU0sRUFDTixRQUFRLEVBQ1IsVUFBVSxFQUNWLFVBQVUsRUFDVixhQUFhLEdBQ1AsRUFBc0IsRUFBRTtJQUM5QixNQUFNLGdCQUFnQixHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLHVCQUF1QixDQUFDO1FBQ3BFLENBQUMsQ0FBQyxNQUFNLENBQUMsdUJBQXVCO1FBQ2hDLENBQUMsQ0FBQyxNQUFNLENBQUMsdUJBQXVCLEtBQUssSUFBSTtZQUN2QyxDQUFDLENBQUMsd0JBQXdCO1lBQzFCLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFFaEIsT0FBTztRQUNMLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSTtRQUNqQixVQUFVLEVBQUUsTUFBTSxDQUFDLElBQUk7UUFDdkIsR0FBRyxLQUFLO1FBQ1IsYUFBYSxFQUFFLE1BQU0sQ0FBQyxhQUFhO1FBQ25DLGtCQUFrQixFQUFFLFFBQVE7UUFDNUIsb0JBQW9CLEVBQUUsYUFBYSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxhQUFhLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVM7UUFDMUUsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsVUFBVSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTO1FBRTFELFVBQVUsRUFDUixNQUFNLENBQUMsZ0JBQWdCLEtBQUssS0FBSyxJQUFJLFVBQVU7WUFDN0MsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLFVBQVUsQ0FBQyxFQUFFLEVBQUU7WUFDdkIsQ0FBQyxDQUFDLFNBQVM7UUFFZixpQ0FBaUMsRUFBRSxNQUFNLENBQUMsd0JBQXdCO1lBQ2hFLENBQUMsQ0FBQyxPQUFPLENBQUMsK0NBQStDLENBQUMsT0FBTztZQUNqRSxDQUFDLENBQUMsT0FBTyxDQUFDLCtDQUErQyxDQUFDLFFBQVE7UUFFcEUsOEJBQThCLEVBQUUsTUFBTSxDQUFDLHFCQUFxQjtZQUMxRCxDQUFDLENBQUMsT0FBTyxDQUFDLDRDQUE0QyxDQUFDLE9BQU87WUFDOUQsQ0FBQyxDQUFDLE9BQU8sQ0FBQyw0Q0FBNEMsQ0FBQyxRQUFRO1FBRWpFLGdCQUFnQixFQUFFLGdCQUFnQjtZQUNoQyxDQUFDLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztZQUNsRCxDQUFDLENBQUMsU0FBUztRQUViLFdBQVcsRUFBRSxNQUFNLENBQUMsZ0JBQWdCO1lBQ2xDLENBQUMsQ0FBQyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO2dCQUNsQyxJQUFJLEVBQUUsR0FBRyxNQUFNLENBQUMsSUFBSSxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLFdBQVc7Z0JBQ3JELFdBQVcsRUFBRSxDQUFDO2FBQ2YsQ0FBQyxDQUFDO1lBQ0wsQ0FBQyxDQUFDLFNBQVM7S0FDZCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
|
package/VNet/VPNGateway.js
CHANGED
|
@@ -1,10 +1,36 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
2
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
29
|
const Naming_1 = require("../Common/Naming");
|
|
4
30
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
5
|
-
const network = require("@pulumi/azure-native/network");
|
|
31
|
+
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
6
32
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
7
|
-
const IpAddress_1 = require("./IpAddress");
|
|
33
|
+
const IpAddress_1 = __importDefault(require("./IpAddress"));
|
|
8
34
|
// https://learn.microsoft.com/en-us/azure/vpn-gateway/openvpn-azure-ad-tenant
|
|
9
35
|
exports.default = ({ name, group, subnetId, vpnClientAddressPools = ["172.16.100.0/24"], sku = {
|
|
10
36
|
name: network.VirtualNetworkGatewaySkuName.VpnGw1,
|
|
@@ -70,4 +96,4 @@ exports.default = ({ name, group, subnetId, vpnClientAddressPools = ["172.16.100
|
|
|
70
96
|
},
|
|
71
97
|
}, { dependsOn: ipAddress });
|
|
72
98
|
};
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVlBOR2F0ZXdheS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1ZQTkdhdGV3YXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLDZDQUE4QztBQUM5QywyQ0FBb0Q7QUFDcEQsc0VBQXdEO0FBQ3hELGlEQUE4QztBQUM5Qyw0REFBb0M7QUFXcEMsOEVBQThFO0FBQzlFLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFFBQVEsRUFDUixxQkFBcUIsR0FBRyxDQUFDLGlCQUFpQixDQUFDLEVBQzNDLEdBQUcsR0FBRztJQUNKLElBQUksRUFBRSxPQUFPLENBQUMsNEJBQTRCLENBQUMsTUFBTTtJQUNqRCxJQUFJLEVBQUUsT0FBTyxDQUFDLDRCQUE0QixDQUFDLE1BQU07Q0FDbEQsRUFDRCxTQUFTLEdBQ08sRUFBRSxFQUFFO0lBQ3BCLElBQUksR0FBRyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEIsTUFBTSxTQUFTLEdBQUcsSUFBQSxtQkFBUyxFQUFDO1FBQzFCLElBQUk7UUFDSixLQUFLO1FBQ0wsVUFBVSxFQUFFLEtBQUs7UUFDakIsSUFBSSxFQUFFLEtBQUs7UUFDWCxTQUFTO0tBQ1YsQ0FBQyxDQUFDO0lBRUgsT0FBTyxJQUFJLE9BQU8sQ0FBQyxxQkFBcUIsQ0FDdEMsSUFBSSxFQUNKO1FBQ0UseUJBQXlCLEVBQUUsSUFBSTtRQUMvQixHQUFHLEtBQUs7UUFDUixHQUFHO1FBRUgsV0FBVyxFQUFFLEtBQUs7UUFDbEIsT0FBTyxFQUFFLFlBQVk7UUFDckIsU0FBUyxFQUFFLEtBQUs7UUFDaEIsWUFBWSxFQUFFLEtBQUs7UUFDbkIsbUJBQW1CLEVBQUUsS0FBSztRQUMxQixzQkFBc0IsRUFBRSxJQUFJO1FBRTVCLGdCQUFnQixFQUFFO1lBQ2hCO2dCQUNFLElBQUksRUFBRSxtQkFBbUI7Z0JBQ3pCLGVBQWUsRUFBRTtvQkFDZixFQUFFLEVBQUUsU0FBUyxDQUFDLEVBQUU7aUJBQ2pCO2dCQUNELE1BQU0sRUFBRTtvQkFDTixFQUFFLEVBQUUsUUFBUTtpQkFDYjthQUNGO1NBQ0Y7UUFFRCxzQkFBc0IsRUFBRTtZQUN0QixzQ0FBc0M7WUFDdEMsb0NBQW9DO1lBQ3BDLG9DQUFvQztZQUNwQyw4Q0FBOEM7WUFDOUMsNkNBQTZDO1lBQzdDLGlGQUFpRjtZQUNqRix5SEFBeUg7WUFDekgsdUdBQXVHO1lBQ3ZHLHdFQUF3RTtZQUN4RSx5RkFBeUY7WUFDekYsK0ZBQStGO1lBQy9GLCtHQUErRztZQUMvRyx5R0FBeUc7WUFFekcsa0JBQWtCLEVBQUUsQ0FBQyxTQUFTLENBQUM7WUFDL0Isb0JBQW9CLEVBQUUscUJBQXFCO2dCQUN6QyxDQUFDLENBQUM7b0JBQ0UsZUFBZSxFQUFFLHFCQUFxQjtpQkFDdkM7Z0JBQ0gsQ0FBQyxDQUFDLFNBQVM7WUFDYix5QkFBeUIsRUFBRSxFQUFFO1lBQzdCLDRCQUE0QixFQUFFLEVBQUU7WUFDaEMsbUJBQW1CLEVBQUUsRUFBRTtZQUN2QixrQkFBa0IsRUFBRSxFQUFFO1lBRXRCLHNCQUFzQixFQUFFLENBQUMsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEdBQUcsQ0FBQztZQUMzRCxTQUFTLEVBQUUsSUFBQSxvQkFBVyxFQUFBLHFDQUFxQyxtQkFBUSxFQUFFO1lBQ3JFLFdBQVcsRUFBRSxzQ0FBc0M7WUFDbkQsU0FBUyxFQUFFLElBQUEsb0JBQVcsRUFBQSwyQkFBMkIsbUJBQVEsR0FBRztTQUM3RDtLQUNGLEVBQ0QsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLENBQ3pCLENBQUM7QUFDSixDQUFDLENBQUMifQ==
|
package/VNet/VirtualWAN.js
CHANGED
|
@@ -1,8 +1,34 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
2
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const network = require("@pulumi/azure-native/network");
|
|
29
|
+
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
4
30
|
const Naming_1 = require("../Common/Naming");
|
|
5
|
-
const Firewall_1 = require("./Firewall");
|
|
31
|
+
const Firewall_1 = __importDefault(require("./Firewall"));
|
|
6
32
|
exports.default = ({ name, group, hubAddressPrefix, hubRoutes, firewall, }) => {
|
|
7
33
|
const wanName = (0, Naming_1.getWanName)(name);
|
|
8
34
|
const hubName = (0, Naming_1.getHubName)(name);
|
|
@@ -37,4 +63,4 @@ exports.default = ({ name, group, hubAddressPrefix, hubRoutes, firewall, }) => {
|
|
|
37
63
|
}, { dependsOn: azFirewall ? [azFirewall.firewall, wan] : wan });
|
|
38
64
|
return { wan, hub, firewall: azFirewall };
|
|
39
65
|
};
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVmlydHVhbFdBTi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1ZpcnR1YWxXQU4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLHNFQUF3RDtBQUN4RCw2Q0FBMEQ7QUFHMUQsMERBQWtDO0FBaUJsQyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxnQkFBZ0IsRUFDaEIsU0FBUyxFQUNULFFBQVEsR0FDRixFQUFFLEVBQUU7SUFDVixNQUFNLE9BQU8sR0FBRyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDakMsTUFBTSxPQUFPLEdBQUcsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpDLE1BQU0sR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLEVBQUU7UUFDMUMsR0FBRyxLQUFLO1FBQ1IsY0FBYyxFQUFFLE9BQU87UUFDdkIsc0JBQXNCLEVBQUUsSUFBSTtRQUM1QiwwQkFBMEIsRUFBRSxLQUFLO1FBQ2pDLElBQUksRUFBRSxVQUFVO0tBQ2pCLENBQUMsQ0FBQztJQUVILE1BQU0sVUFBVSxHQUFHLFFBQVEsRUFBRSxNQUFNO1FBQ2pDLENBQUMsQ0FBQyxJQUFBLGtCQUFRLEVBQUM7WUFDUCxJQUFJO1lBQ0osS0FBSztZQUNMLE1BQU0sRUFBRSxRQUFRLENBQUMsTUFBTTtZQUN2QixRQUFRLEVBQUU7Z0JBQ1I7b0JBQ0UsUUFBUSxFQUFFLFFBQVEsQ0FBQyxRQUFRO29CQUMzQixlQUFlLEVBQUUsUUFBUSxDQUFDLGVBQWU7aUJBQzFDO2FBQ0Y7U0FDRixDQUFDO1FBQ0osQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVkLE1BQU0sR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FDaEMsT0FBTyxFQUNQO1FBQ0UsR0FBRyxLQUFLO1FBQ1IsY0FBYyxFQUFFLE9BQU87UUFDdkIsMEJBQTBCLEVBQUUsS0FBSztRQUNqQyxVQUFVLEVBQUUsRUFBRSxFQUFFLEVBQUUsR0FBRyxDQUFDLEVBQUUsRUFBRTtRQUUxQixhQUFhLEVBQUUsZ0JBQWdCO1FBQy9CLHVCQUF1QixFQUFFLFNBQVM7UUFDbEMsYUFBYSxFQUFFLFVBQVUsSUFBSSxFQUFFLEVBQUUsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFBRTtLQUM1RCxFQUNELEVBQUUsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FDN0QsQ0FBQztJQUVGLE9BQU8sRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxVQUFVLEVBQUUsQ0FBQztBQUM1QyxDQUFDLENBQUMifQ==
|
package/VNet/Vnet.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as network from "@pulumi/azure-native/network";
|
|
2
2
|
import * as pulumi from "@pulumi/pulumi";
|
|
3
3
|
import { output as outputs } from "@pulumi/azure-native/types";
|
|
4
|
-
import { BasicResourceArgs } from "../types";
|
|
4
|
+
import { BasicResourceArgs, ResourceInfo } from "../types";
|
|
5
5
|
import { RouteArgs, CustomSecurityRuleArgs } from "./types";
|
|
6
6
|
import { SubnetProps } from "./Subnet";
|
|
7
7
|
export type DelegateServices = "Microsoft.ContainerInstance/containerGroups" | "Microsoft.Web/serverFarms";
|
|
@@ -42,7 +42,7 @@ export interface VnetProps extends BasicResourceArgs {
|
|
|
42
42
|
};
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
|
-
export type VnetResult = {
|
|
45
|
+
export type VnetResult = ResourceInfo & {
|
|
46
46
|
vnet: network.VirtualNetwork;
|
|
47
47
|
appGatewaySubnet: pulumi.OutputInstance<outputs.network.SubnetResponse | undefined>;
|
|
48
48
|
gatewaySubnet: pulumi.OutputInstance<outputs.network.SubnetResponse | undefined>;
|
package/VNet/Vnet.js
CHANGED
|
@@ -1,12 +1,38 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
2
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const network = require("@pulumi/azure-native/network");
|
|
29
|
+
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
4
30
|
const Helper_1 = require("./Helper");
|
|
5
31
|
const Naming_1 = require("../Common/Naming");
|
|
6
|
-
const Subnet_1 = require("./Subnet");
|
|
7
|
-
const SecurityGroup_1 = require("./SecurityGroup");
|
|
8
|
-
const RouteTable_1 = require("./RouteTable");
|
|
9
|
-
const AppGatewaySecurityRule_1 = require("./NSGRules/AppGatewaySecurityRule");
|
|
32
|
+
const Subnet_1 = __importDefault(require("./Subnet"));
|
|
33
|
+
const SecurityGroup_1 = __importDefault(require("./SecurityGroup"));
|
|
34
|
+
const RouteTable_1 = __importDefault(require("./RouteTable"));
|
|
35
|
+
const AppGatewaySecurityRule_1 = __importDefault(require("./NSGRules/AppGatewaySecurityRule"));
|
|
10
36
|
exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], natGateway, dnsServers, features = {}, dependsOn, }) => {
|
|
11
37
|
const vName = (0, Naming_1.getVnetName)(name);
|
|
12
38
|
const securityRules = features.securityGroup?.rules || [];
|
|
@@ -117,6 +143,9 @@ exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], natGatewa
|
|
|
117
143
|
const findSubnet = (name) => vnet.subnets.apply((ss) => ss.find((s) => s.name === name));
|
|
118
144
|
//Return the results
|
|
119
145
|
return {
|
|
146
|
+
resourceName: vName,
|
|
147
|
+
group,
|
|
148
|
+
id: vnet.id,
|
|
120
149
|
vnet,
|
|
121
150
|
securityGroup,
|
|
122
151
|
routeTable,
|
|
@@ -128,4 +157,4 @@ exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], natGatewa
|
|
|
128
157
|
bastionSubnet: findSubnet(Helper_1.azBastionSubnetName),
|
|
129
158
|
};
|
|
130
159
|
};
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
160
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVm5ldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1ZuZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNFQUF3RDtBQUt4RCxxQ0FNa0I7QUFDbEIsNkNBQStDO0FBQy9DLHNEQUFxRDtBQUNyRCxvRUFBNEM7QUFDNUMsOERBQXNDO0FBQ3RDLCtGQUF1RTtBQXdFdkUsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsTUFBTSxFQUNOLGFBQWEsRUFDYixPQUFPLEdBQUcsRUFBRSxFQUNaLFVBQVUsRUFDVixVQUFVLEVBQ1YsUUFBUSxHQUFHLEVBQUUsRUFDYixTQUFTLEdBQ0MsRUFBYyxFQUFFO0lBQzFCLE1BQU0sS0FBSyxHQUFHLElBQUEsb0JBQVcsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUNoQyxNQUFNLGFBQWEsR0FBRyxRQUFRLENBQUMsYUFBYSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7SUFFMUQsWUFBWTtJQUNaLElBQUksUUFBUSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDOUIsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLElBQUksRUFBRSw2QkFBb0I7WUFDMUIsYUFBYSxFQUFFLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhO1lBQ3RELHVCQUF1QixFQUFFLEtBQUs7WUFDOUIsbUJBQW1CLEVBQUUsS0FBSztZQUMxQixnQkFBZ0IsRUFBRSxLQUFLO1NBQ3hCLENBQUMsQ0FBQztRQUVILDRFQUE0RTtRQUM1RSxhQUFhLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBQSxnQ0FBc0IsRUFBQyxRQUFRLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO0lBQzNFLENBQUM7SUFFRCxnQkFBZ0I7SUFDaEIsSUFBSSxRQUFRLEVBQUUsYUFBYSxFQUFFLENBQUM7UUFDNUIsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLElBQUksRUFBRSwwQkFB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
|
package/VNet/index.d.ts
CHANGED
|
@@ -50,6 +50,9 @@ declare const _default: ({ group, name, ddosId, addressSpace, publicIpAddress, s
|
|
|
50
50
|
firewall: network.AzureFirewall;
|
|
51
51
|
policy: network.FirewallPolicy | undefined;
|
|
52
52
|
} | undefined;
|
|
53
|
+
resourceName: string;
|
|
54
|
+
group: ResourceGroupInfo;
|
|
55
|
+
id: pulumi.Output<string>;
|
|
53
56
|
vnet: network.VirtualNetwork;
|
|
54
57
|
appGatewaySubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse | undefined>;
|
|
55
58
|
gatewaySubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse | undefined>;
|
package/VNet/index.js
CHANGED
|
@@ -1,10 +1,36 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
2
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const network = require("@pulumi/azure-native/network");
|
|
4
|
-
const
|
|
5
|
-
const Firewall_1 = require("./Firewall");
|
|
6
|
-
const NetworkPeering_1 = require("./NetworkPeering");
|
|
7
|
-
const Vnet_1 = require("./Vnet");
|
|
29
|
+
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
30
|
+
const azure_providers_1 = require("@drunk-pulumi/azure-providers");
|
|
31
|
+
const Firewall_1 = __importDefault(require("./Firewall"));
|
|
32
|
+
const NetworkPeering_1 = __importDefault(require("./NetworkPeering"));
|
|
33
|
+
const Vnet_1 = __importDefault(require("./Vnet"));
|
|
8
34
|
const Helper_1 = require("./Helper");
|
|
9
35
|
exports.default = ({ group, name, ddosId, addressSpace, publicIpAddress, subnets, features = {}, monitorConfig, ...others }) => {
|
|
10
36
|
const securities = features.securityGroup?.rules || [];
|
|
@@ -144,7 +170,7 @@ exports.default = ({ group, name, ddosId, addressSpace, publicIpAddress, subnets
|
|
|
144
170
|
});
|
|
145
171
|
//Update route to firewall IpAddress
|
|
146
172
|
if (pp.firewallPrivateIpAddress && vnet.routeTable) {
|
|
147
|
-
new
|
|
173
|
+
new azure_providers_1.NetworkRouteResource(`${name}-vnet-to-firewall`, {
|
|
148
174
|
routeName: "vnet-to-firewall",
|
|
149
175
|
...group,
|
|
150
176
|
routeTableName: vnet.routeTable.name,
|
|
@@ -169,7 +195,7 @@ const createFirewall = ({ name, group, routeTableName, dependsOn = [], ...others
|
|
|
169
195
|
});
|
|
170
196
|
if (routeTableName) {
|
|
171
197
|
//Route Vnet to Firewall
|
|
172
|
-
new
|
|
198
|
+
new azure_providers_1.NetworkRouteResource(`${name}-vnet-to-firewall`, {
|
|
173
199
|
routeName: `vnet-to-firewall`,
|
|
174
200
|
...group,
|
|
175
201
|
routeTableName: routeTableName,
|
|
@@ -182,4 +208,4 @@ const createFirewall = ({ name, group, routeTableName, dependsOn = [], ...others
|
|
|
182
208
|
}
|
|
183
209
|
return rs;
|
|
184
210
|
};
|
|
185
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
211
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBSXhELG1FQUFxRTtBQUdyRSwwREFBbUU7QUFFbkUsc0VBQTJDO0FBRTNDLGtEQUEwQjtBQUMxQixxQ0FBK0M7QUErQy9DLGtCQUFlLENBQUMsRUFDZCxLQUFLLEVBQ0wsSUFBSSxFQUNKLE1BQU0sRUFDTixZQUFZLEVBQ1osZUFBZSxFQUNmLE9BQU8sRUFDUCxRQUFRLEdBQUcsRUFBRSxFQUNiLGFBQWEsRUFDYixHQUFHLE1BQU0sRUFDSCxFQUFFLEVBQUU7SUFDVixNQUFNLFVBQVUsR0FBRyxRQUFRLENBQUMsYUFBYSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7SUFDdkQsTUFBTSxNQUFNLEdBQUcsSUFBSSxLQUFLLEVBQW1DLENBQUM7SUFFNUQsSUFBSSxlQUFlLEVBQUUsQ0FBQztRQUNwQixzQ0FBc0M7UUFDdEMsSUFBSSxRQUFRLENBQUMsY0FBYyxFQUFFLENBQUM7WUFDNUIsTUFBTSxDQUFDLElBQUksQ0FBQztnQkFDVixJQUFJLEVBQUUsc0JBQXNCO2dCQUM1QixhQUFhLEVBQUUsZUFBZSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUM7Z0JBQ2hFLFdBQVcsRUFBRSxPQUFPLENBQUMsZ0JBQWdCLENBQUMsUUFBUTthQUMvQyxDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsbURBQW1EO2FBQ2hELElBQUksUUFBUSxDQUFDLGFBQWEsRUFBRSwwQkFBMEI7WUFDekQsVUFBVSxDQUFDLElBQUksQ0FBQztnQkFDZCxJQUFJLEVBQUUsd0NBQXdDO2dCQUM5QyxtQkFBbUIsRUFBRSxHQUFHO2dCQUN4QixlQUFlLEVBQUUsR0FBRztnQkFDcEIsd0JBQXdCLEVB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
|
package/Web/AppCertOrder.js
CHANGED
|
@@ -1,7 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
2
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const certificateregistration = require("@pulumi/azure-native/certificateregistration");
|
|
4
|
-
const ResourceCreator_1 = require("../Core/ResourceCreator");
|
|
29
|
+
const certificateregistration = __importStar(require("@pulumi/azure-native/certificateregistration"));
|
|
30
|
+
const ResourceCreator_1 = __importDefault(require("../Core/ResourceCreator"));
|
|
5
31
|
const Common_1 = require("../Common");
|
|
6
32
|
const Naming_1 = require("../Common/Naming");
|
|
7
33
|
exports.default = ({ domain, productType = certificateregistration.CertificateProductType
|
|
@@ -29,4 +55,4 @@ exports.default = ({ domain, productType = certificateregistration.CertificatePr
|
|
|
29
55
|
}
|
|
30
56
|
return order;
|
|
31
57
|
};
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ2VydE9yZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDZXJ0T3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNHQUF3RjtBQUV4Riw4RUFBOEM7QUFDOUMsc0NBQW1DO0FBQ25DLDZDQUFvRDtBQVFwRCxrQkFBZSxDQUFDLEVBQ2QsTUFBTSxFQUNOLFdBQVcsR0FBRyx1QkFBdUIsQ0FBQyxzQkFBc0I7S0FDekQsa0NBQWtDLEVBQ3JDLFNBQVMsRUFDVCxHQUFHLE1BQU0sRUFDSCxFQUFFLEVBQUU7SUFDVixNQUFNLENBQUMsR0FBRyxJQUFBLHlCQUFnQixFQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRW5DLE1BQU0sS0FBSyxHQUFHLElBQUEseUJBQU8sRUFDbkIsdUJBQXVCLENBQUMsMEJBQTBCLEVBQ2xEO1FBQ0Usb0JBQW9CLEVBQUUsQ0FBQztRQUN2QixHQUFHLGVBQU0sQ0FBQyxTQUFTO1FBQ25CLFFBQVEsRUFBRSxRQUFRO1FBQ2xCLFdBQVc7UUFDWCxTQUFTLEVBQUUsSUFBSTtRQUNmLGlCQUFpQixFQUFFLFFBQVEsTUFBTSxFQUFFO1FBQ25DLE9BQU8sRUFBRSxJQUFJO1FBQ2IsZUFBZSxFQUFFLENBQUM7UUFDbEIsR0FBRyxNQUFNO0tBRVUsQ0FDdEIsQ0FBQztJQUVGLElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxJQUFJLHVCQUF1QixDQUFDLHFDQUFxQyxDQUMvRCxDQUFDLEVBQ0Q7WUFDRSxvQkFBb0IsRUFBRSxDQUFDO1lBQ3ZCLEdBQUcsZUFBTSxDQUFDLFNBQVM7WUFDbkIsUUFBUSxFQUFFLFFBQVE7WUFDbEIsa0JBQWtCLEVBQUUsQ0FBQztZQUNyQixVQUFVLEVBQUUsU0FBUyxDQUFDLEVBQUU7U0FDekIsRUFDRCxFQUFFLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxFQUFFLENBQzlCLENBQUM7SUFDSixDQUFDO0lBQ0QsT0FBTyxLQUFLLENBQUM7QUFDZixDQUFDLENBQUMifQ==
|
package/Web/AppConfig.d.ts
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
1
|
+
import * as appConfig from "@pulumi/azure-native/appconfiguration";
|
|
2
|
+
import { KeyVaultInfo, PrivateLinkProps, ResourceGroupInfo, ResourceInfo } from "../types";
|
|
3
|
+
export type AppConfigProps = {
|
|
3
4
|
name: string;
|
|
4
5
|
group: ResourceGroupInfo;
|
|
5
|
-
disabledAccessKeys?: boolean;
|
|
6
6
|
privateLink?: PrivateLinkProps;
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
readPrimaryConnectionStringKey: string;
|
|
13
|
-
readSecondaryConnectionStringKey: string;
|
|
14
|
-
};
|
|
7
|
+
disableLocalAuth?: boolean;
|
|
8
|
+
vaultInfo: KeyVaultInfo;
|
|
9
|
+
};
|
|
10
|
+
declare const _default: ({ group, name, vaultInfo, disableLocalAuth, privateLink, }: AppConfigProps) => ResourceInfo & {
|
|
11
|
+
instance: appConfig.ConfigurationStore;
|
|
15
12
|
};
|
|
16
13
|
export default _default;
|
package/Web/AppConfig.js
CHANGED
|
@@ -1,40 +1,59 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
2
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const
|
|
29
|
+
const appConfig = __importStar(require("@pulumi/azure-native/appconfiguration"));
|
|
30
|
+
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
4
31
|
const Naming_1 = require("../Common/Naming");
|
|
5
|
-
const
|
|
6
|
-
const PrivateEndpoint_1 = require("../VNet/PrivateEndpoint");
|
|
32
|
+
const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
7
33
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
8
|
-
exports.default = ({ group, name, vaultInfo,
|
|
9
|
-
//enablePublicAccess,
|
|
10
|
-
privateLink, }) => {
|
|
34
|
+
exports.default = ({ group, name, vaultInfo, disableLocalAuth, privateLink, }) => {
|
|
11
35
|
name = (0, Naming_1.getAppConfigName)(name);
|
|
12
36
|
const readPrimaryConnectionStringKey = `${name}-read-primary-connection-string`;
|
|
13
37
|
const readSecondaryConnectionStringKey = `${name}-read-secondary-connection-string`;
|
|
14
|
-
|
|
15
|
-
// if (!enablePublicAccess && !privateLink) {
|
|
16
|
-
// enablePublicAccess = true;
|
|
17
|
-
// }
|
|
18
|
-
const appConfig = new AppConfiguration.ConfigurationStore(name, {
|
|
38
|
+
const app = new appConfig.ConfigurationStore(name, {
|
|
19
39
|
configStoreName: name,
|
|
20
40
|
...group,
|
|
21
|
-
identity: { type:
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
41
|
+
identity: { type: "SystemAssigned" },
|
|
42
|
+
enablePurgeProtection: AzureEnv_1.isPrd,
|
|
43
|
+
softDeleteRetentionInDays: AzureEnv_1.isPrd ? 7 : 1,
|
|
44
|
+
disableLocalAuth,
|
|
45
|
+
publicNetworkAccess: privateLink
|
|
46
|
+
? appConfig.PublicNetworkAccess.Disabled
|
|
47
|
+
: appConfig.PublicNetworkAccess.Enabled,
|
|
48
|
+
sku: { name: "Standard" },
|
|
27
49
|
});
|
|
28
50
|
//Access Keys
|
|
29
|
-
if (
|
|
30
|
-
|
|
31
|
-
}
|
|
32
|
-
else if (vaultInfo) {
|
|
33
|
-
appConfig.id.apply(async (id) => {
|
|
51
|
+
if (vaultInfo && !disableLocalAuth) {
|
|
52
|
+
app.id.apply(async (id) => {
|
|
34
53
|
if (!id)
|
|
35
54
|
return;
|
|
36
55
|
//Load the keys from Azure
|
|
37
|
-
const keys = await
|
|
56
|
+
const keys = await appConfig.listConfigurationStoreKeys({
|
|
38
57
|
configStoreName: name,
|
|
39
58
|
...group,
|
|
40
59
|
});
|
|
@@ -43,7 +62,7 @@ privateLink, }) => {
|
|
|
43
62
|
//Only Read Connection String here
|
|
44
63
|
if (key.readOnly) {
|
|
45
64
|
(0, CustomHelper_1.addCustomSecret)({
|
|
46
|
-
name: key.name.includes(
|
|
65
|
+
name: key.name.includes("Primary")
|
|
47
66
|
? readPrimaryConnectionStringKey
|
|
48
67
|
: readSecondaryConnectionStringKey,
|
|
49
68
|
value: key.connectionString,
|
|
@@ -60,18 +79,17 @@ privateLink, }) => {
|
|
|
60
79
|
(0, PrivateEndpoint_1.default)({
|
|
61
80
|
name: (0, Naming_1.getPrivateEndpointName)(name),
|
|
62
81
|
group,
|
|
63
|
-
privateDnsZoneName:
|
|
64
|
-
linkServiceGroupIds: [
|
|
65
|
-
resourceId:
|
|
82
|
+
privateDnsZoneName: `${name}.privatelink.azconfig.io`,
|
|
83
|
+
linkServiceGroupIds: ["appConfig"],
|
|
84
|
+
resourceId: app.id,
|
|
66
85
|
...privateLink,
|
|
67
86
|
});
|
|
68
87
|
}
|
|
69
88
|
return {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
},
|
|
89
|
+
resourceName: name,
|
|
90
|
+
group,
|
|
91
|
+
id: app.id,
|
|
92
|
+
instance: app,
|
|
75
93
|
};
|
|
76
94
|
};
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlGQUFtRTtBQUNuRSxpREFBMkM7QUFDM0MsNkNBQTRFO0FBTzVFLDhFQUFzRDtBQUN0RCwyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixFQUNoQixXQUFXLEdBQ0ksRUFFZixFQUFFO0lBQ0YsSUFBSSxHQUFHLElBQUEseUJBQWdCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUIsTUFBTSw4QkFBOEIsR0FBRyxHQUFHLElBQUksaUNBQWlDLENBQUM7SUFDaEYsTUFBTSxnQ0FBZ0MsR0FBRyxHQUFHLElBQUksbUNBQW1DLENBQUM7SUFFcEYsTUFBTSxHQUFHLEdBQUcsSUFBSSxTQUFTLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFO1FBQ2pELGVBQWUsRUFBRSxJQUFJO1FBQ3JCLEdBQUcsS0FBSztRQUNSLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRTtRQUNwQyxxQkFBcUIsRUFBRSxnQkFBSztRQUM1Qix5QkFBeUIsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEMsZ0JBQWdCO1FBQ2hCLG1CQUFtQixFQUFFLFdBQVc7WUFDOUIsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRO1lBQ3hDLENBQUMsQ0FBQyxTQUFTLENBQUMsbUJBQW1CLENBQUMsT0FBTztRQUV6QyxHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFO0tBQzFCLENBQUMsQ0FBQztJQUVILGFBQWE7SUFDYixJQUFJLFNBQVMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDbkMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ3hCLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFDaEIsMkJBQTJCO1lBQzNCLE1BQU0sSUFBSSxHQUFHLE1BQU0sU0FBUyxDQUFDLDBCQUEwQixDQUFDO2dCQUN0RCxlQUFlLEVBQUUsSUFBSTtnQkFDckIsR0FBRyxLQUFLO2FBQ1QsQ0FBQyxDQUFDO1lBRUgsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2YsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtvQkFDckIsa0NBQWtDO29CQUNsQyxJQUFJLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQzt3QkFDakIsSUFBQSw4QkFBZSxFQUFDOzRCQUNkLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUM7Z0NBQ2hDLENBQUMsQ0FBQyw4QkFBOEI7Z0NBQ2hDLENBQUMsQ0FBQyxnQ0FBZ0M7NEJBQ3BDLEtBQUssRUFBRSxHQUFHLENBQUMsZ0JBQWdCOzRCQUMzQixXQUFXLEVBQUUsYUFBYSxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksRUFBRTs0QkFDNUMsU0FBUzt5QkFDVixDQUFDLENBQUM7b0JBQ0wsQ0FBQztnQkFDSCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxjQUFjO0lBQ2QsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixJQUFBLHlCQUFlLEVBQUM7WUFDZCxJQUFJLEVBQUUsSUFBQSwrQkFBc0IsRUFBQyxJQUFJLENBQUM7WUFDbEMsS0FBSztZQUNMLGtCQUFrQixFQUFFLEdBQUcsSUFBSSwwQkFBMEI7WUFDckQsbUJBQW1CLEVBQUUsQ0FBQyxXQUFXLENBQUM7WUFDbEMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxFQUFFO1lBQ2xCLEdBQUcsV0FBVztTQUNmLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPO1FBQ0wsWUFBWSxFQUFFLElBQUk7UUFDbEIsS0FBSztRQUNMLEVBQUUsRUFBRSxHQUFHLENBQUMsRUFBRTtRQUNWLFFBQVEsRUFBRSxHQUFHO0tBQ2QsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9
|