@drunk-pulumi/azure 1.0.23 → 1.0.25

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 (142) hide show
  1. package/Aks/Helper.d.ts +4 -6
  2. package/Aks/Helper.js +13 -18
  3. package/Aks/Identity.js +3 -3
  4. package/Aks/index.js +4 -7
  5. package/AzAd/EnvRoles/EnvRoles.Consts.d.ts +6 -0
  6. package/AzAd/EnvRoles/EnvRoles.Consts.js +178 -0
  7. package/AzAd/{EnvRoles.d.ts → EnvRoles/EnvRoles.d.ts} +1 -9
  8. package/AzAd/EnvRoles/EnvRoles.js +91 -0
  9. package/AzAd/EnvRoles/index.d.ts +2 -0
  10. package/AzAd/EnvRoles/index.js +19 -0
  11. package/AzAd/Group.d.ts +2 -2
  12. package/AzAd/Group.js +3 -3
  13. package/AzAd/Helper.js +6 -66
  14. package/AzAd/Identities/AzDevOpsIdentity.js +4 -5
  15. package/AzAd/Identities/AzDevOpsManagedIdentity.js +1 -1
  16. package/AzAd/Identities/AzUserAdRevertSync.js +3 -3
  17. package/AzAd/Identity.js +1 -2
  18. package/AzAd/RoleDefinitions/index.d.ts +1 -0
  19. package/AzAd/RoleDefinitions/index.js +18 -0
  20. package/AzAd/{GraphDefinition.js → Roles/GraphDefinition.js} +1 -1
  21. package/AzAd/Roles/Role.d.ts +16 -0
  22. package/AzAd/Roles/Role.js +31 -0
  23. package/AzAd/{RoleAssignment.d.ts → Roles/RoleAssignment.d.ts} +1 -1
  24. package/AzAd/{RoleAssignment.js → Roles/RoleAssignment.js} +2 -2
  25. package/AzAd/{RolesBuiltIn.js → Roles/RolesBuiltIn.js} +1 -1
  26. package/AzAd/Roles/index.d.ts +3 -0
  27. package/AzAd/Roles/index.js +22 -0
  28. package/AzAd/UserAssignedIdentity.js +1 -2
  29. package/AzAd/index.d.ts +6 -0
  30. package/AzAd/index.js +23 -0
  31. package/Builder/AcrBuilder.d.ts +5 -0
  32. package/Builder/AcrBuilder.js +43 -10
  33. package/Builder/AksBuilder.d.ts +5 -0
  34. package/Builder/AksBuilder.js +92 -8
  35. package/Builder/ApimApiBuilder.js +1 -1
  36. package/Builder/ApimBuilder.js +3 -7
  37. package/Builder/ApimPolicyBuilder.js +1 -1
  38. package/Builder/ApimProductBuilder.d.ts +6 -5
  39. package/Builder/ApimProductBuilder.js +53 -28
  40. package/Builder/AppConfigBuilder.js +4 -8
  41. package/Builder/DnsZoneBuilder.js +2 -3
  42. package/Builder/EnvRoleBuilder.d.ts +4 -23
  43. package/Builder/EnvRoleBuilder.js +8 -9
  44. package/Builder/MySqlBuilder.js +4 -8
  45. package/Builder/PostgreSqlBuilder.js +4 -8
  46. package/Builder/PrivateDnsZoneBuilder.d.ts +1 -1
  47. package/Builder/PrivateDnsZoneBuilder.js +3 -3
  48. package/Builder/RedisCacheBuilder.js +4 -11
  49. package/Builder/ResourceBuilder.js +6 -6
  50. package/Builder/ServiceBusBuilder.js +4 -11
  51. package/Builder/SignalRBuilder.js +4 -11
  52. package/Builder/VaultBuilder.js +7 -26
  53. package/Builder/types/acrBuilder.d.ts +38 -2
  54. package/Builder/types/apimBuilder.d.ts +109 -5
  55. package/Builder/types/apimPolicyBuilder.d.ts +129 -7
  56. package/Builder/types/apimPolicyBuilder.js +4 -1
  57. package/Builder/types/apimProductBuilder.d.ts +152 -5
  58. package/Builder/types/appCertBuilder.d.ts +17 -0
  59. package/Builder/types/appConfigBuilder.d.ts +22 -0
  60. package/Builder/types/askBuilder.d.ts +79 -1
  61. package/Builder/types/automationBuilder.d.ts +17 -0
  62. package/Builder/types/cdnBuilder.d.ts +11 -0
  63. package/Builder/types/dnsZoneBuilder.d.ts +20 -0
  64. package/Builder/types/envRoleBuilder.d.ts +29 -3
  65. package/Builder/types/genericBuilder.d.ts +78 -0
  66. package/Builder/types/genericBuilder.js +9 -1
  67. package/Builder/types/iotHubBuilder.d.ts +38 -5
  68. package/Builder/types/logicAppBuilder.d.ts +17 -0
  69. package/Builder/types/mySqlBuilder.d.ts +54 -1
  70. package/Builder/types/posgreSqlBuilder.d.ts +64 -2
  71. package/Builder/types/privateDnsZoneBuilder.d.ts +26 -0
  72. package/Builder/types/redisCacheBuilder.d.ts +31 -0
  73. package/Builder/types/resourceBuilder.d.ts +172 -10
  74. package/Builder/types/serviceBusBuilder.d.ts +55 -0
  75. package/Builder/types/signalRBuilder.d.ts +65 -6
  76. package/Builder/types/sqlBuilder.d.ts +88 -1
  77. package/Builder/types/storageBuilder.d.ts +63 -0
  78. package/Builder/types/vaultBuilder.d.ts +43 -1
  79. package/Builder/types/vdiBuilder.d.ts +41 -2
  80. package/Builder/types/vmBuilder.d.ts +83 -1
  81. package/Builder/types/vnetBuilder.d.ts +107 -0
  82. package/Cdn/index.d.ts +1 -1
  83. package/Cdn/index.js +2 -2
  84. package/Common/AzureEnv/AutoTags.js +27 -0
  85. package/Common/{AzureEnv.js → AzureEnv/index.js} +3 -3
  86. package/Common/{LocationBuiltIn.js → Location/LocationBuiltIn.js} +1 -1
  87. package/Common/Location/index.js +36 -0
  88. package/Common/{Naming/Rulers.d.ts → Naming.d.ts} +12 -3
  89. package/Common/Naming.js +392 -0
  90. package/Common/RsInfo/Helper.js +8 -6
  91. package/Common/index.d.ts +1 -4
  92. package/Common/index.js +7 -7
  93. package/Core/KeyGenerators.js +4 -5
  94. package/Core/Random.js +2 -3
  95. package/KeyVault/CustomHelper.d.ts +1 -3
  96. package/KeyVault/CustomHelper.js +27 -3
  97. package/KeyVault/Helper.d.ts +5 -8
  98. package/KeyVault/Helper.js +35 -61
  99. package/KeyVault/index.d.ts +1 -11
  100. package/KeyVault/index.js +3 -21
  101. package/Logs/AppInsight.js +1 -2
  102. package/Logs/Helpers.js +1 -3
  103. package/Logs/LogAnalytics.js +1 -2
  104. package/README.md +37 -29
  105. package/Sql/index.js +4 -7
  106. package/Storage/Helper.js +5 -6
  107. package/Storage/index.js +8 -13
  108. package/VM/index.js +1 -2
  109. package/VNet/PrivateEndpoint.d.ts +47 -4
  110. package/VNet/PrivateEndpoint.js +69 -2
  111. package/VNet/index.d.ts +1 -0
  112. package/VNet/index.js +5 -1
  113. package/envHelper.d.ts +4 -0
  114. package/envHelper.js +62 -0
  115. package/package.json +1 -1
  116. package/types.d.ts +184 -12
  117. package/AzAd/ConditionalPolicies/index.d.ts +0 -0
  118. package/AzAd/ConditionalPolicies/index.js +0 -2
  119. package/AzAd/EnvRoles.Consts.d.ts +0 -22
  120. package/AzAd/EnvRoles.Consts.js +0 -173
  121. package/AzAd/EnvRoles.js +0 -94
  122. package/AzAd/Role.d.ts +0 -17
  123. package/AzAd/Role.js +0 -30
  124. package/Common/AutoTags.js +0 -27
  125. package/Common/GlobalEnv.d.ts +0 -3
  126. package/Common/GlobalEnv.js +0 -29
  127. package/Common/Location.js +0 -36
  128. package/Common/Naming/Rulers.js +0 -537
  129. package/Common/Naming/index.d.ts +0 -10
  130. package/Common/Naming/index.js +0 -112
  131. package/Sql/Auditing.d.ts +0 -0
  132. package/Sql/Auditing.js +0 -2
  133. package/Sql/Helper.d.ts +0 -9
  134. package/Sql/Helper.js +0 -11
  135. package/VNet/GlobalNetworkPeering.d.ts +0 -9
  136. package/VNet/GlobalNetworkPeering.js +0 -40
  137. /package/AzAd/{GraphDefinition.d.ts → Roles/GraphDefinition.d.ts} +0 -0
  138. /package/AzAd/{RolesBuiltIn.d.ts → Roles/RolesBuiltIn.d.ts} +0 -0
  139. /package/Common/{AutoTags.d.ts → AzureEnv/AutoTags.d.ts} +0 -0
  140. /package/Common/{AzureEnv.d.ts → AzureEnv/index.d.ts} +0 -0
  141. /package/Common/{LocationBuiltIn.d.ts → Location/LocationBuiltIn.d.ts} +0 -0
  142. /package/Common/{Location.d.ts → Location/index.d.ts} +0 -0
