@drunk-pulumi/azure-components 1.1.24 → 1.1.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AppResources.d.ts +22 -73
- package/AppResources.js +6 -2
- package/ResourceBuilder.js +6 -2
- package/aks/AzKubernetes.d.ts +9 -19
- package/aks/AzKubernetes.js +8 -2
- package/aks/ContainerRegistry.d.ts +1 -4
- package/aks/ContainerRegistry.js +2 -1
- package/apim/Apim.d.ts +2 -4
- package/apim/Apim.js +2 -1
- package/apim/ApimApi.d.ts +1 -4
- package/apim/ApimApi.js +2 -1
- package/apim/ApimApiSet.d.ts +1 -4
- package/apim/ApimApiSet.js +3 -1
- package/apim/ApimProduct.d.ts +1 -4
- package/apim/ApimProduct.js +2 -1
- package/app/AppCert.d.ts +3 -4
- package/app/AppCert.js +3 -1
- package/app/AppConfig.d.ts +1 -4
- package/app/AppConfig.js +3 -1
- package/app/AppContainer.d.ts +2 -6
- package/app/AppContainer.js +3 -2
- package/app/AppContainerEnv.d.ts +4 -6
- package/app/AppContainerEnv.js +18 -2
- package/app/AppJob.d.ts +72 -0
- package/app/AppJob.js +135 -0
- package/app/AppService.d.ts +2 -4
- package/app/AppService.js +3 -1
- package/app/IoTHub.d.ts +2 -4
- package/app/IoTHub.js +3 -1
- package/app/LogicApp.d.ts +2 -4
- package/app/LogicApp.js +3 -1
- package/app/SignalR.d.ts +1 -4
- package/app/SignalR.js +2 -1
- package/app/index.d.ts +1 -0
- package/app/index.js +2 -1
- package/azAd/RoleAssignment.js +1 -1
- package/common/RsGroup.d.ts +2 -4
- package/database/AzSql.d.ts +1 -4
- package/database/AzSql.js +2 -1
- package/database/MySql.d.ts +1 -4
- package/database/MySql.js +2 -1
- package/database/Postgres.d.ts +1 -4
- package/database/Postgres.js +2 -1
- package/database/Redis.d.ts +3 -10
- package/database/Redis.js +2 -1
- package/helpers/rsHelpers.d.ts +1 -5
- package/helpers/rsHelpers.js +2 -2
- package/logs/Logs.js +6 -5
- package/package.json +1 -1
- package/services/Automation.d.ts +1 -4
- package/services/Automation.js +3 -1
- package/services/AzSearch.d.ts +1 -4
- package/services/AzSearch.js +2 -1
- package/services/ServiceBus.d.ts +1 -4
- package/services/ServiceBus.js +2 -1
- package/storage/StorageAccount.d.ts +1 -5
- package/storage/StorageAccount.js +2 -2
- package/storage/helpers.d.ts +2 -0
- package/types.d.ts +3 -4
- package/vault/KeyVault.d.ts +1 -4
- package/vault/KeyVault.js +7 -2
- package/vm/DiskEncryptionSet.d.ts +2 -4
- package/vm/DiskEncryptionSet.js +3 -1
- package/vm/VirtualMachine.d.ts +1 -4
- package/vm/VirtualMachine.js +2 -1
- package/vnet/Basion.d.ts +1 -4
- package/vnet/Basion.js +2 -1
- package/vnet/DnsZone.d.ts +2 -4
- package/vnet/DnsZone.js +2 -1
- package/vnet/Firewall.js +12 -3
- package/vnet/IpAddresses.d.ts +3 -6
- package/vnet/IpAddresses.js +8 -2
- package/vnet/NetworkPeering.js +2 -2
- package/vnet/PrivateDnsZone.d.ts +2 -4
- package/vnet/PrivateDnsZone.js +2 -1
- package/vnet/RouteTable.d.ts +1 -4
- package/vnet/RouteTable.js +3 -1
- package/vnet/VirtualNetwork.js +46 -11
- package/vnet/VpnGateway.d.ts +1 -4
- package/vnet/VpnGateway.js +2 -1
package/vnet/IpAddresses.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as network from '@pulumi/azure-native/network';
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
3
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
4
|
+
import * as types from '../types';
|
|
4
5
|
type IpSku = {
|
|
5
6
|
/**
|
|
6
7
|
* Name of a public IP address SKU.
|
|
@@ -24,15 +25,11 @@ export interface IpAddressesArgs extends CommonBaseArgs {
|
|
|
24
25
|
}>;
|
|
25
26
|
}
|
|
26
27
|
export declare class IpAddresses extends BaseResourceComponent<IpAddressesArgs> {
|
|
27
|
-
readonly ipAddresses: Record<string, {
|
|
28
|
-
id: pulumi.Output<string>;
|
|
29
|
-
resourceName: pulumi.Output<string>;
|
|
28
|
+
readonly ipAddresses: Record<string, types.ResourceOutputs & {
|
|
30
29
|
ipAddress: pulumi.Output<string | undefined>;
|
|
31
30
|
}>;
|
|
32
31
|
constructor(name: string, args: IpAddressesArgs, opts?: pulumi.ComponentResourceOptions);
|
|
33
|
-
getOutputs(): Record<string, {
|
|
34
|
-
id: pulumi.Output<string>;
|
|
35
|
-
resourceName: pulumi.Output<string>;
|
|
32
|
+
getOutputs(): Record<string, types.ResourceOutputs & {
|
|
36
33
|
ipAddress: pulumi.Output<string | undefined>;
|
|
37
34
|
}>;
|
|
38
35
|
private createIpPrefix;
|
package/vnet/IpAddresses.js
CHANGED
|
@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.IpAddresses = void 0;
|
|
37
37
|
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
38
|
+
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
38
39
|
const base_1 = require("../base");
|
|
39
40
|
const helpers_1 = require("../helpers");
|
|
40
41
|
class IpAddresses extends base_1.BaseResourceComponent {
|
|
@@ -52,7 +53,12 @@ class IpAddresses extends base_1.BaseResourceComponent {
|
|
|
52
53
|
publicIPAllocationMethod: network.IPAllocationMethod.Static,
|
|
53
54
|
zones: helpers_1.zoneHelper.getDefaultZones(ip.zones ?? defaultConfig?.zones),
|
|
54
55
|
}, { ...opts, dependsOn: prefix ? prefix : opts?.dependsOn, parent: this, ignoreChanges: ['natGateway'] });
|
|
55
|
-
this.ipAddresses[ip.name] = {
|
|
56
|
+
this.ipAddresses[ip.name] = {
|
|
57
|
+
id: ipAddress.id,
|
|
58
|
+
resourceName: ipAddress.name,
|
|
59
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
60
|
+
ipAddress: ipAddress.ipAddress,
|
|
61
|
+
};
|
|
56
62
|
return ipAddress;
|
|
57
63
|
});
|
|
58
64
|
this.registerOutputs();
|
|
@@ -72,4 +78,4 @@ class IpAddresses extends base_1.BaseResourceComponent {
|
|
|
72
78
|
}
|
|
73
79
|
}
|
|
74
80
|
exports.IpAddresses = IpAddresses;
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSXBBZGRyZXNzZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdm5ldC9JcEFkZHJlc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFDeEQsdURBQXlDO0FBQ3pDLGtDQUFnRTtBQUNoRSx3Q0FBd0M7QUFnQ3hDLE1BQWEsV0FBWSxTQUFRLDRCQUFzQztJQUNyRCxXQUFXLEdBS3ZCLEVBQUUsQ0FBQztJQUVQLFlBQVksSUFBWSxFQUFFLElBQXFCLEVBQUUsSUFBc0M7UUFDckYsS0FBSyxDQUFDLGFBQWEsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRXZDLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLGFBQWEsRUFBRSxXQUFXLEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBQy9ELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUVyQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUU7WUFDckIsTUFBTSxTQUFTLEdBQUcsSUFBSSxPQUFPLENBQUMsZUFBZSxDQUMzQyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQ3BCO2dCQUNFLEdBQUcsYUFBYTtnQkFDaEIsR0FBRyxPQUFPO2dCQUNWLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBRyxJQUFJLEdBQUc7Z0JBQ2xCLGNBQWMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLE1BQU0sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUztnQkFDdEQsd0JBQXdCLEVBQUUsT0FBTyxDQUFDLGtCQUFrQixDQUFDLE1BQU07Z0JBQzNELEtBQUssRUFBRSxvQkFBVSxDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUMsS0FBSyxJQUFJLGFBQWEsRUFBRSxLQUFLLENBQUM7YUFDcEUsRUFDRCxFQUFFLEdBQUcsSUFBSSxFQUFFLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQ3ZHLENBQUM7WUFFRixJQUFJLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRztnQkFDMUIsRUFBRSxFQUFFLFNBQVMsQ0FBQyxFQUFFO2dCQUNoQixZQUFZLEVBQUUsU0FBUyxDQUFDLElBQUk7Z0JBQzVCLGlCQUFpQixFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsaUJBQWlCLENBQUM7Z0JBQ3JFLFNBQVMsRUFBRSxTQUFTLENBQUMsU0FBUzthQUMvQixDQUFDO1lBQ0YsT0FBTyxTQUFTLENBQUM7UUFDbkIsQ0FBQyxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDekIsQ0FBQztJQUVNLFVBQVU7UUFDZixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUM7SUFDMUIsQ0FBQztJQUVPLGNBQWM7UUFDcEIsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztRQUMzQyxJQUFJLENBQUMsTUFBTTtZQUFFLE9BQU8sU0FBUyxDQUFDO1FBRTlCLE9BQU8sSUFBSSxPQUFPLENBQUMsY0FBYyxDQUMvQixJQUFJLENBQUMsSUFBSSxFQUNUO1lBQ0UsR0FBRyxPQUFPO1lBQ1YsWUFBWSxFQUFFLE1BQU0sQ0FBQyxNQUFNO1lBQzNCLEdBQUc7U0FDSixFQUNELEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FDL0IsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQTFERCxrQ0EwREMifQ==
|
package/vnet/NetworkPeering.js
CHANGED
|
@@ -70,7 +70,7 @@ class NetworkPeering extends pulumi.ComponentResource {
|
|
|
70
70
|
...options,
|
|
71
71
|
virtualNetworkPeeringName: n,
|
|
72
72
|
virtualNetworkName: vnetInfo.resourceName,
|
|
73
|
-
resourceGroupName: vnetInfo.
|
|
73
|
+
resourceGroupName: vnetInfo.resourceGroupName,
|
|
74
74
|
peeringSyncLevel: 'FullyInSync',
|
|
75
75
|
remoteVirtualNetwork: {
|
|
76
76
|
id: to.id,
|
|
@@ -82,4 +82,4 @@ class NetworkPeering extends pulumi.ComponentResource {
|
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
exports.NetworkPeering = NetworkPeering;
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTmV0d29ya1BlZXJpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdm5ldC9OZXR3b3JrUGVlcmluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFDeEQsdURBQXlDO0FBQ3pDLDZDQUEyRDtBQUUzRCx3Q0FBdUM7QUFpQnZDLE1BQU0sWUFBWSxHQUF3QjtJQUN4QyxxQkFBcUIsRUFBRSxJQUFJO0lBQzNCLHlCQUF5QixFQUFFLElBQUk7SUFDL0IsbUJBQW1CLEVBQUUsSUFBSTtJQUN6QixzQkFBc0IsRUFBRSxNQUFNO0lBQzlCLHlCQUF5QixFQUFFLElBQUk7Q0FDaEMsQ0FBQztBQVNGLE1BQWEsY0FBZSxTQUFRLE1BQU0sQ0FBQyxpQkFBcUM7SUFFcEU7SUFDQTtJQUNBO0lBSFYsWUFDVSxJQUFZLEVBQ1osSUFBd0IsRUFDeEIsSUFBc0M7UUFFOUMsS0FBSyxDQUFDLElBQUEsa0NBQXdCLEVBQUMsZ0JBQWdCLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBSjVELFNBQUksR0FBSixJQUFJLENBQVE7UUFDWixTQUFJLEdBQUosSUFBSSxDQUFvQjtRQUN4QixTQUFJLEdBQUosSUFBSSxDQUFrQztRQUk5QyxNQUFNLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxTQUFTLEVBQUUsR0FBRyxJQUFJLENBQUM7UUFDbEQsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxFQUFFLEVBQUU7WUFDNUQsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxDQUFDLENBQUM7WUFDbEMsSUFBSSxTQUFTLEtBQUssZUFBZTtnQkFBRSxJQUFJLENBQUMsYUFBYSxDQUFDLE1BQU0sRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN2RSxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFTyxhQUFhLENBQUMsSUFBd0IsRUFBRSxFQUFzQjtRQUNwRSxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztRQUM5QixNQUFNLFFBQVEsR0FBRyxtQkFBUyxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFcEQsTUFBTSxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUMsSUFBSSxJQUFJLG1CQUFTLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxtQkFBUyxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQztRQUNwSCxPQUFPLElBQUksT0FBTyxDQUFDLHFCQUFxQixDQUN0QyxDQUFDLEVBQ0Q7WUFDRSxHQUFHLFlBQVk7WUFDZixHQUFHLE9BQU87WUFDVix5QkFBeUIsRUFBRSxDQUFDO1lBQzVCLGtCQUFrQixFQUFFLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLGlCQUFpQixFQUFFLFFBQVEsQ0FBQyxpQkFBaUI7WUFDN0MsZ0JBQWdCLEVBQUUsYUFBYTtZQUMvQixvQkFBb0IsRUFBRTtnQkFDcEIsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFO2FBQ1Y7U0FDRixFQUNEO1lBQ0UsU0FBUyxFQUFFLElBQUksQ0FBQyxJQUFJLEVBQUUsU0FBUztZQUMvQixNQUFNLEVBQUUsSUFBSTtTQUNiLENBQ0YsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQXZDRCx3Q0F1Q0MifQ==
|
package/vnet/PrivateDnsZone.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as privateDns from '@pulumi/azure-native/privatedns';
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
3
|
import { BaseComponent } from '../base';
|
|
4
|
+
import * as types from '../types';
|
|
4
5
|
import { DnsRecordTypes, WithResourceGroupInputs } from '../types';
|
|
5
6
|
export type DnsRecordArgs = Omit<privateDns.PrivateRecordSetArgs, 'privateZoneName' | 'relativeRecordSetName' | 'resourceGroupName' | 'ttl' | 'recordType'> & {
|
|
6
7
|
recordType: DnsRecordTypes;
|
|
@@ -20,10 +21,7 @@ export declare class PrivateDnsZone extends BaseComponent<PrivateDnsZoneArgs> {
|
|
|
20
21
|
readonly resourceName: pulumi.Output<string>;
|
|
21
22
|
private readonly _rsName;
|
|
22
23
|
constructor(name: string, args: PrivateDnsZoneArgs, opts?: pulumi.ComponentResourceOptions);
|
|
23
|
-
getOutputs():
|
|
24
|
-
id: pulumi.Output<string>;
|
|
25
|
-
resourceName: pulumi.Output<string>;
|
|
26
|
-
};
|
|
24
|
+
getOutputs(): types.ResourceOutputs;
|
|
27
25
|
addARecords(aRecords: Array<{
|
|
28
26
|
name: string;
|
|
29
27
|
ipv4Address: pulumi.Input<pulumi.Input<string>[]>;
|
package/vnet/PrivateDnsZone.js
CHANGED
|
@@ -63,6 +63,7 @@ class PrivateDnsZone extends base_1.BaseComponent {
|
|
|
63
63
|
return {
|
|
64
64
|
id: this.id,
|
|
65
65
|
resourceName: this.resourceName,
|
|
66
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
66
67
|
};
|
|
67
68
|
}
|
|
68
69
|
addARecords(aRecords) {
|
|
@@ -108,4 +109,4 @@ class PrivateDnsZone extends base_1.BaseComponent {
|
|
|
108
109
|
}
|
|
109
110
|
}
|
|
110
111
|
exports.PrivateDnsZone = PrivateDnsZone;
|
|
111
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZURuc1pvbmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdm5ldC9Qcml2YXRlRG5zWm9uZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0RUFBOEQ7QUFDOUQsdURBQXlDO0FBQ3pDLGtDQUF3QztBQUN4Qyw2Q0FBMkQ7QUFDM0Qsd0NBQXVDO0FBR3ZDLG1EQUFxQztBQWdCckMsTUFBYSxjQUFlLFNBQVEsb0JBQWlDO0lBQ25ELEVBQUUsQ0FBd0I7SUFDMUIsWUFBWSxDQUF3QjtJQUNuQyxPQUFPLENBQVM7SUFFakMsWUFBWSxJQUFZLEVBQUUsSUFBd0IsRUFBRSxJQUFzQztRQUN4RixLQUFLLENBQUMsSUFBQSxrQ0FBd0IsRUFBQyxnQkFBZ0IsQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDcEUsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQztRQUN4QyxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7UUFFcEMsTUFBTSxJQUFJLEdBQUcsSUFBSSxVQUFVLENBQUMsV0FBVyxDQUNyQyxJQUFJLENBQUMsT0FBTyxFQUNaO1lBQ0UsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjtZQUMxQyxRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVE7WUFDeEIsZUFBZSxFQUFFLElBQUk7U0FDdEIsRUFDRCxFQUFFLEdBQUcsSUFBSSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FDMUIsQ0FBQztRQUVGLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFM0IsSUFBSSxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQ2xCLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLElBQUks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
|
package/vnet/RouteTable.d.ts
CHANGED
|
@@ -14,9 +14,6 @@ export declare class RouteTable extends BaseComponent<RouteTableArgs> {
|
|
|
14
14
|
readonly id: pulumi.Output<string>;
|
|
15
15
|
readonly resourceName: pulumi.Output<string>;
|
|
16
16
|
constructor(name: string, args: RouteTableArgs, opts?: pulumi.ComponentResourceOptions);
|
|
17
|
-
getOutputs():
|
|
18
|
-
id: pulumi.Output<string>;
|
|
19
|
-
resourceName: pulumi.Output<string>;
|
|
20
|
-
};
|
|
17
|
+
getOutputs(): types.ResourceOutputs;
|
|
21
18
|
addRoute(name: string, props: RouteArgs): import("@pulumi/azure-native/network/route").Route;
|
|
22
19
|
}
|
package/vnet/RouteTable.js
CHANGED
|
@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.RouteTable = void 0;
|
|
37
37
|
const network = __importStar(require("@pulumi/azure-native/network"));
|
|
38
|
+
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
38
39
|
const base_1 = require("../base");
|
|
39
40
|
const helpers_1 = require("../base/helpers");
|
|
40
41
|
class RouteTable extends base_1.BaseComponent {
|
|
@@ -59,6 +60,7 @@ class RouteTable extends base_1.BaseComponent {
|
|
|
59
60
|
return {
|
|
60
61
|
id: this.id,
|
|
61
62
|
resourceName: this.resourceName,
|
|
63
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
62
64
|
};
|
|
63
65
|
}
|
|
64
66
|
addRoute(name, props) {
|
|
@@ -72,4 +74,4 @@ class RouteTable extends base_1.BaseComponent {
|
|
|
72
74
|
}
|
|
73
75
|
}
|
|
74
76
|
exports.RouteTable = RouteTable;
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUm91dGVUYWJsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92bmV0L1JvdXRlVGFibGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBQ3hELHVEQUF5QztBQUN6QyxrQ0FBd0M7QUFDeEMsNkNBQTJEO0FBbUIzRCxNQUFhLFVBQVcsU0FBUSxvQkFBNkI7SUFDM0MsRUFBRSxDQUF3QjtJQUMxQixZQUFZLENBQXdCO0lBRXBELFlBQVksSUFBWSxFQUFFLElBQW9CLEVBQUUsSUFBc0M7UUFDcEYsS0FBSyxDQUFDLElBQUEsa0NBQXdCLEVBQUMsWUFBWSxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUVoRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sR0FBRyxFQUFFLEVBQUUsR0FBRyxLQUFLLEVBQUUsR0FBRyxJQUFJLENBQUM7UUFDaEQsTUFBTSxFQUFFLEdBQUcsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUMvQixJQUFJLEVBQ0o7WUFDRSxHQUFHLEtBQUs7WUFDUixHQUFHLE9BQU87WUFDVixNQUFNLEVBQUUsU0FBUztTQUNsQixFQUNELEVBQUUsR0FBRyxJQUFJLEVBQUUsYUFBYSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUNyRCxDQUFDO1FBRUYsSUFBSSxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUMsRUFBRSxDQUFDO1FBQ2hCLElBQUksQ0FBQyxZQUFZLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQztRQUU1QixNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDZixJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxHQUFHLENBQUMsRUFBRSxHQUFHLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFDOUMsQ0FBQyxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDekIsQ0FBQztJQUVNLFVBQVU7UUFDZixPQUFPO1lBQ0wsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1lBQ1gsWUFBWSxFQUFFLElBQUksQ0FBQyxZQUFZO1lBQy9CLGlCQUFpQixFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsaUJBQWlCLENBQUM7U0FDdEUsQ0FBQztJQUNKLENBQUM7SUFFTSxRQUFRLENBQUMsSUFBWSxFQUFFLEtBQWdCO1FBQzVDLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBQzlCLE9BQU8sSUFBSSxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDLElBQUksSUFBSSxJQUFJLEVBQUUsRUFBRTtZQUMvQyxHQUFHLE9BQU87WUFDVixHQUFHLEtBQUs7WUFDUixjQUFjLEVBQUUsSUFBSSxDQUFDLFlBQVk7WUFDakMsU0FBUyxFQUFFLElBQUk7U0FDaEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBN0NELGdDQTZDQyJ9
|
package/vnet/VirtualNetwork.js
CHANGED
|
@@ -72,18 +72,46 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
72
72
|
//this.createOutboundRoute({ router: routeTable!, natGateway, firewall });
|
|
73
73
|
this.createPeering(vnet);
|
|
74
74
|
if (basion)
|
|
75
|
-
this.basion = {
|
|
75
|
+
this.basion = {
|
|
76
|
+
id: basion.id,
|
|
77
|
+
resourceName: basion.resourceName,
|
|
78
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
79
|
+
};
|
|
76
80
|
if (securityGroup)
|
|
77
|
-
this.securityGroup = {
|
|
78
|
-
|
|
81
|
+
this.securityGroup = {
|
|
82
|
+
id: securityGroup.id,
|
|
83
|
+
resourceName: securityGroup.name,
|
|
84
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
85
|
+
};
|
|
86
|
+
this.routeTable = {
|
|
87
|
+
id: routeTable.id,
|
|
88
|
+
resourceName: routeTable.resourceName,
|
|
89
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
90
|
+
};
|
|
79
91
|
if (natGateway)
|
|
80
|
-
this.natGateway = {
|
|
92
|
+
this.natGateway = {
|
|
93
|
+
id: natGateway.id,
|
|
94
|
+
resourceName: natGateway.name,
|
|
95
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
96
|
+
};
|
|
81
97
|
if (vpnGateway)
|
|
82
|
-
this.vpnGateway = {
|
|
98
|
+
this.vpnGateway = {
|
|
99
|
+
id: vpnGateway.id,
|
|
100
|
+
resourceName: vpnGateway.resourceName,
|
|
101
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
102
|
+
};
|
|
83
103
|
if (firewall)
|
|
84
104
|
this.firewall = firewall.getOutputs();
|
|
85
|
-
this.vnet = {
|
|
86
|
-
|
|
105
|
+
this.vnet = {
|
|
106
|
+
id: vnet.id,
|
|
107
|
+
resourceName: vnet.name,
|
|
108
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
109
|
+
};
|
|
110
|
+
this.subnets = (0, rsHelpers_1.dictReduce)(subnets, (name, s) => ({
|
|
111
|
+
id: s.id,
|
|
112
|
+
resourceName: s.name.apply((n) => n),
|
|
113
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
114
|
+
}));
|
|
87
115
|
this.ipAddresses = ipAddresses;
|
|
88
116
|
this.createPrivateZonesLinks(vnet);
|
|
89
117
|
this.registerOutputs();
|
|
@@ -146,7 +174,10 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
146
174
|
parent: this,
|
|
147
175
|
retainOnDelete: true,
|
|
148
176
|
});
|
|
149
|
-
return Object.values(this.ipAddressInstance.ipAddresses)
|
|
177
|
+
return Object.values(this.ipAddressInstance.ipAddresses).map((ip) => ({
|
|
178
|
+
...ip,
|
|
179
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
180
|
+
}));
|
|
150
181
|
}
|
|
151
182
|
createManagePublicIpAddress() {
|
|
152
183
|
const { firewallCreate, rsGroup } = this.args;
|
|
@@ -344,7 +375,11 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
344
375
|
return undefined;
|
|
345
376
|
return new NetworkPeering_1.NetworkPeering(`${this.name}-peering`, {
|
|
346
377
|
...peeringCreate,
|
|
347
|
-
firstVnet: {
|
|
378
|
+
firstVnet: {
|
|
379
|
+
id: vnet.id,
|
|
380
|
+
resourceName: vnet.name,
|
|
381
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
382
|
+
},
|
|
348
383
|
secondVnet: peeringCreate.vnet,
|
|
349
384
|
}, { dependsOn: vnet, parent: this });
|
|
350
385
|
}
|
|
@@ -356,7 +391,7 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
356
391
|
const info = helpers_1.rsHelpers.getRsInfoFromId(pz.id);
|
|
357
392
|
return new privateDns.VirtualNetworkLink(`${this.name}-${info.resourceName}`.substring(0, 55), {
|
|
358
393
|
privateZoneName: info.resourceName,
|
|
359
|
-
resourceGroupName: info.
|
|
394
|
+
resourceGroupName: info.resourceGroupName,
|
|
360
395
|
location: 'global',
|
|
361
396
|
registrationEnabled: false,
|
|
362
397
|
virtualNetwork: { id: vnet.id },
|
|
@@ -365,4 +400,4 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
365
400
|
}
|
|
366
401
|
}
|
|
367
402
|
exports.Vnet = Vnet;
|
|
368
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"VirtualNetwork.js","sourceRoot":"","sources":["../../src/vnet/VirtualNetwork.ts"],"names":[],"mappings":"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"}
|
|
403
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"VirtualNetwork.js","sourceRoot":"","sources":["../../src/vnet/VirtualNetwork.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAAwD;AAExD,uDAAyC;AACzC,kCAAgE;AAChE,oDAAkD;AAElD,qCAA8C;AAC9C,yCAAqE;AACrE,mDAAqC;AACrC,qDAAsE;AACtE,6CAA0D;AAC1D,mDAAyD;AACzD,6CAA0D;AAC1D,+CAA6D;AAC7D,4EAA8D;AAC9D,wCAAmD;AAkGnD,MAAa,IAAK,SAAQ,4BAA+B;IACvC,MAAM,CAAyB;IAC/B,aAAa,CAAyB;IACtC,UAAU,CAAwB;IAClC,UAAU,CAAyB;IACnC,UAAU,CAAyB;IACnC,QAAQ,CAAmB;IAC3B,IAAI,CAAwB;IAC5B,OAAO,CAAwC;IAC/C,WAAW,GAAwC,EAAE,CAAC;IAC9D,iBAAiB,CAA0B;IAEnD,YAAY,IAAY,EAAE,IAAc,EAAE,IAAsC;QAC9E,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEhC,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACnD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;QACrF,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAElD,0EAA0E;QAC1E,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAEzB,IAAI,MAAM;YACR,IAAI,CAAC,MAAM,GAAG;gBACZ,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;aACtE,CAAC;QACJ,IAAI,aAAa;YACf,IAAI,CAAC,aAAa,GAAG;gBACnB,EAAE,EAAE,aAAa,CAAC,EAAE;gBACpB,YAAY,EAAE,aAAa,CAAC,IAAI;gBAChC,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;aACtE,CAAC;QACJ,IAAI,CAAC,UAAU,GAAG;YAChB,EAAE,EAAE,UAAU,CAAC,EAAE;YACjB,YAAY,EAAE,UAAU,CAAC,YAAY;YACrC,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;SACtE,CAAC;QACF,IAAI,UAAU;YACZ,IAAI,CAAC,UAAU,GAAG;gBAChB,EAAE,EAAE,UAAU,CAAC,EAAE;gBACjB,YAAY,EAAE,UAAU,CAAC,IAAI;gBAC7B,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;aACtE,CAAC;QACJ,IAAI,UAAU;YACZ,IAAI,CAAC,UAAU,GAAG;gBAChB,EAAE,EAAE,UAAU,CAAC,EAAE;gBACjB,YAAY,EAAE,UAAU,CAAC,YAAY;gBACrC,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;aACtE,CAAC;QACJ,IAAI,QAAQ;YAAE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,UAAU,EAAE,CAAC;QACpD,IAAI,CAAC,IAAI,GAAG;YACV,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,YAAY,EAAE,IAAI,CAAC,IAAI;YACvB,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;SACtE,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAA,sBAAU,EAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/C,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC;YACrC,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;SACtE,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAEnC,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAEM,UAAU;QACf,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC;IACJ,CAAC;IAEO,mBAAmB;QACzB,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3D,IAAI,CAAC,mBAAmB;YAAE,OAAO,SAAS,CAAC;QAC3C,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,KAAK,EAAE,GAAG,mBAAmB,CAAC;QAE7D,IAAI,MAAM,EAAE,CAAC;YACX,aAAa,CAAC,IAAI,CAAC,GAAG,IAAA,sCAAsB,EAAC,EAAE,oBAAoB,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;QAC/F,CAAC;QAED,OAAO,IAAI,OAAO,CAAC,oBAAoB,CACrC,GAAG,IAAI,CAAC,IAAI,MAAM,EAClB;YACE,GAAG,OAAO;YACV,GAAG,KAAK;YACR,aAAa;SACd,EACD,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAClD,CAAC;IACJ,CAAC;IAEO,gBAAgB;QACtB,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,gBAAgB,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACrE,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,UAAU,EAAE,GAAG,gBAAgB,CAAC;QAExD,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,UAAU;gBAChB,GAAG,OAAO,CAAC,iBAAiB,CAAC,oBAAoB;aAClD,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,uBAAU,CACnB,GAAG,IAAI,CAAC,IAAI,KAAK,EACjB;YACE,OAAO;YACP,GAAG,UAAU;YACb,MAAM;SACP,EACD,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAClD,CAAC;IACJ,CAAC;IAED,oGAAoG;IAC5F,uBAAuB;QAC7B,MAAM,EAAE,cAAc,EAAE,iBAAiB,EAAE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACnG,IAAI,iBAAiB;YAAE,OAAO,iBAAiB,CAAC;QAChD,MAAM,QAAQ,GACZ,CAAC,gBAAgB,IAAI,cAAc,CAAC,IAAI,CAAC,cAAc;YACrD,CAAC,CAAC;gBACE,GAAG,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,GAAG,IAAI,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE;gBACpE,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;aACtC;YACH,CAAC,CAAC,cAAc,CAAC;QAErB,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,CAAC;QACzB,IAAI,CAAC,iBAAiB,GAAG,IAAI,yBAAW,CACtC,GAAG,IAAI,CAAC,IAAI,KAAK,EACjB,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,EACxB;YACE,MAAM,EAAE,IAAI;YACZ,cAAc,EAAE,IAAI;SACrB,CACF,CAAC;QAEF,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACpE,GAAG,EAAE;YACL,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;SACtE,CAAC,CAAC,CAAC;IACN,CAAC;IAEO,2BAA2B;QACjC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC9C,IAAI,cAAc,EAAE,yBAAyB;YAAE,OAAO,cAAc,CAAC,yBAAyB,CAAC;QAE/F,IAAI,cAAc,EAAE,GAAG,CAAC,IAAI,IAAI,OAAO;YACrC,OAAO,CAAC,IAAI,CAAC,iBAAiB,GAAG,IAAI,yBAAW,CAC9C,GAAG,IAAI,CAAC,IAAI,SAAS,EACrB,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,EAC3F;gBACE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS;gBAC/B,MAAM,EAAE,IAAI;aACb,CACF,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAEO,gBAAgB,CAAC,WAAmC;QAC1D,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAChD,IAAI,CAAC,gBAAgB;YAAE,OAAO,SAAS,CAAC;QACxC,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;QAE9E,OAAO,IAAI,OAAO,CAAC,UAAU,CAC3B,GAAG,IAAI,CAAC,IAAI,MAAM,EAClB;YACE,GAAG,OAAO;YACV,GAAG,gBAAgB;YACnB,GAAG,EAAE,EAAE,IAAI,EAAE,gBAAgB,CAAC,GAAG,EAAE;YACnC,KAAK,EAAE,gBAAgB,CAAC,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,oBAAU,CAAC,eAAe,CAAC,gBAAgB,CAAC,KAAK,CAAC;YACtG,iBAAiB,EAAE,WAAW;SAC/B,EACD,EAAE,SAAS,EAAE,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAC5E,CAAC;IACJ,CAAC;IAEO,gBAAgB,CAAC,OAAuC;QAC9D,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAChD,IAAI,CAAC,gBAAgB;YAAE,OAAO,SAAS,CAAC;QAExC,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QACtE,OAAO,IAAI,uBAAU,CACnB,GAAG,IAAI,CAAC,IAAI,MAAM,EAClB;YACE,GAAG,gBAAgB;YACnB,OAAO;YACP,QAAQ,EAAE,SAAS,CAAC,EAAE;SACvB,EACD,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CACvC,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,OAAuC;QAC5D,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACnF,IAAI,CAAC,cAAc;YAAE,OAAO,SAAS,CAAC;QAEtC,MAAM,KAAK,GAAG,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACjD,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;QAC1E,MAAM,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;QAE1F,OAAO,IAAI,mBAAQ,CACjB,GAAG,IAAI,CAAC,IAAI,KAAK,EACjB;YACE,GAAG,cAAc;YACjB,OAAO;YACP,yBAAyB,EACvB,oBAAoB,IAAI,KAAK;gBAC3B,CAAC,CAAC;oBACE,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,gBAAgB;oBAClC,eAAe,EAAE,KAAK;oBACtB,MAAM,EAAE,EAAE,EAAE,EAAE,oBAAoB,CAAC,EAAE,EAAE;iBACxC;gBACH,CAAC,CAAC,SAAS;YAEf,gBAAgB,EAAE,iBAAiB;gBACjC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAC7C,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;oBACrB,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,YAAY,YAAY;oBAChD,+DAA+D;oBAC/D,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;oBACjD,oDAAoD;oBACpD,MAAM,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS;iBAC5D,CAAC,CAAC,CACJ;gBACH,CAAC,CAAC;oBACE;wBACE,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,YAAY;wBAC9B,MAAM,EAAE,EAAE,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE;qBAClC;iBACF;SACN,EACD,EAAE,SAAS,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,oBAAoB,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,CAC5G,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,OAAuC;QAC1D,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACtC,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QAE3E,OAAO,IAAI,eAAM,CACf,GAAG,IAAI,CAAC,IAAI,UAAU,EACtB;YACE,GAAG,MAAM;YACT,OAAO;YACP,QAAQ,EAAE,YAAY,CAAC,EAAE;YACzB,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE;SAC/B,EACD,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,CAC1C,CAAC;IACJ,CAAC;IAEO,UAAU,CAAC,EACjB,UAAU,EACV,UAAU,EACV,aAAa,GAKd;QACC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC9E,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;QACnC,MAAM,SAAS,GAAoC,EAAE,CAAC;QAEtD,IAAI,cAAc,EAAE,CAAC;YACnB,qGAAqG;YACrG,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBACpB,CAAC,CAAC,iBAAiB,GAAG,IAAI,CAAC;gBAC7B,CAAC,CAAC,CAAC;YACL,CAAC;YAED,OAAO,CAAC,IAAI,CAAC;gBACX,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,gBAAgB;gBACrD,aAAa,EAAE,cAAc,CAAC,YAAY;gBAC1C,oBAAoB,EAAE,IAAI;gBAC1B,iBAAiB,EAAE,KAAK;gBACxB,iBAAiB,EAAE,KAAK;aACzB,CAAC,CAAC;YAEH,IAAI,cAAc,CAAC,sBAAsB,EAAE,CAAC;gBAC1C,OAAO,CAAC,IAAI,CAAC;oBACX,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,0BAA0B;oBAC/D,aAAa,EAAE,cAAc,CAAC,sBAAsB;oBACpD,oBAAoB,EAAE,IAAI;oBAC1B,iBAAiB,EAAE,IAAI;oBACvB,iBAAiB,EAAE,IAAI;iBACxB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC;gBACX,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,mBAAmB;gBACxD,aAAa,EAAE,MAAM,CAAC,YAAY;gBAClC,oBAAoB,EAAE,KAAK;gBAC3B,iBAAiB,EAAE,IAAI;gBACvB,iBAAiB,EAAE,IAAI;aACxB,CAAC,CAAC;QACL,CAAC;QACD,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC;gBACX,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,iBAAiB;gBACtD,aAAa,EAAE,gBAAgB,CAAC,YAAY;gBAC5C,oBAAoB,EAAE,IAAI;gBAC1B,iBAAiB,EAAE,IAAI;gBACvB,iBAAiB,EAAE,IAAI;aACxB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,UAAU;YAAE,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,UAAU;YAAE,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,aAAa;YAAE,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEjD,MAAM,EAAE,GAAG,IAAI,OAAO,CAAC,cAAc,CACnC,GAAG,IAAI,CAAC,IAAI,OAAO,EACnB;YACE,GAAG,OAAO;YACV,GAAG,IAAI;YACP,YAAY,EAAE;gBACZ,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAc,CAAC;aAC9E;YAED,OAAO,EAAE,EAAE;YACX,sBAAsB,EAAE,EAAE;YAE1B,kBAAkB,EAAE,IAAI;YACxB,UAAU,EAAE;gBACV,OAAO,EAAE,IAAI;gBACb,WAAW,EAAE,OAAO,CAAC,mCAAmC,CAAC,gBAAgB;aAC1E;SACF,EACD,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,wBAAwB,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAClF,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC;YAC9B,OAAO;YACP,IAAI,EAAE,EAAE;YACR,UAAU;YACV,UAAU;YACV,aAAa;SACd,CAAC,CAAC;QAEH,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACrC,CAAC;IAEO,aAAa,CAAC,EACpB,OAAO,EACP,IAAI,EACJ,UAAU,EACV,UAAU,EACV,aAAa,GAOd;QACC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC9B,MAAM,EAAE,GAAmC,EAAE,CAAC;QAE9C,OAAO;aACJ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;aACxD,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,IAAI,OAAO,CAAC,MAAM,CACpC,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,UAAU,EAAE,EAC9B;YACE,GAAG,CAAC;YACJ,GAAG,OAAO;YACV,gBAAgB,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;YAClG,kBAAkB,EAAE,IAAI,CAAC,IAAI;YAE7B,qFAAqF;YACrF,qBAAqB,EAAE,CAAC,CAAC,qBAAqB,IAAI,KAAK;YACvD,UAAU,EAAE,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS;YAC5F,oBAAoB,EAAE,CAAC,CAAC,oBAAoB;gBAC1C,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,aAAa;oBACb,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,EAAE,EAAE;oBAC1B,CAAC,CAAC,SAAS;YACf,UAAU,EAAE,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS;SAC7F,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAC7D,CAAC,CACL,CAAC;QAEJ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,gCAAgC;IAChC,YAAY;IACZ,cAAc;IACd,gBAAgB;IAChB,OAAO;IACP,wBAAwB;IACxB,qCAAqC;IACrC,yBAAyB;IACzB,OAAO;IACP,mCAAmC;IACnC,qGAAqG;IACrG,MAAM;IACN,IAAI;IAEI,aAAa,CAAC,IAA4B;QAChD,MAAM,EACJ,IAAI,EAAE,EAAE,aAAa,EAAE,GACxB,GAAG,IAAI,CAAC,IAAI,CAAC;QACd,IAAI,CAAC,aAAa;YAAE,OAAO,SAAS,CAAC;QAErC,OAAO,IAAI,+BAAc,CACvB,GAAG,IAAI,CAAC,IAAI,UAAU,EACtB;YACE,GAAG,aAAa;YAChB,SAAS,EAAE;gBACT,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,YAAY,EAAE,IAAI,CAAC,IAAI;gBACvB,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;aACtE;YACD,UAAU,EAAE,aAAa,CAAC,IAAI;SAC/B,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAClC,CAAC;IACJ,CAAC;IAEO,uBAAuB,CAAC,IAA4B;QAC1D,MAAM,EACJ,IAAI,EAAE,EAAE,iBAAiB,EAAE,GAC5B,GAAG,IAAI,CAAC,IAAI,CAAC;QACd,IAAI,CAAC,iBAAiB;YAAE,OAAO,SAAS,CAAC;QACzC,OAAO,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CACtD,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YACf,MAAM,IAAI,GAAG,mBAAS,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAC9C,OAAO,IAAI,UAAU,CAAC,kBAAkB,CACtC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,EACpD;gBACE,eAAe,EAAE,IAAI,CAAC,YAAY;gBAClC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,QAAQ,EAAE,QAAQ;gBAClB,mBAAmB,EAAE,KAAK;gBAC1B,cAAc,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE;aAChC,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CACrD,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AA9cD,oBA8cC"}
|
package/vnet/VpnGateway.d.ts
CHANGED
|
@@ -11,8 +11,5 @@ export declare class VpnGateway extends BaseComponent<VpnGatewayArgs> {
|
|
|
11
11
|
readonly id: pulumi.Output<string>;
|
|
12
12
|
readonly resourceName: pulumi.Output<string>;
|
|
13
13
|
constructor(name: string, args: VpnGatewayArgs, opts?: pulumi.ComponentResourceOptions);
|
|
14
|
-
getOutputs():
|
|
15
|
-
id: pulumi.Output<string>;
|
|
16
|
-
resourceName: pulumi.Output<string>;
|
|
17
|
-
};
|
|
14
|
+
getOutputs(): types.ResourceOutputs;
|
|
18
15
|
}
|
package/vnet/VpnGateway.js
CHANGED
|
@@ -83,8 +83,9 @@ class VpnGateway extends base_1.BaseComponent {
|
|
|
83
83
|
return {
|
|
84
84
|
id: this.id,
|
|
85
85
|
resourceName: this.resourceName,
|
|
86
|
+
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
86
87
|
};
|
|
87
88
|
}
|
|
88
89
|
}
|
|
89
90
|
exports.VpnGateway = VpnGateway;
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVnBuR2F0ZXdheS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92bmV0L1ZwbkdhdGV3YXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsaUVBQW1EO0FBQ25ELHVEQUF5QztBQUN6QyxrQ0FBd0M7QUFDeEMsNkNBQTJEO0FBQzNELHdDQUFzQztBQWV0QyxNQUFhLFVBQVcsU0FBUSxvQkFBNkI7SUFDM0MsRUFBRSxDQUF3QjtJQUMxQixZQUFZLENBQXdCO0lBRXBELFlBQVksSUFBWSxFQUFFLElBQW9CLEVBQUUsSUFBc0M7UUFDcEYsS0FBSyxDQUFDLElBQUEsa0NBQXdCLEVBQUMsWUFBWSxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUVoRSxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxlQUFlLEVBQUUsUUFBUSxFQUFFLEdBQUcsS0FBSyxFQUFFLEdBQUcsSUFBSSxDQUFDO1FBRW5FLE1BQU0sR0FBRyxHQUFHLElBQUksRUFBRSxDQUFDLHFCQUFxQixDQUN0QyxJQUFJLEVBQ0o7WUFDRSxHQUFHLE9BQU87WUFDVixHQUFHLEtBQUs7WUFDUixHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUU7WUFFN0IsV0FBVyxFQUFFLEtBQUssQ0FBQyxXQUFXLElBQUksS0FBSztZQUN2QyxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sSUFBSSxZQUFZO1lBRXRDLGdCQUFnQixFQUFFO2dCQUNoQjtvQkFDRSxJQUFJLEVBQUUsbUJBQW1CO29CQUN6QixlQUFlLEVBQ2IsR0FBRyxLQUFLLE9BQU87d0JBQ2IsQ0FBQyxDQUFDOzRCQUNFLEVBQUUsRUFBRSxlQUFlLENBQUMsRUFBRTt5QkFDdkI7d0JBQ0gsQ0FBQyxDQUFDLFNBQVM7b0JBQ2YsTUFBTSxFQUFFO3dCQUNOLEVBQUUsRUFBRSxRQUFRO3FCQUNiO2lCQUNGO2FBQ0Y7WUFFRCxzQkFBc0IsRUFBRSxLQUFLLENBQUMsc0JBQXNCLElBQUk7Z0JBQ3RELGtCQUFrQixFQUFFLENBQUMsU0FBUyxDQUFDO2dCQUMvQixvQkFBb0IsRUFBRTtvQkFDcEIsZUFBZSxFQUFFLENBQUMsaUJBQWlCLENBQUM7aUJBQ3JDO2dCQUVELHNCQUFzQixFQUFFLENBQUMsRUFBRSxDQUFDLHFCQUFxQixDQUFDLEdBQUcsQ0FBQztnQkFDdEQsU0FBUyxFQUFFLE1BQU0sQ0FBQyxXQUFXLENBQUEscUNBQXFDLGtCQUFRLENBQUMsUUFBUSxFQUFFO2dCQUNyRixXQUFXLEVBQUUsc0NBQXNDO2dCQUNuRCxTQUFTLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQSwyQkFBMkIsa0JBQVEsQ0FBQyxRQUFRLEdBQUc7YUFDN0U7U0FDRixFQUNELEVBQUUsR0FBRyxJQUFJLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUMxQixDQUFDO1FBRUYsSUFBSSxDQUFDLEVBQUUsR0FBRyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxZQUFZLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQztRQUU3QixJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDekIsQ0FBQztJQUVNLFVBQVU7UUFDZixPQUFPO1lBQ0wsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1lBQ1gsWUFBWSxFQUFFLElBQUksQ0FBQyxZQUFZO1lBQy9CLGlCQUFpQixFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsaUJBQWlCLENBQUM7U0FDdEUsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQTlERCxnQ0E4REMifQ==
|