@drunk-pulumi/azure 0.0.43 → 0.0.44

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. package/Apps/LogicApp.d.ts +4 -11
  2. package/Apps/LogicApp.js +9 -13
  3. package/AzAd/Group.d.ts +1 -1
  4. package/AzAd/RoleAssignment.d.ts +1 -1
  5. package/AzAd/RoleAssignment.js +12 -7
  6. package/Builder/ApimBuilder.js +9 -5
  7. package/Builder/ResourceBuilder.js +1 -2
  8. package/Builder/VaultBuilder.js +1 -2
  9. package/Builder/VnetBuilder.js +24 -14
  10. package/Builder/types/apimBuilder.d.ts +2 -3
  11. package/Builder/types/vnetBuilder.d.ts +4 -1
  12. package/Common/AzureEnv.d.ts +1 -2
  13. package/Common/AzureEnv.js +1 -1
  14. package/Common/Helpers.d.ts +13 -0
  15. package/Common/Helpers.js +43 -5
  16. package/Common/Naming/index.d.ts +3 -2
  17. package/Common/Naming/index.js +10 -7
  18. package/Common/ResourceEnv.d.ts +1 -11
  19. package/Common/ResourceEnv.js +24 -20
  20. package/ContainerRegistry/index.d.ts +2 -2
  21. package/ContainerRegistry/index.js +7 -8
  22. package/KeyVault/index.d.ts +5 -9
  23. package/KeyVault/index.js +12 -10
  24. package/MySql/index.d.ts +2 -9
  25. package/MySql/index.js +14 -10
  26. package/Postgresql/index.d.ts +2 -9
  27. package/Postgresql/index.js +13 -10
  28. package/RedisCache/index.d.ts +9 -5
  29. package/RedisCache/index.js +42 -31
  30. package/ServiceBus/index.d.ts +2 -6
  31. package/ServiceBus/index.js +10 -12
  32. package/SignalR/index.d.ts +2 -2
  33. package/SignalR/index.js +21 -27
  34. package/Sql/index.d.ts +2 -6
  35. package/Sql/index.js +25 -26
  36. package/Storage/index.js +3 -5
  37. package/VNet/Helper.d.ts +2 -2
  38. package/VNet/Helper.js +7 -10
  39. package/VNet/PrivateEndpoint.d.ts +6 -6
  40. package/VNet/PrivateEndpoint.js +9 -8
  41. package/Web/AppConfig.d.ts +2 -2
  42. package/Web/AppConfig.js +3 -5
  43. package/package.json +1 -1
  44. package/types.d.ts +19 -10
package/VNet/Helper.js CHANGED
@@ -34,10 +34,7 @@ exports.gatewaySubnetName = "GatewaySubnet";
34
34
  exports.azFirewallSubnet = "AzureFirewallSubnet";
35
35
  exports.azFirewallManagementSubnet = "AzureFirewallManagementSubnet";
36
36
  exports.azBastionSubnetName = "AzureBastionSubnet";
37
- const getIpsRange = (prefix) => {
38
- //console.debug('getIpsRange', block);
39
- return new netmask.Netmask(prefix);
40
- };
37
+ const getIpsRange = (prefix) => new netmask.Netmask(prefix);
41
38
  exports.getIpsRange = getIpsRange;
42
39
  /** Convert IP address and IP address group into range */
43
40
  const convertToIpRange = (ipAddress) => ipAddress.map((ip) => {
@@ -75,9 +72,9 @@ const getIpAddressResource = ({ name, groupName, }) => {
75
72
  });
76
73
  };
77
74
  exports.getIpAddressResource = getIpAddressResource;