@@ -0,0 +1,392 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.getResourceName = exports.cleanName = exports.replaceSpaceWithDash = exports.removeLeadingAndTrailingDash = exports.removeNumberAndDash = exports.replaceInString = exports.rules = void 0;
27
+ exports.namingCreator = namingCreator;
28
+ const env = __importStar(require("../envHelper"));
29
+ const AzureEnv_1 = require("./AzureEnv");
30
+ const StackEnv_1 = require("./StackEnv");
31
+ exports.rules = {
32
+ getResourceGroupName: {
33
+ cleanName: false,
34
+ suffix: `grp-${StackEnv_1.organization}`,
35
+ maxLength: 90,
36
+ },
37
+ getStorageName: {
38
+ cleanName: true,
39
+ maxLength: 24,
40
+ includeOrgName: true,
41
+ suffix: 'stg',
42
+ replaces: [{ from: /[-.]/g, to: '' }],
43
+ },
44
+ getAppPlanName: {
45
+ cleanName: true,
46
+ includeOrgName: false,
47
+ suffix: 'app-plan',
48
+ maxLength: 80,
49
+ },
50
+ getAutomationAccountName: {
51
+ cleanName: true,
52
+ maxLength: 80,
53
+ suffix: 'acc-auto',
54
+ },
55
+ getB2cName: {
56
+ cleanName: true,
57
+ maxLength: 80,
58
+ suffix: 'b2c',
59
+ },
60
+ getCosmosDbName: {
61
+ cleanName: true,
62
+ maxLength: 80,
63
+ suffix: 'cdb',
64
+ },
65
+ getAppConfigName: {
66
+ cleanName: true,
67
+ maxLength: 80,
68
+ suffix: 'cfg',
69
+ },
70
+ getApimName: {
71
+ cleanName: true,
72
+ maxLength: 80,
73
+ suffix: 'apim',
74
+ },
75
+ getDiskEncryptionName: {
76
+ cleanName: true,
77
+ maxLength: 80,
78
+ suffix: 'disk-encrypt',
79
+ },
80
+ getSshName: {
81
+ cleanName: true,
82
+ maxLength: 80,
83
+ suffix: 'ssh',
84
+ },
85
+ getIdentityName: {
86
+ cleanName: true,
87
+ maxLength: 80,
88
+ suffix: '',
89
+ },
90
+ getUIDName: {
91
+ cleanName: true,
92
+ maxLength: 80,
93
+ suffix: 'uid',
94
+ },
95
+ getAksName: {
96
+ cleanName: true,
97
+ maxLength: 80,
98
+ suffix: 'aks',
99
+ },
100
+ getK8sProviderName: {
101
+ cleanName: true,
102
+ maxLength: 80,
103
+ suffix: 'ks-pvd',
104
+ },
105
+ getAppInsightName: {
106
+ cleanName: true,
107
+ maxLength: 80,
108
+ suffix: 'isg',
109
+ },
110
+ getLogWpName: {
111
+ cleanName: true,
112
+ maxLength: 80,
113
+ suffix: 'wp',
114
+ },
115
+ getWebAppName: {
116
+ cleanName: true,
117
+ maxLength: 80,
118
+ suffix: 'web',
119
+ },
120
+ getFuncAppName: {
121
+ cleanName: true,
122
+ maxLength: 80,
123
+ suffix: 'func',
124
+ },
125
+ getWebTestName: {
126
+ cleanName: true,
127
+ maxLength: 80,
128
+ suffix: 'wt',
129
+ },
130
+ getAlertName: {
131
+ cleanName: true,
132
+ maxLength: 80,
133
+ suffix: 'alt',
134
+ },
135
+ getRedisCacheName: {
136
+ cleanName: true,
137
+ maxLength: 80,
138
+ suffix: 'rds',
139
+ },
140
+ getServiceBusName: {
141
+ cleanName: true,
142
+ maxLength: 80,
143
+ suffix: 'bus',
144
+ },
145
+ getPrivateEndpointName: {
146
+ cleanName: true,
147
+ maxLength: 80,
148
+ suffix: 'pre',
149
+ },
150
+ getSignalRName: {
151
+ cleanName: true,
152
+ maxLength: 80,
153
+ suffix: 'sigr',
154
+ },
155
+ getElasticPoolName: {
156
+ cleanName: true,
157
+ maxLength: 80,
158
+ suffix: 'elp',
159
+ },
160
+ getSqlDbName: {
161
+ cleanName: true,
162
+ maxLength: 128,
163
+ suffix: 'db',
164
+ },
165
+ getSqlServerName: {
166
+ cleanName: true,
167
+ maxLength: 80,
168
+ suffix: 'sql',
169
+ },
170
+ getPostgresqlName: {
171
+ cleanName: true,
172
+ maxLength: 80,
173
+ suffix: 'postgres',
174
+ },
175
+ getMySqlName: {
176
+ cleanName: true,
177
+ maxLength: 80,
178
+ suffix: 'mysql',
179
+ },
180
+ getFirewallName: {
181
+ cleanName: true,
182
+ maxLength: 80,
183
+ suffix: 'fw',
184
+ },
185
+ getFirewallPolicyName: {
186
+ cleanName: true,
187
+ maxLength: 80,
188
+ suffix: 'fwp',
189
+ },
190
+ getFirewallPolicyGroupName: {
191
+ cleanName: true,
192
+ maxLength: 80,
193
+ suffix: 'fw-pg',
194
+ },
195
+ getVMName: {
196
+ cleanName: true,
197
+ maxLength: 80,
198
+ suffix: 'vm',
199
+ },
200
+ getNICName: {
201
+ cleanName: true,
202
+ maxLength: 80,
203
+ suffix: 'nic',
204
+ },
205
+ getVdiName: {
206
+ cleanName: true,
207
+ maxLength: 80,
208
+ suffix: 'vdi',
209
+ },
210
+ getVpnName: {
211
+ cleanName: true,
212
+ maxLength: 80,
213
+ suffix: 'vpn',
214
+ },
215
+ getVnetName: {
216
+ cleanName: true,
217
+ maxLength: 80,
218
+ suffix: 'vnt',
219
+ },
220
+ getWanName: {
221
+ cleanName: true,
222
+ maxLength: 80,
223
+ suffix: 'wan',
224
+ },
225
+ getHubName: {
226
+ cleanName: true,
227
+ maxLength: 80,
228
+ suffix: 'hub',
229
+ },
230
+ getIotHubName: {
231
+ cleanName: true,
232
+ maxLength: 80,
233
+ suffix: 'iot',
234
+ },
235
+ getRouteName: {
236
+ cleanName: true,
237
+ maxLength: 80,
238
+ suffix: 'route',
239
+ },
240
+ //getRouteItemName: { cleanName: true, maxLength: 80, suffix: 'item' },
241
+ getWorkflowName: {
242
+ cleanName: true,
243
+ maxLength: 80,
244
+ suffix: 'wkp',
245
+ },
246
+ getNetworkSGName: {
247
+ cleanName: true,
248
+ maxLength: 80,
249
+ suffix: 'nsg',
250
+ },
251
+ getIpAddressName: {
252
+ cleanName: true,
253
+ maxLength: 80,
254
+ suffix: 'ip',
255
+ },
256
+ getIpAddressPrefixName: {
257
+ cleanName: true,
258
+ maxLength: 80,
259
+ suffix: 'ipx',
260
+ },
261
+ getAppGatewayName: {
262
+ cleanName: true,
263
+ maxLength: 80,
264
+ suffix: 'gtw',
265
+ },
266
+ getNatGatewayName: {
267
+ cleanName: true,
268
+ maxLength: 80,
269
+ suffix: 'nat',
270
+ },
271
+ getBastionName: {
272
+ cleanName: true,
273
+ maxLength: 80,
274
+ suffix: 'bst',
275
+ },
276
+ getKeyVaultName: {
277
+ cleanName: true,
278
+ maxLength: 24,
279
+ suffix: 'vlt',
280
+ includeOrgName: true,
281
+ },
282
+ getCdnEndpointName: {
283
+ cleanName: true,
284
+ maxLength: 80,
285
+ suffix: 'cdn',
286
+ },
287
+ getCdnProfileName: {
288
+ cleanName: true,
289
+ maxLength: 80,
290
+ suffix: 'cdn-pfl',
291
+ },
292
+ getAcrName: {
293
+ cleanName: true,
294
+ maxLength: 24,
295
+ prefix: '',
296
+ suffix: 'acr',
297
+ region: AzureEnv_1.currentCountryCode,
298
+ includeOrgName: true,
299
+ replaces: [{ from: /[-.]/g, to: '' }],
300
+ },
301
+ getCertOrderName: {
302
+ maxLength: 80,
303
+ prefix: '',
304
+ suffix: 'cert',
305
+ replaces: [{ from: '.', to: '-' }],
306
+ },
307
+ };
308
+ const replaceInString = (val, pattern) => {
309
+ let regex;
310
+ if (pattern.from instanceof RegExp) {
311
+ // If 'from' is already a RegExp, use it directly
312
+ regex = pattern.from;
313
+ }
314
+ else {
315
+ // If 'from' is a string, convert it to a RegExp
316
+ regex = new RegExp(pattern.from, 'g');
317
+ }
318
+ // Replace occurrences of 'from' with 'to'
319
+ return val.replace(regex, pattern.to);
320
+ };
321
+ exports.replaceInString = replaceInString;
322
+ //======================================================================
323
+ const removeNumberAndDash = (s) => s.replace(/^\d+-/, '');
324
+ exports.removeNumberAndDash = removeNumberAndDash;
325
+ const removeLeadingAndTrailingDash = (s) => s.replace(/^-|-$/g, '');
326
+ exports.removeLeadingAndTrailingDash = removeLeadingAndTrailingDash;
327
+ const replaceSpaceWithDash = (s) => s.replace(/\s+/g, '-');
328
+ exports.replaceSpaceWithDash = replaceSpaceWithDash;
329
+ const cleanName = (name) => {
330
+ name = (0, exports.removeNumberAndDash)(name);
331
+ name = (0, exports.removeLeadingAndTrailingDash)(name);
332
+ return name;
333
+ };
334
+ exports.cleanName = cleanName;
335
+ const getResourceName = (name, convention = {}) => {
336
+ if (env.DPA_NAMING_DISABLE_PREFIX)
337
+ convention.prefix = undefined;
338
+ else if (convention.prefix === undefined)
339
+ convention.prefix = StackEnv_1.stack;
340
+ if (env.DPA_NAMING_DISABLE_SUFFIX)
341
+ convention.suffix = undefined;
342
+ if (env.DPA_NAMING_DISABLE_REGION)
343
+ convention.region = undefined;
344
+ else if (convention.region === undefined)
345
+ convention.region = AzureEnv_1.currentCountryCode;
346
+ if (!name)
347
+ return name;
348
+ name = (0, exports.replaceSpaceWithDash)(name).toLowerCase();
349
+ if (convention.cleanName)
350
+ name = (0, exports.cleanName)(name);
351
+ const rs = [];
352
+ //Add prefix
353
+ if (convention.prefix && !name.startsWith(convention.prefix.toLowerCase())) {
354
+ rs.push(convention.prefix.toLowerCase());
355
+ }
356
+ rs.push(name);
357
+ //Organization
358
+ if (convention.includeOrgName && !name.includes(StackEnv_1.organization.toLowerCase())) {
359
+ rs.push(StackEnv_1.organization.toLowerCase());
360
+ }
361
+ //Region
362
+ if (convention.region && !name.includes(convention.region.toLowerCase())) {
363
+ rs.push(convention.region.toLowerCase());
364
+ }
365
+ //Add the suffix
366
+ if (convention.suffix && !name.includes(convention.suffix.toLowerCase()))
367
+ rs.push(convention.suffix.toLowerCase());
368
+ name = rs.join('-');
369
+ if (convention.replaces)
370
+ convention.replaces.forEach((p) => (name = (0, exports.replaceInString)(name, p)));
371
+ if (convention.maxLength && name.length > convention.maxLength)
372
+ name = (0, exports.removeLeadingAndTrailingDash)(name.substring(0, convention.maxLength));
373
+ return name;
374
+ };
375
+ exports.getResourceName = getResourceName;
376
+ //======================================================================
377
+ const namingResult = {};
378
+ function namingCreator() {
379
+ if (Object.keys(namingResult).length > 0)
380
+ return namingResult;
381
+ Object.keys(exports.rules).forEach((r) => {
382
+ const rule = exports.rules[r];
383
+ namingResult[r] = (name) => {
384
+ const n = typeof name === 'string' ? name : name.val;
385
+ const c = typeof name === 'string' ? undefined : name.rule;
386
+ return (0, exports.getResourceName)(n, { ...c, ...rule });
387
+ };
388
+ });
389
+ return namingResult;
390
+ }
391
+ exports.default = namingCreator();
392
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Naming.js","sourceRoot":"","sources":["../../src/Common/Naming.ts"],"names":[],"mappings":"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"}
@@ -5,11 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const Naming_1 = __importDefault(require("../Naming"));
7
7
  const AzureEnv_1 = require("../AzureEnv");
