@drunk-pulumi/azure 1.0.21 → 1.0.23

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 (180) hide show
  1. package/Aks/Helper.js +7 -6
  2. package/Aks/Identity.d.ts +1 -1
  3. package/Aks/Identity.js +1 -1
  4. package/Aks/index.d.ts +2 -3
  5. package/Aks/index.js +2 -2
  6. package/AzAd/B2C.d.ts +2 -2
  7. package/AzAd/B2C.js +13 -14
  8. package/AzAd/EnvRoles.Consts.d.ts +7 -5
  9. package/AzAd/EnvRoles.Consts.js +54 -42
  10. package/AzAd/EnvRoles.js +3 -3
  11. package/AzAd/Helper.js +14 -8
  12. package/AzAd/Identities/AzDevOpsIdentity.d.ts +1 -1
  13. package/AzAd/Identities/AzDevOpsIdentity.js +1 -1
  14. package/AzAd/Identities/AzUserAdRevertSync.d.ts +1 -1
  15. package/AzAd/Identity.d.ts +2 -11
  16. package/AzAd/Identity.js +4 -3
  17. package/AzAd/UserAssignedIdentity.js +7 -2
  18. package/Builder/AcrBuilder.d.ts +3 -0
  19. package/Builder/AcrBuilder.js +143 -0
  20. package/Builder/ApimApiBuilder.js +2 -3
  21. package/Builder/ApimBuilder.js +2 -2
  22. package/Builder/ApimProductBuilder.js +3 -4
  23. package/Builder/AppCertBuilder.d.ts +3 -0
  24. package/Builder/AppCertBuilder.js +75 -0
  25. package/Builder/AppConfigBuilder.d.ts +3 -0
  26. package/Builder/AppConfigBuilder.js +152 -0
  27. package/Builder/AutomationBuilder.d.ts +3 -0
  28. package/Builder/AutomationBuilder.js +106 -0
  29. package/Builder/IotHubBuilder.d.ts +3 -0
  30. package/Builder/IotHubBuilder.js +240 -0
  31. package/Builder/LogicAppBuilder.d.ts +3 -0
  32. package/Builder/LogicAppBuilder.js +69 -0
  33. package/Builder/MySqlBuilder.d.ts +3 -0
  34. package/Builder/MySqlBuilder.js +229 -0
  35. package/Builder/PostgreSqlBuilder.d.ts +3 -0
  36. package/Builder/PostgreSqlBuilder.js +235 -0
  37. package/Builder/RedisCacheBuilder.d.ts +3 -0
  38. package/Builder/RedisCacheBuilder.js +151 -0
  39. package/Builder/ResourceBuilder.js +52 -20
  40. package/Builder/ServiceBusBuilder.d.ts +3 -0
  41. package/Builder/ServiceBusBuilder.js +330 -0
  42. package/Builder/SignalRBuilder.d.ts +3 -0
  43. package/Builder/SignalRBuilder.js +179 -0
  44. package/Builder/StorageBuilder.js +3 -3
  45. package/Builder/VdiBuilder.js +2 -2
  46. package/Builder/index.d.ts +11 -0
  47. package/Builder/index.js +24 -2
  48. package/Builder/types/acrBuilder.d.ts +18 -0
  49. package/Builder/types/acrBuilder.js +3 -0
  50. package/Builder/types/appCertBuilder.d.ts +14 -0
  51. package/Builder/types/appCertBuilder.js +3 -0
  52. package/Builder/types/appConfigBuilder.d.ts +15 -0
  53. package/Builder/types/appConfigBuilder.js +3 -0
  54. package/Builder/types/automationBuilder.d.ts +11 -0
  55. package/Builder/types/automationBuilder.js +3 -0
  56. package/Builder/types/index.d.ts +12 -0
  57. package/Builder/types/index.js +13 -1
  58. package/Builder/types/iotHubBuilder.d.ts +31 -0
  59. package/Builder/types/iotHubBuilder.js +3 -0
  60. package/Builder/types/logicAppBuilder.d.ts +10 -0
  61. package/Builder/types/logicAppBuilder.js +3 -0
  62. package/Builder/types/mySqlBuilder.d.ts +45 -0
  63. package/Builder/types/mySqlBuilder.js +3 -0
  64. package/Builder/types/posgreSqlBuilder.d.ts +45 -0
  65. package/Builder/types/posgreSqlBuilder.js +3 -0
  66. package/Builder/types/redisCacheBuilder.d.ts +15 -0
  67. package/Builder/types/redisCacheBuilder.js +3 -0
  68. package/Builder/types/resourceBuilder.d.ts +2 -0
  69. package/Builder/types/serviceBusBuilder.d.ts +23 -0
  70. package/Builder/types/serviceBusBuilder.js +3 -0
  71. package/Builder/types/signalRBuilder.d.ts +38 -0
  72. package/Builder/types/signalRBuilder.js +3 -0
  73. package/Builder/types/storageBuilder.d.ts +3 -4
  74. package/Cdn/CdnEndpoint.js +2 -2
  75. package/Cdn/index.js +2 -2
  76. package/Common/AzureEnv.js +1 -1
  77. package/Common/GlobalEnv.js +6 -3
  78. package/Common/Naming/Rulers.d.ts +288 -0
  79. package/Common/Naming/Rulers.js +537 -0
  80. package/Common/Naming/index.d.ts +10 -0
  81. package/Common/Naming/index.js +112 -0
  82. package/Common/OpenApi/index.js +37 -0
  83. package/{Web → Common/OpenApi}/types.js +1 -1
  84. package/Common/RsInfo/Helper.d.ts +3 -3
  85. package/Common/RsInfo/Helper.js +12 -34
  86. package/Common/RsInfo/index.d.ts +24 -24
  87. package/Common/RsInfo/index.js +14 -14
  88. package/Common/index.d.ts +2 -4
  89. package/Common/index.js +8 -6
  90. package/Core/KeyGenerators.js +2 -2
  91. package/Core/Random.d.ts +1 -0
  92. package/Core/Random.js +9 -4
  93. package/CustomRoles/index.js +4 -4
  94. package/KeyVault/CustomHelper.js +4 -3
  95. package/KeyVault/Helper.d.ts +4 -0
  96. package/KeyVault/Helper.js +30 -4
  97. package/KeyVault/index.js +2 -2
  98. package/Logs/AppInsight.js +2 -2
  99. package/Logs/Helpers.js +7 -4
  100. package/Logs/LogAnalytics.js +2 -2
  101. package/Logs/WebTest.js +3 -3
  102. package/Logs/index.d.ts +1 -1
  103. package/Sql/Helper.js +3 -3
  104. package/Sql/SqlDb.js +2 -2
  105. package/Sql/index.js +3 -4
  106. package/Storage/Helper.js +6 -6
  107. package/Storage/ManagementRules.d.ts +2 -2
  108. package/Storage/ManagementRules.js +4 -4
  109. package/Storage/index.d.ts +4 -8
  110. package/Storage/index.js +50 -18
  111. package/VM/DiskEncryptionSet.js +2 -2
  112. package/VM/index.js +3 -3
  113. package/VNet/Bastion.js +2 -2
  114. package/VNet/Firewall.d.ts +2 -2
  115. package/VNet/Firewall.js +4 -4
  116. package/VNet/FirewallPolicy.js +2 -2
  117. package/VNet/GlobalNetworkPeering.js +4 -4
  118. package/VNet/IpAddress.js +1 -1
  119. package/VNet/IpAddressPrefix.js +2 -2
  120. package/VNet/NSGRules/ApimSecurityRule.d.ts +1 -1
  121. package/VNet/NSGRules/ApimSecurityRule.js +20 -20
  122. package/VNet/NatGateway.d.ts +2 -2
  123. package/VNet/NatGateway.js +3 -3
  124. package/VNet/NetworkPeering.js +1 -1
  125. package/VNet/PrivateEndpoint.d.ts +1 -0
  126. package/VNet/PrivateEndpoint.js +2 -2
  127. package/VNet/RouteTable.js +4 -5
  128. package/VNet/SecurityGroup.d.ts +3 -3
  129. package/VNet/SecurityGroup.js +3 -3
  130. package/VNet/VPNGateway.js +2 -2
  131. package/VNet/Vnet.js +2 -2
  132. package/package.json +3 -3
  133. package/types.d.ts +29 -3
  134. package/Apim/ApiProduct/OpenApi.js +0 -3
  135. package/Apim/ApiProduct/SwaggerHelper.js +0 -37
  136. package/Apps/LogicApp.d.ts +0 -5
  137. package/Apps/LogicApp.js +0 -38
  138. package/Automation/index.d.ts +0 -6
  139. package/Automation/index.js +0 -78
  140. package/Common/Naming.d.ts +0 -68
  141. package/Common/Naming.js +0 -190
  142. package/Common/ResourceEnv.d.ts +0 -2
  143. package/Common/ResourceEnv.js +0 -65
  144. package/ContainerRegistry/Helper.d.ts +0 -15
  145. package/ContainerRegistry/Helper.js +0 -77
  146. package/ContainerRegistry/index.d.ts +0 -15
  147. package/ContainerRegistry/index.js +0 -93
  148. package/Core/ResourceGroup.d.ts +0 -18
  149. package/Core/ResourceGroup.js +0 -36
  150. package/CosmosDb/index.d.ts +0 -28
  151. package/CosmosDb/index.js +0 -142
  152. package/IOT/Hub/index.d.ts +0 -26
  153. package/IOT/Hub/index.js +0 -191
  154. package/MySql/index.d.ts +0 -16
  155. package/MySql/index.js +0 -185
  156. package/Postgresql/index.d.ts +0 -16
  157. package/Postgresql/index.js +0 -157
  158. package/RedisCache/index.d.ts +0 -15
  159. package/RedisCache/index.js +0 -112
  160. package/ServiceBus/ServiceBusHelper.d.ts +0 -21
  161. package/ServiceBus/ServiceBusHelper.js +0 -35
  162. package/ServiceBus/index.d.ts +0 -88
  163. package/ServiceBus/index.js +0 -405
  164. package/SignalR/index.d.ts +0 -19
  165. package/SignalR/index.js +0 -128
  166. package/Web/AppCertOrder.d.ts +0 -8
  167. package/Web/AppCertOrder.js +0 -52
  168. package/Web/AppConfig.d.ts +0 -10
  169. package/Web/AppConfig.js +0 -93
  170. package/Web/AppGateway.d.ts +0 -15
  171. package/Web/AppGateway.js +0 -58
  172. package/Web/FuncApp.d.ts +0 -11
  173. package/Web/FuncApp.js +0 -41
  174. package/Web/WebAppPlan.d.ts +0 -6
  175. package/Web/WebAppPlan.js +0 -45
  176. package/Web/types.d.ts +0 -37
  177. package/z_tests/_tools/Mocks.d.ts +0 -2
  178. package/z_tests/_tools/Mocks.js +0 -69
  179. /package/{Apim/ApiProduct/SwaggerHelper.d.ts → Common/OpenApi/index.d.ts} +0 -0
  180. /package/{Apim/ApiProduct/OpenApi.d.ts → Common/OpenApi/types.d.ts} +0 -0
