@drunk-pulumi/azure 1.0.11 → 1.0.13
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/Automation/index.d.ts +1 -1
- package/Automation/index.js +22 -4
- package/Builder/ApimBuilder.js +4 -4
- package/Builder/DnsZoneBuilder.js +3 -3
- package/Builder/PrivateDnsZoneBuilder.js +11 -8
- package/Builder/VnetBuilder.js +3 -4
- package/Builder/types/privateDnsZoneBuilder.d.ts +3 -4
- package/Common/RsInfo/index.d.ts +7 -5
- package/Common/RsInfo/index.js +38 -19
- package/KeyVault/index.d.ts +8 -2
- package/VNet/Bastion.d.ts +3 -3
- package/VNet/Bastion.js +7 -10
- package/VNet/Firewall.d.ts +13 -4
- package/VNet/Firewall.js +29 -7
- package/VNet/FirewallPolicies/CloudPCFirewallPolicy.js +2 -1
- package/VNet/Helper.d.ts +0 -8
- package/VNet/Helper.js +2 -30
- package/VNet/IpAddress.d.ts +9 -4
- package/VNet/IpAddress.js +30 -4
- package/VNet/IpAddressPrefix.js +3 -6
- package/VNet/PrivateEndpoint.d.ts +4 -1
- package/VNet/PrivateEndpoint.js +29 -25
- package/VNet/VPNGateway.d.ts +3 -3
- package/VNet/VPNGateway.js +15 -19
- package/VNet/index.d.ts +2 -0
- package/VNet/index.js +29 -0
- package/package.json +1 -1
package/Automation/index.d.ts
CHANGED
|
@@ -2,5 +2,5 @@ import { BasicEncryptResourceArgs, ResourceInfoWithInstance } from '../types';
|
|
|
2
2
|
import * as automation from '@pulumi/azure-native/automation';
|
|
3
3
|
interface Props extends BasicEncryptResourceArgs {
|
|
4
4
|
}
|
|
5
|
-
declare const _default: ({ name, group, enableEncryption,
|
|
5
|
+
declare const _default: ({ name, group, enableEncryption, vaultInfo, dependsOn, ignoreChanges, }: Props) => ResourceInfoWithInstance<automation.AutomationAccount>;
|
|
6
6
|
export default _default;
|
package/Automation/index.js
CHANGED
|
@@ -30,14 +30,28 @@ const automation = __importStar(require("@pulumi/azure-native/automation"));
|
|
|
30
30
|
const Common_1 = require("../Common");
|
|
31
31
|
const Helper_1 = require("../KeyVault/Helper");
|
|
32
32
|
const UserAssignedIdentity_1 = __importDefault(require("../AzAd/UserAssignedIdentity"));
|
|
33
|
-
|
|
33
|
+
const RoleAssignment_1 = require("../AzAd/RoleAssignment");
|
|
34
|
+
exports.default = ({ name, group, enableEncryption, vaultInfo, dependsOn, ignoreChanges, }) => {
|
|
34
35
|
name = (0, Common_1.getAutomationAccountName)(name);
|
|
36
|
+
const grantPermission = ({ name, principalId, dependsOn, }) => (0, RoleAssignment_1.roleAssignment)({
|
|
37
|
+
name,
|
|
38
|
+
dependsOn,
|
|
39
|
+
principalId,
|
|
40
|
+
principalType: 'ServicePrincipal',
|
|
41
|
+
roleName: 'Contributor',
|
|
42
|
+
scope: Common_1.defaultSubScope,
|
|
43
|
+
});
|
|
35
44
|
const identity = (0, UserAssignedIdentity_1.default)({
|
|
36
45
|
name,
|
|
37
46
|
group,
|
|
38
47
|
dependsOn,
|
|
39
48
|
});
|
|
40
|
-
|
|
49
|
+
//Grant permission as contributor of subscription
|
|
50
|
+
grantPermission({
|
|
51
|
+
name: `${name}-UID`,
|
|
52
|
+
dependsOn: identity.instance,
|
|
53
|
+
principalId: identity.principalId,
|
|
54
|
+
});
|
|
41
55
|
const encryption = enableEncryption && vaultInfo
|
|
42
56
|
? (0, Helper_1.addEncryptKey)({ name, vaultInfo })
|
|
43
57
|
: undefined;
|
|
@@ -67,7 +81,11 @@ exports.default = ({ name, group, enableEncryption, envRoles, vaultInfo, depends
|
|
|
67
81
|
name: 'Basic',
|
|
68
82
|
},
|
|
69
83
|
}, { dependsOn: identity.instance, ignoreChanges });
|
|
70
|
-
|
|
84
|
+
auto.identity.apply((id) => grantPermission({
|
|
85
|
+
name: `${name}-identity`,
|
|
86
|
+
dependsOn: auto,
|
|
87
|
+
principalId: id.principalId,
|
|
88
|
+
}));
|
|
71
89
|
return {
|
|
72
90
|
name,
|
|
73
91
|
group,
|
|
@@ -75,4 +93,4 @@ exports.default = ({ name, group, enableEncryption, envRoles, vaultInfo, depends
|
|
|
75
93
|
instance: auto,
|
|
76
94
|
};
|
|
77
95
|
};
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXV0b21hdGlvbi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBS0EsNEVBQThEO0FBQzlELHNDQUFzRTtBQUN0RSwrQ0FBbUQ7QUFDbkQsd0ZBQWdFO0FBQ2hFLDJEQUF3RDtBQUt4RCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxnQkFBZ0IsRUFDaEIsU0FBUyxFQUNULFNBQVMsRUFDVCxhQUFhLEdBQ1AsRUFBMEQsRUFBRTtJQUNsRSxJQUFJLEdBQUcsSUFBQSxpQ0FBd0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUV0QyxNQUFNLGVBQWUsR0FBRyxDQUFDLEVBQ3ZCLElBQUksRUFDSixXQUFXLEVBQ1gsU0FBUyxHQUlNLEVBQUUsRUFBRSxDQUNuQixJQUFBLCtCQUFjLEVBQUM7UUFDYixJQUFJO1FBQ0osU0FBUztRQUNULFdBQVc7UUFDWCxhQUFhLEVBQUUsa0JBQWtCO1FBQ2pDLFFBQVEsRUFBRSxhQUFhO1FBQ3ZCLEtBQUssRUFBRSx3QkFBZTtLQUN2QixDQUFDLENBQUM7SUFFTCxNQUFNLFFBQVEsR0FBRyxJQUFBLDhCQUFvQixFQUFDO1FBQ3BDLElBQUk7UUFDSixLQUFLO1FBQ0wsU0FBUztLQUNWLENBQUMsQ0FBQztJQUNILGlEQUFpRDtJQUNqRCxlQUFlLENBQUM7UUFDZCxJQUFJLEVBQUUsR0FBRyxJQUFJLE1BQU07UUFDbkIsU0FBUyxFQUFFLFFBQVEsQ0FBQyxRQUFRO1FBQzVCLFdBQVcsRUFBRSxRQUFRLENBQUMsV0FBVztLQUNsQyxDQUFDLENBQUM7SUFFSCxNQUFNLFVBQVUsR0FDZCxnQkFBZ0IsSUFBSSxTQUFTO1FBQzNCLENBQUMsQ0FBQyxJQUFBLHNCQUFhLEVBQUMsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUM7UUFDcEMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVoQixNQUFNLElBQUksR0FBRyxJQUFJLFVBQVUsQ0FBQyxpQkFBaUIsQ0FDM0MsSUFBSSxFQUNKO1FBQ0UscUJBQXFCLEVBQUUsSUFBSTtRQUMzQixHQUFHLEtBQUs7UUFFUixtQkFBbUIsRUFBRSxLQUFLO1FBQzFCLFFBQVEsRUFBRTtZQUNSLElBQUksRUFBRSxVQUFVLENBQUMsb0JBQW9CLENBQUMsMkJBQTJCO1lBQ2pFLHNCQUFzQixFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztTQUN0QztRQUNELGdCQUFnQixFQUFFLElBQUk7UUFFdEIsVUFBVSxFQUFFO1lBQ1YsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLHNCQUFzQjtZQUNyRSxRQUFRLEVBQUUsVUFBVTtnQkFDbEIsQ0FBQyxDQUFDLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLEVBQUU7Z0JBQ3pDLENBQUMsQ0FBQyxTQUFTO1lBQ2Isa0JBQWtCLEVBQUUsVUFBVTtnQkFDNUIsQ0FBQyxDQUFDO29CQUNFLE9BQU8sRUFBRSxVQUFVLENBQUMsT0FBTztvQkFDM0IsV0FBVyxFQUFFLFVBQVUsQ0FBQyxXQUFXO29CQUNuQyxVQUFVLEVBQUUsVUFBVSxDQUFDLFVBQVU7aUJBQ2xDO2dCQUNILENBQUMsQ0FBQyxTQUFTO1NBQ2Q7UUFDRCxHQUFHLEVBQUU7WUFDSCxJQUFJLEVBQUUsT0FBTztTQUNkO0tBQ0YsRUFDRCxFQUFFLFNBQVMsRUFBRSxRQUFRLENBQUMsUUFBUSxFQUFFLGFBQWEsRUFBRSxDQUNoRCxDQUFDO0lBRUYsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUN6QixlQUFlLENBQUM7UUFDZCxJQUFJLEVBQUUsR0FBRyxJQUFJLFdBQVc7UUFDeEIsU0FBUyxFQUFFLElBQUk7UUFDZixXQUFXLEVBQUUsRUFBRyxDQUFDLFdBQVc7S0FDN0IsQ0FBQyxDQUNILENBQUM7SUFFRixPQUFPO1FBQ0wsSUFBSTtRQUNKLEtBQUs7UUFDTCxFQUFFLEVBQUUsSUFBSSxDQUFDLEVBQUU7UUFDWCxRQUFRLEVBQUUsSUFBSTtLQUNmLENBQUM7QUFDSixDQUFDLENBQUMifQ==
|
package/Builder/ApimBuilder.js
CHANGED
|
@@ -31,7 +31,7 @@ const apim = __importStar(require("@pulumi/azure-native/apimanagement"));
|
|
|
31
31
|
const Common_1 = require("../Common");
|
|
32
32
|
const azure_providers_1 = require("@drunk-pulumi/azure-providers");
|
|
33
33
|
const Random_1 = require("../Core/Random");
|
|
34
|
-
const
|
|
34
|
+
const IpAddress = __importStar(require("../VNet/IpAddress"));
|
|
35
35
|
const Identity_1 = __importDefault(require("../AzAd/Identity"));
|
|
36
36
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
37
37
|
const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
@@ -119,10 +119,10 @@ class ApimBuilder extends types.Builder {
|
|
|
119
119
|
name: `${this.commonProps.name}-apim`,
|
|
120
120
|
enableZone: this._sku.sku === 'Premium',
|
|
121
121
|
};
|
|
122
|
-
this._ipAddressInstances[this.commonProps.name] =
|
|
122
|
+
this._ipAddressInstances[this.commonProps.name] = IpAddress.create(ipPros);
|
|
123
123
|
if (this._additionalLocations) {
|
|
124
124
|
this._additionalLocations.forEach((j) => {
|
|
125
|
-
this._ipAddressInstances[j.location] =
|
|
125
|
+
this._ipAddressInstances[j.location] = IpAddress.create({
|
|
126
126
|
...ipPros,
|
|
127
127
|
name: `${this.commonProps.name}-${j.location}-apim`,
|
|
128
128
|
});
|
|
@@ -325,4 +325,4 @@ class ApimBuilder extends types.Builder {
|
|
|
325
325
|
}
|
|
326
326
|
}
|
|
327
327
|
exports.default = (props) => new ApimBuilder(props);
|
|
328
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ApimBuilder.js","sourceRoot":"","sources":["../../src/Builder/ApimBuilder.ts"],"names":[],"mappings":"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"}
|
|
328
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ApimBuilder.js","sourceRoot":"","sources":["../../src/Builder/ApimBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
27
|
-
const
|
|
27
|
+
const Common_1 = require("../Common");
|
|
28
28
|
class DnsZoneBuilder {
|
|
29
29
|
_aRecords = [];
|
|
30
30
|
_children = [];
|
|
@@ -36,7 +36,7 @@ class DnsZoneBuilder {
|
|
|
36
36
|
...others,
|
|
37
37
|
group: {
|
|
38
38
|
resourceGroupName: group.resourceGroupName,
|
|
39
|
-
location:
|
|
39
|
+
location: Common_1.globalKeyName,
|
|
40
40
|
},
|
|
41
41
|
};
|
|
42
42
|
}
|
|
@@ -106,4 +106,4 @@ class DnsZoneBuilder {
|
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
108
|
exports.default = (props) => new DnsZoneBuilder(props);
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
109
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRG5zWm9uZUJ1aWxkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQnVpbGRlci9EbnNab25lQnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRUEsc0VBQXdEO0FBQ3hELHNDQUEwQztBQUUxQyxNQUFNLGNBQWM7SUFDVixTQUFTLEdBQXlCLEVBQUUsQ0FBQztJQUNyQyxTQUFTLEdBQWEsRUFBRSxDQUFDO0lBQ2hCLFdBQVcsQ0FBb0I7SUFFeEMsYUFBYSxHQUE2QixTQUFTLENBQUM7SUFDcEQsa0JBQWtCLEdBQStCLFNBQVMsQ0FBQztJQUVuRSxZQUFtQixFQUFFLEtBQUssRUFBRSxHQUFHLE1BQU0sRUFBcUI7UUFDeEQsSUFBSSxDQUFDLFdBQVcsR0FBRztZQUNqQixHQUFHLE1BQU07WUFDVCxLQUFLLEVBQUU7Z0JBQ0wsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjtnQkFDMUMsUUFBUSxFQUFFLHNCQUFhO2FBQ3hCO1NBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCxXQUFXLENBQUMsSUFBWTtRQUN0QixJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMxQixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxXQUFXLENBQUMsS0FBeUI7UUFDbkMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDM0IsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRU8sZUFBZTtRQUNyQixPQUFPLElBQUksQ0FBQyxhQUFhLENBQUM7SUFDNUIsQ0FBQztJQUVPLFNBQVM7UUFDZixNQUFNLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDO1FBQ3BELElBQUksQ0FBQyxhQUFhLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUNuQyxJQUFJLEVB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
|
|
@@ -88,18 +88,21 @@ class PrivateDnsZoneBuilder {
|
|
|
88
88
|
});
|
|
89
89
|
}
|
|
90
90
|
buildVnetLinks() {
|
|
91
|
-
if (this._vnetLinks.length <= 0)
|
|
91
|
+
if (this._vnetLinks.length <= 0 || !this._dnsInfo)
|
|
92
92
|
return;
|
|
93
|
-
this.
|
|
93
|
+
const linkName = Common_1.rsInfo.getNameFromId(this._dnsInfo.name);
|
|
94
|
+
const vnetIds = this._vnetLinks.flatMap((lik) => [
|
|
94
95
|
//Link all subnets first
|
|
95
|
-
...(lik.subnetIds ?? []).map((s) => (0, pulumi_1.output)(s).apply((i) =>
|
|
96
|
+
...(lik.subnetIds ?? []).map((s) => (0, pulumi_1.output)(s).apply((i) => Common_1.rsInfo.getVnetIdFromSubnetId(i))),
|
|
96
97
|
//Then link the extra Vnet
|
|
97
98
|
...(lik.vnetIds ?? []),
|
|
98
|
-
]
|
|
99
|
-
|
|
100
|
-
|
|
99
|
+
]);
|
|
100
|
+
(0, pulumi_1.output)(vnetIds).apply((vids) => vids.map((v) => {
|
|
101
|
+
const n = Common_1.rsInfo.getNameFromId(v);
|
|
102
|
+
return new native.network.VirtualNetworkLink(`${linkName}-${n}-link`, {
|
|
101
103
|
...this._dnsInfo.group,
|
|
102
|
-
|
|
104
|
+
privateZoneName: this._dnsInfo.name,
|
|
105
|
+
registrationEnabled: false,
|
|
103
106
|
virtualNetwork: { id: v },
|
|
104
107
|
}, { dependsOn: this._zoneInstance, deleteBeforeReplace: true });
|
|
105
108
|
}));
|
|
@@ -114,4 +117,4 @@ class PrivateDnsZoneBuilder {
|
|
|
114
117
|
const from = (info) => PrivateDnsZoneBuilder.from(info);
|
|
115
118
|
exports.from = from;
|
|
116
119
|
exports.default = (props) => new PrivateDnsZoneBuilder(props);
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
120
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZURuc1pvbmVCdWlsZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0J1aWxkZXIvUHJpdmF0ZURuc1pvbmVCdWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRUEsc0VBQXdEO0FBS3hELDZEQUErQztBQUMvQywyQ0FBd0M7QUFDeEMsc0NBQWtEO0FBRWxELE1BQU0scUJBQXFCO0lBQ2pCLFNBQVMsR0FBeUIsRUFBRSxDQUFDO0lBQ3JDLFVBQVUsR0FBb0MsRUFBRSxDQUFDO0lBQ3hDLFdBQVcsQ0FBb0I7SUFFeEMsUUFBUSxHQUE2QixTQUFTLENBQUM7SUFDL0MsYUFBYSxHQUFvQyxTQUFTLENBQUM7SUFFbkUsWUFBbUIsS0FBd0I7UUFDekMsSUFBSSxJQUFJLElBQUksS0FBSztZQUFFLElBQUksQ0FBQyxRQUFRLEdBQUcsS0FBcUIsQ0FBQztRQUN6RCxJQUFJLENBQUMsV0FBVyxHQUFHO1lBQ2pCLEdBQUcsS0FBSztZQUNSLEtBQUssRUFBRTtnQkFDTCxpQkFBaUIsRUFBRSxLQUFLLENBQUMsS0FBSyxDQUFDLGlCQUFpQjtnQkFDaEQsUUFBUSxFQUFFLHNCQUFhO2FBQ3hCO1NBQ0YsQ0FBQztJQUNKLENBQUM7SUFFTSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQWtCO1FBQ25DLE9BQU8sSUFBSSxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN6QyxDQUFDO0lBRUQsTUFBTSxDQUFDLEtBQW9DO1FBQ3pDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzVCLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELFdBQVcsQ0FBQyxLQUF5QjtRQUNuQyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMzQixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFTyxTQUFTO1FBQ2YsSUFBSSxJQUFJLENBQUMsUUFBUTtZQUFFLE9BQU87UUFDMUIsTUFBTSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQztRQUNwRCxJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FDMUMsSUFBSSxFQUNKO1lBQ0UsZUFBZSxFQUFFLElBQUk7WUFDckIsR0FBRyxLQUFLO1NBQ1QsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQUM7UUFFRixJQUFJLENBQUMsUUFBUSxHQUFHO1lBQ2QsSUFBSSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSTtZQUMzQixLQUFLLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLO1lBQzdCLEVBQUUsRUFBRSxJQUFJLENBQUMsYUFBYyxDQUFDLEVBQUU7U0FDM0IsQ0FBQztJQUNKLENBQUM7SUFFTyxZQUFZO1FBQ2xCLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxFQUFFO1lBQ2xDLE1BQU0sQ0FBQyxHQUNMLENBQUMsQ0FBQyxVQUFVLEtBQUssR0FBRztnQkFDbEIsQ0FBQyxDQUFDLE9BQU8sS0FBSyxVQUFVO2dCQUN4QixDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQVUsS0FBSyxHQUFHO29CQUNwQixDQUFDLENBQUMsUUFBUSxLQUFLLFVBQVU7b0JBQ3pCLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxVQUFVLFVBQVUsQ0FBQztZQUVsQyxPQUFPLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUNqQyxHQUFHLElBQUksQ0FBQyxRQUFTLENBQUMsSUFBSSxJQUFJLENBQUMsRUFBRSxFQUM3QjtnQkFDRSxlQUFlLEVBQUUsSUFBSSxDQUFDLFFBQVMsQ0FBQyxJQUFJO2dCQUNwQyxHQUFHLElBQUksQ0FBQyxRQUFTLENBQUMsS0FBSztnQkFDdkIscUJBQXFCLEVBQUUsQ0FBQyxDQUFDLFVBQVU7Z0JBQ25DLFVBQVUsRUFBRSxHQUFHO2dCQUNmLFFBQVEsRUFBRSxDQUFDLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO2dCQUN4RCxHQUFHLEVBQUUsSUFBSTthQUNWLEVBQ0QsRUFBRSxTQUFTLEVBQUUsSUFBSSxDQUFDLGFBQWEsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLEVBQUUsQ0FDN0QsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVPLGNBQWM7UUFDcEIsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUTtZQUFFLE9BQU87UUFFMUQsTUFBTSxRQUFRLEdBQUcsZUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQztZQUMvQyx3QkFBd0I7WUFDeEIsR0FBRyxDQUFDLEdBQUcsQ0FBQyxTQUFTLElBQUksRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDakMsSUFBQSxlQUFNLEVBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxlQUFNLENBQUMscUJBQXFCLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FDeEQ7WUFDRCwwQkFBMEI7WUFDMUIsR0FBRyxDQUFDLEdBQUcsQ0FBQyxPQUFPLElBQUksRUFBRSxDQUFDO1NBQ3ZCLENBQUMsQ0FBQztRQUVILElBQUEsZUFBTSxFQUFDLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQzdCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUNiLE1BQU0sQ0FBQyxHQUFHLGVBQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDbEMsT0FBTyxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsa0JBQWtCLENBQzFDLEdBQUcsUUFBUSxJQUFJLENBQUMsT0FBTyxFQUN2QjtnQkFDRSxHQUFHLElBQUksQ0FBQyxRQUFTLENBQUMsS0FBSztnQkFDdkIsZUFBZSxFQUFFLElBQUksQ0FBQyxRQUFTLENBQUMsSUFBSTtnQkFDcEMsbUJBQW1CLEVBQUUsS0FBSztnQkFDMUIsY0FBYyxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRTthQUMxQixFQUNELEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxhQUFhLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxFQUFFLENBQzdELENBQUM7UUFDSixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVNLEtBQUs7UUFDVixJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDakIsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3BCLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUV0QixPQUFPLElBQUksQ0FBQyxRQUFTLENBQUM7SUFDeEIsQ0FBQztDQUNGO0FBRU0sTUFBTSxJQUFJLEdBQUcsQ0FBQyxJQUFrQixFQUFFLEVBQUUsQ0FDekMscUJBQXFCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBMkIsQ0FBQztBQURoRCxRQUFBLElBQUksUUFDNEM7QUFFN0Qsa0JBQWUsQ0FBQyxLQUF3QixFQUFFLEVBQUUsQ0FDMUMsSUFBSSxxQkFBcUIsQ0FBQyxLQUFLLENBQTJCLENBQUMifQ==
|
package/Builder/VnetBuilder.js
CHANGED
|
@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
const IpAddressPrefix_1 = __importDefault(require("../VNet/IpAddressPrefix"));
|
|
30
30
|
const NSGRules_1 = require("../VNet/NSGRules");
|
|
31
|
-
const
|
|
31
|
+
const Firewall = __importStar(require("../VNet/Firewall"));
|
|
32
32
|
const Vnet_1 = __importDefault(require("../VNet/Vnet"));
|
|
33
33
|
const NatGateway_1 = __importDefault(require("../VNet/NatGateway"));
|
|
34
34
|
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
@@ -230,7 +230,7 @@ class VnetBuilder extends types.Builder {
|
|
|
230
230
|
return;
|
|
231
231
|
const firewallSubnetId = this._vnetInstance?.firewallSubnet?.apply((s) => s?.id);
|
|
232
232
|
const manageSubnetId = this._vnetInstance?.firewallManageSubnet?.apply((s) => s?.id);
|
|
233
|
-
this._firewallInstance =
|
|
233
|
+
this._firewallInstance = Firewall.create({
|
|
234
234
|
...this.commonProps,
|
|
235
235
|
...this._firewallProps,
|
|
236
236
|
outbound: [
|
|
@@ -286,7 +286,6 @@ class VnetBuilder extends types.Builder {
|
|
|
286
286
|
name: k,
|
|
287
287
|
}).linkTo({
|
|
288
288
|
vnetIds: [this._vnetInstance.id],
|
|
289
|
-
registrationEnabled: false,
|
|
290
289
|
});
|
|
291
290
|
if (bFunc)
|
|
292
291
|
bFunc(builder);
|
|
@@ -342,4 +341,4 @@ class VnetBuilder extends types.Builder {
|
|
|
342
341
|
}
|
|
343
342
|
}
|
|
344
343
|
exports.default = (props) => new VnetBuilder(props);
|
|
345
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"VnetBuilder.js","sourceRoot":"","sources":["../../src/Builder/VnetBuilder.ts"],"names":[],"mappings":"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"}
|
|
344
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"VnetBuilder.js","sourceRoot":"","sources":["../../src/Builder/VnetBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { Input } from
|
|
2
|
-
import { ResourceInfo } from
|
|
3
|
-
import { DnsZoneARecordType } from
|
|
1
|
+
import { Input } from '@pulumi/pulumi';
|
|
2
|
+
import { ResourceInfo } from '../../types';
|
|
3
|
+
import { DnsZoneARecordType } from './dnsZoneBuilder';
|
|
4
4
|
export type PrivateDnsZoneVnetLinkingType = {
|
|
5
5
|
vnetIds?: Input<string>[];
|
|
6
6
|
subnetIds?: Input<string>[];
|
|
7
|
-
registrationEnabled?: boolean;
|
|
8
7
|
};
|
|
9
8
|
export interface IPrivateDnsZoneBuilder {
|
|
10
9
|
withARecord(props: DnsZoneARecordType): IPrivateDnsZoneBuilder;
|
package/Common/RsInfo/index.d.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { Output } from '@pulumi/pulumi';
|
|
2
|
-
import { ResourceGroupInfo, ResourceInfo, ResourceInfoWithSub } from '../../types';
|
|
2
|
+
import { ConventionProps, ResourceGroupInfo, ResourceGroupWithIdInfo, ResourceInfo, ResourceInfoWithSub } from '../../types';
|
|
3
3
|
export declare const getResourceInfoFromId: (id: string) => ResourceInfoWithSub | undefined;
|
|
4
|
+
export declare const getNameFromId: (id: string) => string | undefined;
|
|
4
5
|
/** The method to get Resource group Name*/
|
|
5
6
|
export declare const getRGId: (group: ResourceGroupInfo) => Output<string>;
|
|
7
|
+
export declare const getRGInfo: (name: string) => ResourceGroupWithIdInfo;
|
|
6
8
|
export declare const getStorageInfo: (name: string) => ResourceInfo;
|
|
7
9
|
export declare const getAutomationAccountInfo: (name: string) => ResourceInfo;
|
|
8
10
|
export declare const getAppConfigInfo: (name: string) => ResourceInfo;
|
|
@@ -16,15 +18,15 @@ export declare const getSignalRInfo: (name: string) => ResourceInfo;
|
|
|
16
18
|
export declare const getSqlServerInfo: (name: string) => ResourceInfo;
|
|
17
19
|
export declare const getPostgresqlInfo: (name: string) => ResourceInfo;
|
|
18
20
|
export declare const getMySqlInfo: (name: string) => ResourceInfo;
|
|
19
|
-
export declare const getFirewallInfo: (name: string) => ResourceInfo;
|
|
21
|
+
export declare const getFirewallInfo: (name: string, ops?: ConventionProps | undefined) => ResourceInfo;
|
|
20
22
|
export declare const getVMInfo: (name: string) => ResourceInfo;
|
|
21
|
-
export declare const getVnetInfo: (name: string,
|
|
23
|
+
export declare const getVnetInfo: (name: string, ops?: ConventionProps | undefined) => ResourceInfo;
|
|
22
24
|
export declare const getVnetIdFromSubnetId: (subnetId: string) => string;
|
|
23
25
|
export declare const getSubnetIdByName: (subnetName: string, vnetAndGroupName: string) => Output<string>;
|
|
24
|
-
export declare const
|
|
26
|
+
export declare const getIpAddressInfo: ({ name, groupName, }: {
|
|
25
27
|
name: string;
|
|
26
28
|
groupName: string;
|
|
27
|
-
}) =>
|
|
29
|
+
}) => ResourceInfo;
|
|
28
30
|
export declare const getKeyVaultInfo: (name: string, region?: string) => ResourceInfo;
|
|
29
31
|
export declare const getCdnProfileInfo: (name: string) => ResourceInfo;
|
|
30
32
|
export declare const getAcrInfo: (name: string) => ResourceInfo;
|
package/Common/RsInfo/index.js
CHANGED
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.getCertOrderInfo = exports.getAcrInfo = exports.getCdnProfileInfo = exports.getKeyVaultInfo = exports.
|
|
29
|
+
exports.getCertOrderInfo = exports.getAcrInfo = exports.getCdnProfileInfo = exports.getKeyVaultInfo = exports.getIpAddressInfo = exports.getSubnetIdByName = exports.getVnetIdFromSubnetId = exports.getVnetInfo = exports.getVMInfo = exports.getFirewallInfo = exports.getMySqlInfo = exports.getPostgresqlInfo = exports.getSqlServerInfo = exports.getSignalRInfo = exports.getServiceBusInfo = exports.getRedisCacheInfo = exports.getLogWpInfo = exports.getAppInsightInfo = exports.getAksInfo = exports.getApimInfo = exports.getAppConfigInfo = exports.getAutomationAccountInfo = exports.getStorageInfo = exports.getRGInfo = exports.getRGId = exports.getNameFromId = exports.getResourceInfoFromId = void 0;
|
|
30
30
|
const Helper_1 = __importDefault(require("./Helper"));
|
|
31
31
|
const naming = __importStar(require("../Naming"));
|
|
32
32
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
@@ -34,7 +34,7 @@ const AzureEnv_1 = require("../AzureEnv");
|
|
|
34
34
|
const getResourceInfoFromId = (id) => {
|
|
35
35
|
if (!id)
|
|
36
36
|
return undefined;
|
|
37
|
-
const details = id.split('/');
|
|
37
|
+
const details = id.trim().split('/');
|
|
38
38
|
let name = '';
|
|
39
39
|
let groupName = '';
|
|
40
40
|
let subId = '';
|
|
@@ -54,14 +54,28 @@ const getResourceInfoFromId = (id) => {
|
|
|
54
54
|
};
|
|
55
55
|
};
|
|
56
56
|
exports.getResourceInfoFromId = getResourceInfoFromId;
|
|
57
|
+
const getNameFromId = (id) => {
|
|
58
|
+
id = id.trim();
|
|
59
|
+
//Resource ID
|
|
60
|
+
if (id.includes('/')) {
|
|
61
|
+
return id.split('/').pop();
|
|
62
|
+
}
|
|
63
|
+
//Domain
|
|
64
|
+
if (id.includes('.'))
|
|
65
|
+
return id.split('.')[0];
|
|
66
|
+
//If not just get last 25 character
|
|
67
|
+
return id.slice(-25);
|
|
68
|
+
};
|
|
69
|
+
exports.getNameFromId = getNameFromId;
|
|
57
70
|
/** The method to get Resource group Name*/
|
|
58
71
|
const getRGId = (group) => (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${group.resourceGroupName}`;
|
|
59
72
|
exports.getRGId = getRGId;
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
73
|
+
const getRGInfo = (name) => {
|
|
74
|
+
const rgName = naming.getResourceGroupName(name);
|
|
75
|
+
const id = (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${rgName}`;
|
|
76
|
+
return { resourceGroupName: rgName, id, location: AzureEnv_1.currentRegionCode };
|
|
77
|
+
};
|
|
78
|
+
exports.getRGInfo = getRGInfo;
|
|
65
79
|
const getStorageInfo = (name) => {
|
|
66
80
|
const info = Helper_1.default.getStorageName(name);
|
|
67
81
|
const id = (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${info.group.resourceGroupName}/providers/Microsoft.Storage/storageAccounts/${info.name}`;
|
|
@@ -155,8 +169,8 @@ const getMySqlInfo = (name) => {
|
|
|
155
169
|
return { ...info, id };
|
|
156
170
|
};
|
|
157
171
|
exports.getMySqlInfo = getMySqlInfo;
|
|
158
|
-
const getFirewallInfo = (name) => {
|
|
159
|
-
const info = Helper_1.default.getFirewallName(name);
|
|
172
|
+
const getFirewallInfo = (name, ops = undefined) => {
|
|
173
|
+
const info = Helper_1.default.getFirewallName(name, ops);
|
|
160
174
|
const id = (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${info.group.resourceGroupName}/providers/Microsoft.Network/azureFirewalls/${info.name}`;
|
|
161
175
|
return { ...info, id };
|
|
162
176
|
};
|
|
@@ -169,8 +183,8 @@ const getVMInfo = (name) => {
|
|
|
169
183
|
exports.getVMInfo = getVMInfo;
|
|
170
184
|
// export const getVpnName = (name: string) =>
|
|
171
185
|
// getResourceName(name, { suffix: 'vpn' });
|
|
172
|
-
const getVnetInfo = (name,
|
|
173
|
-
const info = Helper_1.default.getVnetName(name,
|
|
186
|
+
const getVnetInfo = (name, ops = undefined) => {
|
|
187
|
+
const info = Helper_1.default.getVnetName(name, ops);
|
|
174
188
|
const id = (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${info.group.resourceGroupName}/providers/Microsoft.Network/virtualNetworks/${info.name}`;
|
|
175
189
|
return { ...info, id };
|
|
176
190
|
};
|
|
@@ -181,17 +195,22 @@ const getVnetIdFromSubnetId = (subnetId) => {
|
|
|
181
195
|
};
|
|
182
196
|
exports.getVnetIdFromSubnetId = getVnetIdFromSubnetId;
|
|
183
197
|
const getSubnetIdByName = (subnetName, vnetAndGroupName) => {
|
|
184
|
-
const vnetName = naming.getVnetName(vnetAndGroupName);
|
|
198
|
+
const vnetName = naming.getVnetName(naming.cleanName(vnetAndGroupName));
|
|
185
199
|
const group = naming.getResourceGroupName(vnetAndGroupName);
|
|
186
|
-
return (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${group}/providers/Microsoft.Network/virtualNetworks/${vnetName}/subnets/${subnetName}`;
|
|
200
|
+
return (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${group}/providers/Microsoft.Network/virtualNetworks/${vnetName}/subnets/${naming.cleanName(subnetName)}`;
|
|
187
201
|
};
|
|
188
202
|
exports.getSubnetIdByName = getSubnetIdByName;
|
|
189
|
-
const
|
|
190
|
-
|
|
191
|
-
const
|
|
192
|
-
|
|
203
|
+
const getIpAddressInfo = ({ name, groupName, }) => {
|
|
204
|
+
name = naming.getIpAddressName(name);
|
|
205
|
+
const rgName = naming.getResourceGroupName(groupName);
|
|
206
|
+
const id = (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${rgName}/providers/Microsoft.Network/publicIPAddresses/${name}`;
|
|
207
|
+
return {
|
|
208
|
+
name,
|
|
209
|
+
group: { resourceGroupName: rgName, location: AzureEnv_1.currentRegionCode },
|
|
210
|
+
id,
|
|
211
|
+
};
|
|
193
212
|
};
|
|
194
|
-
exports.
|
|
213
|
+
exports.getIpAddressInfo = getIpAddressInfo;
|
|
195
214
|
// export const getWanName = (name: string) =>
|
|
196
215
|
// getResourceName(name, { suffix: 'wan' });
|
|
197
216
|
//
|
|
@@ -242,4 +261,4 @@ const getCertOrderInfo = (name) => {
|
|
|
242
261
|
return { ...info, id };
|
|
243
262
|
};
|
|
244
263
|
exports.getCertOrderInfo = getCertOrderInfo;
|
|
245
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Common/RsInfo/index.ts"],"names":[],"mappings":"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"}
|
|
264
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Common/RsInfo/index.ts"],"names":[],"mappings":"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"}
|
package/KeyVault/index.d.ts
CHANGED
|
@@ -6,7 +6,10 @@ export interface KeyVaultProps extends BasicResourceArgs {
|
|
|
6
6
|
}
|
|
7
7
|
export declare const createVaultPrivateLink: ({ vaultInfo, ...props }: PrivateLinkPropsType & {
|
|
8
8
|
vaultInfo: KeyVaultInfo;
|
|
9
|
-
}) => import("@pulumi/
|
|
9
|
+
}) => import("@pulumi/pulumi").Output<{
|
|
10
|
+
instance: import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint;
|
|
11
|
+
ipAddresses: import("@pulumi/pulumi").Output<string[]>;
|
|
12
|
+
}[]>;
|
|
10
13
|
declare const _default: ({ name, group, network, softDeleteRetentionInDays, ignoreChanges, dependsOn, importUri, ...others }: KeyVaultProps) => {
|
|
11
14
|
name: string;
|
|
12
15
|
vault: import("@pulumi/azure-native/keyvault/vault").Vault;
|
|
@@ -15,6 +18,9 @@ declare const _default: ({ name, group, network, softDeleteRetentionInDays, igno
|
|
|
15
18
|
group: import("../types").ResourceGroupInfo;
|
|
16
19
|
id: import("@pulumi/pulumi").Output<string>;
|
|
17
20
|
};
|
|
18
|
-
createPrivateLink: (props: PrivateLinkPropsType) => import("@pulumi/
|
|
21
|
+
createPrivateLink: (props: PrivateLinkPropsType) => import("@pulumi/pulumi").Output<{
|
|
22
|
+
instance: import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint;
|
|
23
|
+
ipAddresses: import("@pulumi/pulumi").Output<string[]>;
|
|
24
|
+
}[]>;
|
|
19
25
|
};
|
|
20
26
|
export default _default;
|
package/VNet/Bastion.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { BasicResourceArgs } from
|
|
2
|
-
import { Input } from
|
|
1
|
+
import { BasicResourceArgs } from '../types';
|
|
2
|
+
import { Input } from '@pulumi/pulumi';
|
|
3
3
|
export interface BastionProps extends BasicResourceArgs {
|
|
4
4
|
subnetId: Input<string>;
|
|
5
|
-
sku?:
|
|
5
|
+
sku?: 'Basic' | 'Standard' | 'Developer' | string;
|
|
6
6
|
}
|
|
7
7
|
declare const _default: ({ name, group, subnetId, dependsOn, importUri, ignoreChanges, sku, }: BastionProps) => import("@pulumi/azure-native/network/bastionHost").BastionHost;
|
|
8
8
|
export default _default;
|
package/VNet/Bastion.js
CHANGED
|
@@ -22,16 +22,13 @@ 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
|
-
};
|
|
28
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
const
|
|
26
|
+
const IpAddress = __importStar(require("./IpAddress"));
|
|
30
27
|
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
31
|
-
const
|
|
32
|
-
exports.default = ({ name, group, subnetId, dependsOn, importUri, ignoreChanges, sku =
|
|
33
|
-
name = (0,
|
|
34
|
-
const ipAddressId =
|
|
28
|
+
const Common_1 = require("../Common");
|
|
29
|
+
exports.default = ({ name, group, subnetId, dependsOn, importUri, ignoreChanges, sku = 'Basic', }) => {
|
|
30
|
+
name = (0, Common_1.getBastionName)(name);
|
|
31
|
+
const ipAddressId = IpAddress.create({
|
|
35
32
|
name,
|
|
36
33
|
group,
|
|
37
34
|
}).id;
|
|
@@ -41,7 +38,7 @@ exports.default = ({ name, group, subnetId, dependsOn, importUri, ignoreChanges,
|
|
|
41
38
|
sku: { name: sku },
|
|
42
39
|
ipConfigurations: [
|
|
43
40
|
{
|
|
44
|
-
name:
|
|
41
|
+
name: 'IpConfig',
|
|
45
42
|
publicIPAddress: { id: ipAddressId },
|
|
46
43
|
subnet: { id: subnetId },
|
|
47
44
|
privateIPAllocationMethod: network.IPAllocationMethod.Dynamic,
|
|
@@ -54,4 +51,4 @@ exports.default = ({ name, group, subnetId, dependsOn, importUri, ignoreChanges,
|
|
|
54
51
|
ignoreChanges,
|
|
55
52
|
});
|
|
56
53
|
};
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L0Jhc3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLHVEQUF5QztBQUN6QyxzRUFBd0Q7QUFFeEQsc0NBQTJDO0FBTzNDLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFFBQVEsRUFDUixTQUFTLEVBQ1QsU0FBUyxFQUNULGFBQWEsRUFDYixHQUFHLEdBQUcsT0FBTyxHQUNBLEVBQUUsRUFBRTtJQUNqQixJQUFJLEdBQUcsSUFBQSx1QkFBYyxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTVCLE1BQU0sV0FBVyxHQUFHLFNBQVMsQ0FBQyxNQUFNLENBQUM7UUFDbkMsSUFBSTtRQUNKLEtBQUs7S0FDTixDQUFDLENBQUMsRUFBRSxDQUFDO0lBRU4sT0FBTyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQzVCLElBQUksRUFDSjtRQUNFLGVBQWUsRUFBRSxJQUFJO1FBQ3JCLEdBQUcsS0FBSztRQUNSLEdBQUcsRUFBRSxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUU7UUFDbEIsZ0JBQWdCLEVBQUU7WUFDaEI7Z0JBQ0UsSUFBSSxFQUFFLFVBQVU7Z0JBQ2hCLGVBQWUsRUFBRSxFQUFFLEVBQUUsRUFBRSxXQUFXLEVBQUU7Z0JBQ3BDLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxRQUFRLEVBQUU7Z0JBQ3hCLHlCQUF5QixFQUFFLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPO2FBQzlEO1NBQ0Y7S0FDRixFQUNEO1FBQ0UsU0FBUyxFQUFFLFNBQVM7UUFDcEIsbUJBQW1CLEVBQUUsSUFBSTtRQUN6QixNQUFNLEVBQUUsU0FBUztRQUNqQixhQUFhO0tBQ2QsQ0FDRixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
|
package/VNet/Firewall.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
|
-
import { Input } from '@pulumi/pulumi';
|
|
4
|
-
import { BasicResourceArgs, LogInfo, ResourceInfoWithInstance } from '../types';
|
|
3
|
+
import { Input, Output } from '@pulumi/pulumi';
|
|
4
|
+
import { BasicResourceArgs, ConventionProps, LogInfo, ResourceInfo, ResourceInfoWithInstance } from '../types';
|
|
5
5
|
import { FirewallPolicyProps } from './types';
|
|
6
6
|
export interface FwOutboundConfig {
|
|
7
7
|
subnetId: pulumi.Input<string>;
|
|
@@ -31,5 +31,14 @@ export interface FirewallProps extends BasicResourceArgs {
|
|
|
31
31
|
export type FirewallResult = ResourceInfoWithInstance<network.AzureFirewall> & {
|
|
32
32
|
policy: network.FirewallPolicy | undefined;
|
|
33
33
|
};
|
|
34
|
-
|
|
35
|
-
export
|
|
34
|
+
/**Create Firewall*/
|
|
35
|
+
export declare const create: ({ name, group, snat, policy, outbound, management, logInfo, enableDnsProxy, sku, dependsOn, ignoreChanges, }: FirewallProps) => FirewallResult;
|
|
36
|
+
type FirewallIPOutputType = {
|
|
37
|
+
publicIPAddress?: string;
|
|
38
|
+
privateIPAddress: string;
|
|
39
|
+
};
|
|
40
|
+
export declare const getFirewallIPAddresses: (info: ResourceInfo) => Output<FirewallIPOutputType>;
|
|
41
|
+
export declare const getFirewallInfoWithIPAddresses: (groupName: string, ops?: ConventionProps | undefined) => ResourceInfo & {
|
|
42
|
+
ipAddresses: Output<FirewallIPOutputType>;
|
|
43
|
+
};
|
|
44
|
+
export {};
|
package/VNet/Firewall.js
CHANGED
|
@@ -22,23 +22,22 @@ 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
|
-
};
|
|
28
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.getFirewallInfoWithIPAddresses = exports.getFirewallIPAddresses = exports.create = void 0;
|
|
29
27
|
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
30
28
|
const Common_1 = require("../Common");
|
|
31
29
|
const FirewallPolicy_1 = __importStar(require("./FirewallPolicy"));
|
|
32
|
-
const
|
|
30
|
+
const IpAddress = __importStar(require("./IpAddress"));
|
|
33
31
|
const Helpers_1 = require("../Logs/Helpers");
|
|
34
|
-
|
|
32
|
+
/**Create Firewall*/
|
|
33
|
+
const create = ({ name, group, snat, policy, outbound, management, logInfo, enableDnsProxy, sku = {
|
|
35
34
|
name: network.AzureFirewallSkuName.AZFW_VNet,
|
|
36
35
|
tier: network.AzureFirewallSkuTier.Basic,
|
|
37
36
|
}, dependsOn, ignoreChanges, }) => {
|
|
38
37
|
name = (0, Common_1.getFirewallName)(name);
|
|
39
38
|
//Create Public IpAddress for Management
|
|
40
39
|
const manageIpAddress = management
|
|
41
|
-
?
|
|
40
|
+
? IpAddress.create({
|
|
42
41
|
name: `${name}-mag`,
|
|
43
42
|
group,
|
|
44
43
|
lock: false,
|
|
@@ -125,4 +124,27 @@ exports.default = ({ name, group, snat, policy, outbound, management, logInfo, e
|
|
|
125
124
|
}
|
|
126
125
|
return { name, group, id: firewall.id, instance: firewall, policy: fwPolicy };
|
|
127
126
|
};
|
|
128
|
-
|
|
127
|
+
exports.create = create;
|
|
128
|
+
const getFirewallIPAddresses = (info) => {
|
|
129
|
+
const firewall = network.getAzureFirewallOutput({
|
|
130
|
+
azureFirewallName: info.name,
|
|
131
|
+
...info.group,
|
|
132
|
+
});
|
|
133
|
+
return firewall.ipConfigurations.apply(async (cf) => {
|
|
134
|
+
const privateIPAddress = cf[0].privateIPAddress;
|
|
135
|
+
let publicIPAddress = undefined;
|
|
136
|
+
if (cf[0].publicIPAddress?.id) {
|
|
137
|
+
const publicInfo = Common_1.rsInfo.getResourceInfoFromId(cf[0].publicIPAddress.id);
|
|
138
|
+
publicIPAddress = await IpAddress.getPublicIPAddress(publicInfo);
|
|
139
|
+
}
|
|
140
|
+
return { publicIPAddress, privateIPAddress };
|
|
141
|
+
});
|
|
142
|
+
};
|
|
143
|
+
exports.getFirewallIPAddresses = getFirewallIPAddresses;
|
|
144
|
+
const getFirewallInfoWithIPAddresses = (groupName, ops = undefined) => {
|
|
145
|
+
const info = Common_1.rsInfo.getFirewallInfo(groupName, ops);
|
|
146
|
+
const ipAddresses = (0, exports.getFirewallIPAddresses)(info);
|
|
147
|
+
return { ...info, ipAddresses };
|
|
148
|
+
};
|
|
149
|
+
exports.getFirewallInfoWithIPAddresses = getFirewallInfoWithIPAddresses;
|
|
150
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmlyZXdhbGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9GaXJld2FsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNFQUF3RDtBQUd4RCxzQ0FBMkQ7QUFRM0QsbUVBQXFFO0FBRXJFLHVEQUF5QztBQUN6Qyw2Q0FBbUQ7QUFnQ25ELG9CQUFvQjtBQUNiLE1BQU0sTUFBTSxHQUFHLENBQUMsRUFDckIsSUFBSSxFQUNKLEtBQUssRUFDTCxJQUFJLEVBQ0osTUFBTSxFQUNOLFFBQVEsRUFDUixVQUFVLEVBQ1YsT0FBTyxFQUNQLGNBQWMsRUFDZCxHQUFHLEdBQUc7SUFDSixJQUFJLEVBQUUsT0FBTyxDQUFDLG9CQUFvQixDQUFDLFNBQVM7SUFDNUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLO0NBQ3pDLEVBQ0QsU0FBUyxFQUNULGFBQWEsR0FDQyxFQUFrQixFQUFFO0lBQ2xDLElBQUksR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFN0Isd0NBQXdDO0lBQ3hDLE1BQU0sZUFBZSxHQUFHLFVBQVU7UUFDaEMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUM7WUFDZixJQUFJLEVBQUUsR0FBRyxJQUFJLE1BQU07WUFDbkIsS0FBSztZQUNMLElBQUksRUFBRSxLQUFLO1lBQ1gsU0FBUztTQUNWLENBQUM7UUFDSixDQUFDLENBQUMsU0FBUyxDQUFDO0lBRWQsTUFBTSxvQkFBb0IsR0FBa0MsRUFBRSxDQUFDO0lBQy9ELElBQUksY0FBYyxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssT0FBTyxDQUFDLG9CQUFvQixDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3RFLG9CQUFvQixDQUFDLHlCQUF5QixDQUFDLEdBQUcsU0FBUyxDQUFDO0lBQzlELENBQUM7SUFDRCxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ1QsSUFBSSxJQUFJLENBQUMsYUFBYTtZQUNwQixvQkFBb0IsQ0FBQyxhQUFhLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQztRQUMxRCxJQUFJLElBQUksQ0FBQyxzQkFBc0I7WUFDN0Isb0JBQW9CLENBQUMsc0JBQXNCLEdBQUcsU0FBUyxDQUFDO1FBQzFELElBQUksSUFBSSxDQUFDLGFBQWE7WUFDcEIsb0JBQW9CLENBQUMsdUNBQXVDLENBQUM7Z0JBQzNELElBQUksQ0FBQyxhQUFhLENBQUM7SUFDekIsQ0FBQztJQUVELE1BQU0sUUFBUSxHQUFHLE1BQU07UUFDckIsQ0FBQyxDQUFDLElBQUEsd0JBQWMsRUFBQztZQUNiLElBQUk7WUFDSixLQUFLO1lBQ0wsWUFBWSxFQUFFLE1BQU0sQ0FBQyxjQUFjO1lBQ25DLEdBQUcsRUFBRSxHQUFHLENBQUMsSUFBSTtZQUNiLFdBQVcsRUFDVCxHQUFHLEVBQUUsSUFBSSxLQUFLLE9BQU87Z0JBQ25CLENBQUMsQ0FBQztvQkFDRSxXQUFXLEVBQUUsSUFBSTtpQkFDbEI7Z0JBQ0gsQ0FBQyxDQUFDLFNBQVM7WUFDZixTQUFTO1NBQ1YsQ0FBQztRQUNKLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFFZCxNQUFNLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxhQUFhLENBQ3hDLElBQUksRUFDSjtRQUNFLGlCQUFpQixFQUFFLElBQUk7UUFDdkIsR0FBRyxLQUFLO1FBQ1IsR0FBRztRQUNILGNBQWMsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLFFBQVEsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUztRQUMxRCxLQUFLLEVBQUUsY0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVM7UUFFMUMsZUFBZSxFQUNiLEdBQUcsQ0FBQyxJQUFJLEtBQUssT0FBTyxDQUFDLG9CQUFvQixDQUFDLEtBQUs7WUFDL0MsR0FBRyxDQUFDLElBQUksS0FBSyxVQUFVO1lBQ3JCLENBQUMsQ0FBQyxPQUFPLENBQUMsNEJBQTRCLENBQUMsSUFBSTtZQUMzQyxDQUFDLENBQUMsU0FBUztRQUVmLHlCQUF5QixFQUN2QixVQUFVLElBQUksZUFBZTtZQUMzQixDQUFDLENBQUM7Z0JBQ0UsSUFBSSxFQUFFLFlBQVk7Z0JBQ2xCLGVBQWUsRUFBRSxFQUFFLEVBQUUsRUFBRSxlQUFlLENBQUMsRUFBRSxFQUFFO2dCQUMzQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEVBQUUsVUFBVSxDQUFDLFFBQVEsRUFBRTthQUNwQztZQUNILENBQUMsQ0FBQyxTQUFTO1FBRWYsZ0JBQWdCLEVBQUUsUUFBUTtZQUN4QixDQUFDLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7Z0JBQ3RCLElBQUksRUFBRSxZQUFZLENBQUMsRUFBRTtnQkFDckIsZUFBZSxFQUFFLENBQUMsQ0FBQyxpQkFBaUI7b0JBQ2xDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsaUJBQWlCLEVBQUU7b0JBQzdCLENBQUMsQ0FBQyxTQUFTO2dCQUNiLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsUUFBUSxFQUFFO2FBQzNCLENBQUMsQ0FBQztZQUNMLENBQUMsQ0FBQyxTQUFTO1FBRWIsb0JBQW9CO0tBQ3JCLEVBQ0QsRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLENBQzdCLENBQUM7SUFFRixJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQ1osSUFBQSwwQkFBZ0IsRUFBQztZQUNmLElBQUk7WUFDSixnQkFBZ0IsRUFBRSxRQUFRLENBQUMsRUFBRTtZQUM3QixPQUFPO1lBQ1AsY0FBYyxFQUFFO2dCQUNkLDhCQUE4QjtnQkFDOUIsMEJBQTBCO2dCQUMxQix1QkFBdUI7YUFDeEI7WUFDRCxTQUFTLEVBQUUsUUFBUTtTQUNwQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQscUJBQXFCO0lBQ3JCLElBQUksUUFBUSxJQUFJLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQztRQUM5QixJQUFBLGtDQUFpQixFQUFDO1lBQ2hCLEtBQUs7WUFDTCxnQkFBZ0I7WUFDaEIsa0JBQWtCLEVBQUUsUUFBUSxDQUFDLElBQUk7WUFDakMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxLQUFLO1lBQ25CLFNBQVMsRUFBRSxDQUFDLFFBQVEsRUFBRSxRQUFRLENBQUM7U0FDaEMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxRQUFRLENBQUMsRUFBRSxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxDQUFDO0FBQ2hGLENBQUMsQ0FBQztBQTNIVyxRQUFBLE1BQU0sVUEySGpCO0FBT0ssTUFBTSxzQkFBc0IsR0FBRyxDQUNwQyxJQUFrQixFQUNZLEVBQUU7SUFDaEMsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLHNCQUFzQixDQUFDO1FBQzlDLGlCQUFpQixFQUFFLElBQUksQ0FBQyxJQUFJO1FBQzVCLEdBQUcsSUFBSSxDQUFDLEtBQUs7S0FDZCxDQUFDLENBQUM7SUFFSCxPQUFPLFFBQVEsQ0FBQyxnQkFBaUIsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1FBQ25ELE1BQU0sZ0JBQWdCLEdBQUcsRUFBRyxDQUFDLENBQUMsQ0FBRSxDQUFDLGdCQUFpQixDQUFDO1FBQ25ELElBQUksZUFBZSxHQUF1QixTQUFTLENBQUM7UUFFcEQsSUFBSSxFQUFHLENBQUMsQ0FBQyxDQUFFLENBQUMsZUFBZSxFQUFFLEVBQUUsRUFBRSxDQUFDO1lBQ2hDLE1BQU0sVUFBVSxHQUFHLGVBQU0sQ0FBQyxxQkFBcUIsQ0FDN0MsRUFBRyxDQUFDLENBQUMsQ0FBRSxDQUFDLGVBQWdCLENBQUMsRUFBRSxDQUMzQixDQUFDO1lBQ0gsZUFBZSxHQUFHLE1BQU0sU0FBUyxDQUFDLGtCQUFrQixDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ25FLENBQUM7UUFFRCxPQUFPLEVBQUUsZUFBZSxFQUFFLGdCQUFnQixFQUFFLENBQUM7SUFDL0MsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFyQlcsUUFBQSxzQkFBc0IsMEJBcUJqQztBQUVLLE1BQU0sOEJBQThCLEdBQUcsQ0FDNUMsU0FBaUIsRUFDakIsTUFBbUMsU0FBUyxFQUc1QyxFQUFFO0lBQ0YsTUFBTSxJQUFJLEdBQUcsZUFBTSxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDcEQsTUFBTSxXQUFXLEdBQUcsSUFBQSw4QkFBc0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUNqRCxPQUFPLEVBQUUsR0FBRyxJQUFJLEVBQUUsV0FBVyxFQUFFLENBQUM7QUFDbEMsQ0FBQyxDQUFDO0FBVFcsUUFBQSw4QkFBOEIsa0NBU3pDIn0=
|
|
@@ -71,6 +71,7 @@ exports.default = ({ name = 'cloud-pc', priority, subnetSpaces, allowsOffice365,
|
|
|
71
71
|
'*.msecnd.net',
|
|
72
72
|
'*.msftauth.net',
|
|
73
73
|
'*.msftauthimages.net',
|
|
74
|
+
'www.microsoft.com',
|
|
74
75
|
],
|
|
75
76
|
protocols: [{ protocolType: 'Https', port: 443 }],
|
|
76
77
|
});
|
|
@@ -270,4 +271,4 @@ exports.default = ({ name = 'cloud-pc', priority, subnetSpaces, allowsOffice365,
|
|
|
270
271
|
action: 'Allow',
|
|
271
272
|
});
|
|
272
273
|
};
|
|
273
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
274
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"CloudPCFirewallPolicy.js","sourceRoot":"","sources":["../../../src/VNet/FirewallPolicies/CloudPCFirewallPolicy.ts"],"names":[],"mappings":"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"}
|
package/VNet/Helper.d.ts
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import * as network from '@pulumi/azure-native/network';
|
|
2
1
|
import * as netmask from 'netmask';
|
|
3
|
-
import { ResourceArgs } from '../types';
|
|
4
2
|
export declare const appGatewaySubnetName = "app-gateway";
|
|
5
3
|
export declare const gatewaySubnetName = "GatewaySubnet";
|
|
6
4
|
export declare const azFirewallSubnet = "AzureFirewallSubnet";
|
|
@@ -12,10 +10,4 @@ export declare const convertToIpRange: (ipAddress: string[]) => Array<{
|
|
|
12
10
|
start: string;
|
|
13
11
|
end: string;
|
|
14
12
|
}>;
|
|
15
|
-
export declare const getIpAddressResource: ({ name, groupName, }: {
|
|
16
|
-
name: string;
|
|
17
|
-
groupName: string;
|
|
18
|
-
}) => Promise<network.GetPublicIPAddressResult>;
|
|
19
|
-
export declare const getFirewallIpAddress: ({ name, group }: ResourceArgs) => import("@pulumi/pulumi").Output<string>;
|
|
20
|
-
export declare const getFirewallIpAddressByGroupName: (groupName: string) => import("@pulumi/pulumi").Output<string>;
|
|
21
13
|
export declare const getIpAddressFromHost: (host: string) => import("@pulumi/pulumi").Output<import("@pulumi/pulumi").UnwrappedObject<import("dns").LookupAddress>>;
|
package/VNet/Helper.js
CHANGED
|
@@ -26,12 +26,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.getIpAddressFromHost = exports.
|
|
30
|
-
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
29
|
+
exports.getIpAddressFromHost = exports.convertToIpRange = exports.getIpsRange = exports.azBastionSubnetName = exports.azFirewallManagementSubnet = exports.azFirewallSubnet = exports.gatewaySubnetName = exports.appGatewaySubnetName = void 0;
|
|
31
30
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
32
31
|
const netmask = __importStar(require("netmask"));
|
|
33
32
|
const promises_1 = __importDefault(require("node:dns/promises"));
|
|
34
|
-
const Common_1 = require("../Common");
|
|
35
33
|
exports.appGatewaySubnetName = 'app-gateway';
|
|
36
34
|
exports.gatewaySubnetName = 'GatewaySubnet';
|
|
37
35
|
exports.azFirewallSubnet = 'AzureFirewallSubnet';
|
|
@@ -48,32 +46,6 @@ const convertToIpRange = (ipAddress) => ipAddress.map((ip) => {
|
|
|
48
46
|
return { start: ip, end: ip };
|
|
49
47
|
});
|
|
50
48
|
exports.convertToIpRange = convertToIpRange;
|
|
51
|
-
const getIpAddressResource = ({ name, groupName, }) => {
|
|
52
|
-
const n = (0, Common_1.getIpAddressName)(name);
|
|
53
|
-
const group = (0, Common_1.getResourceGroupName)(groupName);
|
|
54
|
-
return network.getPublicIPAddress({
|
|
55
|
-
publicIpAddressName: n,
|
|
56
|
-
resourceGroupName: group,
|
|
57
|
-
});
|
|
58
|
-
};
|
|
59
|
-
exports.getIpAddressResource = getIpAddressResource;
|
|
60
|
-
const getFirewallIpAddress = ({ name, group }) => {
|
|
61
|
-
const firewall = network.getAzureFirewallOutput({
|
|
62
|
-
azureFirewallName: name,
|
|
63
|
-
...group,
|
|
64
|
-
});
|
|
65
|
-
return firewall.ipConfigurations.apply((cf) => cf[0].privateIPAddress);
|
|
66
|
-
};
|
|
67
|
-
exports.getFirewallIpAddress = getFirewallIpAddress;
|
|
68
|
-
const getFirewallIpAddressByGroupName = (groupName) => {
|
|
69
|
-
const fireWallName = (0, Common_1.getFirewallName)(groupName);
|
|
70
|
-
const rsName = (0, Common_1.getResourceGroupName)(groupName);
|
|
71
|
-
return (0, exports.getFirewallIpAddress)({
|
|
72
|
-
name: fireWallName,
|
|
73
|
-
group: { resourceGroupName: rsName },
|
|
74
|
-
});
|
|
75
|
-
};
|
|
76
|
-
exports.getFirewallIpAddressByGroupName = getFirewallIpAddressByGroupName;
|
|
77
49
|
const getIpAddressFromHost = (host) => (0, pulumi_1.output)(promises_1.default.lookup(host, { family: 4 }));
|
|
78
50
|
exports.getIpAddressFromHost = getIpAddressFromHost;
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMkNBQXdDO0FBQ3hDLGlEQUFtQztBQUNuQyxpRUFBb0M7QUFFdkIsUUFBQSxvQkFBb0IsR0FBRyxhQUFhLENBQUM7QUFDckMsUUFBQSxpQkFBaUIsR0FBRyxlQUFlLENBQUM7QUFDcEMsUUFBQSxnQkFBZ0IsR0FBRyxxQkFBcUIsQ0FBQztBQUN6QyxRQUFBLDBCQUEwQixHQUFHLCtCQUErQixDQUFDO0FBQzdELFFBQUEsbUJBQW1CLEdBQUcsb0JBQW9CLENBQUM7QUFFakQsTUFBTSxXQUFXLEdBQUcsQ0FBQyxNQUFjLEVBQUUsRUFBRSxDQUFDLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUE5RCxRQUFBLFdBQVcsZUFBbUQ7QUFFM0UseURBQXlEO0FBQ2xELE1BQU0sZ0JBQWdCLEdBQUcsQ0FDOUIsU0FBbUIsRUFDb0IsRUFBRSxDQUN6QyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUU7SUFDbkIsSUFBSSxFQUFFLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDckIsTUFBTSxLQUFLLEdBQUcsSUFBQSxtQkFBVyxFQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQzlCLE9BQU8sRUFBRSxLQUFLLEVBQUUsS0FBSyxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsS0FBSyxDQUFDLFNBQVMsRUFBRSxDQUFDO0lBQ3JELENBQUM7SUFDRCxPQUFPLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLENBQUM7QUFDaEMsQ0FBQyxDQUFDLENBQUM7QUFUUSxRQUFBLGdCQUFnQixvQkFTeEI7QUFRRSxNQUFNLG9CQUFvQixHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FDbkQsSUFBQSxlQUFNLEVBQUMsa0JBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLEVBQUUsTUFBTSxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztBQUQ3QixRQUFBLG9CQUFvQix3QkFDUyJ9
|
package/VNet/IpAddress.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as network from '@pulumi/azure-native/network';
|
|
2
|
-
import { Input } from '@pulumi/pulumi';
|
|
3
|
-
import { BasicResourceArgs } from '../types';
|
|
2
|
+
import { Input, Output } from '@pulumi/pulumi';
|
|
3
|
+
import { BasicResourceArgs, ResourceInfo } from '../types';
|
|
4
4
|
interface Props extends BasicResourceArgs {
|
|
5
5
|
version?: network.IPVersion;
|
|
6
6
|
publicIPPrefix?: network.PublicIPPrefix;
|
|
@@ -11,5 +11,10 @@ interface Props extends BasicResourceArgs {
|
|
|
11
11
|
enableZone?: boolean;
|
|
12
12
|
lock?: boolean;
|
|
13
13
|
}
|
|
14
|
-
declare const
|
|
15
|
-
export
|
|
14
|
+
export declare const create: ({ name, group, version, publicIPPrefix, enableDdos, ddosCustomPolicyId, enableZone, allocationMethod, tier, lock, dependsOn, }: Props) => import("@pulumi/azure-native/network/publicIPAddress").PublicIPAddress;
|
|
15
|
+
export declare const getPublicIPAddress: (info: ResourceInfo) => Promise<string>;
|
|
16
|
+
export declare const getPublicIPAddressOutput: (info: ResourceInfo) => Output<string>;
|
|
17
|
+
export declare const getIPInfoWithAddress: (name: string, groupName: string) => ResourceInfo & {
|
|
18
|
+
publicIPAddress: Output<string>;
|
|
19
|
+
};
|
|
20
|
+
export {};
|
package/VNet/IpAddress.js
CHANGED
|
@@ -23,12 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.getIPInfoWithAddress = exports.getPublicIPAddressOutput = exports.getPublicIPAddress = exports.create = void 0;
|
|
26
27
|
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
27
28
|
const Common_1 = require("../Common");
|
|
28
29
|
const Locker_1 = require("../Core/Locker");
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
name = getIpName(name);
|
|
30
|
+
const create = ({ name, group, version = network.IPVersion.IPv4, publicIPPrefix, enableDdos, ddosCustomPolicyId, enableZone = Common_1.isPrd, allocationMethod = network.IPAllocationMethod.Static, tier = network.PublicIPAddressSkuTier.Regional, lock = Common_1.isPrd, dependsOn, }) => {
|
|
31
|
+
name = Common_1.naming.getIpAddressName(name);
|
|
32
32
|
const ipAddress = new network.PublicIPAddress(name, {
|
|
33
33
|
publicIpAddressName: name,
|
|
34
34
|
...group,
|
|
@@ -50,4 +50,30 @@ exports.default = ({ name, group, version = network.IPVersion.IPv4, publicIPPref
|
|
|
50
50
|
}
|
|
51
51
|
return ipAddress;
|
|
52
52
|
};
|
|
53
|
-
|
|
53
|
+
exports.create = create;
|
|
54
|
+
const getPublicIPAddress = async (info) => {
|
|
55
|
+
const ip = await network.getPublicIPAddress({
|
|
56
|
+
publicIpAddressName: info.name,
|
|
57
|
+
...info.group,
|
|
58
|
+
});
|
|
59
|
+
return ip.ipAddress;
|
|
60
|
+
};
|
|
61
|
+
exports.getPublicIPAddress = getPublicIPAddress;
|
|
62
|
+
const getPublicIPAddressOutput = (info) => {
|
|
63
|
+
const ip = network.getPublicIPAddressOutput({
|
|
64
|
+
publicIpAddressName: info.name,
|
|
65
|
+
...info.group,
|
|
66
|
+
});
|
|
67
|
+
return ip.ipAddress.apply((i) => i);
|
|
68
|
+
};
|
|
69
|
+
exports.getPublicIPAddressOutput = getPublicIPAddressOutput;
|
|
70
|
+
const getIPInfoWithAddress = (name, groupName) => {
|
|
71
|
+
const ipInfo = Common_1.rsInfo.getIpAddressInfo({ name, groupName });
|
|
72
|
+
const publicIPAddress = (0, exports.getPublicIPAddressOutput)(ipInfo);
|
|
73
|
+
return {
|
|
74
|
+
...ipInfo,
|
|
75
|
+
publicIPAddress,
|
|
76
|
+
};
|
|
77
|
+
};
|
|
78
|
+
exports.getIPInfoWithAddress = getIPInfoWithAddress;
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSXBBZGRyZXNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvSXBBZGRyZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBR3hELHNDQU1tQjtBQUNuQiwyQ0FBd0M7QUFhakMsTUFBTSxNQUFNLEdBQUcsQ0FBQyxFQUNyQixJQUFJLEVBQ0osS0FBSyxFQUNMLE9BQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksRUFDaEMsY0FBYyxFQUNkLFVBQVUsRUFDVixrQkFBa0IsRUFDbEIsVUFBVSxHQUFHLGNBQUssRUFDbEIsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLGtCQUFrQixDQUFDLE1BQU0sRUFDcEQsSUFBSSxHQUFHLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLEVBQzlDLElBQUksR0FBRyxjQUFLLEVBQ1osU0FBUyxHQUNILEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxlQUFNLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDckMsTUFBTSxTQUFTLEdBQUcsSUFBSSxPQUFPLENBQUMsZUFBZSxDQUMzQyxJQUFJLEVBQ0o7UUFDRSxtQkFBbUIsRUFBRSxJQUFJO1FBQ3pCLEdBQUcsS0FBSztRQUNSLFdBQVcsRUFBRSxFQUFFLGVBQWUsRUFBRSxHQUFHLElBQUksSUFBSSxxQkFBWSxFQUFFLEVBQUU7UUFDM0Qsc0JBQXNCLEVBQUUsT0FBTztRQUMvQix3QkFBd0IsRUFBRSxnQkFBZ0I7UUFDMUMsY0FBYyxFQUFFLGNBQWMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsY0FBYyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTO1FBQ3RFLFlBQVksRUFDVixVQUFVLElBQUksa0JBQWtCO1lBQzlCLENBQUMsQ0FBQztnQkFDRSxjQUFjLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLFVBQVU7Z0JBQ25ELGtCQUFrQixFQUFFLEVBQUUsRUFBRSxFQUFFLGtCQUFrQixFQUFFO2FBQy9DO1lBQ0gsQ0FBQyxDQUFDLFNBQVM7UUFDZixHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRTtRQUMvQixLQUFLLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVM7S0FDaEQsRUFDRCxFQUFFLFNBQVMsRUFBRSxjQUFjLElBQUksU0FBUyxFQUFFLENBQzNDLENBQUM7SUFFRixJQUFJLElBQUksRUFBRSxDQUFDO1FBQ1QsSUFBQSxlQUFNLEVBQUMsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDeEMsQ0FBQztJQUVELE9BQU8sU0FBUyxDQUFDO0FBQ25CLENBQUMsQ0FBQztBQXpDVyxRQUFBLE1BQU0sVUF5Q2pCO0FBRUssTUFBTSxrQkFBa0IsR0FBRyxLQUFLLEVBQUUsSUFBa0IsRUFBRSxFQUFFO0lBQzdELE1BQU0sRUFBRSxHQUFHLE1BQU0sT0FBTyxDQUFDLGtCQUFrQixDQUFDO1FBQzFDLG1CQUFtQixFQUFFLElBQUksQ0FBQyxJQUFJO1FBQzlCLEdBQUcsSUFBSSxDQUFDLEtBQUs7S0FDZCxDQUFDLENBQUM7SUFFSCxPQUFPLEVBQUUsQ0FBQyxTQUFVLENBQUM7QUFDdkIsQ0FBQyxDQUFDO0FBUFcsUUFBQSxrQkFBa0Isc0JBTzdCO0FBRUssTUFBTSx3QkFBd0IsR0FBRyxDQUFDLElBQWtCLEVBQUUsRUFBRTtJQUM3RCxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsd0JBQXdCLENBQUM7UUFDMUMsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLElBQUk7UUFDOUIsR0FBRyxJQUFJLENBQUMsS0FBSztLQUNkLENBQUMsQ0FBQztJQUVILE9BQU8sRUFBRSxDQUFDLFNBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUUsQ0FBQyxDQUFDO0FBQ3hDLENBQUMsQ0FBQztBQVBXLFFBQUEsd0JBQXdCLDRCQU9uQztBQUVLLE1BQU0sb0JBQW9CLEdBQUcsQ0FDbEMsSUFBWSxFQUNaLFNBQWlCLEVBQ21DLEVBQUU7SUFDdEQsTUFBTSxNQUFNLEdBQUcsZUFBTSxDQUFDLGdCQUFnQixDQUFDLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDNUQsTUFBTSxlQUFlLEdBQUcsSUFBQSxnQ0FBd0IsRUFBQyxNQUFNLENBQUMsQ0FBQztJQUV6RCxPQUFPO1FBQ0wsR0FBRyxNQUFNO1FBQ1QsZUFBZTtLQUNoQixDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBWFcsUUFBQSxvQkFBb0Isd0JBVy9CIn0=
|
package/VNet/IpAddressPrefix.js
CHANGED
|
@@ -22,14 +22,11 @@ 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
|
-
};
|
|
28
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
26
|
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
30
27
|
const Common_1 = require("../Common");
|
|
31
28
|
const Locker_1 = require("../Core/Locker");
|
|
32
|
-
const
|
|
29
|
+
const IpAddress = __importStar(require("./IpAddress"));
|
|
33
30
|
exports.default = ({ name, group, prefixLength = 30, createPrefix = true, ipAddresses, config = {
|
|
34
31
|
version: network.IPVersion.IPv4,
|
|
35
32
|
allocationMethod: network.IPAllocationMethod.Static,
|
|
@@ -54,7 +51,7 @@ exports.default = ({ name, group, prefixLength = 30, createPrefix = true, ipAddr
|
|
|
54
51
|
if (ipAddresses) {
|
|
55
52
|
ipAddresses.forEach((ip, i) => {
|
|
56
53
|
const n = ip.name ?? `${name}-${i}`;
|
|
57
|
-
addresses[n] =
|
|
54
|
+
addresses[n] = IpAddress.create({
|
|
58
55
|
...config,
|
|
59
56
|
name: n,
|
|
60
57
|
group,
|
|
@@ -66,4 +63,4 @@ exports.default = ({ name, group, prefixLength = 30, createPrefix = true, ipAddr
|
|
|
66
63
|
}
|
|
67
64
|
return { addressPrefix, addresses };
|
|
68
65
|
};
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSXBBZGRyZXNzUHJlZml4LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvSXBBZGRyZXNzUHJlZml4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFHeEQsc0NBQW1EO0FBQ25ELDJDQUF3QztBQUV4Qyx1REFBeUM7QUF1QnpDLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFlBQVksR0FBRyxFQUFFLEVBQ2pCLFlBQVksR0FBRyxJQUFJLEVBQ25CLFdBQVcsRUFDWCxNQUFNLEdBQUc7SUFDUCxPQUFPLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJO0lBQy9CLGdCQUFnQixFQUFFLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNO0NBQ3BELEVBQ0QsU0FBUyxFQUNULElBQUksR0FBRyxJQUFJLEdBQ2dCLEVBQStCLEVBQUU7SUFDNUQsTUFBTSxDQUFDLEdBQUcsSUFBQSwrQkFBc0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN2QyxNQUFNLEdBQUcsR0FBRyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxDQUFDO0lBRW5ELE1BQU0sYUFBYSxHQUFHLFlBQVk7UUFDaEMsQ0FBQyxDQUFDLElBQUksT0FBTyxDQUFDLGNBQWMsQ0FDeEIsQ0FBQyxFQUNEO1lBQ0Usa0JBQWtCLEVBQUUsQ0FBQztZQUNyQixHQUFHLEtBQUs7WUFDUixZQUFZO1lBQ1osR0FBRztTQUNKLEVBQ0QsRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FDL0M7UUFDSCxDQUFDLENBQUMsU0FBUyxDQUFDO0lBRWQsSUFBSSxJQUFJLElBQUksYUFBYSxFQUFFLENBQUM7UUFDMUIsSUFBQSxlQUFNLEVBQUM7WUFDTCxJQUFJO1lBQ0osUUFBUSxFQUFFLGFBQWE7U0FDeEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE1BQU0sU0FBUyxHQUFvQyxFQUFFLENBQUM7SUFFdEQsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixXQUFXLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFO1lBQzVCLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLElBQUksR0FBRyxJQUFJLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDcEMsU0FBUyxDQUFDLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxNQUFNLENBQUM7Z0JBQzlCLEdBQUcsTUFBTTtnQkFDVCxJQUFJLEVBQUUsQ0FBQztnQkFDUCxLQUFLO2dCQUNMLGNBQWMsRUFBRSxhQUFhO2dCQUM3QixJQUFJO2dCQUNKLFNBQVM7YUFDVixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPLEVBQUUsYUFBYSxFQUFFLFNBQVMsRUFBRSxDQUFDO0FBQ3RDLENBQUMsQ0FBQyJ9
|
|
@@ -5,5 +5,8 @@ export type PrivateEndpointProps = Omit<PrivateLinkPropsType, 'type'> & Pick<Opt
|
|
|
5
5
|
privateDnsZoneName: string;
|
|
6
6
|
linkServiceGroupIds: string[];
|
|
7
7
|
};
|
|
8
|
-
declare const _default: ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }: PrivateEndpointProps) => import("@pulumi/
|
|
8
|
+
declare const _default: ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }: PrivateEndpointProps) => import("@pulumi/pulumi").Output<{
|
|
9
|
+
instance: import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint;
|
|
10
|
+
ipAddresses: import("@pulumi/pulumi").Output<string[]>;
|
|
11
|
+
}[]>;
|
|
9
12
|
export default _default;
|
package/VNet/PrivateEndpoint.js
CHANGED
|
@@ -29,31 +29,35 @@ const Common_1 = require("../Common");
|
|
|
29
29
|
const Builder_1 = require("../Builder");
|
|
30
30
|
exports.default = ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }) => {
|
|
31
31
|
const name = (0, Common_1.getPrivateEndpointName)(resourceInfo.name);
|
|
32
|
-
const endpoints = subnetIds.
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
{
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
32
|
+
const endpoints = (0, pulumi_1.output)(subnetIds).apply((ss) => ss.map((s) => {
|
|
33
|
+
const n = Common_1.rsInfo.getNameFromId(s);
|
|
34
|
+
const ep = new network.PrivateEndpoint(`${name}-${n}`, {
|
|
35
|
+
...resourceInfo.group,
|
|
36
|
+
privateEndpointName: `${name}-${n}`,
|
|
37
|
+
subnet: { id: s },
|
|
38
|
+
privateLinkServiceConnections: [
|
|
39
|
+
{
|
|
40
|
+
groupIds: linkServiceGroupIds,
|
|
41
|
+
name: `${name}-conn`,
|
|
42
|
+
privateLinkServiceId: resourceInfo.id,
|
|
43
|
+
},
|
|
44
|
+
],
|
|
45
|
+
}, { dependsOn });
|
|
46
|
+
return {
|
|
47
|
+
instance: ep,
|
|
48
|
+
ipAddresses: ep.customDnsConfigs.apply((c) => c.flatMap((i) => i.ipAddresses)),
|
|
49
|
+
};
|
|
50
|
+
}));
|
|
44
51
|
//Get IpAddress in
|
|
45
|
-
const ipAddresses = (0, pulumi_1.output)(endpoints
|
|
46
|
-
(0, pulumi_1.output)(
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
})
|
|
53
|
-
|
|
54
|
-
.linkTo({ subnetIds, vnetIds: extraVnetIds, registrationEnabled: false })
|
|
55
|
-
.build();
|
|
56
|
-
});
|
|
52
|
+
const ipAddresses = (0, pulumi_1.output)(endpoints).apply((a) => a.flatMap((i) => i.ipAddresses));
|
|
53
|
+
(0, pulumi_1.output)(ipAddresses).apply((ip) => (0, Builder_1.PrivateDnsZoneBuilder)({
|
|
54
|
+
name: `${resourceInfo.name}.${privateDnsZoneName}`,
|
|
55
|
+
group: resourceInfo.group,
|
|
56
|
+
dependsOn,
|
|
57
|
+
})
|
|
58
|
+
.withARecord({ ipAddresses: ip, recordName: '@' })
|
|
59
|
+
.linkTo({ subnetIds, vnetIds: extraVnetIds })
|
|
60
|
+
.build());
|
|
57
61
|
return endpoints;
|
|
58
62
|
};
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUVuZHBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvUHJpdmF0ZUVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFDeEQsMkNBQXdDO0FBRXhDLHNDQUEyRDtBQUMzRCx3Q0FBbUQ7QUFVbkQsa0JBQWUsQ0FBQyxFQUNkLFlBQVksRUFDWixTQUFTLEVBQ1QsWUFBWSxFQUNaLGtCQUFrQixFQUNsQixtQkFBbUIsRUFDbkIsU0FBUyxHQUNZLEVBQUUsRUFBRTtJQUN6QixNQUFNLElBQUksR0FBRyxJQUFBLCtCQUFzQixFQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV2RCxNQUFNLFNBQVMsR0FBRyxJQUFBLGVBQU0sRUFBQyxTQUFTLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUMvQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7UUFDWCxNQUFNLENBQUMsR0FBRyxlQUFNLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sRUFBRSxHQUFHLElBQUksT0FBTyxDQUFDLGVBQWUsQ0FDcEMsR0FBRyxJQUFJLElBQUksQ0FBQyxFQUFFLEVBQ2Q7WUFDRSxHQUFHLFlBQVksQ0FBQyxLQUFLO1lBQ3JCLG1CQUFtQixFQUFFLEdBQUcsSUFBSSxJQUFJLENBQUMsRUFBRTtZQUNuQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFO1lBQ2pCLDZCQUE2QixFQUFFO2dCQUM3QjtvQkFDRSxRQUFRLEVBQUUsbUJBQW1CO29CQUM3QixJQUFJLEVBQUUsR0FBRyxJQUFJLE9BQU87b0JBQ3BCLG9CQUFvQixFQUFFLFlBQVksQ0FBQyxFQUFFO2lCQUN0QzthQUNGO1NBQ0YsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQUM7UUFFRixPQUFPO1lBQ0wsUUFBUSxFQUFFLEVBQUU7WUFDWixXQUFXLEVBQUUsRUFBRSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQzNDLENBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUUsQ0FBQyxXQUFZLENBQUMsQ0FDbkM7U0FDRixDQUFDO0lBQ0osQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUVGLGtCQUFrQjtJQUNsQixNQUFNLFdBQVcsR0FBRyxJQUFBLGVBQU0sRUFBQyxTQUFTLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUNoRCxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBWSxDQUFDLENBQ2pDLENBQUM7SUFFRixJQUFBLGVBQU0sRUFBQyxXQUFXLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUMvQixJQUFBLCtCQUFxQixFQUFDO1FBQ3BCLElBQUksRUFBRSxHQUFHLFlBQWEsQ0FBQyxJQUFJLElBQUksa0JBQWtCLEVBQUU7UUFDbkQsS0FBSyxFQUFFLFlBQWEsQ0FBQyxLQUFLO1FBQzFCLFNBQVM7S0FDVixDQUFDO1NBQ0MsV0FBVyxDQUFDLEVBQUUsV0FBVyxFQUFFLEVBQUUsRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLENBQUM7U0FDakQsTUFBTSxDQUFDLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsQ0FBQztTQUM1QyxLQUFLLEVBQUUsQ0FDWCxDQUFDO0lBRUYsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQyxDQUFDIn0=
|
package/VNet/VPNGateway.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { BasicResourceArgs } from
|
|
2
|
-
import { Input } from
|
|
3
|
-
import * as network from
|
|
1
|
+
import { BasicResourceArgs } from '../types';
|
|
2
|
+
import { Input } from '@pulumi/pulumi';
|
|
3
|
+
import * as network from '@pulumi/azure-native/network';
|
|
4
4
|
export interface VpnGatewayProps extends BasicResourceArgs {
|
|
5
5
|
subnetId: Input<string>;
|
|
6
6
|
vpnClientAddressPools?: string[];
|
package/VNet/VPNGateway.js
CHANGED
|
@@ -22,22 +22,18 @@ 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
|
-
};
|
|
28
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
const
|
|
26
|
+
const Common_1 = require("../Common");
|
|
30
27
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
31
28
|
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
32
|
-
const
|
|
33
|
-
const IpAddress_1 = __importDefault(require("./IpAddress"));
|
|
29
|
+
const IpAddress = __importStar(require("./IpAddress"));
|
|
34
30
|
// https://learn.microsoft.com/en-us/azure/vpn-gateway/openvpn-azure-ad-tenant
|
|
35
|
-
exports.default = ({ name, group, subnetId, vpnClientAddressPools = [
|
|
31
|
+
exports.default = ({ name, group, subnetId, vpnClientAddressPools = ['172.16.100.0/24'], sku = {
|
|
36
32
|
name: network.VirtualNetworkGatewaySkuName.VpnGw1,
|
|
37
33
|
tier: network.VirtualNetworkGatewaySkuTier.VpnGw1,
|
|
38
34
|
}, dependsOn, }) => {
|
|
39
|
-
name = (0,
|
|
40
|
-
const ipAddress =
|
|
35
|
+
name = (0, Common_1.getVpnName)(name);
|
|
36
|
+
const ipAddress = IpAddress.create({
|
|
41
37
|
name,
|
|
42
38
|
group,
|
|
43
39
|
enableZone: false,
|
|
@@ -48,15 +44,15 @@ exports.default = ({ name, group, subnetId, vpnClientAddressPools = ["172.16.100
|
|
|
48
44
|
virtualNetworkGatewayName: name,
|
|
49
45
|
...group,
|
|
50
46
|
sku,
|
|
51
|
-
gatewayType:
|
|
52
|
-
vpnType:
|
|
47
|
+
gatewayType: 'Vpn',
|
|
48
|
+
vpnType: 'RouteBased',
|
|
53
49
|
enableBgp: false,
|
|
54
50
|
activeActive: false,
|
|
55
51
|
enableDnsForwarding: false,
|
|
56
52
|
allowRemoteVnetTraffic: true,
|
|
57
53
|
ipConfigurations: [
|
|
58
54
|
{
|
|
59
|
-
name:
|
|
55
|
+
name: 'vnetGatewayConfig',
|
|
60
56
|
publicIPAddress: {
|
|
61
57
|
id: ipAddress.id,
|
|
62
58
|
},
|
|
@@ -79,7 +75,7 @@ exports.default = ({ name, group, subnetId, vpnClientAddressPools = ["172.16.100
|
|
|
79
75
|
// vpnClientProtocols?: pulumi.Input<pulumi.Input<string | enums.network.VpnClientProtocol>[]>;
|
|
80
76
|
// vpnClientRevokedCertificates?: pulumi.Input<pulumi.Input<inputs.network.VpnClientRevokedCertificateArgs>[]>;
|
|
81
77
|
// vpnClientRootCertificates?: pulumi.Input<pulumi.Input<inputs.network.VpnClientRootCertificateArgs>[]>;
|
|
82
|
-
vpnClientProtocols: [
|
|
78
|
+
vpnClientProtocols: ['OpenVPN'],
|
|
83
79
|
vpnClientAddressPool: vpnClientAddressPools
|
|
84
80
|
? {
|
|
85
81
|
addressPrefixes: vpnClientAddressPools,
|
|
@@ -87,13 +83,13 @@ exports.default = ({ name, group, subnetId, vpnClientAddressPools = ["172.16.100
|
|
|
87
83
|
: undefined,
|
|
88
84
|
vpnClientRootCertificates: [],
|
|
89
85
|
vpnClientRevokedCertificates: [],
|
|
90
|
-
radiusServerAddress:
|
|
91
|
-
radiusServerSecret:
|
|
86
|
+
radiusServerAddress: '',
|
|
87
|
+
radiusServerSecret: '',
|
|
92
88
|
vpnAuthenticationTypes: [network.VpnAuthenticationType.AAD],
|
|
93
|
-
aadTenant: (0, pulumi_1.interpolate) `https://login.microsoftonline.com/${
|
|
94
|
-
aadAudience:
|
|
95
|
-
aadIssuer: (0, pulumi_1.interpolate) `https://sts.windows.net/${
|
|
89
|
+
aadTenant: (0, pulumi_1.interpolate) `https://login.microsoftonline.com/${Common_1.tenantId}`,
|
|
90
|
+
aadAudience: '41b23e61-6c1e-4545-b367-cd054e0ed4b4',
|
|
91
|
+
aadIssuer: (0, pulumi_1.interpolate) `https://sts.windows.net/${Common_1.tenantId}/`,
|
|
96
92
|
},
|
|
97
93
|
}, { dependsOn: ipAddress });
|
|
98
94
|
};
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVlBOR2F0ZXdheS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1ZQTkdhdGV3YXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLHNDQUFpRDtBQUNqRCwyQ0FBb0Q7QUFDcEQsc0VBQXdEO0FBQ3hELHVEQUF5QztBQVd6Qyw4RUFBOEU7QUFDOUUsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsUUFBUSxFQUNSLHFCQUFxQixHQUFHLENBQUMsaUJBQWlCLENBQUMsRUFDM0MsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBQyxNQUFNO0lBQ2pELElBQUksRUFBRSxPQUFPLENBQUMsNEJBQTRCLENBQUMsTUFBTTtDQUNsRCxFQUNELFNBQVMsR0FDTyxFQUFFLEVBQUU7SUFDcEIsSUFBSSxHQUFHLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4QixNQUFNLFNBQVMsR0FBRyxTQUFTLENBQUMsTUFBTSxDQUFDO1FBQ2pDLElBQUk7UUFDSixLQUFLO1FBQ0wsVUFBVSxFQUFFLEtBQUs7UUFDakIsSUFBSSxFQUFFLEtBQUs7UUFDWCxTQUFTO0tBQ1YsQ0FBQyxDQUFDO0lBRUgsT0FBTyxJQUFJLE9BQU8sQ0FBQyxxQkFBcUIsQ0FDdEMsSUFBSSxFQUNKO1FBQ0UseUJBQXlCLEVBQUUsSUFBSTtRQUMvQixHQUFHLEtBQUs7UUFDUixHQUFHO1FBRUgsV0FBVyxFQUFFLEtBQUs7UUFDbEIsT0FBTyxFQUFFLFlBQVk7UUFDckIsU0FBUyxFQUFFLEtBQUs7UUFDaEIsWUFBWSxFQUFFLEtBQUs7UUFDbkIsbUJBQW1CLEVBQUUsS0FBSztRQUMxQixzQkFBc0IsRUFBRSxJQUFJO1FBRTVCLGdCQUFnQixFQUFFO1lBQ2hCO2dCQUNFLElBQUksRUFBRSxtQkFBbUI7Z0JBQ3pCLGVBQWUsRUFBRTtvQkFDZixFQUFFLEVBQUUsU0FBUyxDQUFDLEVBQUU7aUJBQ2pCO2dCQUNELE1BQU0sRUFBRTtvQkFDTixFQUFFLEVBQUUsUUFBUTtpQkFDYjthQUNGO1NBQ0Y7UUFFRCxzQkFBc0IsRUFBRTtZQUN0QixzQ0FBc0M7WUFDdEMsb0NBQW9DO1lBQ3BDLG9DQUFvQztZQUNwQyw4Q0FBOEM7WUFDOUMsNkNBQTZDO1lBQzdDLGlGQUFpRjtZQUNqRix5SEFBeUg7WUFDekgsdUdBQXVHO1lBQ3ZHLHdFQUF3RTtZQUN4RSx5RkFBeUY7WUFDekYsK0ZBQStGO1lBQy9GLCtHQUErRztZQUMvRyx5R0FBeUc7WUFFekcsa0JBQWtCLEVBQUUsQ0FBQyxTQUFTLENBQUM7WUFDL0Isb0JBQW9CLEVBQUUscUJBQXFCO2dCQUN6QyxDQUFDLENBQUM7b0JBQ0UsZUFBZSxFQUFFLHFCQUFxQjtpQkFDdkM7Z0JBQ0gsQ0FBQyxDQUFDLFNBQVM7WUFDYix5QkFBeUIsRUFBRSxFQUFFO1lBQzdCLDRCQUE0QixFQUFFLEVBQUU7WUFDaEMsbUJBQW1CLEVBQUUsRUFBRTtZQUN2QixrQkFBa0IsRUFBRSxFQUFFO1lBRXRCLHNCQUFzQixFQUFFLENBQUMsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEdBQUcsQ0FBQztZQUMzRCxTQUFTLEVBQUUsSUFBQSxvQkFBVyxFQUFBLHFDQUFxQyxpQkFBUSxFQUFFO1lBQ3JFLFdBQVcsRUFBRSxzQ0FBc0M7WUFDbkQsU0FBUyxFQUFFLElBQUEsb0JBQVcsRUFBQSwyQkFBMkIsaUJBQVEsR0FBRztTQUM3RDtLQUNGLEVBQ0QsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLENBQ3pCLENBQUM7QUFDSixDQUFDLENBQUMifQ==
|
package/VNet/index.d.ts
ADDED
package/VNet/index.js
ADDED
|
@@ -0,0 +1,29 @@
|
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.Firewall = exports.IpAddress = void 0;
|
|
27
|
+
exports.IpAddress = __importStar(require("./IpAddress"));
|
|
28
|
+
exports.Firewall = __importStar(require("./Firewall"));
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHlEQUF5QztBQUN6Qyx1REFBdUMifQ==
|