8
- const resourceNamingCreator = () => {
9
- const rs = {};
8
+ const rsNamingResult = {};
9
+ const rsNamingCreator = () => {
10
+ if (Object.keys(rsNamingResult).length > 0)
11
+ return rsNamingResult;
10
12
  Object.keys(Naming_1.default).forEach((k) => {
11
13
  const formater = Naming_1.default[k];
12
- rs[k] = (groupName, resourceName = undefined) => {
14
+ rsNamingResult[k] = (groupName, resourceName = undefined) => {
13
15
  const rgName = Naming_1.default.getResourceGroupName(groupName);
14
16
  const rsName = resourceName
15
17
  ? formater(resourceName)
@@ -20,7 +22,7 @@ const resourceNamingCreator = () => {
20
22
  };
21
23
  };
22
24
  });
23
- return rs;
25
+ return rsNamingResult;
24
26
  };
25
- exports.default = resourceNamingCreator();
26
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL0NvbW1vbi9Sc0luZm8vSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsdURBQStCO0FBRS9CLDBDQUFnRDtBQWFoRCxNQUFNLHFCQUFxQixHQUFHLEdBQUcsRUFBRTtJQUNqQyxNQUFNLEVBQUUsR0FBdUMsRUFBRSxDQUFDO0lBRWxELE1BQU0sQ0FBQyxJQUFJLENBQUMsZ0JBQU0sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1FBQ2hDLE1BQU0sUUFBUSxHQUFJLGdCQUFjLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFFcEMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQ04sU0FBcUIsRUFDckIsZUFBdUMsU0FBUyxFQUN0QixFQUFFO1lBQzVCLE1BQU0sTUFBTSxHQUFHLGdCQUFNLENBQUMsb0JBQW9CLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDdEQsTUFBTSxNQUFNLEdBQUcsWUFBWTtnQkFDekIsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUM7Z0JBQ3hCLENBQUMsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUM7WUFFeEIsT0FBTztnQkFDTCxJQUFJLEVBQUUsTUFBTTtnQkFDWixLQUFLLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLDRCQUFpQixFQUFFO2FBQ2xFLENBQUM7UUFDSixDQUFDLENBQUM7SUFDSixDQUFDLENBQUMsQ0FBQztJQUVILE9BQU8sRUFBMEQsQ0FBQztBQUNwRSxDQUFDLENBQUM7QUFFRixrQkFBZSxxQkFBcUIsRUFBRSxDQUFDIn0=
27
+ exports.default = rsNamingCreator();
28
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL0NvbW1vbi9Sc0luZm8vSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsdURBQStDO0FBRS9DLDBDQUFnRDtBQVloRCxNQUFNLGNBQWMsR0FBdUMsRUFBRSxDQUFDO0FBRTlELE1BQU0sZUFBZSxHQUFHLEdBQUcsRUFBRTtJQUMzQixJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDeEMsT0FBTyxjQUdOLENBQUM7SUFFSixNQUFNLENBQUMsSUFBSSxDQUFDLGdCQUFNLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNoQyxNQUFNLFFBQVEsR0FBSSxnQkFBYyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBRXBDLGNBQWMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUNsQixTQUFxQixFQUNyQixlQUF1QyxTQUFTLEVBQ3RCLEVBQUU7WUFDNUIsTUFBTSxNQUFNLEdBQUcsZ0JBQU0sQ0FBQyxvQkFBb0IsQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUN0RCxNQUFNLE1BQU0sR0FBRyxZQUFZO2dCQUN6QixDQUFDLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQztnQkFDeEIsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUV4QixPQUFPO2dCQUNMLElBQUksRUFBRSxNQUFNO2dCQUNaLEtBQUssRUFBRSxFQUFFLGlCQUFpQixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsNEJBQWlCLEVBQUU7YUFDbEUsQ0FBQztRQUNKLENBQUMsQ0FBQztJQUNKLENBQUMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxjQUFzRSxDQUFDO0FBQ2hGLENBQUMsQ0FBQztBQUVGLGtCQUFlLGVBQWUsRUFBRSxDQUFDIn0=
package/Common/index.d.ts CHANGED
@@ -1,12 +1,9 @@
1
1
  export * as helpers from './Helpers';
2
2
  export * as azureEnv from './AzureEnv';
3
3
  export * as stackEnv from './StackEnv';
4
- export * as global from './GlobalEnv';
5
- export { default as naming } from './Naming';
6
4
  export * as rsInfo from './RsInfo';
7
5
  export * as openApi from './OpenApi';
6
+ export { default as naming, cleanName, getResourceName, removeLeadingAndTrailingDash, } from './Naming';
8
7
  export * from './Helpers';
9
8
  export * from './AzureEnv';
10
9
  export * from './StackEnv';
11
- export * from './GlobalEnv';
12
- export * from './Naming';
package/Common/index.js CHANGED
@@ -29,18 +29,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
29
29
  return (mod && mod.__esModule) ? mod : { "default": mod };
30
30
  };
31
31
  Object.defineProperty(exports, "__esModule", { value: true });
32
- exports.openApi = exports.rsInfo = exports.naming = exports.global = exports.stackEnv = exports.azureEnv = exports.helpers = void 0;
32
+ exports.removeLeadingAndTrailingDash = exports.getResourceName = exports.cleanName = exports.naming = exports.openApi = exports.rsInfo = exports.stackEnv = exports.azureEnv = exports.helpers = void 0;
33
33
  exports.helpers = __importStar(require("./Helpers"));
34
34
  exports.azureEnv = __importStar(require("./AzureEnv"));
35
35
  exports.stackEnv = __importStar(require("./StackEnv"));
36
- exports.global = __importStar(require("./GlobalEnv"));
37
- var Naming_1 = require("./Naming");
38
- Object.defineProperty(exports, "naming", { enumerable: true, get: function () { return __importDefault(Naming_1).default; } });
39
36
  exports.rsInfo = __importStar(require("./RsInfo"));
40
37
  exports.openApi = __importStar(require("./OpenApi"));
38
+ var Naming_1 = require("./Naming");
39
+ Object.defineProperty(exports, "naming", { enumerable: true, get: function () { return __importDefault(Naming_1).default; } });
40
+ Object.defineProperty(exports, "cleanName", { enumerable: true, get: function () { return Naming_1.cleanName; } });
41
+ Object.defineProperty(exports, "getResourceName", { enumerable: true, get: function () { return Naming_1.getResourceName; } });
42
+ Object.defineProperty(exports, "removeLeadingAndTrailingDash", { enumerable: true, get: function () { return Naming_1.removeLeadingAndTrailingDash; } });
41
43
  __exportStar(require("./Helpers"), exports);
42
44
  __exportStar(require("./AzureEnv"), exports);
43
45
  __exportStar(require("./StackEnv"), exports);
44
- __exportStar(require("./GlobalEnv"), exports);
45
- __exportStar(require("./Naming"), exports);
46
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29tbW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscURBQXFDO0FBQ3JDLHVEQUF1QztBQUN2Qyx1REFBdUM7QUFDdkMsc0RBQXNDO0FBQ3RDLG1DQUE2QztBQUFwQyxpSEFBQSxPQUFPLE9BQVU7QUFDMUIsbURBQW1DO0FBQ25DLHFEQUFxQztBQUVyQyw0Q0FBMEI7QUFDMUIsNkNBQTJCO0FBQzNCLDZDQUEyQjtBQUMzQiw4Q0FBNEI7QUFDNUIsMkNBQXlCIn0=
46
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29tbW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscURBQXFDO0FBQ3JDLHVEQUF1QztBQUN2Qyx1REFBdUM7QUFDdkMsbURBQW1DO0FBQ25DLHFEQUFxQztBQUNyQyxtQ0FLa0I7QUFKaEIsaUhBQUEsT0FBTyxPQUFVO0FBQ2pCLG1HQUFBLFNBQVMsT0FBQTtBQUNULHlHQUFBLGVBQWUsT0FBQTtBQUNmLHNIQUFBLDRCQUE0QixPQUFBO0FBRzlCLDRDQUEwQjtBQUMxQiw2Q0FBMkI7QUFDM0IsNkNBQTJCIn0=
@@ -22,7 +22,6 @@ const generateSsh = ({ name, loginPrefix, maxUserNameLength, vaultInfo, }) => {
22
22
  }, { dependsOn: pass });