package/Aks/Helper.js CHANGED
@@ -26,13 +26,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.getAksPrivateDnz = exports.getAksVaultConfig = exports.getAksConfig = void 0;
27
27
  const cs = __importStar(require("@pulumi/azure-native/containerservice"));
28
28
  const Common_1 = require("../Common");
29
- const GlobalEnv_1 = require("../Common/GlobalEnv");
30
29
  const Helper_1 = require("../KeyVault/Helper");
31
30
  const pulumi_1 = require("@pulumi/pulumi");
32
31
  /** Get AKS Config from Managed Cluster*/
33
32
  const getAksConfig = async ({ name, groupName, formattedName, disableLocalAccounts, }) => {
34
- const aksName = formattedName ? name : (0, Common_1.getAksName)(name);
35
- const group = formattedName ? groupName : (0, Common_1.getResourceGroupName)(groupName);
33
+ const aksName = formattedName ? name : Common_1.naming.getAksName(name);
34
+ const group = formattedName
35
+ ? groupName
36
+ : Common_1.naming.getResourceGroupName(groupName);
36
37
  const aks = disableLocalAccounts
37
38
  ? await cs.listManagedClusterUserCredentials({
38
39
  resourceName: aksName,
@@ -47,7 +48,7 @@ const getAksConfig = async ({ name, groupName, formattedName, disableLocalAccoun
47
48
  exports.getAksConfig = getAksConfig;
48
49
  /** Get AKS Config from Key Vault*/
49
50
  const getAksVaultConfig = async ({ name, version, vaultInfo, formattedName, }) => {
50
- const aksName = formattedName ? name : (0, Common_1.getAksName)(name);
51
+ const aksName = formattedName ? name : Common_1.naming.getAksName(name);
51
52
  const rs = await (0, Helper_1.getSecret)({
52
53
  name: `${aksName}-config`,
53
54
  version,
@@ -68,9 +69,9 @@ const getAksPrivateDnz = async (aksInfo) => {
68
69
  const rsGroup = aks.nodeResourceGroup;
69
70
  return {
70
71
  name: dnsName,
71
- group: { resourceGroupName: rsGroup, location: GlobalEnv_1.globalKeyName },
72
+ group: { resourceGroupName: rsGroup, location: Common_1.globalKeyName },
72
73
  id: (0, pulumi_1.interpolate) `${Common_1.defaultSubScope}/resourceGroups/${rsGroup}/providers/Microsoft.Network/privateDnsZones/${dnsName}`,
73
74
  };
74
75
  };
75
76
  exports.getAksPrivateDnz = getAksPrivateDnz;
76
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwwRUFBNEQ7QUFDNUQsc0NBQThFO0FBQzlFLG1EQUFvRDtBQUVwRCwrQ0FBK0M7QUFDL0MsMkNBQXFEO0FBR3JELHlDQUF5QztBQUNsQyxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsSUFBSSxFQUNKLFNBQVMsRUFDVCxhQUFhLEVBQ2Isb0JBQW9CLEdBS3JCLEVBQW1CLEVBQUU7SUFDcEIsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4RCxNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBQSw2QkFBb0IsRUFBQyxTQUFTLENBQUMsQ0FBQztJQUUxRSxNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLGlDQUFpQyxDQUFDO1lBQ3pDLFlBQVksRUFBRSxPQUFPO1lBQ3JCLGlCQUFpQixFQUFFLEtBQUs7U0FDekIsQ0FBQztRQUNKLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxrQ0FBa0MsQ0FBQztZQUMxQyxZQUFZLEVBQUUsT0FBTztZQUNyQixpQkFBaUIsRUFBRSxLQUFLO1NBQ3pCLENBQUMsQ0FBQztJQUVQLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBeEJXLFFBQUEsWUFBWSxnQkF3QnZCO0FBRUYsbUNBQW1DO0FBQzVCLE1BQU0saUJBQWlCLEdBQUcsS0FBSyxFQUFFLEVBQ3RDLElBQUksRUFDSixPQUFPLEVBQ1AsU0FBUyxFQUNULGFBQWEsR0FLZCxFQUFtQixFQUFFO0lBQ3BCLE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEQsTUFBTSxFQUFFLEdBQUcsTUFBTSxJQUFBLGtCQUFTLEVBQUM7UUFDekIsSUFBSSxFQUFFLEdBQUcsT0FBTyxTQUFTO1FBQ3pCLE9BQU87UUFDUCxTQUFTO1FBQ1QsYUFBYSxFQUFFLEtBQUs7S0FDckIsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxFQUFFLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQztBQUN6QixDQUFDLENBQUM7QUFsQlcsUUFBQSxpQkFBaUIscUJBa0I1QjtBQUVLLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxFQUNuQyxPQUFxQixFQUNjLEVBQUU7SUFDckMsTUFBTSxHQUFHLEdBQUcsTUFBTSxFQUFFLENBQUMsaUJBQWlCLENBQUM7UUFDckMsWUFBWSxFQUFFLE9BQU8sQ0FBQyxJQUFJO1FBQzFCLGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsaUJBQWlCO0tBQ25ELENBQUMsQ0FBQztJQUVILElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVztRQUFFLE9BQU8sU0FBUyxDQUFDO0lBQ3ZDLE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDOUQsTUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLGlCQUFrQixDQUFDO0lBRXZDLE9BQU87UUFDTCxJQUFJLEVBQUUsT0FBTztRQUNiLEtBQUssRUFBRSxFQUFFLGlCQUFpQixFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUseUJBQWEsRUFBRTtRQUM5RCxFQUFFLEVBQUUsSUFBQSxvQkFBVyxFQUFBLEdBQUcsd0JBQWUsbUJBQW1CLE9BQU8sZ0RBQWdELE9BQU8sRUFBRTtLQUNyRyxDQUFDO0FBQ3BCLENBQUMsQ0FBQztBQWpCVyxRQUFBLGdCQUFnQixvQkFpQjNCIn0=
77
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwwRUFBNEQ7QUFDNUQsc0NBQW1FO0FBR25FLCtDQUErQztBQUMvQywyQ0FBNkM7QUFFN0MseUNBQXlDO0FBQ2xDLE1BQU0sWUFBWSxHQUFHLEtBQUssRUFBRSxFQUNqQyxJQUFJLEVBQ0osU0FBUyxFQUNULGFBQWEsRUFDYixvQkFBb0IsR0FLckIsRUFBbUIsRUFBRTtJQUNwQixNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsZUFBTSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvRCxNQUFNLEtBQUssR0FBRyxhQUFhO1FBQ3pCLENBQUMsQ0FBQyxTQUFTO1FBQ1gsQ0FBQyxDQUFDLGVBQU0sQ0FBQyxvQkFBb0IsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUUzQyxNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLGlDQUFpQyxDQUFDO1lBQ3pDLFlBQVksRUFBRSxPQUFPO1lBQ3JCLGlCQUFpQixFQUFFLEtBQUs7U0FDekIsQ0FBQztRQUNKLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxrQ0FBa0MsQ0FBQztZQUMxQyxZQUFZLEVBQUUsT0FBTztZQUNyQixpQkFBaUIsRUFBRSxLQUFLO1NBQ3pCLENBQUMsQ0FBQztJQUVQLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBMUJXLFFBQUEsWUFBWSxnQkEwQnZCO0FBRUYsbUNBQW1DO0FBQzVCLE1BQU0saUJBQWlCLEdBQUcsS0FBSyxFQUFFLEVBQ3RDLElBQUksRUFDSixPQUFPLEVBQ1AsU0FBUyxFQUNULGFBQWEsR0FLZCxFQUFtQixFQUFFO0lBQ3BCLE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxlQUFNLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQy9ELE1BQU0sRUFBRSxHQUFHLE1BQU0sSUFBQSxrQkFBUyxFQUFDO1FBQ3pCLElBQUksRUFBRSxHQUFHLE9BQU8sU0FBUztRQUN6QixPQUFPO1FBQ1AsU0FBUztRQUNULGFBQWEsRUFBRSxLQUFLO0tBQ3JCLENBQUMsQ0FBQztJQUNILE9BQU8sRUFBRSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7QUFDekIsQ0FBQyxDQUFDO0FBbEJXLFFBQUEsaUJBQWlCLHFCQWtCNUI7QUFFSyxNQUFNLGdCQUFnQixHQUFHLEtBQUssRUFDbkMsT0FBcUIsRUFDYyxFQUFFO0lBQ3JDLE1BQU0sR0FBRyxHQUFHLE1BQU0sRUFBRSxDQUFDLGlCQUFpQixDQUFDO1FBQ3JDLFlBQVksRUFBRSxPQUFPLENBQUMsSUFBSTtRQUMxQixpQkFBaUIsRUFBRSxPQUFPLENBQUMsS0FBSyxDQUFDLGlCQUFpQjtLQUNuRCxDQUFDLENBQUM7SUFFSCxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVc7UUFBRSxPQUFPLFNBQVMsQ0FBQztJQUN2QyxNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzlELE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxpQkFBa0IsQ0FBQztJQUV2QyxPQUFPO1FBQ0wsSUFBSSxFQUFFLE9BQU87UUFDYixLQUFLLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLHNCQUFhLEVBQUU7UUFDOUQsRUFBRSxFQUFFLElBQUEsb0JBQVcsRUFBQSxHQUFHLHdCQUFlLG1CQUFtQixPQUFPLGdEQUFnRCxPQUFPLEVBQUU7S0FDckcsQ0FBQztBQUNwQixDQUFDLENBQUM7QUFqQlcsUUFBQSxnQkFBZ0Isb0JBaUIzQiJ9
package/Aks/Identity.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { BasicResourceWithVaultArgs } from '../types';
2
2
  type Props = BasicResourceWithVaultArgs;
3
- declare const _default: ({ name, group, vaultInfo, dependsOn }: Props) => import("../AzAd/Identity").IdentityResult;
3
+ declare const _default: ({ name, group, vaultInfo, dependsOn }: Props) => import("../types").AdIdentityInfoWithInstance<import("@pulumi/azuread/application").Application>;
4
4
  export default _default;
package/Aks/Identity.js CHANGED
@@ -19,7 +19,7 @@ exports.default = ({ name, group, vaultInfo, dependsOn }) => {
19
19
  });
20
20
  (0, RoleAssignment_1.roleAssignment)({
21
21
  name: `${name}-svId-rg`,
22
- dependsOn: serverIdentity.resource,
22
+ dependsOn: serverIdentity.instance,
23
23
  principalId: serverIdentity.principalId,
24
24
  principalType: 'ServicePrincipal',
25
25
  scope: Common_1.rsInfo.getRGId(group),
package/Aks/index.d.ts CHANGED
@@ -1,8 +1,7 @@
1
1
  import * as ccs from '@pulumi/azure-native/containerservice';
2
2
  import * as pulumi from '@pulumi/pulumi';
3
3
  import { Input, Output } from '@pulumi/pulumi';
4
- import { BasicEncryptResourceArgs, WithLockable, LogInfo, ResourceInfoWithInstance, WithDiskEncryption } from '../types';
5
- import { IdentityResult } from '../AzAd/Identity';
4
+ import { BasicEncryptResourceArgs, WithLockable, LogInfo, ResourceInfoWithInstance, WithDiskEncryption, AdIdentityInfo } from '../types';
6
5
  export declare enum VmSizes {
7
6
  /** 32G RAM - 4CPU - $221.92 */
8
7
  Standard_E4as_v4 = "Standard_E4as_v4",
@@ -93,7 +92,7 @@ export interface AksProps extends BasicEncryptResourceArgs, WithLockable, WithDi
93
92
  };
94
93
  }
95
94
  export type AksResults = ResourceInfoWithInstance<ccs.ManagedCluster> & {
96
- serviceIdentity: IdentityResult;
95
+ serviceIdentity: AdIdentityInfo;
97
96
  disableLocalAccounts?: boolean;
98
97
  getKubeConfig: () => Output<string> | undefined;
99
98
  };
package/Aks/index.js CHANGED
@@ -304,7 +304,7 @@ exports.default = async ({ group, name, aksAccess, envRoles, envUIDInfo, vaultIn
304
304
  : undefined,
305
305
  },
306
306
  }, {
307
- dependsOn: serviceIdentity.resource,
307
+ dependsOn: serviceIdentity.instance,
308
308
  import: importUri,
309
309
  deleteBeforeReplace: true,
310
310
  ignoreChanges,
@@ -443,4 +443,4 @@ exports.default = async ({ group, name, aksAccess, envRoles, envUIDInfo, vaultIn
443
443
  : undefined,
444
444
  };
445
445
  };
446
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}
446
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}
package/AzAd/B2C.d.ts CHANGED
@@ -1,5 +1,5 @@
1
- import { BasicResourceArgs } from "../types";
2
- type Locations = "United States" | "Europe" | "Asia Pacific" | "Australia";
1
+ import { BasicResourceArgs } from '../types';
2
+ type Locations = 'United States' | 'Europe' | 'Asia Pacific' | 'Australia';
3
3
  interface Props extends BasicResourceArgs {
4
4
  displayName: string;
5
5
  location: Locations;
package/AzAd/B2C.js CHANGED
@@ -24,24 +24,24 @@ var __importStar = (this && this.__importStar) || function (mod) {
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
26
  const native = __importStar(require("@pulumi/azure-native"));
27
- const Naming_1 = require("../Common/Naming");
27
+ const Common_1 = require("../Common");
28
28
  const getCountryCode = (location) => {
29
29
  switch (location) {
30
- case "Asia Pacific":
31
- return "SG";
32
- case "Australia":
33
- return "AU";
34
- case "United States":
35
- return "US";
36
- case "Europe":
37
- return "EU";
30
+ case 'Asia Pacific':
31
+ return 'SG';
32
+ case 'Australia':
33
+ return 'AU';
34
+ case 'United States':
35
+ return 'US';
36
+ case 'Europe':
37
+ return 'EU';
38
38
  default:
39
- return "SG";
39
+ return 'SG';
40
40
  }
41
41
  };
42
42
  exports.default = ({ name, group, location, displayName }) => {
43
- const n = (0, Naming_1.getB2cName)(name);
44
- const b2cTenant = new native.azureactivedirectory.B2CTenant(n, {
43
+ const n = Common_1.naming.getB2cName(name);
44
+ return new native.azureactivedirectory.B2CTenant(n, {
45
45
  resourceName: n,
46
46
  ...group,
47
47
  location,
@@ -52,6 +52,5 @@ exports.default = ({ name, group, location, displayName }) => {
52
52
  tier: native.azureactivedirectory.B2CResourceSKUTier.A0,
53
53
  },
54
54
  });
55
- return b2cTenant;
56
55
  };
57
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQjJDLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvQjJDLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFFL0MsNkNBQThDO0FBVzlDLE1BQU0sY0FBYyxHQUFHLENBQUMsUUFBbUIsRUFBRSxFQUFFO0lBQzdDLFFBQVEsUUFBUSxFQUFFLENBQUM7UUFDakIsS0FBSyxjQUFjO1lBQ2pCLE9BQU8sSUFBSSxDQUFDO1FBQ2QsS0FBSyxXQUFXO1lBQ2QsT0FBTyxJQUFJLENBQUM7UUFDZCxLQUFLLGVBQWU7WUFDbEIsT0FBTyxJQUFJLENBQUM7UUFDZCxLQUFLLFFBQVE7WUFDWCxPQUFPLElBQUksQ0FBQztRQUNkO1lBQ0UsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztBQUNILENBQUMsQ0FBQztBQUVGLGtCQUFlLENBQUMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQVMsRUFBRSxFQUFFO0lBQy9ELE1BQU0sQ0FBQyxHQUFHLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUUzQixNQUFNLFNBQVMsR0FBRyxJQUFJLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFO1FBQzdELFlBQVksRUFBRSxDQUFDO1FBQ2YsR0FBRyxLQUFLO1FBQ1IsUUFBUTtRQUVSLFdBQVcsRUFBRSxjQUFjLENBQUMsUUFBUSxDQUFDO1FBQ3JDLFdBQVc7UUFFWCxHQUFHLEVBQUU7WUFDSCxJQUFJLEVBQUUsTUFBTSxDQUFDLG9CQUFvQixDQUFDLGtCQUFrQixDQUFDLFFBQVE7WUFDN0QsSUFBSSxFQUFFLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFO1NBQ3hEO0tBQ0YsQ0FBQyxDQUFDO0lBRUgsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQyxDQUFDIn0=
56
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQjJDLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvQjJDLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFDL0Msc0NBQW1DO0FBVW5DLE1BQU0sY0FBYyxHQUFHLENBQUMsUUFBbUIsRUFBRSxFQUFFO0lBQzdDLFFBQVEsUUFBUSxFQUFFLENBQUM7UUFDakIsS0FBSyxjQUFjO1lBQ2pCLE9BQU8sSUFBSSxDQUFDO1FBQ2QsS0FBSyxXQUFXO1lBQ2QsT0FBTyxJQUFJLENBQUM7UUFDZCxLQUFLLGVBQWU7WUFDbEIsT0FBTyxJQUFJLENBQUM7UUFDZCxLQUFLLFFBQVE7WUFDWCxPQUFPLElBQUksQ0FBQztRQUNkO1lBQ0UsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztBQUNILENBQUMsQ0FBQztBQUVGLGtCQUFlLENBQUMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQVMsRUFBRSxFQUFFO0lBQy9ELE1BQU0sQ0FBQyxHQUFHLGVBQU0sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFbEMsT0FBTyxJQUFJLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFO1FBQ2xELFlBQVksRUFBRSxDQUFDO1FBQ2YsR0FBRyxLQUFLO1FBQ1IsUUFBUTtRQUVSLFdBQVcsRUFBRSxjQUFjLENBQUMsUUFBUSxDQUFDO1FBQ3JDLFdBQVc7UUFFWCxHQUFHLEVBQUU7WUFDSCxJQUFJLEVBQUUsTUFBTSxDQUFDLG9CQUFvQixDQUFDLGtCQUFrQixDQUFDLFFBQVE7WUFDN0QsSUFBSSxFQUFFLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFO1NBQ3hEO0tBQ0YsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDIn0=
@@ -1,5 +1,9 @@
1
1
  import { EnvRoleKeyTypes, EnvRolesInfo } from './EnvRoles';
2
2
  import { RoleAssignmentProps } from './RoleAssignment';
3
+ export type ListRoleType = Record<EnvRoleKeyTypes, Set<string>>;
4
+ export declare const grantEnvRolesAccess: ({ name, envRoles, scope, dependsOn, ...others }: RoleEnableTypes & Omit<RoleAssignmentProps, "roleName" | "principalType" | "principalId"> & {
5
+ envRoles: EnvRolesInfo;
6
+ }) => void;
3
7
  export type RoleEnableItem = boolean | {
4
8
  [k in EnvRoleKeyTypes]?: boolean;
5
9
  };
@@ -12,9 +16,7 @@ export type RoleEnableTypes = {
12
16
  /** Container Registry Roles */
13
17
  enableACRRoles?: RoleEnableItem;
14
18
  enableAppConfig?: RoleEnableItem;
19
+ enableServiceBus?: RoleEnableItem;
20
+ enableSignalR?: RoleEnableItem;
15
21
  };
16
- export type ListRoleType = Record<EnvRoleKeyTypes, Set<string>>;
17
- export declare const getRoleNames: ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableAksRoles, enableStorageRoles, enableACRRoles, enableAppConfig, }: RoleEnableTypes) => Record<EnvRoleKeyTypes, string[]>;
18
- export declare const grantEnvRolesAccess: ({ name, envRoles, scope, dependsOn, ...others }: RoleEnableTypes & Omit<RoleAssignmentProps, "roleName" | "principalType" | "principalId"> & {
19
- envRoles: EnvRolesInfo;
20
- }) => void;
22
+ export declare const getRoleNames: ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableAksRoles, enableStorageRoles, enableACRRoles, enableAppConfig, enableServiceBus, enableSignalR, }: RoleEnableTypes) => Record<EnvRoleKeyTypes, string[]>;
@@ -1,7 +1,47 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.grantEnvRolesAccess = exports.getRoleNames = void 0;
3
+ exports.getRoleNames = exports.grantEnvRolesAccess = void 0;
4
4
  const RoleAssignment_1 = require("./RoleAssignment");
5
+ const getRoleFor = (roleType, roleCollection, results) => {
6
+ if (!roleType)
7
+ return results;
8
+ const allows = {
9
+ readOnly: typeof roleType === 'boolean' ? roleType : roleType.readOnly,
10
+ contributor: typeof roleType === 'boolean' ? roleType : roleType.contributor,
11
+ admin: typeof roleType === 'boolean' ? roleType : roleType.admin,
12
+ };
13
+ if (allows.readOnly) {
14
+ roleCollection.readOnly.forEach((r) => results.readOnly.add(r));
15
+ }
16
+ if (allows.contributor) {
17
+ roleCollection.contributor.forEach((r) => results.contributor.add(r));
18
+ }
19
+ if (allows.admin) {
20
+ roleCollection.admin.forEach((r) => results.admin.add(r));
21
+ }
22
+ return results;
23
+ };
24
+ const grantEnvRolesAccess = ({ name, envRoles, scope, dependsOn, ...others }) => {
25
+ const roles = (0, exports.getRoleNames)(others);
26
+ Object.keys(envRoles).forEach((k) => {
27
+ const type = k;
28
+ const objectId = envRoles[type].objectId;
29
+ if (!objectId) {
30
+ console.warn(`The Env role '${type}' was ignored as the objectId was NULL.`);
31
+ return;
32
+ }
33
+ const n = `${name}-${type}`;
34
+ roles[type].forEach((r) => (0, RoleAssignment_1.roleAssignment)({
35
+ name: n,
36
+ roleName: r,
37
+ principalId: objectId,
38
+ principalType: 'Group',
39
+ scope,
40
+ dependsOn,
41
+ }));
42
+ });
43
+ };
44
+ exports.grantEnvRolesAccess = grantEnvRolesAccess;
5
45
  //Resource Group Role
6
46
  const RGRoleNames = {
7
47
  readOnly: ['Reader'],
@@ -98,26 +138,17 @@ const AppConfigRoleNames = {
98
138
  contributor: ['App Configuration Data Owner'],
99
139
  admin: [],
100
140
  };
101
- const getRoleFor = (roleType, roleCollection, results) => {
102
- if (!roleType)
103
- return results;
104
- const allows = {
105
- readOnly: typeof roleType === 'boolean' ? roleType : roleType.readOnly,
106
- contributor: typeof roleType === 'boolean' ? roleType : roleType.contributor,
107
- admin: typeof roleType === 'boolean' ? roleType : roleType.admin,
108
- };
109
- if (allows.readOnly) {
110
- roleCollection.readOnly.forEach((r) => results.readOnly.add(r));
111
- }
112
- if (allows.contributor) {
113
- roleCollection.contributor.forEach((r) => results.contributor.add(r));
114
- }
115
- if (allows.admin) {
116
- roleCollection.admin.forEach((r) => results.admin.add(r));
117
- }
118
- return results;
141
+ const ServiceBusRoles = {
142
+ readOnly: ['Azure Service Bus Data Receiver'],
143
+ contributor: ['Azure Service Bus Data Sender'],
144
+ admin: ['Azure Service Bus Data Owner'],
119
145
  };
120
- const getRoleNames = ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableAksRoles, enableStorageRoles, enableACRRoles, enableAppConfig, }) => {
146
+ const SignalRRoles = {
147
+ readOnly: ['SignalR REST API Reader'],
148
+ contributor: ['SignalR App Server'],
149
+ admin: ['SignalR REST API Owner'],
150
+ };
151
+ const getRoleNames = ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableAksRoles, enableStorageRoles, enableACRRoles, enableAppConfig, enableServiceBus, enableSignalR, }) => {
121
152
  const rs = {
122
153
  readOnly: new Set(),
123
154
  admin: new Set(),
@@ -130,6 +161,8 @@ const getRoleNames = ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableA
130
161
  getRoleFor(enableStorageRoles, StorageRoleNames, rs);
131
162
  getRoleFor(enableACRRoles, ContainerRegistry, rs);
132
163
  getRoleFor(enableAppConfig, AppConfigRoleNames, rs);
164
+ getRoleFor(enableServiceBus, ServiceBusRoles, rs);
165
+ getRoleFor(enableSignalR, SignalRRoles, rs);
133
166
  return {
134
167
  readOnly: Array.from(rs.readOnly).sort(),
135
168
  admin: Array.from(rs.admin).sort(),
@@ -137,25 +170,4 @@ const getRoleNames = ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableA
137
170
  };
138
171
  };
139
172
  exports.getRoleNames = getRoleNames;
140
- const grantEnvRolesAccess = ({ name, envRoles, scope, dependsOn, ...others }) => {
141
- const roles = (0, exports.getRoleNames)(others);
142
- Object.keys(envRoles).forEach((k) => {
143
- const type = k;
144
- const objectId = envRoles[type].objectId;
145
- if (!objectId) {
146
- console.warn(`The Env role '${type}' was ignored as the objectId was NULL.`);
147
- return;
148
- }
149
- const n = `${name}-${type}`;
150
- roles[type].forEach((r) => (0, RoleAssignment_1.roleAssignment)({
151
- name: n,
152
- roleName: r,
153
- principalId: objectId,
154
- principalType: 'Group',
155
- scope,
156
- dependsOn,
157
- }));
158
- });
159
- };
160
- exports.grantEnvRolesAccess = grantEnvRolesAccess;
161
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52Um9sZXMuQ29uc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvRW52Um9sZXMuQ29uc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUF1RTtBQUV2RSxxQkFBcUI7QUFDckIsTUFBTSxXQUFXLEdBQXNDO0lBQ3JELFFBQVEsRUFBRSxDQUFDLFFBQVEsQ0FBQztJQUNwQixXQUFXLEVBQUUsQ0FBQyxhQUFhLENBQUM7SUFDNUIsS0FBSyxFQUFFLENBQUMsT0FBTyxDQUFDO0NBQ2pCLENBQUM7QUFFRixXQUFXO0FBQ1gsTUFBTSxZQUFZLEdBQXNDO0lBQ3RELFFBQVEsRUFBRTtRQUNSLHNDQUFzQztRQUN0Qyw0Q0FBNEM7S0FDN0M7SUFDRCxXQUFXLEVBQUU7UUFDWCxzQ0FBc0M7UUFDdEMsNENBQTRDO0tBQzdDO0lBQ0QsS0FBSyxFQUFFO1FBQ0wsNkNBQTZDO1FBQzdDLDZDQUE2QztLQUM5QztDQUNGLENBQUM7QUFFRixXQUFXO0FBQ1gsTUFBTSxlQUFlLEdBQXNDO0lBQ3pELFFBQVEsRUFBRSxDQUFDLHFCQUFxQixDQUFDO0lBQ2pDLFdBQVcsRUFBRSxDQUFDLDBCQUEwQixDQUFDO0lBQ3pDLEtBQUssRUFBRSxDQUFDLDhCQUE4QixFQUFFLDBCQUEwQixDQUFDO0NBQ3BFLENBQUM7QUFFRixpQkFBaUI7QUFDakIsTUFBTSxpQkFBaUIsR0FBc0M7SUFDM0QsUUFBUSxFQUFFO1FBQ1IsMENBQTBDO1FBQzFDLHVDQUF1QztRQUN2Qyx3QkFBd0I7UUFDeEIsdUJBQXVCO1FBQ3ZCLDRCQUE0QjtRQUM1QixrQkFBa0I7S0FDbkI7SUFDRCxXQUFXLEVBQUU7UUFDWCxnQ0FBZ0M7UUFDaEMsMEJBQTBCO1FBQzFCLDJCQUEyQjtRQUMzQix1QkFBdUI7S0FDeEI7SUFDRCxLQUFLLEVBQUUsQ0FBQyx5QkFBeUIsRUFBRSxxQ0FBcUMsQ0FBQztDQUMxRSxDQUFDO0FBRUYsZUFBZTtBQUNmLE1BQU0sZ0JBQWdCLEdBQXNDO0lBQzFELFFBQVEsRUFBRTtRQUNSLDBCQUEwQjtRQUMxQixvQ0FBb0M7UUFDcEMsMkJBQTJCO1FBQzNCLDJCQUEyQjtLQUM1QjtJQUNELFdBQVcsRUFBRTtRQUNYLG9DQUFvQztRQUNwQyw2QkFBNkI7UUFDN0IsbURBQW1EO1FBQ25ELCtCQUErQjtRQUMvQixxQ0FBcUM7UUFDckMseUNBQXlDO1FBQ3pDLGtEQUFrRDtRQUNsRCxnQ0FBZ0M7UUFDaEMsc0NBQXNDO1FBQ3RDLG1DQUFtQztRQUNuQyxnQ0FBZ0M7S0FDakM7SUFDRCxLQUFLLEVBQUU7UUFDTCwyQ0FBMkM7UUFDM0MseUJBQXlCO1FBQ3pCLDBDQUEwQztLQUMzQztDQUNGLENBQUM7QUFFRiwwQkFBMEI7QUFDMUIsTUFBTSxpQkFBaUIsR0FBc0M7SUFDM0QsUUFBUSxFQUFFO1FBQ1IsZ0NBQWdDO1FBQ2hDLHVCQUF1QjtRQUN2QixxQkFBcUI7UUFDckIsWUFBWTtLQUNiO0lBQ0QsV0FBVyxFQUFFO1FBQ1gsZ0JBQWdCO1FBQ2hCLFNBQVM7UUFDVCxTQUFTO1FBRVQsK0JBQStCO1FBQy9CLDBCQUEwQjtRQUMxQix3QkFBd0I7S0FDekI7SUFDRCxLQUFLLEVBQUUsQ0FBQyxXQUFXLENBQUM7Q0FDckIsQ0FBQztBQUVGLGlCQUFpQjtBQUNqQixNQUFNLGtCQUFrQixHQUFzQztJQUM1RCxRQUFRLEVBQUUsQ0FBQywrQkFBK0IsQ0FBQztJQUMzQyxXQUFXLEVBQUUsQ0FBQyw4QkFBOEIsQ0FBQztJQUM3QyxLQUFLLEVBQUUsRUFBRTtDQUNWLENBQUM7QUFpQkYsTUFBTSxVQUFVLEdBQUcsQ0FDakIsUUFBb0MsRUFDcEMsY0FBaUQsRUFDakQsT0FBcUIsRUFDckIsRUFBRTtJQUNGLElBQUksQ0FBQyxRQUFRO1FBQUUsT0FBTyxPQUFPLENBQUM7SUFFOUIsTUFBTSxNQUFNLEdBQUc7UUFDYixRQUFRLEVBQUUsT0FBTyxRQUFRLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxRQUFRO1FBQ3RFLFdBQVcsRUFDVCxPQUFPLFFBQVEsS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLFdBQVc7UUFDakUsS0FBSyxFQUFFLE9BQU8sUUFBUSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsS0FBSztLQUNqRSxDQUFDO0lBRUYsSUFBSSxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDcEIsY0FBYyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbEUsQ0FBQztJQUNELElBQUksTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ3ZCLGNBQWMsQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3hFLENBQUM7SUFDRCxJQUFJLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNqQixjQUFjLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM1RCxDQUFDO0lBRUQsT0FBTyxPQUFPLENBQUM7QUFDakIsQ0FBQyxDQUFDO0FBRUssTUFBTSxZQUFZLEdBQUcsQ0FBQyxFQUMzQixhQUFhLEVBQ2IsY0FBYyxFQUNkLGdCQUFnQixFQUNoQixjQUFjLEVBQ2Qsa0JBQWtCLEVBQ2xCLGNBQWMsRUFDZCxlQUFlLEdBQ0MsRUFBcUMsRUFBRTtJQUN2RCxNQUFNLEVBQUUsR0FBaUI7UUFDdkIsUUFBUSxFQUFFLElBQUksR0FBRyxFQUFVO1FBQzNCLEtBQUssRUFBRSxJQUFJLEdBQUcsRUFBVTtRQUN4QixXQUFXLEVBQUUsSUFBSSxHQUFHLEVBQVU7S0FDL0IsQ0FBQztJQUVGLFVBQVUsQ0FBQyxjQUFjLEVBQUUsZUFBZSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ2hELFVBQVUsQ0FBQyxhQUFhLEVBQUUsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQzNDLFVBQVUsQ0FBQyxnQkFBZ0IsRUFBRSxpQkFBaUIsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNwRCxVQUFVLENBQUMsY0FBYyxFQUFFLFlBQVksRUFBRSxFQUFFLENBQUMsQ0FBQztJQUM3QyxVQUFVLENBQUMsa0JBQWtCLEVBQUUsZ0JBQWdCLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDckQsVUFBVSxDQUFDLGNBQWMsRUFBRSxpQkFBaUIsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNsRCxVQUFVLENBQUMsZUFBZSxFQUFFLGtCQUFrQixFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBRXBELE9BQU87UUFDTCxRQUFRLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLENBQUMsSUFBSSxFQUFFO1FBQ3hDLEtBQUssRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLEVBQUU7UUFDbEMsV0FBVyxFQUFFLEtBQUssQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksRUFBRTtLQUMvQyxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBNUJXLFFBQUEsWUFBWSxnQkE0QnZCO0FBRUssTUFBTSxtQkFBbUIsR0FBRyxDQUFDLEVBQ2xDLElBQUksRUFDSixRQUFRLEVBQ1IsS0FBSyxFQUNMLFNBQVMsRUFDVCxHQUFHLE1BQU0sRUFJUixFQUFFLEVBQUU7SUFDTCxNQUFNLEtBQUssR0FBRyxJQUFBLG9CQUFZLEVBQUMsTUFBTSxDQUFDLENBQUM7SUFDbkMsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNsQyxNQUFNLElBQUksR0FBRyxDQUFvQixDQUFDO1FBQ2xDLE1BQU0sUUFBUSxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLENBQUM7UUFDekMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ2QsT0FBTyxDQUFDLElBQUksQ0FDVixpQkFBaUIsSUFBSSx5Q0FBeUMsQ0FDL0QsQ0FBQztZQUNGLE9BQU87UUFDVCxDQUFDO1FBRUQsTUFBTSxDQUFDLEdBQUcsR0FBRyxJQUFJLElBQUksSUFBSSxFQUFFLENBQUM7UUFDNUIsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ3hCLElBQUEsK0JBQWMsRUFBQztZQUNiLElBQUksRUFBRSxDQUFDO1lBQ1AsUUFBUSxFQUFFLENBQUM7WUFDWCxXQUFXLEVBQUUsUUFBUTtZQUNyQixhQUFhLEVBQUUsT0FBTztZQUN0QixLQUFLO1lBQ0wsU0FBUztTQUNWLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFqQ1csUUFBQSxtQkFBbUIsdUJBaUM5QiJ9
173
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52Um9sZXMuQ29uc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvRW52Um9sZXMuQ29uc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUF1RTtBQUl2RSxNQUFNLFVBQVUsR0FBRyxDQUNqQixRQUFvQyxFQUNwQyxjQUFpRCxFQUNqRCxPQUFxQixFQUNyQixFQUFFO0lBQ0YsSUFBSSxDQUFDLFFBQVE7UUFBRSxPQUFPLE9BQU8sQ0FBQztJQUU5QixNQUFNLE1BQU0sR0FBRztRQUNiLFFBQVEsRUFBRSxPQUFPLFFBQVEsS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLFFBQVE7UUFDdEUsV0FBVyxFQUNULE9BQU8sUUFBUSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsV0FBVztRQUNqRSxLQUFLLEVBQUUsT0FBTyxRQUFRLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0tBQ2pFLENBQUM7SUFFRixJQUFJLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNwQixjQUFjLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsRSxDQUFDO0lBQ0QsSUFBSSxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDdkIsY0FBYyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDeEUsQ0FBQztJQUNELElBQUksTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2pCLGNBQWMs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
package/AzAd/EnvRoles.js CHANGED
@@ -25,8 +25,8 @@ const envRoleConfig = {
25
25
  },
26
26
  };
27
27
  const getRoleSecretName = (name) => ({
28
- objectIdName: (0, Common_1.getSecretName)(`envRoles-${name}-object-id`),
29
- displayName: (0, Common_1.getSecretName)(`envRoles-${name}-display-name`),
28
+ objectIdName: (0, Helper_1.getVaultItemName)(`envRoles-${name}-object-id`),
29
+ displayName: (0, Helper_1.getVaultItemName)(`envRoles-${name}-display-name`),
30
30
  });
31
31
  const pushEnvRolesToVault = (envRoles, vaultInfo) => {
32
32
  Object.keys(envRoleConfig).forEach((key) => {
@@ -91,4 +91,4 @@ const getEnvRolesOutput = (vaultInfo) => {
91
91
  return rs;
92
92
  };
93
93
  exports.getEnvRolesOutput = getEnvRolesOutput;
94
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52Um9sZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9FbnZSb2xlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx1REFBd0Q7QUFDeEQsa0RBQXlDO0FBRXpDLDJDQUFnRDtBQUNoRCxzQ0FBMkQ7QUFDM0QsMkRBQTREO0FBQzVELCtDQUErQztBQUkvQyxNQUFNLGFBQWEsR0FBdUM7SUFDeEQsUUFBUSxFQUFFO1FBQ1IsUUFBUSxFQUFFLFVBQVU7UUFDcEIsT0FBTyxFQUFFLE9BQU87S0FDakI7SUFDRCxXQUFXLEVBQUU7UUFDWCxRQUFRLEVBQUUsYUFBYTtRQUN2QixPQUFPLEVBQUUsT0FBTztLQUNqQjtJQUNELEtBQUssRUFBRTtRQUNMLFFBQVEsRUFBRSxPQUFPO1FBQ2pCLE9BQU8sRUFBRSxPQUFPO0tBQ2pCO0NBQ0YsQ0FBQztBQVFGLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDM0MsWUFBWSxFQUFFLElBQUEsc0JBQWEsRUFBQyxZQUFZLElBQUksWUFBWSxDQUFDO0lBQ3pELFdBQVcsRUFBRSxJQUFBLHNCQUFhLEVBQUMsWUFBWSxJQUFJLGVBQWUsQ0FBQztDQUM1RCxDQUFDLENBQUM7QUFNSSxNQUFNLG1CQUFtQixHQUFHLENBQ2pDLFFBQXNCLEVBQ3RCLFNBQXVCLEVBQ3ZCLEVBQUU7SUFDRixNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1FBQ3pDLE1BQU0sSUFBSSxHQUFHLFFBQVEsQ0FBQyxHQUFzQixDQUFDLENBQUM7UUFDOUMsa0JBQWtCO1FBQ2xCLE1BQU0sV0FBVyxHQUFHLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzNDLElBQUEsK0JBQWdCLEVBQUM7WUFDZixTQUFTO1lBQ1QsV0FBVyxFQUFFLFdBQVc7WUFDeEIsS0FBSyxFQUFFO2dCQUNMLEVB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
94
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52Um9sZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9FbnZSb2xlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx1REFBd0Q7QUFDeEQsa0RBQXlDO0FBRXpDLDJDQUFnRDtBQUNoRCxzQ0FBNEM7QUFDNUMsMkRBQTREO0FBQzVELCtDQUFpRTtBQUlqRSxNQUFNLGFBQWEsR0FBdUM7SUFDeEQsUUFBUSxFQUFFO1FBQ1IsUUFBUSxFQUFFLFVBQVU7UUFDcEIsT0FBTyxFQUFFLE9BQU87S0FDakI7SUFDRCxXQUFXLEVBQUU7UUFDWCxRQUFRLEVBQUUsYUFBYTtRQUN2QixPQUFPLEVBQUUsT0FBTztLQUNqQjtJQUNELEtBQUssRUFBRTtRQUNMLFFBQVEsRUFBRSxPQUFPO1FBQ2pCLE9BQU8sRUFBRSxPQUFPO0tBQ2pCO0NBQ0YsQ0FBQztBQVFGLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDM0MsWUFBWSxFQUFFLElBQUEseUJBQWdCLEVBQUMsWUFBWSxJQUFJLFlBQVksQ0FBQztJQUM1RCxXQUFXLEVBQUUsSUFBQSx5QkFBZ0IsRUFBQyxZQUFZLElBQUksZUFBZSxDQUFDO0NBQy9ELENBQUMsQ0FBQztBQU1JLE1BQU0sbUJBQW1CLEdBQUcsQ0FDakMsUUFBc0IsRUFDdEIsU0FBdUIsRUFDdkIsRUFBRTtJQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7UUFDekMsTUFBTSxJQUFJLEdBQUcsUUFBUSxDQUFDLEdBQXNCLENBQUMsQ0FBQztRQUM5QyxrQkFBa0I7UUFDbEIsTUFBTSxXQUFXLEdBQUcsaUJBQWlCLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDM0MsSUFBQSwrQkFBZ0IsRUFBQztZQUNmLFNBQVM7WUFDVCxXQUFXLEVBQUUsV0FBVztZQUN4QixLQUFLLEVBQUU7Z0JBQ0ws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
package/AzAd/Helper.js CHANGED
@@ -5,15 +5,15 @@ const Common_1 = require("../Common");
5
5
  const Helper_1 = require("../KeyVault/Helper");
6
6
  const pulumi_1 = require("@pulumi/pulumi");
7
7
  const getIdentitySecretNames = (name) => ({
8
- objectIdName: (0, Common_1.getSecretName)(`${name}-object-id`),
9
- clientIdKeyName: (0, Common_1.getSecretName)(`${name}-client-id`),
10
- clientSecretKeyName: (0, Common_1.getSecretName)(`${name}-client-secret`),
11
- principalIdKeyName: (0, Common_1.getSecretName)(`${name}-principal-id`),
12
- principalSecretKeyName: (0, Common_1.getSecretName)(`${name}-principal-secret`),
8
+ objectIdName: (0, Helper_1.getVaultItemName)(`${name}-object-id`),
9
+ clientIdKeyName: (0, Helper_1.getVaultItemName)(`${name}-client-id`),
10
+ clientSecretKeyName: (0, Helper_1.getVaultItemName)(`${name}-client-secret`),
11
+ principalIdKeyName: (0, Helper_1.getVaultItemName)(`${name}-principal-id`),
12
+ principalSecretKeyName: (0, Helper_1.getVaultItemName)(`${name}-principal-secret`),
13
13
  });
14
14
  exports.getIdentitySecretNames = getIdentitySecretNames;
15
15
  const getIdentityInfo = async ({ name, vaultInfo, includePrincipal, }) => {
16
- name = (0, Common_1.getIdentityName)(name);
16
+ name = Common_1.naming.getIdentityName(name);
17
17
  const secretNames = (0, exports.getIdentitySecretNames)(name);
18
18
  const [objectId, clientId, clientSecret] = await Promise.all([
19
19
  (0, Helper_1.getSecret)({ name: secretNames.objectIdName, vaultInfo }),
@@ -95,12 +95,17 @@ exports.getIdentityInfoOutput = getIdentityInfoOutput;
95
95
  // }
96
96
  // };
97
97
  const getUserAssignedIdentityInfo = (name, vaultInfo) => {
98
- name = (0, Common_1.getUIDName)(name);
98
+ name = Common_1.naming.getUIDName(name);
99
99
  const id = (0, pulumi_1.output)((0, Helper_1.getSecret)({
100
100
  name: `${name}-id`,
101
101
  vaultInfo,
102
102
  nameFormatted: true,
103
103
  }));
104
+ const clientId = (0, pulumi_1.output)((0, Helper_1.getSecret)({
105
+ name: `${name}-clientId`,
106
+ vaultInfo,
107
+ nameFormatted: true,
108
+ }));
104
109
  const principalId = (0, pulumi_1.output)((0, Helper_1.getSecret)({
105
110
  name: `${name}-principalId`,
106
111
  vaultInfo,
@@ -108,8 +113,9 @@ const getUserAssignedIdentityInfo = (name, vaultInfo) => {
108
113
  }));
109
114
  return {
110
115
  id: id?.apply((i) => i?.value),
116
+ clientId: clientId?.apply((i) => i?.value),
111
117
  principalId: principalId?.apply((i) => i?.value),
112
118
  };
113
119
  };
114
120
  exports.getUserAssignedIdentityInfo = getUserAssignedIdentityInfo;
115
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUF1RTtBQUN2RSwrQ0FBK0M7QUFFL0MsMkNBQXdDO0FBZ0JqQyxNQUFNLHNCQUFzQixHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZELFlBQVksRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUNoRCxlQUFlLEVBQUUsSUFBQSxzQkFBYSxFQUFDLEdBQUcsSUFBSSxZQUFZLENBQUM7SUFDbkQsbUJBQW1CLEVBQUUsSUFBQSxzQkFBYSxFQUFDLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQztJQUMzRCxrQkFBa0IsRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLGVBQWUsQ0FBQztJQUN6RCxzQkFBc0IsRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLG1CQUFtQixDQUFDO0NBQ2xFLENBQUMsQ0FBQztBQU5VLFFBQUEsc0JBQXNCLDBCQU1oQztBQUVJLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFBRSxFQUNwQyxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixHQUNWLEVBQWdDLEVBQUU7SUFDeEMsSUFBSSxHQUFHLElBQUEsd0JBQWUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUM3QixNQUFNLFdBQVcsR0FBRyxJQUFBLDhCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpELE1BQU0sQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLFlBQVksQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUMzRCxJQUFBLGtCQUFTLEVBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLFlBQVksRUFBRSxTQUFTLEVBQUUsQ0FBQztRQUN4RCxJQUFBLGtCQUFTLEVBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLGVBQWUsRUFBRSxT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
121
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUFtQztBQUNuQywrQ0FBaUU7QUFFakUsMkNBQXdDO0FBZ0JqQyxNQUFNLHNCQUFzQixHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZELFlBQVksRUFBRSxJQUFBLHlCQUFnQixFQUFDLEdBQUcsSUFBSSxZQUFZLENBQUM7SUFDbkQsZUFBZSxFQUFFLElBQUEseUJBQWdCLEVBQUMsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUN0RCxtQkFBbUIsRUFBRSxJQUFBLHlCQUFnQixFQUFDLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQztJQUM5RCxrQkFBa0IsRUFBRSxJQUFBLHlCQUFnQixFQUFDLEdBQUcsSUFBSSxlQUFlLENBQUM7SUFDNUQsc0JBQXNCLEVBQUUsSUFBQSx5QkFBZ0IsRUFBQyxHQUFHLElBQUksbUJBQW1CLENBQUM7Q0FDckUsQ0FBQyxDQUFDO0FBTlUsUUFBQSxzQkFBc0IsMEJBTWhDO0FBRUksTUFBTSxlQUFlLEdBQUcsS0FBSyxFQUFFLEVBQ3BDLElBQUksRUFDSixTQUFTLEVBQ1QsZ0JBQWdCLEdBQ1YsRUFBZ0MsRUFBRTtJQUN4QyxJQUFJLEdBQUcsZUFBTSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwQyxNQUFNLFdBQVcsR0FBRyxJQUFBLDhCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpELE1BQU0sQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLFlBQVksQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUMzRCxJQUFBLGtCQUFTLEVBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLFlBQVksRUFBRSxTQUFTLEVBQUUsQ0FBQztRQUN4RCxJQUFBLGtCQUFTLEVBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLGVB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
@@ -8,5 +8,5 @@ interface Props {
8
8
  /** Get Global ADO Identity */
9
9
  export declare const getAdoIdentityInfo: (vaultInfo: KeyVaultInfo) => import("@pulumi/pulumi").Output<import("@pulumi/pulumi").UnwrappedObject<import("../Helper").IdentityInfoResults>>;
10
10
  /** Create Global ADO Identity */
11
- declare const _default: ({ name, vaultInfo, isSubOwner, ...others }: Props) => import("../Identity").IdentityResult;
11
+ declare const _default: ({ name, vaultInfo, isSubOwner, ...others }: Props) => import("../../types").AdIdentityInfoWithInstance<import("@pulumi/azuread/application").Application>;
12
12
  export default _default;
@@ -33,7 +33,7 @@ exports.default = ({ name = exports.defaultAzAdoName, vaultInfo, isSubOwner, ...
33
33
  (0, RoleAssignment_1.roleAssignment)({
34
34
  name,
35
35
  scope: Common_1.defaultSubScope,
36
- dependsOn: ado.resource,
36
+ dependsOn: ado.instance,
37
37
  principalId: ado.principalId,
38
38
  principalType: 'ServicePrincipal',
39
39
  roleName,
@@ -2,5 +2,5 @@ import { KeyVaultInfo, WithNamedType } from '../../types';
2
2
  interface Props extends WithNamedType {
3
3
  vaultInfo: KeyVaultInfo;
4
4
  }
5
- declare const _default: ({ name, ...others }: Props) => import("../Identity").IdentityResult;
5
+ declare const _default: ({ name, ...others }: Props) => import("../../types").AdIdentityInfoWithInstance<import("@pulumi/azuread/application").Application>;
6
6
  export default _default;
@@ -1,8 +1,7 @@
1
1
  import * as azureAD from '@pulumi/azuread';
2
2
  import * as pulumi from '@pulumi/pulumi';
3
- import { Output } from '@pulumi/pulumi';
4
3
  import { ApplicationApiOauth2PermissionScope, ApplicationAppRole, ApplicationOptionalClaims, ApplicationRequiredResourceAccess } from '@pulumi/azuread/types/input';
5
- import { WithNamedType, NamedWithVaultBasicArgs } from '../types';
4
+ import { NamedWithVaultBasicArgs, AdIdentityInfoWithInstance } from '../types';
6
5
  type PreAuthApplicationProps = {
7
6
  appId: string;
8
7
  oauth2PermissionNames: string[];
@@ -24,13 +23,5 @@ interface IdentityProps extends NamedWithVaultBasicArgs {
24
23
  requiredResourceAccesses?: pulumi.Input<pulumi.Input<ApplicationRequiredResourceAccess>[]>;
25
24
  optionalClaims?: pulumi.Input<ApplicationOptionalClaims>;
26
25
  }
27
- export type IdentityResult = WithNamedType & {
28
- objectId: Output<string>;
29
- clientId: Output<string>;
30
- clientSecret: Output<string> | undefined;
31
- principalId: Output<string> | undefined;
32
- principalSecret: Output<string> | undefined;
33
- resource: azureAD.Application;
34
- };
35
- declare const _default: ({ name, owners, createClientSecret, createPrincipal, replyUrls, appType, allowMultiOrg, appRoles, appRoleAssignmentRequired, requiredResourceAccesses, oauth2Permissions, publicClient, optionalClaims, vaultInfo, dependsOn, }: IdentityProps) => IdentityResult;
26
+ declare const _default: ({ name, owners, createClientSecret, createPrincipal, replyUrls, appType, allowMultiOrg, appRoles, appRoleAssignmentRequired, requiredResourceAccesses, oauth2Permissions, publicClient, optionalClaims, vaultInfo, dependsOn, }: IdentityProps) => AdIdentityInfoWithInstance<azureAD.Application>;
36
27
  export default _default;
package/AzAd/Identity.js CHANGED
@@ -30,7 +30,7 @@ const CustomHelper_1 = require("../KeyVault/CustomHelper");
30
30
  const Helper_1 = require("./Helper");
31
31
  exports.default = ({ name, owners, createClientSecret = false, createPrincipal = false, replyUrls, appType = 'spa', allowMultiOrg = false, appRoles, appRoleAssignmentRequired, requiredResourceAccesses = [], oauth2Permissions, publicClient = false, optionalClaims, vaultInfo, dependsOn, }) => {
32
32
  // Azure AD Application no need suffix
33
- name = (0, Common_1.getIdentityName)(name);
33
+ name = Common_1.naming.getIdentityName(name);
34
34
  const secretNames = (0, Helper_1.getIdentitySecretNames)(name);
35
35
  const identifierUris = publicClient
36
36
  ? undefined
@@ -76,6 +76,7 @@ exports.default = ({ name, owners, createClientSecret = false, createPrincipal =
76
76
  (0, CustomHelper_1.addCustomSecrets)({
77
77
  vaultInfo,
78
78
  contentType: 'Identity',
79
+ formattedName: true,
79
80
  items: [
80
81
  { name: secretNames.objectIdName, value: app.objectId },
81
82
  { name: secretNames.clientIdKeyName, value: app.clientId },
@@ -132,7 +133,7 @@ exports.default = ({ name, owners, createClientSecret = false, createPrincipal =
132
133
  clientSecret,
133
134
  principalId: principal?.objectId,
134
135
  principalSecret,
135
- resource: app,
136
+ instance: app,
136
137
  };
137
138
  };
138
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9JZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEseURBQTJDO0FBRTNDLHVEQUF5QztBQUV6QyxzQ0FBNEM7QUFRNUMsMkRBQTZFO0FBQzdFLHFDQUFrRDtBQXNDbEQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixNQUFNLEVBQ04sa0JBQWtCLEdBQUcsS0FBSyxFQUMxQixlQUFlLEdBQUcsS0FBSyxFQUN2QixTQUFTLEVBQ1QsT0FBTyxHQUFHLEtBQUssRUFDZixhQUFhLEdBQUcsS0FBSyxFQUNyQixRQUFRLEVBQ1IseUJBQXlCLEVBQ3pCLHdCQUF3QixHQUFHLEVBQUUsRUFDN0IsaUJBQWlCLEVBQ2pCLFlBQVksR0FBRyxLQUFLLEVBQ3BCLGNBQWMsRUFDZCxTQUFTLEVBQ1QsU0FBUyxHQUNLLEVBQWtCLEVBQUU7SUFDbEMsc0NBQXNDO0lBQ3RDLElBQUksR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDN0IsTUFBTSxXQUFXLEdBQUcsSUFBQSwrQkFBc0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUVqRCxNQUFNLGNBQWMsR0FBRyxZQUFZO1FBQ2pDLENBQUMsQ0FBQyxTQUFTO1FBQ1gsQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUFJLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBRXBDLE1BQU0sR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FDakMsSUFBSSxFQUNKO1FBQ0UsV0FBVyxFQUFFLElBQUk7UUFDakIsV0FBVyxFQUFFLElBQUk7UUFFakIsTUFBTTtRQUNOLFFBQVE7UUFDUixjQUFjLEVBQUUsYUFBYSxDQUFDLENBQUMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsY0FBYztRQUN0RSxxQkFBcUIsRUFBRSxDQUFDLGVBQWUsQ0FBQztRQUN4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
139
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9JZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEseURBQTJDO0FBRTNDLHVEQUF5QztBQUV6QyxzQ0FBbUM7QUFZbkMsMkRBQTZFO0FBQzdFLHFDQUFrRDtBQTZCbEQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixNQUFNLEVBQ04sa0JBQWtCLEdBQUcsS0FBSyxFQUMxQixlQUFlLEdBQUcsS0FBSyxFQUN2QixTQUFTLEVBQ1QsT0FBTyxHQUFHLEtBQUssRUFDZixhQUFhLEdBQUcsS0FBSyxFQUNyQixRQUFRLEVBQ1IseUJBQXlCLEVBQ3pCLHdCQUF3QixHQUFHLEVBQUUsRUFDN0IsaUJBQWlCLEVBQ2pCLFlBQVksR0FBRyxLQUFLLEVBQ3BCLGNBQWMsRUFDZCxTQUFTLEVBQ1QsU0FBUyxHQUNLLEVBQW1ELEVBQUU7SUFDbkUsc0NBQXNDO0lBQ3RDLElBQUksR0FBRyxlQUFNLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BDLE1BQU0sV0FBVyxHQUFHLElBQUEsK0JBQXNCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFakQsTUFBTSxjQUFjLEdBQUcsWUFBWTtRQUNqQyxDQUFDLENBQUMsU0FBUztRQUNYLENBQUMsQ0FBQyxDQUFDLFNBQVMsSUFBSSxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUVwQyxNQUFNLEdBQUcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQ2pDLElBQUksRUFDSjtRQUNFLFdBQVcsRUFBRSxJQUFJO1FBQ2pCLFdBQVcsRUFBRSxJQUFJO1FBRWpCLE1BQU07UUFDTixRQUFRO1FBQ1IsY0FBYyxFQUFFLGFBQWEsQ0FBQyxDQUFDLENBQUMscUJBQXFCLENBQUMsQ0FBQyxDQUFDLGNBQWM7UUFDdEUscUJBQXFCLEVBQUUsQ0FBQyxlQUFlLENBQUM7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