78
- const getVnetInfo = (groupName) => {
79
- const vnetName = (0, Naming_1.getVnetName)(groupName);
80
- const rsName = (0, Naming_1.getResourceGroupName)(groupName);
75
+ const getVnetInfo = (groupName, region = AzureEnv_1.currentCountryCode) => {
76
+ const vnetName = (0, Naming_1.getVnetName)(groupName, { region });
77
+ const rsName = (0, Naming_1.getResourceGroupName)(groupName, { region });
81
78
  return {
82
79
  vnetName,
83
80
  resourceGroupName: rsName,
@@ -85,8 +82,8 @@ const getVnetInfo = (groupName) => {
85
82
  };
86
83
  };
87
84
  exports.getVnetInfo = getVnetInfo;
88
- const getVnetIdByName = (groupName) => {
89
- const info = (0, exports.getVnetInfo)(groupName);
85
+ const getVnetIdByName = (groupName, region = AzureEnv_1.currentCountryCode) => {
86
+ const info = (0, exports.getVnetInfo)(groupName, region);
90
87
  return (0, pulumi_1.interpolate) `/subscriptions/${info.subscriptionId}/resourceGroups/${info.resourceGroupName}/providers/Microsoft.Network/virtualNetworks/${info.vnetName}`;
91
88
  };
92
89
  exports.getVnetIdByName = getVnetIdByName;
@@ -113,4 +110,4 @@ const getFirewallIpAddressByGroupName = (groupName) => {
113
110
  return (0, exports.getFirewallIpAddress)(fireWallName, { resourceGroupName: rsName });
114
111
  };
115
112
  exports.getFirewallIpAddressByGroupName = getFirewallIpAddressByGroupName;
116
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBQ3hELDJDQUFvRTtBQUNwRSxpREFBbUM7QUFDbkMsaURBSTRCO0FBQzVCLDZDQUswQjtBQUliLFFBQUEsb0JBQW9CLEdBQUcsYUFBYSxDQUFDO0FBQ3JDLFFBQUEsaUJBQWlCLEdBQUcsZUFBZSxDQUFDO0FBQ3BDLFFBQUEsZ0JBQWdCLEdBQUcscUJBQXFCLENBQUM7QUFDekMsUUFBQSwwQkFBMEIsR0FBRywrQkFBK0IsQ0FBQztBQUM3RCxRQUFBLG1CQUFtQixHQUFHLG9CQUFvQixDQUFDO0FBRWpELE1BQU0sV0FBVyxHQUFHLENBQUMsTUFBYyxFQUFFLEVBQUU7SUFDNUMsc0NBQXNDO0lBQ3RDLE9BQU8sSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQ3JDLENBQUMsQ0FBQztBQUhXLFFBQUEsV0FBVyxlQUd0QjtBQUVGLHlEQUF5RDtBQUNsRCxNQUFNLGdCQUFnQixHQUFHLENBQzlCLFNBQW1CLEVBQ29CLEVBQUUsQ0FDekMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFO0lBQ25CLElBQUksRUFBRSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ3JCLE1BQU0sS0FBSyxHQUFHLElBQUEsbUJBQVcsRUFBQyxFQUFFLENBQUMsQ0FBQztRQUM5QixPQUFPLEVBQUUsS0FBSyxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEtBQUssQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNyRCxDQUFDO0lBQ0QsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxDQUFDO0FBQ2hDLENBQUMsQ0FBQyxDQUFDO0FBVFEsUUFB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
113
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBQ3hELDJDQUFvRTtBQUNwRSxpREFBbUM7QUFDbkMsaURBSTRCO0FBQzVCLDZDQUswQjtBQUliLFFBQUEsb0JBQW9CLEdBQUcsYUFBYSxDQUFDO0FBQ3JDLFFBQUEsaUJBQWlCLEdBQUcsZUFBZSxDQUFDO0FBQ3BDLFFBQUEsZ0JBQWdCLEdBQUcscUJBQXFCLENBQUM7QUFDekMsUUFBQSwwQkFBMEIsR0FBRywrQkFBK0IsQ0FBQztBQUM3RCxRQUFBLG1CQUFtQixHQUFHLG9CQUFvQixDQUFDO0FBRWpELE1BQU0sV0FBVyxHQUFHLENBQUMsTUFBYyxFQUFFLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7QUFBOUQsUUFBQSxXQUFXLGVBQW1EO0FBRTNFLHlEQUF5RDtBQUNsRCxNQUFNLGdCQUFnQixHQUFHLENBQzlCLFNBQW1CLEVBQ29CLEVBQUUsQ0FDekMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFO0lBQ25CLElBQUksRUFBRSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ3JCLE1BQU0sS0FBSyxHQUFHLElBQUEsbUJBQVcsRUFBQyxFQUFFLENBQUMsQ0FBQztRQUM5QixPQUFPLEVBQUUsS0FBSyxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEtBQUssQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNyRCxDQUFDO0lBQ0QsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxDQUFDO0FBQ2hDLENBQUMsQ0FBQyxDQUFDO0FBVFEsUUFBQSxnQkFBZ0Isb0JBU3hCO0FBRUUsTUFBTSxxQkFBcUIs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
@@ -1,9 +1,9 @@
1
- import { Input } from "@pulumi/pulumi";
2
- import { BasicResourceArgs, PrivateLinkProps } from "../types";
3
- interface Props extends BasicResourceArgs, PrivateLinkProps {
4
- resourceId: Input<string>;
1
+ import { BasicArgs, PrivateLinkPropsType, ResourceInfo } from "../types";
2
+ export type PrivateEndpointProps = Pick<PrivateLinkPropsType, "subnetIds"> & Pick<BasicArgs, "dependsOn"> & {
3
+ resourceInfo: ResourceInfo;
4
+ /** check the private link DNS Zone here https://learn.microsoft.com/en-us/azure/private-link/private-endpoint-dns */
5
5
  privateDnsZoneName: string;
6
6
  linkServiceGroupIds: string[];
7
- }
8
- declare const _default: ({ name, group, resourceId, subnetIds, privateDnsZoneName, linkServiceGroupIds, }: Props) => import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint[];
7
+ };
8
+ declare const _default: ({ resourceInfo, subnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }: PrivateEndpointProps) => import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint[];
9
9
  export default _default;
@@ -28,27 +28,28 @@ const pulumi_1 = require("@pulumi/pulumi");
28
28
  const AzureEnv_1 = require("../Common/AzureEnv");
29
29
  const Naming_1 = require("../Common/Naming");
30
30
  const Builder_1 = require("../Builder");
31
- exports.default = ({ name, group, resourceId, subnetIds, privateDnsZoneName, linkServiceGroupIds, }) => {
32
- name = (0, Naming_1.getPrivateEndpointName)(name);
31
+ exports.default = ({ resourceInfo, subnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }) => {
32
+ const name = (0, Naming_1.getPrivateEndpointName)(resourceInfo.resourceName);
33
33
  const endpoints = subnetIds.map((s, index) => new network.PrivateEndpoint(`${name}-${index}`, {
34
34
  privateEndpointName: `${name}-${index}`,
35
- ...group,
35
+ ...resourceInfo.group,
36
36
  subnet: { id: s },
37
37
  privateLinkServiceConnections: [
38
38
  {
39
39
  groupIds: linkServiceGroupIds,
40
40
  name: `${name}-conn`,
41
- privateLinkServiceId: resourceId,
41
+ privateLinkServiceId: resourceInfo.id,
42
42
  },
43
43
  ],
44
- }));
44
+ }, { dependsOn }));
45
45
  //Get IpAddress in
46
46
  const ipAddresses = (0, pulumi_1.output)(endpoints.map((e) => e.customDnsConfigs.apply((c) => c.flatMap((i) => i.ipAddresses)))).apply((a) => a.flatMap((i) => i));
47
- (0, pulumi_1.output)([resourceId, ipAddresses]).apply(([id, ip]) => {
47
+ (0, pulumi_1.output)([resourceInfo.id, ipAddresses]).apply(([id, ip]) => {
48
48
  const resourceInfo = (0, AzureEnv_1.parseResourceInfoFromId)(id);
49
49
  return (0, Builder_1.PrivateDnsZoneBuilder)({
50
50
  name: `${resourceInfo.name}.${privateDnsZoneName}`,
51
- group,
51
+ group: resourceInfo.group,
52
+ dependsOn,
52
53
  })
53
54
  .withARecord({ ipAddresses: ip, recordName: "@" })
54
55
  .linkTo({ subnetIds, registrationEnabled: false })
@@ -56,4 +57,4 @@ exports.default = ({ name, group, resourceId, subnetIds, privateDnsZoneName, lin
56
57
  });
57
58
  return endpoints;
58
59
  };
59
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUVuZHBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvUHJpdmF0ZUVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFDeEQsMkNBQStDO0FBRy9DLGlEQUE2RDtBQUM3RCw2Q0FBMEQ7QUFDMUQsd0NBQW1EO0FBUW5ELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFVBQVUsRUFDVixTQUFTLEVBQ1Qsa0JBQWtCLEVBQ2xCLG1CQUFtQixHQUNiLEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxJQUFBLCtCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXBDLE1BQU0sU0FBUyxHQUFHLFNBQVMsQ0FBQyxHQUFHLENBQzdCLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxFQUFFLENBQ1gsSUFBSSxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUcsSUFBSSxJQUFJLEtBQUssRUFBRSxFQUFFO1FBQzlDLG1CQUFtQixFQUFFLEdBQUcsSUFBSSxJQUFJLEtBQUssRUFBRTtRQUN2QyxHQUFHLEtBQUs7UUFFUixNQUFNLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFO1FBQ2pCLDZCQUE2QixFQUFFO1lBQzdCO2dCQUNFLFFBQVEsRUFBRSxtQkFBbUI7Z0JBQzdCLElBQUksRUFBRSxHQUFHLElBQUksT0FBTztnQkFDcEIsb0JBQW9CLEVBQUUsVUFBVTthQUNqQztTQUNGO0tBQ0YsQ0FBQyxDQUNMLENBQUM7SUFFRixrQkFBa0I7SUFDbEIsTUFBTSxXQUFXLEdBQUcsSUFBQSxlQUFNLEVBQ3hCLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUNsQixDQUFDLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBWSxDQUFDLENBQUMsQ0FDbkUsQ0FDRixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBRSxDQUFDLENBQUMsQ0FBQztJQUVyQyxJQUFBLGVBQU0sRUFBQyxDQUFDLFVBQVUsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUU7UUFDbkQsTUFBTSxZQUFZLEdBQUcsSUFBQSxrQ0FBdUIsRUFBQyxFQUFZLENBQUMsQ0FBQztRQUMzRCxPQUFPLElBQUEsK0JBQXFCLEVBQUM7WUFDM0IsSUFBSSxFQUFFLEdBQUcsWUFBYSxDQUFDLElBQUksSUFBSSxrQkFBa0IsRUFBRTtZQUNuRCxLQUFLO1NBQ04sQ0FBQzthQUNDLFdBQVcsQ0FBQyxFQUFFLFdBQVcsRUFBRSxFQUFjLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxDQUFDO2FBQzdELE1BQU0sQ0FBQyxFQUFFLFNBQVMsRUFBRSxtQkFBbUIsRUFBRSxLQUFLLEVBQUUsQ0FBQzthQUNqRCxLQUFLLEVBQUUsQ0FBQztJQUNiLENBQUMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQyxDQUFDIn0=
60
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUVuZHBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvUHJpdmF0ZUVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFDeEQsMkNBQXdDO0FBRXhDLGlEQUE2RDtBQUM3RCw2Q0FBMEQ7QUFDMUQsd0NBQW1EO0FBVW5ELGtCQUFlLENBQUMsRUFDZCxZQUFZLEVBQ1osU0FBUyxFQUNULGtCQUFrQixFQUNsQixtQkFBbUIsRUFDbkIsU0FBUyxHQUNZLEVBQUUsRUFBRTtJQUN6QixNQUFNLElBQUksR0FBRyxJQUFBLCtCQUFzQixFQUFDLFlBQVksQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUUvRCxNQUFNLFNBQVMsR0FBRyxTQUFTLENBQUMsR0FBRyxDQUM3QixDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUNYLElBQUksT0FBTyxDQUFDLGVBQWUsQ0FDekIsR0FBRyxJQUFJLElBQUksS0FBSyxFQUFFLEVBQ2xCO1FBQ0UsbUJBQW1CLEVBQUUsR0FBRyxJQUFJLElBQUksS0FBSyxFQUFFO1FBQ3ZDLEdBQUcsWUFBWSxDQUFDLEtBQUs7UUFDckIsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRTtRQUNqQiw2QkFBNkIsRUFBRTtZQUM3QjtnQkFDRSxRQUFRLEVBQUUsbUJBQW1CO2dCQUM3QixJQUFJLEVBQUUsR0FBRyxJQUFJLE9BQU87Z0JBQ3BCLG9CQUFvQixFQUFFLFlBQVksQ0FBQyxFQUFFO2FBQ3RDO1NBQ0Y7S0FDRixFQUNELEVBQUUsU0FBUyxFQUFFLENBQ2QsQ0FDSixDQUFDO0lBRUYsa0JBQWtCO0lBQ2xCLE1BQU0sV0FBVyxHQUFHLElBQUEsZUFBTSxFQUN4QixTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDbEIsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLFdBQVksQ0FBQyxDQUFDLENBQ25FLENBQ0YsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUUsQ0FBQyxDQUFDLENBQUM7SUFFckMsSUFBQSxlQUFNLEVBQUMsQ0FBQyxZQUFZLENBQUMsRUFBRSxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUN4RCxNQUFNLFlBQVksR0FBRyxJQUFBLGtDQUF1QixFQUFDLEVBQVksQ0FBQyxDQUFDO1FBQzNELE9BQU8sSUFBQSwrQkFBcUIsRUFBQztZQUMzQixJQUFJLEVBQUUsR0FBRyxZQUFhLENBQUMsSUFBSSxJQUFJLGtCQUFrQixFQUFFO1lBQ25ELEtBQUssRUFBRSxZQUFhLENBQUMsS0FBSztZQUMxQixTQUFTO1NBQ1YsQ0FBQzthQUNDLFdBQVcsQ0FBQyxFQUFFLFdBQVcsRUFBRSxFQUFjLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxDQUFDO2FBQzdELE1BQU0sQ0FBQyxFQUFFLFNBQVMsRUFBRSxtQkFBbUIsRUFBRSxLQUFLLEVBQUUsQ0FBQzthQUNqRCxLQUFLLEVBQUUsQ0FBQztJQUNiLENBQUMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQyxDQUFDIn0=
@@ -1,9 +1,9 @@
1
1
  import * as appConfig from "@pulumi/azure-native/appconfiguration";
2
- import { KeyVaultInfo, PrivateLinkProps, ResourceGroupInfo, ResourceInfo } from "../types";
2
+ import { KeyVaultInfo, PrivateLinkPropsType, ResourceGroupInfo, ResourceInfo } from "../types";
3
3
  export type AppConfigProps = {
4
4
  name: string;
5
5
  group: ResourceGroupInfo;
6
- privateLink?: PrivateLinkProps;
6
+ privateLink?: PrivateLinkPropsType;
7
7
  disableLocalAuth?: boolean;
8
8
  vaultInfo: KeyVaultInfo;
9
9
  };
package/Web/AppConfig.js CHANGED
@@ -77,11 +77,9 @@ exports.default = ({ group, name, vaultInfo, disableLocalAuth, privateLink, }) =
77
77
  //Private Link
78
78
  if (privateLink) {
79
79
  (0, PrivateEndpoint_1.default)({
80
- name: (0, Naming_1.getPrivateEndpointName)(name),
81
- group,
82
- privateDnsZoneName: `${name}.privatelink.azconfig.io`,
80
+ resourceInfo: { resourceName: name, group, id: app.id },
81
+ privateDnsZoneName: "privatelink.azconfig.io",
83
82
  linkServiceGroupIds: ["appConfig"],
84
- resourceId: app.id,
85
83
  ...privateLink,
86
84
  });
87
85
  }
@@ -92,4 +90,4 @@ exports.default = ({ group, name, vaultInfo, disableLocalAuth, privateLink, }) =
92
90
  instance: app,
93
91
  };
94
92
  };
95
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlGQUFtRTtBQUNuRSxpREFBMkM7QUFDM0MsNkNBQTRFO0FBTzVFLDhFQUFzRDtBQUN0RCwyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixFQUNoQixXQUFXLEdBQ0ksRUFFZixFQUFFO0lBQ0YsSUFBSSxHQUFHLElBQUEseUJBQWdCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUIsTUFBTSw4QkFBOEIsR0FBRyxHQUFHLElBQUksaUNBQWlDLENBQUM7SUFDaEYsTUFBTSxnQ0FBZ0MsR0FBRyxHQUFHLElBQUksbUNBQW1DLENBQUM7SUFFcEYsTUFBTSxHQUFHLEdBQUcsSUFBSSxTQUFTLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFO1FBQ2pELGVBQWUsRUFBRSxJQUFJO1FBQ3JCLEdBQUcsS0FBSztRQUNSLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRTtRQUNwQyxxQkFBcUIsRUFBRSxnQkFBSztRQUM1Qix5QkFBeUIsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEMsZ0JBQWdCO1FBQ2hCLG1CQUFtQixFQUFFLFdBQVc7WUFDOUIsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRO1lBQ3hDLENBQUMsQ0FBQyxTQUFTLENBQUMsbUJBQW1CLENBQUMsT0FBTztRQUV6QyxHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFO0tBQzFCLENBQUMsQ0FBQztJQUVILGFBQWE7SUFDYixJQUFJLFNBQVMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDbkMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ3hCLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFDaEIsMkJBQTJCO1lBQzNCLE1BQU0sSUFBSSxHQUFHLE1BQU0sU0FBUyxDQUFDLDBCQUEwQixDQUFDO2dCQUN0RCxlQUFlLEVBQUUsSUFBSTtnQkFDckIsR0FBRyxLQUFLO2FBQ1QsQ0FBQyxDQUFDO1lBRUgsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2YsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtvQkFDckIsa0NBQWtDO29CQUNsQyxJQUFJLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQzt3QkFDakIsSUFBQSw4QkFBZSxFQUFDOzRCQUNkLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUM7Z0NBQ2hDLENBQUMsQ0FBQyw4QkFBOEI7Z0NBQ2hDLENBQUMsQ0FBQyxnQ0FBZ0M7NEJBQ3BDLEtBQUssRUFBRSxHQUFHLENBQUMsZ0JBQWdCOzRCQUMzQixXQUFXLEVBQUUsYUFBYSxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksRUFBRTs0QkFDNUMsU0FBUzt5QkFDVixDQUFDLENBQUM7b0JBQ0wsQ0FBQztnQkFDSCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxjQUFjO0lBQ2QsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixJQUFBLHlCQUFlLEVBQUM7WUFDZCxJQUFJLEVBQUUsSUFBQSwrQkFBc0IsRUFBQyxJQUFJLENBQUM7WUFDbEMsS0FBSztZQUNMLGtCQUFrQixFQUFFLEdBQUcsSUFBSSwwQkFBMEI7WUFDckQsbUJBQW1CLEVBQUUsQ0FBQyxXQUFXLENBQUM7WUFDbEMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxFQUFFO1lBQ2xCLEdBQUcsV0FBVztTQUNmLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPO1FBQ0wsWUFBWSxFQUFFLElBQUk7UUFDbEIsS0FBSztRQUNMLEVBQUUsRUFBRSxHQUFHLENBQUMsRUFBRTtRQUNWLFFBQVEsRUFBRSxHQUFHO0tBQ2QsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9
93
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlGQUFtRTtBQUNuRSxpREFBMkM7QUFDM0MsNkNBQTRFO0FBTzVFLDhFQUFzRDtBQUN0RCwyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixFQUNoQixXQUFXLEdBQ0ksRUFFZixFQUFFO0lBQ0YsSUFBSSxHQUFHLElBQUEseUJBQWdCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUIsTUFBTSw4QkFBOEIsR0FBRyxHQUFHLElBQUksaUNBQWlDLENBQUM7SUFDaEYsTUFBTSxnQ0FBZ0MsR0FBRyxHQUFHLElBQUksbUNBQW1DLENBQUM7SUFFcEYsTUFBTSxHQUFHLEdBQUcsSUFBSSxTQUFTLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFO1FBQ2pELGVBQWUsRUFBRSxJQUFJO1FBQ3JCLEdBQUcsS0FBSztRQUNSLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRTtRQUNwQyxxQkFBcUIsRUFBRSxnQkFBSztRQUM1Qix5QkFBeUIsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEMsZ0JBQWdCO1FBQ2hCLG1CQUFtQixFQUFFLFdBQVc7WUFDOUIsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRO1lBQ3hDLENBQUMsQ0FBQyxTQUFTLENBQUMsbUJBQW1CLENBQUMsT0FBTztRQUV6QyxHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFO0tBQzFCLENBQUMsQ0FBQztJQUVILGFBQWE7SUFDYixJQUFJLFNBQVMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDbkMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ3hCLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFDaEIsMkJBQTJCO1lBQzNCLE1BQU0sSUFBSSxHQUFHLE1BQU0sU0FBUyxDQUFDLDBCQUEwQixDQUFDO2dCQUN0RCxlQUFlLEVBQUUsSUFBSTtnQkFDckIsR0FBRyxLQUFLO2FBQ1QsQ0FBQyxDQUFDO1lBRUgsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2YsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtvQkFDckIsa0NBQWtDO29CQUNsQyxJQUFJLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQzt3QkFDakIsSUFBQSw4QkFBZSxFQUFDOzRCQUNkLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUM7Z0NBQ2hDLENBQUMsQ0FBQyw4QkFBOEI7Z0NBQ2hDLENBQUMsQ0FBQyxnQ0FBZ0M7NEJBQ3BDLEtBQUssRUFBRSxHQUFHLENBQUMsZ0JBQWdCOzRCQUMzQixXQUFXLEVBQUUsYUFBYSxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksRUFBRTs0QkFDNUMsU0FBUzt5QkFDVixDQUFDLENBQUM7b0JBQ0wsQ0FBQztnQkFDSCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxjQUFjO0lBQ2QsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixJQUFBLHlCQUFlLEVBQUM7WUFDZCxZQUFZLEVBQUUsRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsR0FBRyxDQUFDLEVBQUUsRUFBRTtZQUN2RCxrQkFBa0IsRUFBRSx5QkFBeUI7WUFDN0MsbUJBQW1CLEVBQUUsQ0FBQyxXQUFXLENBQUM7WUFDbEMsR0FBRyxXQUFXO1NBQ2YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU87UUFDTCxZQUFZLEVBQUUsSUFBSTtRQUNsQixLQUFLO1FBQ0wsRUFBRSxFQUFFLEdBQUcsQ0FBQyxFQUFFO1FBQ1YsUUFBUSxFQUFFLEdBQUc7S0FDZCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@drunk-pulumi/azure",
3
- "version": "0.0.43",
3
+ "version": "0.0.44",
4
4
  "author": "drunkcoding@outlook.com",
5
5
  "description": "The custom helpers pulumi-azure",
6
6
  "license": "MIT",
package/types.d.ts CHANGED
@@ -2,6 +2,14 @@ import { Input, Output, Resource } from "@pulumi/pulumi";
2
2
  import * as authorization from "@pulumi/azure-native/authorization";
3
3
  import { DiagnosticSetting } from "@pulumi/azure-native/aadiam/diagnosticSetting";
4
4
  import { EnvRoleKeyTypes } from "./AzAd/EnvRoles";
5
+ export interface ResourceInfoArg {
6
+ /**If name and provider of the resource is not provided then the Id will be resource group Id*/
7
+ name?: Input<string>;
8
+ /**The provider name of the resource ex: "Microsoft.Network/virtualNetworks" or "Microsoft.Network/networkSecurityGroups"*/
9
+ provider?: string;
10
+ group: ResourceGroupInfo;
11
+ subscriptionId?: Input<string>;
12
+ }
5
13
  export interface BasicArgs {
6
14
  dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
7
15
  importUri?: string;
@@ -15,18 +23,10 @@ export interface ConventionProps {
15
23
  prefix?: string;
16
24
  suffix?: string;
17
25
  /**Whether include the Azure Region name at the end of the name or not*/
18
- includeRegion?: boolean;
26
+ region?: string;
19
27
  /**Whether include the organization name at the end of the name or not*/
20
28
  includeOrgName?: boolean;
21
29
  }
22
- export interface PrivateLinkProps {
23
- subnetIds: Input<string>[];
24
- }
25
- export interface NetworkRulesProps {
26
- subnetId?: Input<string>;
27
- privateLink?: Omit<PrivateLinkProps, "subnetIds">;
28
- ipAddresses?: Input<string>[];
29
- }
30
30
  export interface BasicMonitorArgs extends BasicArgs {
31
31
  logWpId?: Input<string>;
32
32
  logStorageId?: Input<string>;
@@ -54,6 +54,15 @@ export interface BasicResourceArgs extends BasicArgs {
54
54
  export interface DefaultResourceArgs extends BasicArgs {
55
55
  monitoring?: Omit<DiagnosticProps, "name" | "targetResourceId">;
56
56
  }
57
+ export type PrivateLinkPropsType = {
58
+ subnetIds: Input<string>[];
59
+ type?: string;
60
+ };
61
+ export type NetworkPropsType = {
62
+ subnetId?: Input<string>;
63
+ ipAddresses?: Input<string>[];
64
+ privateLink?: PrivateLinkPropsType;
65
+ };
57
66
  export interface BasicResourceResultProps<TClass> {
58
67
  name: string;
59
68
  resource: TClass;
@@ -65,7 +74,7 @@ export interface ResourceResultProps<TClass> extends BasicResourceResultProps<TC
65
74
  export interface KeyVaultInfo {
66
75
  name: string;
67
76
  group: ResourceGroupInfo;
68
- id: Input<string>;
77
+ id: Output<string>;
69
78
  }
70
79
  export type IdentityRoleAssignment = {
71
80
  vaultInfo?: KeyVaultInfo;