23
23
  //Add secrets to vault
24
24
  (0, CustomHelper_1.addCustomSecrets)({
25
- formattedName: true,
26
25
  vaultInfo,
27
26
  contentType: 'Random Ssh',
28
27
  dependsOn: rs,
@@ -34,9 +33,9 @@ const generateSsh = ({ name, loginPrefix, maxUserNameLength, vaultInfo, }) => {
34
33
  return {
35
34
  userName,
36
35
  lists: {
37
- getPublicKey: () => (0, pulumi_1.output)((0, Helper_1.getSecret)({ name: publicKeyName, nameFormatted: true, vaultInfo })).apply((i) => i?.value),
38
- getPrivateKey: () => (0, pulumi_1.output)((0, Helper_1.getSecret)({ name: privateKeyName, nameFormatted: true, vaultInfo })).apply((i) => i.value),
39
- getPassword: () => (0, pulumi_1.output)((0, Helper_1.getSecret)({ name: passwordKeyName, nameFormatted: true, vaultInfo })).apply((i) => i.value),
36
+ getPublicKey: () => (0, pulumi_1.output)((0, Helper_1.getSecret)({ name: publicKeyName, vaultInfo })).apply((i) => i?.value),
37
+ getPrivateKey: () => (0, pulumi_1.output)((0, Helper_1.getSecret)({ name: privateKeyName, vaultInfo })).apply((i) => i.value),
38
+ getPassword: () => (0, pulumi_1.output)((0, Helper_1.getSecret)({ name: passwordKeyName, vaultInfo })).apply((i) => i.value),
40
39
  },
41
40
  };
42
41
  };
@@ -57,4 +56,4 @@ const generatePGP = ({ name, options, vaultInfo, }) => {
57
56
  };
58
57
  };
59
58
  exports.generatePGP = generatePGP;
60
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiS2V5R2VuZXJhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Db3JlL0tleUdlbmVyYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0Esc0NBQW1DO0FBQ25DLG1GQUErRTtBQUMvRSwyREFBNEQ7QUFDNUQsK0NBQStDO0FBQy9DLHFDQUFzRTtBQUN0RSw2RUFHb0Q7QUFDcEQsMkNBQWdEO0FBZXpDLE1BQU0sV0FBVyxHQUFHLENBQUMsRUFDMUIsSUFBSSxFQUNKLFdBQVcsRUFDWCxpQkFBaUIsRUFDakIsU0FBUyxHQUNVLEVBQWMsRUFBRTtJQUNuQyxJQUFJLEdBQUcsZUFBTSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUUvQixNQUFNLFdBQVcsR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDO0lBQ25DLE1BQU0sZUFBZSxHQUFHLEdBQUcsSUFBSSxXQUFXLENBQUM7SUFDM0MsTUFBTSxhQUFhLEdBQUcsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUMxQyxNQUFNLGNBQWMsR0FBRyxHQUFHLElBQUksYUFBYSxDQUFDO0lBRTVDLE1BQU0sUUFBUSxHQUFHLElBQUEsdUJBQWMsRUFBQyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQyxDQUFDO0lBQzFFLE1BQU0sSUFBSSxHQUFHLElBQUEsdUJBQWMsRUFBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUVyRCxNQUFNLEVBQUUsR0FBRyxJQUFJLGdDQUFjLENBQzNCLElBQUksRUFDSjtRQUNFLFFBQVEsRUFBRSxJQUFJLENBQUMsTUFBTTtRQUNyQixTQUFTLEVBQUUsU0FBUyxDQUFDLElBQUk7S0FDMUIsRUFDRCxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FDcEIsQ0FBQztJQUVGLHNCQUFzQjtJQUN0QixJQUFBLCtCQUFnQixFQUFDO1FBQ2YsYUFBYSxFQUFFLElBQUk7UUFDbkIs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
59
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiS2V5R2VuZXJhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Db3JlL0tleUdlbmVyYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0Esc0NBQW1DO0FBQ25DLG1GQUErRTtBQUMvRSwyREFBNEQ7QUFDNUQsK0NBQStDO0FBQy9DLHFDQUFzRTtBQUN0RSw2RUFHb0Q7QUFDcEQsMkNBQWdEO0FBZXpDLE1BQU0sV0FBVyxHQUFHLENBQUMsRUFDMUIsSUFBSSxFQUNKLFdBQVcsRUFDWCxpQkFBaUIsRUFDakIsU0FBUyxHQUNVLEVBQWMsRUFBRTtJQUNuQyxJQUFJLEdBQUcsZUFBTSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUUvQixNQUFNLFdBQVcsR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDO0lBQ25DLE1BQU0sZUFBZSxHQUFHLEdBQUcsSUFBSSxXQUFXLENBQUM7SUFDM0MsTUFBTSxhQUFhLEdBQUcsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUMxQyxNQUFNLGNBQWMsR0FBRyxHQUFHLElBQUksYUFBYSxDQUFDO0lBRTVDLE1BQU0sUUFBUSxHQUFHLElBQUEsdUJBQWMsRUFBQyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQyxDQUFDO0lBQzFFLE1BQU0sSUFBSSxHQUFHLElBQUEsdUJBQWMsRUFBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUVyRCxNQUFNLEVBQUUsR0FBRyxJQUFJLGdDQUFjLENBQzNCLElBQUksRUFDSjtRQUNFLFFBQVEsRUFBRSxJQUFJLENBQUMsTUFBTTtRQUNyQixTQUFTLEVBQUUsU0FBUyxDQUFDLElBQUk7S0FDMUIsRUFDRCxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FDcEIsQ0FBQztJQUVGLHNCQUFzQjtJQUN0QixJQUFBLCtCQUFnQixFQUFDO1FBQ2YsU0FBUztRQUNULFdBQVcsRUFBRSxZ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
package/Core/Random.js CHANGED
@@ -27,10 +27,9 @@ exports.randomLogin = exports.randomUserName = exports.randomUuId = exports.rand
27
27
  const random = __importStar(require("@pulumi/random"));
28
28
  const Common_1 = require("../Common");
29
29
  const CustomHelper_1 = require("../KeyVault/CustomHelper");
30
- const Helper_1 = require("../KeyVault/Helper");
31
30
  const getPasswordName = (name, type) => type === null
32
31
  ? (0, Common_1.getResourceName)(name, { suffix: 'pwd' })
33
- : `${(0, Helper_1.getVaultItemName)(name)}-pwd-${type}`;
32
+ : `${name}-pwd-${type}`;
34
33
  exports.getPasswordName = getPasswordName;
35
34
  /**
36
35
  * Genera random password with 50 characters length.
@@ -109,4 +108,4 @@ const randomLogin = ({ name, loginPrefix, maxUserNameLength, passwordOptions = {
109
108
  return { userName, password, vaultKeys: { userNameKey, passwordKey } };
110
109
  };
111
110
  exports.randomLogin = randomLogin;
112
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmFuZG9tLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0NvcmUvUmFuZG9tLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsdURBQXlDO0FBQ3pDLHNDQUE0QztBQUM1QywyREFBNkU7QUFFN0UsK0NBQXNEO0FBRS9DLE1BQU0sZUFBZSxHQUFHLENBQzdCLElBQVksRUFDWixJQUFvQyxFQUNwQyxFQUFFLENBQ0YsSUFBSSxLQUFLLElBQUk7SUFDWCxDQUFDLENBQUMsSUFBQSx3QkFBZSxFQUFDLElBQUksRUFBRSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQztJQUMxQyxDQUFDLENBQUMsR0FBRyxJQUFBLHlCQUFnQixFQUFDLElBQUksQ0FBQyxRQUFRLElBQUksRUFBRSxDQUFDO0FBTmpDLFFBQUEsZUFBZSxtQkFNa0I7QUFhOUM7Ozs7R0FJRztBQUNJLE1BQU0sY0FBYyxHQUFHLENBQUMsRUFDN0IsTUFBTSxHQUFHLEVBQUUsRUFDWCxJQUFJLEVBQ0osTUFBTSxHQUFHLFFBQVEsRUFDakIsT0FBTyxFQUNQLFNBQVMsR0FDTyxFQUFFLEVBQUU7SUFDcEIsSUFBSSxNQUFNLEdBQUcsRUFBRTtRQUFFLE1BQU0sR0FBRyxFQUFFLENBQUM7SUFFN0IsTUFBTSxPQUFPLEdBQ1gsTUFBTSxLQUFLLFNBQVM7UUFDbEIsQ0FBQyxDQUFDLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUUsSUFBSSxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxFQUFFO1FBQ3hELENBQUMsQ0FBQyxNQUFNLEtBQUssUUFBUTtZQUNuQixDQUFDLENBQUMsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxFQUFFO1lBQy9CLENBQUMsQ0FBQyxFQUFFLENBQUM7SUFFWCxJQUFJLEdBQUcsSUFBQSx1QkFBZSxFQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztJQUVu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
111
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmFuZG9tLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0NvcmUvUmFuZG9tLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsdURBQXlDO0FBQ3pDLHNDQUE0QztBQUM1QywyREFBNkU7QUFHdEUsTUFBTSxlQUFlLEdBQUcsQ0FDN0IsSUFBWSxFQUNaLElBQW9DLEVBQ3BDLEVBQUUsQ0FDRixJQUFJLEtBQUssSUFBSTtJQUNYLENBQUMsQ0FBQyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxFQUFFLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxDQUFDO0lBQzFDLENBQUMsQ0FBQyxHQUFHLElBQUksUUFBUSxJQUFJLEVBQUUsQ0FBQztBQU5mLFFBQUEsZUFBZSxtQkFNQTtBQWE1Qjs7OztHQUlHO0FBQ0ksTUFBTSxjQUFjLEdBQUcsQ0FBQyxFQUM3QixNQUFNLEdBQUcsRUFBRSxFQUNYLElBQUksRUFDSixNQUFNLEdBQUcsUUFBUSxFQUNqQixPQUFPLEVBQ1AsU0FBUyxHQUNPLEVBQUUsRUFBRTtJQUNwQixJQUFJLE1BQU0sR0FBRyxFQUFFO1FBQUUsTUFBTSxHQUFHLEVBQUUsQ0FBQztJQUU3QixNQUFNLE9BQU8sR0FDWCxNQUFNLEtBQUssU0FBUztRQUNsQixDQUFDLENBQUMsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLFFBQVEsRUFBRSxJQUFJLElBQUksSUFBSSxFQUFFLENBQUMsV0FBVyxFQUFFLEVBQUU7UUFDeEQsQ0FBQyxDQUFDLE1BQU0sS0FBSyxRQUFRO1lBQ25CLENBQUMsQ0FBQyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUMsV0FBVyxFQUFFLEVBQUU7WUFDL0IsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUVYLElBQUksR0FBRyxJQUFBLHVCQUFlLEVBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBRW5DLE1BQU0sVUFBVSxHQUFHLElBQUksTUFBTSxDQUFDLGNBQWMs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
@@ -9,8 +9,6 @@ interface Props extends Required<NamedWithVaultType> {
9
9
  /**Add key vault secret from a value or from pulumi configuration secret. */
10
10
  export declare const addVaultSecretFrom: ({ name, value, vaultInfo, dependsOn, }: Props) => VaultSecretResource;
11
11
  interface SecretProps extends NamedBasicArgs {
12
- /**Use the name directly without applying naming format*/
13
- formattedName?: boolean;
14
12
  value: Input<string>;
15
13
  vaultInfo: KeyVaultInfo;
16
14
  contentType?: Input<string>;
@@ -19,7 +17,7 @@ interface SecretProps extends NamedBasicArgs {
19
17
  }>;
20
18
  }
21
19
  /** Add a secret to Key Vault. This will auto recover the deleted item and update with a new value if existed. */
22
- export declare const addCustomSecret: ({ name, formattedName, vaultInfo, value, contentType, dependsOn, ...others }: SecretProps) => VaultSecretResource;
20
+ export declare const addCustomSecret: ({ name, vaultInfo, value, contentType, dependsOn, ...others }: SecretProps) => VaultSecretResource;
23
21
  interface MultiSecretProps extends Omit<SecretProps, 'value' | 'name'> {
24
22
  items: Array<{
25
23
  name: string;
@@ -1,4 +1,27 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
2
25
  Object.defineProperty(exports, "__esModule", { value: true });
3
26
  exports.addCustomSecrets = exports.addCustomSecret = exports.addVaultSecretFrom = void 0;
4
27
  const pulumi_1 = require("@pulumi/pulumi");
@@ -6,6 +29,7 @@ const Common_1 = require("../Common");
6
29
  const VaultSecret_1 = require("@drunk-pulumi/azure-providers/VaultSecret");
7
30
  const ConfigHelper_1 = require("../Common/ConfigHelper");
8
31
  const Helper_1 = require("./Helper");
32
+ const env = __importStar(require("../envHelper"));
9
33
  /**Add key vault secret from a value or from pulumi configuration secret. */
10
34
  const addVaultSecretFrom = ({ name, value, vaultInfo, dependsOn, }) => {
11
35
  if (!value)
@@ -22,8 +46,8 @@ const addVaultSecretFrom = ({ name, value, vaultInfo, dependsOn, }) => {
22
46
  };
23
47
  exports.addVaultSecretFrom = addVaultSecretFrom;
24
48
  /** Add a secret to Key Vault. This will auto recover the deleted item and update with a new value if existed. */
25
- const addCustomSecret = ({ name, formattedName, vaultInfo, value, contentType, dependsOn, ...others }) => {
26
- const n = formattedName ? name : (0, Helper_1.getVaultItemName)(name);
49
+ const addCustomSecret = ({ name, vaultInfo, value, contentType, dependsOn, ...others }) => {
50
+ const n = env.DPA_VAULT_DISABLE_FORMAT_NAME ? name : (0, Helper_1.getVaultItemName)(name);
27
51
  //This KeyVault Secret is not auto recovery the deleted one.
28
52
  return new VaultSecret_1.VaultSecretResource((0, Common_1.replaceAll)(name, '.', '-'), {
29
53
  name: n,
@@ -37,4 +61,4 @@ exports.addCustomSecret = addCustomSecret;
37
61
  /** Add multi secrets to Key Vault. This will auto recover the deleted item and update with a new value if existed. */
38
62
  const addCustomSecrets = ({ items, ...others }) => items.map((i) => (0, exports.addCustomSecret)({ ...i, ...others }));
39
63
  exports.addCustomSecrets = addCustomSecrets;
40
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VzdG9tSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0N1c3RvbUhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBeUQ7QUFDekQsc0NBQXVDO0FBQ3ZDLDJFQUFnRjtBQUVoRix5REFBbUQ7QUFDbkQscUNBQTRDO0FBUTVDLDRFQUE0RTtBQUNyRSxNQUFNLGtCQUFrQixHQUFHLENBQUMsRUFDakMsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsU0FBUyxHQUNILEVBQUUsRUFBRTtJQUNWLElBQUksQ0FBQyxLQUFLO1FBQUUsS0FBSyxHQUFHLElBQUEsd0JBQVMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUNwQyxJQUFJLENBQUMsS0FBSztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsaUJBQWlCLElBQUksbUJBQW1CLENBQUMsQ0FBQztJQUV0RSxPQUFPLElBQUEsdUJBQWUsRUFBQztRQUNyQixJQUFJO1FBQ0osS0FBSztRQUNMLFNBQVM7UUFDVCxXQUFXLEVBQUUsa0JBQWtCO1FBQy9CLFNBQVM7S0FDVixDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFoQlcsUUFBQSxrQkFBa0Isc0JBZ0I3QjtBQWFGLGlIQUFpSDtBQUMxRyxNQUFNLGVBQWUsR0FBRyxDQUFDLEVBQzlCLElBQUksRUFDSixhQUFhLEVBQ2IsU0FBUyxFQUNULEtBQUssRUFDTCxXQUFXLEVBQ1gsU0FBUyxFQUNULEdBQUcsTUFBTSxFQUNHLEVBQUUsRUFBRTtJQUNoQixNQUFNLENBQUMsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSx5QkFBZ0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4RCw0REFBNEQ7SUFDNUQsT0FBTyxJQUFJLGlDQUFtQixDQUM1QixJQUFBLG1CQUFVLEVBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFDMUI7UUFDRSxJQUFJLEVBQUUsQ0FBQztRQUNQLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUEsZUFBTSxFQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFO1FBQ3ZELFNBQVMsRUFBRSxTQUFTLENBQUMsSUFBSTtRQUN6QixXQUFXLEVBQUUsV0FBVyxJQUFJLElBQUk7UUFDaEMsR0FBRyxNQUFNO0tBQ1YsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQUM7QUFDSixDQUFDLENBQUM7QUF0QlcsUUFBQSxlQUFlLG1CQXNCMUI7QUFNRixzSEFBc0g7QUFDL0csTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxFQUFvQixFQUFFLEVBQUUsQ0FDekUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBQSx1QkFBZSxFQUFDLEVBQUUsR0FBRyxDQUFDLEVBQUUsR0FBRyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFENUMsUUFBQSxnQkFBZ0Isb0JBQzRCIn0=
64
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VzdG9tSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0N1c3RvbUhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDJDQUF5RDtBQUN6RCxzQ0FBdUM7QUFDdkMsMkVBQWdGO0FBRWhGLHlEQUFtRDtBQUNuRCxxQ0FBNEM7QUFDNUMsa0RBQW9DO0FBUXBDLDRFQUE0RTtBQUNyRSxNQUFNLGtCQUFrQixHQUFHLENBQUMsRUFDakMsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsU0FBUyxHQUNILEVBQUUsRUFBRTtJQUNWLElBQUksQ0FBQyxLQUFLO1FBQUUsS0FBSyxHQUFHLElBQUEsd0JBQVMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUNwQyxJQUFJLENBQUMsS0FBSztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsaUJBQWlCLElBQUksbUJBQW1CLENBQUMsQ0FBQztJQUV0RSxPQUFPLElBQUEsdUJBQWUsRUFBQztRQUNyQixJQUFJO1FBQ0osS0FBSztRQUNMLFNBQVM7UUFDVCxXQUFXLEVBQUUsa0JBQWtCO1FBQy9CLFNBQVM7S0FDVixDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFoQlcsUUFBQSxrQkFBa0Isc0JBZ0I3QjtBQVdGLGlIQUFpSDtBQUMxRyxNQUFNLGVBQWUsR0FBRyxDQUFDLEVBQzlCLElBQUksRUFDSixTQUFTLEVBQ1QsS0FBSyxFQUNMLFdBQVcsRUFDWCxTQUFTLEVBQ1QsR0FBRyxNQUFNLEVBQ0csRUFBRSxFQUFFO0lBQ2hCLE1BQU0sQ0FBQyxHQUFHLEdBQUcsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLHlCQUFnQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQzVFLDREQUE0RDtJQUM1RCxPQUFPLElBQUksaUNBQW1CLENBQzVCLElBQUEsbUJBQVUsRUFBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUMxQjtRQUNFLElBQUksRUFBRSxDQUFDO1FBQ1AsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsSUFBQSxlQUFNLEVBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUU7UUFDdkQsU0FBUyxFQUFFLFNBQVMsQ0FBQyxJQUFJO1FBQ3pCLFdBQVcsRUFBRSxXQUFXLElBQUksSUFBSTtRQUNoQyxHQUFHLE1BQU07S0FDVixFQUNELEVBQUUsU0FBUyxFQUFFLENBQ2QsQ0FBQztBQUNKLENBQUMsQ0FBQztBQXJCVyxRQUFBLGVBQWUsbUJBcUIxQjtBQU1GLHNIQUFzSDtBQUMvRyxNQUFNLGdCQUFnQixHQUFHLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLEVBQW9CLEVBQUUsRUFBRSxDQUN6RSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxJQUFBLHVCQUFlLEVBQUMsRUFBRSxHQUFHLENBQUMsRUFBRSxHQUFHLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQztBQUQ1QyxRQUFBLGdCQUFnQixvQkFDNEIifQ==