@drunk-pulumi/azure 1.0.5 → 1.0.7

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 (141) hide show
  1. package/Aks/Helper.d.ts +3 -5
  2. package/Aks/Helper.js +1 -1
  3. package/Aks/Identity.d.ts +2 -5
  4. package/Aks/Identity.js +1 -1
  5. package/Aks/VmSetAutoScale/index.d.ts +0 -2
  6. package/Aks/VmSetAutoScale/index.js +1 -1
  7. package/Aks/VmSetMonitor/index.d.ts +0 -2
  8. package/Aks/VmSetMonitor/index.js +6 -6
  9. package/Aks/index.d.ts +6 -14
  10. package/Aks/index.js +29 -38
  11. package/Automation/index.d.ts +2 -3
  12. package/Automation/index.js +6 -14
  13. package/AzAd/EnvRoles.Consts.d.ts +2 -2
  14. package/AzAd/EnvRoles.Consts.js +20 -45
  15. package/AzAd/EnvRoles.d.ts +5 -4
  16. package/AzAd/EnvRoles.js +32 -25
  17. package/AzAd/Group.d.ts +5 -7
  18. package/AzAd/Group.js +5 -14
  19. package/AzAd/Helper.d.ts +6 -6
  20. package/AzAd/Helper.js +39 -54
  21. package/AzAd/Identities/AzDevOpsIdentity.d.ts +2 -2
  22. package/AzAd/Identities/AzDevOpsIdentity.js +13 -7
  23. package/AzAd/Identities/AzDevOpsManagedIdentity.js +2 -7
  24. package/AzAd/Identities/AzUserAdRevertSync.d.ts +2 -3
  25. package/AzAd/Identities/AzUserAdRevertSync.js +3 -4
  26. package/AzAd/Identities/GlobalUserAssignedIdentity.d.ts +4 -0
  27. package/AzAd/Identities/GlobalUserAssignedIdentity.js +19 -0
  28. package/AzAd/Identities/index.d.ts +4 -3
  29. package/AzAd/Identities/index.js +26 -2
  30. package/AzAd/Identity.d.ts +4 -7
  31. package/AzAd/Identity.js +19 -27
  32. package/AzAd/RoleAssignment.d.ts +2 -2
  33. package/AzAd/RoleAssignment.js +3 -3
  34. package/AzAd/UserAssignedIdentity.d.ts +3 -3
  35. package/AzAd/UserAssignedIdentity.js +24 -6
  36. package/Builder/AksBuilder.js +3 -3
  37. package/Builder/ApimApiBuilder.js +3 -3
  38. package/Builder/ApimPolicyBuilder.js +3 -3
  39. package/Builder/ApimProductBuilder.js +6 -12
  40. package/Builder/EnvRoleBuilder.d.ts +36 -0
  41. package/Builder/EnvRoleBuilder.js +57 -0
  42. package/Builder/ResourceBuilder.js +26 -16
  43. package/Builder/SqlBuilder.js +7 -1
  44. package/Builder/VmBuilder.js +2 -5
  45. package/Builder/index.d.ts +15 -14
  46. package/Builder/index.js +4 -2
  47. package/Builder/types/apimPolicyBuilder.d.ts +4 -5
  48. package/Builder/types/apimPolicyBuilder.js +1 -1
  49. package/Builder/types/apimProductBuilder.d.ts +8 -10
  50. package/Builder/types/envRoleBuilder.d.ts +14 -0
  51. package/Builder/types/envRoleBuilder.js +3 -0
  52. package/Builder/types/genericBuilder.d.ts +15 -13
  53. package/Builder/types/genericBuilder.js +1 -1
  54. package/Builder/types/index.d.ts +15 -14
  55. package/Builder/types/index.js +2 -1
  56. package/Builder/types/resourceBuilder.d.ts +7 -6
  57. package/Builder/types/sqlBuilder.d.ts +2 -3
  58. package/Builder/types/storageBuilder.d.ts +1 -1
  59. package/Builder/types/vaultBuilder.d.ts +2 -2
  60. package/Builder/types/vmBuilder.d.ts +11 -11
  61. package/Builder/types/vnetBuilder.d.ts +19 -19
  62. package/Cdn/CdnEndpoint.d.ts +2 -2
  63. package/Cdn/index.d.ts +2 -2
  64. package/Cdn/index.js +3 -11
  65. package/Certificate/index.js +12 -25
  66. package/Common/AzureEnv.d.ts +1 -2
  67. package/Common/AzureEnv.js +2 -10
  68. package/Common/Naming/index.d.ts +1 -0
  69. package/Common/Naming/index.js +5 -3
  70. package/ContainerRegistry/Helper.d.ts +2 -3
  71. package/ContainerRegistry/Helper.js +2 -3
  72. package/ContainerRegistry/index.d.ts +2 -4
  73. package/ContainerRegistry/index.js +1 -50
  74. package/Core/Helper.d.ts +4 -2
  75. package/Core/Helper.js +7 -2
  76. package/Core/KeyGenerators.d.ts +2 -4
  77. package/Core/KeyGenerators.js +7 -12
  78. package/Core/Random.d.ts +6 -9
  79. package/Core/Random.js +17 -21
  80. package/Core/ResourceCreator.d.ts +2 -2
  81. package/Core/ResourceGroup.d.ts +2 -2
  82. package/Core/ResourceGroup.js +4 -3
  83. package/CosmosDb/index.d.ts +4 -9
  84. package/CosmosDb/index.js +4 -4
  85. package/IOT/Hub/index.d.ts +4 -5
  86. package/IOT/Hub/index.js +25 -26
  87. package/KeyVault/CustomHelper.d.ts +4 -9
  88. package/KeyVault/CustomHelper.js +3 -4
  89. package/KeyVault/Helper.d.ts +10 -13
  90. package/KeyVault/Helper.js +46 -26
  91. package/KeyVault/index.js +2 -1
  92. package/Logs/AppInsight.d.ts +2 -3
  93. package/Logs/AppInsight.js +1 -1
  94. package/Logs/Helpers.d.ts +3 -8
  95. package/Logs/Helpers.js +12 -10
  96. package/Logs/LogAnalytics.d.ts +2 -5
  97. package/Logs/LogAnalytics.js +13 -17
  98. package/Logs/index.d.ts +3 -5
  99. package/Logs/index.js +7 -4
  100. package/MySql/index.d.ts +3 -10
  101. package/MySql/index.js +15 -20
  102. package/Postgresql/index.d.ts +3 -4
  103. package/Postgresql/index.js +30 -24
  104. package/RedisCache/index.d.ts +5 -3
  105. package/RedisCache/index.js +18 -24
  106. package/ServiceBus/index.d.ts +6 -8
  107. package/ServiceBus/index.js +9 -15
  108. package/SignalR/index.d.ts +5 -3
  109. package/SignalR/index.js +19 -28
  110. package/Sql/SqlDb.d.ts +3 -3
  111. package/Sql/SqlDb.js +11 -2
  112. package/Sql/index.d.ts +5 -9
  113. package/Sql/index.js +41 -30
  114. package/Storage/ManagementRules.d.ts +6 -8
  115. package/Storage/ManagementRules.js +3 -3
  116. package/Storage/index.d.ts +3 -6
  117. package/Storage/index.js +24 -27
  118. package/VM/DiskEncryptionSet.d.ts +8 -0
  119. package/VM/DiskEncryptionSet.js +43 -0
  120. package/VM/index.d.ts +5 -11
  121. package/VM/index.js +24 -12
  122. package/VNet/Firewall.js +3 -5
  123. package/VNet/FirewallPolicies/AksFirewallPolicy.js +2 -2
  124. package/VNet/Helper.d.ts +2 -2
  125. package/VNet/Helper.js +6 -3
  126. package/VNet/IpAddressPrefix.d.ts +5 -7
  127. package/VNet/IpAddressPrefix.js +5 -5
  128. package/VNet/PrivateEndpoint.d.ts +2 -2
  129. package/VNet/PrivateEndpoint.js +2 -3
  130. package/VNet/RouteTable.d.ts +4 -4
  131. package/VNet/RouteTable.js +4 -4
  132. package/VNet/Vnet.js +5 -1
  133. package/VNet/index.d.ts +3 -5
  134. package/VNet/index.js +1 -1
  135. package/VNet/types.d.ts +3 -4
  136. package/Web/AppCertOrder.d.ts +2 -3
  137. package/Web/AppCertOrder.js +1 -1
  138. package/Web/AppConfig.d.ts +2 -5
  139. package/Web/AppConfig.js +3 -4
  140. package/package.json +5 -5
  141. package/types.d.ts +42 -28
@@ -26,26 +26,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
+ const UserAssignedIdentity_1 = __importDefault(require("../AzAd/UserAssignedIdentity"));
30
+ const Helper_1 = require("../KeyVault/Helper");
29
31
  const Common_1 = require("../Common");
30
32
  const pulumi = __importStar(require("@pulumi/pulumi"));
31
33
  const azure = __importStar(require("@pulumi/azure-native"));
32
- const AzureEnv_1 = require("../Common/AzureEnv");
33
34
  const Random_1 = require("../Core/Random");
34
35
  const CustomHelper_1 = require("../KeyVault/CustomHelper");
35
36
  const random_1 = require("@pulumi/random");
36
- const Helper_1 = require("../VNet/Helper");
37
+ const Helper_2 = require("../VNet/Helper");
37
38
  const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
38
39
  const Locker_1 = __importDefault(require("../Core/Locker"));
39
- exports.default = ({ name, group,
40
- //auth,
41
- version = azure.dbforpostgresql.ServerVersion.ServerVersion_14, storageSizeGB = 128,
40
+ exports.default = ({ name, group, version = azure.dbforpostgresql.ServerVersion.ServerVersion_14, storageSizeGB = 128,
42
41
  /**
43
42
  [Standard_B1ms, Standard_B1s, Standard_B2ms, Standard_B2s, Standard_B4ms, Standard_B8ms, Standard_D16s_v3, Standard_D2s_v3, Standard_D32s_v3, Standard_D4s_v3, Standard_D64s_v3, Standard_D8s_v3, Standard_E16s_v3, Standard_E2s_v3, Standard_E32s_v3, Standard_E4s_v3, Standard_E64s_v3, Standard_E8s_v3, Standard_M128ms, Standard_M128s, Standard_M64ms, Standard_M64s, Standard_E48s_v3, Standard_D2ds_v4, Standard_D4ds_v4, Standard_D8ds_v4, Standard_D16ds_v4, Standard_D32ds_v4, Standard_D48ds_v4, Standard_D64ds_v4, Standard_E2ds_v4, Standard_E4ds_v4, Standard_E8ds_v4, Standard_E16ds_v4, Standard_E32ds_v4, Standard_E48ds_v4, Standard_E64ds_v4, Standard_D48s_v3, Standard_E20ds_v4, Standard_M8ms, Standard_M16ms, Standard_M32ts, Standard_M32ls, Standard_M32ms, Standard_M64ls, Standard_M64, Standard_M64m, Standard_M128, Standard_M128m, Standard_B12ms, Standard_B16ms, Standard_B20ms, Standard_D2ads_v5, Standard_D4ads_v5, Standard_D8ads_v5, Standard_D16ads_v5, Standard_D32ads_v5, Standard_D48ads_v5, Standard_D64ads_v5, Standard_D96ads_v5, Standard_E2ads_v5, Standard_E4ads_v5, Standard_E8ads_v5, Standard_E16ads_v5, Standard_E20ads_v5, Standard_E32ads_v5, Standard_E48ads_v5, Standard_E64ads_v5, Standard_E96ads_v5, Standard_D2_v5, Standard_D4_v5, Standard_D8_v5, Standard_D16_v5, Standard_D32_v5, Standard_D48_v5, Standard_D64_v5, Standard_D96_v5, Standard_D2ds_v5, Standard_D4ds_v5, Standard_D8ds_v5, Standard_D16ds_v5, Standard_D32ds_v5, Standard_D48ds_v5, Standard_D64ds_v5, Standard_D96ds_v5, Standard_E2ds_v5, Standard_E4ds_v5, Standard_E8ds_v5, Standard_E16ds_v5, Standard_E20ds_v5, Standard_E32ds_v5, Standard_E48ds_v5, Standard_E64ds_v5, Standard_E96ds_v5, Standard_E104ids_v5, Standard_E2bds_v5, Standard_E4bds_v5, Standard_E8bds_v5, Standard_E16bds_v5, Standard_E32bds_v5, Standard_E48bds_v5, Standard_E64bds_v5, Standard_E112iads_v5, Standard_M32dms_v2, Standard_M64ds_v2, Standard_M64dms_v2, Standard_M128ds_v2, Standard_M128dms_v2, Standard_M192ids_v2, Standard_M192idms_v2]
44
43
  */
45
44
  sku = {
46
45
  name: 'Standard_B1ms',
47
46
  tier: 'Burstable',
48
- }, network, databases, vaultInfo, dependsOn, lock = true, }) => {
47
+ }, network, databases, vaultInfo, enableEncryption, dependsOn, lock = true, }) => {
49
48
  name = (0, Common_1.getPostgresqlName)(name);
50
49
  const username = new random_1.RandomString(name, {
51
50
  special: false,
@@ -58,6 +57,12 @@ sku = {
58
57
  length: 25,
59
58
  options: { special: false },
60
59
  }).result;
60
+ const encryptKey = enableEncryption
61
+ ? (0, Helper_1.addEncryptKey)({ name, vaultInfo: vaultInfo })
62
+ : undefined;
63
+ const userIdentity = enableEncryption
64
+ ? (0, UserAssignedIdentity_1.default)({ name, group, vaultInfo })
65
+ : undefined;
61
66
  const postgres = new azure.dbforpostgresql.Server(name, {
62
67
  serverName: name,
63
68
  ...group,
@@ -66,20 +71,25 @@ sku = {
66
71
  authConfig: {
67
72
  passwordAuth: 'Enabled',
68
73
  activeDirectoryAuth: 'Enabled',
69
- tenantId: AzureEnv_1.tenantId,
74
+ tenantId: Common_1.tenantId,
70
75
  },
71
76
  administratorLogin: username,
72
77
  administratorLoginPassword: password,
73
- dataEncryption: { type: 'SystemManaged' },
74
- //maintenanceWindow: { dayOfWeek: 6 },
78
+ dataEncryption: encryptKey
79
+ ? {
80
+ type: 'AzureKeyVault',
81
+ primaryUserAssignedIdentityId: userIdentity?.id,
82
+ primaryKeyURI: encryptKey.url,
83
+ }
84
+ : { type: 'SystemManaged' },
85
+ maintenanceWindow: { dayOfWeek: 6, startHour: 0, startMinute: 0 },
75
86
  sku,
76
- //network: {},
77
87
  backup: {
78
- geoRedundantBackup: AzureEnv_1.isPrd ? 'Enabled' : 'Disabled',
88
+ geoRedundantBackup: Common_1.isPrd ? 'Enabled' : 'Disabled',
79
89
  backupRetentionDays: 7,
80
90
  },
81
- highAvailability: { mode: AzureEnv_1.isPrd ? 'ZoneRedundant' : 'Disabled' },
82
- availabilityZone: AzureEnv_1.isPrd ? '3' : '1',
91
+ highAvailability: { mode: Common_1.isPrd ? 'ZoneRedundant' : 'Disabled' },
92
+ availabilityZone: Common_1.isPrd ? '3' : '1',
83
93
  }, {
84
94
  dependsOn,
85
95
  protect: lock,
@@ -98,7 +108,7 @@ sku = {
98
108
  }
99
109
  if (network) {
100
110
  if (network.ipAddresses) {
101
- pulumi.output(network.ipAddresses).apply((ips) => (0, Helper_1.convertToIpRange)(ips).map((f, i) => new azure.dbforpostgresql.FirewallRule(`${name}-firewall-${i}`, {
111
+ pulumi.output(network.ipAddresses).apply((ips) => (0, Helper_2.convertToIpRange)(ips).map((f, i) => new azure.dbforpostgresql.FirewallRule(`${name}-firewall-${i}`, {
102
112
  firewallRuleName: `${name}-firewall-${i}`,
103
113
  serverName: postgres.name,
104
114
  ...group,
@@ -126,17 +136,13 @@ sku = {
126
136
  }
127
137
  }
128
138
  if (vaultInfo) {
129
- (0, CustomHelper_1.addCustomSecret)({
130
- name: `${name}-login`,
131
- value: username,
132
- vaultInfo,
133
- contentType: name,
134
- });
135
- (0, CustomHelper_1.addCustomSecret)({
136
- name: `${name}-pass`,
137
- value: password,
139
+ (0, CustomHelper_1.addCustomSecrets)({
138
140
  vaultInfo,
139
141
  contentType: name,
142
+ items: [
143
+ { name: `${name}-login`, value: username },
144
+ { name: `${name}-pass`, value: password },
145
+ ],
140
146
  });
141
147
  }
142
148
  if (databases) {
@@ -148,4 +154,4 @@ sku = {
148
154
  }
149
155
  return postgres;
150
156
  };
151
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUG9zdGdyZXNxbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0Esc0NBQThDO0FBQzlDLHVEQUF5QztBQUN6Qyw0REFBOEM7QUFDOUMsaURBQXFEO0FBQ3JELDJDQUFnRDtBQUVoRCwyREFBMkQ7QUFDM0QsMkNBQThDO0FBQzlDLDJDQUFrRDtBQUNsRCw4RUFBc0Q7QUFDdEQsNERBQW9DO0FBa0JwQyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUs7QUFDTCxPQUFPO0FBQ1AsT0FBTyxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLGdCQUFnQixFQUM5RCxhQUFhLEdBQUcsR0FBRztBQUNuQjs7R0FFRztBQUNILEdBQUcsR0FBRztJQUNKLElBQUksRUFBRSxlQUFlO0lBQ3JCLElBQUksRUFBRSxXQUFXO0NBQ2xCLEVBQ0QsT0FBTyxFQUNQLFNBQVMsRUFDVCxTQUFTLEVBQ1QsU0FBUyxFQUNULElBQUksR0FBRyxJQUFJLEdBQ0csRUFBRSxFQUFFO0lBQ2xCLElBQUksR0FBRyxJQUFBLDBCQUFpQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRS9CLE1BQU0sUUFBUSxHQUFHLElBQUkscUJBQVksQ0FBQyxJQUFJLEVBQUU7UUFDdEMsT0FBTyxFQUFFLEtBQUs7UUFDZCxNQUFNLEVBQUUsQ0FBQztRQUNULEtBQUssRUFBRSxJQUFJO1FBQ1gsS0FBSyxFQUFFLEtBQUs7S0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZDLE1BQU0sUUFBUSxHQUFHLElBQUEsdUJBQWMsRUFBQztRQUM5QixJQUFJO1FBQ0osTUFBTSxFQUFFLEVBQUU7UUFDVixPQUFPLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFO0tBQzVCLENBQUMsQ0FBQyxNQUFNLENBQUM7SUFFVixNQUFNLFFBQVEsR0FBRyxJQUFJLEtBQUssQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUMvQyxJQUFJLEVBQ0o7UUFDRSxVQUFVLEVBQUUsSUFBSTtRQUNoQixHQUFHLEtBQUs7UUFDUixPQUFPO1FBQ1AsT0FBTyxFQUFFLEVBQUUsYUFBYSxFQUFFO1FBRTFCLFVBQVUsRUFBRTtZQUNWLFlBQVksRUFBRSxTQUFTO1lBQ3ZCLG1CQUFtQixFQUFFLFNBQVM7WUFDOUIsUUFBUSxFQUFSLG1CQUFRO1NBQ1Q7UUFDRCxrQkFBa0IsRUFBRSxRQUFRO1FBQzVCLDBCQUEwQixFQUFFLFFBQVE7UUFDcEMsY0FBYyxFQUFFLEVBQUUsSUFBSSxFQUFFLGVBQWUsRUFBRTtRQUN6QyxzQ0FBc0M7UUFDdEMsR0FBRztRQUNILGNBQWM7UUFDZCxNQUFNLEVBQUU7WUFDTixrQkFBa0IsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLFVBQVU7WUFDbEQsbUJBQW1CLEVBQUUsQ0FBQztTQUN2QjtRQUNELGdCQUFnQixFQUFFLEVBQUUsSUFBSSxFQUFFLGdCQUFLLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsVUFBVSxFQUFFO1FBQ2hFLGdCQUFnQixFQUFFLGdCQUFLLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRztLQUNwQyxFQUNEO1FBQ0UsU0FBUztRQUNULE9BQU8sRUFBRSxJQUFJO1FBQ2IsYUFBYSxFQUFFO1lBQ2IsbUJBQW1CO1lBQ25CLFVBQVU7WUFDVixZQUFZO1lBQ1osa0JBQWtCO1lBQ2xCLGtCQUFrQjtZQUNsQixvQkFBb0I7WUFDcEIsZ0JBQWdCO1NBQ2pCO0tBQ0YsQ0FDRixDQUFDO0lBRUYsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUNULElBQUEsZ0JBQU0sRUFBQyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBRUQsSUFBSSxPQUFPLEVBQUUsQ0FBQztRQUNaLElBQUksT0FBTyxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ3hCLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQy9DLElBQUEseUJBQWdCLEVBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUN2QixDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUNQLElBQUksS0FBSyxDQUFDLGVBQWUsQ0FBQyxZQUFZLENBQUMsR0FBRyxJQUFJLGFBQWEsQ0FBQyxFQUFFLEVBQUU7Z0JBQzlELGdCQUFnQixFQUFFLEdBQUcsSUFBSSxhQUFhLENBQUMsRUFBRTtnQkFDekMsVUFBVSxFQUFFLFFBQVEsQ0FBQyxJQUFJO2dCQUN6QixHQUFHLEtBQUs7Z0JBQ1IsY0FBYyxFQUFFLENBQUMsQ0FBQyxLQUFLO2dCQUN2QixZQUFZLEVBQUUsQ0FBQyxDQUFDLEdBQUc7YUFDcEIsQ0FBQyxDQUNMLENBQ0YsQ0FBQztRQUNKLENBQUM7UUFFRCxJQUFJLE9BQU8sQ0FBQyxrQkFBa0I7WUFDNUIsSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLFlBQVksQ0FBQyxHQUFHLElBQUksdUJBQXVCLEVBQUU7Z0JBQ3JFLGdCQUFnQixFQUFFLEdBQUcsSUFBSSx1QkFBdUI7Z0JBQ2hELFVBQVUsRUFBRSxRQUFRLENBQUMsSUFBSTtnQkFDekIsR0FBRyxLQUFLO2dCQUNSLGNBQWMsRUFBRSxTQUFTO2dCQUN6QixZQUFZLEVBQUUsaUJBQWlCO2FBQ2hDLENBQUMsQ0FBQztRQUVMLElBQUksT0FBTyxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ3hCLElBQUEseUJBQWUsRUFBQztnQkFDZCxHQUFHLE9BQU8sQ0FBQyxXQUFXO2dCQUN0QixZQUFZLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxRQUFRLENBQUMsRUFBRSxFQUFFO2dCQUM5QyxrQkFBa0IsRUFBRSw2QkFBNkI7Z0JBQ2pELG1CQUFtQixFQUFFLE9BQU8sQ0FBQyxXQUFXLENBQUMsSUFBSTtvQkFDM0MsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUM7b0JBQzVCLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQzthQUNuQixDQUFDLENBQUM7UUFDTCxDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxJQUFBLDhCQUFlLEVBQUM7WUFDZCxJQUFJLEVBQUUsR0FBRyxJQUFJLFFBQVE7WUFDckIsS0FBSyxFQUFFLFFBQVE7WUFDZixTQUFTO1lBQ1QsV0FBVyxFQUFFLElBQUk7U0FDbEIsQ0FBQyxDQUFDO1FBQ0gsSUFBQSw4QkFBZSxFQUFDO1lBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSxPQUFPO1lBQ3BCLEtBQUssRUFBRSxRQUFRO1lBQ2YsU0FBUztZQUNULFdBQVcsRUFBRSxJQUFJO1NBQ2xCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsU0FBUyxDQUFDLEdBQUcsQ0FDWCxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ0osSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLFFBQVEsQ0FDaEMsR0FBRyxJQUFJLElBQUksQ0FBQyxFQUFFLEVBQ2Q7WUFDRSxVQUFVLEVBQUUsUUFBUSxDQUFDLElBQUk7WUFDekIsWUFBWSxFQUFFLENBQUM7WUFDZixHQUFHLEtBQUs7U0FDVCxFQUNELEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQ3ZDLENBQ0osQ0FBQztJQUNKLENBQUM7SUFFRCxPQUFPLFFBQVEsQ0FBQztBQUNsQixDQUFDLENBQUMifQ==
157
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUG9zdGdyZXNxbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsd0ZBQWdFO0FBQ2hFLCtDQUFtRDtBQUVuRCxzQ0FBK0Q7QUFDL0QsdURBQXlDO0FBQ3pDLDREQUE4QztBQUM5QywyQ0FBZ0Q7QUFFaEQsMkRBQTZFO0FBQzdFLDJDQUE4QztBQUM5QywyQ0FBa0Q7QUFDbEQsOEVBQXNEO0FBQ3RELDREQUFvQztBQWNwQyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxPQUFPLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUMsZ0JBQWdCLEVBQzlELGFBQWEsR0FBRyxHQUFHO0FBQ25COztHQUVHO0FBQ0gsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLGVBQWU7SUFDckIsSUFBSSxFQUFFLFdBQVc7Q0FDbEIsRUFDRCxPQUFPLEVBQ1AsU0FBUyxFQUNULFNBQVMsRUFDVCxnQkFBZ0IsRUFDaEIsU0FBUyxFQUNULElBQUksR0FBRyxJQUFJLEdBQ0csRUFBRSxFQUFFO0lBQ2xCLElBQUksR0FBRyxJQUFBLDBCQUFpQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRS9CLE1BQU0sUUFBUSxHQUFHLElBQUkscUJBQVksQ0FBQyxJQUFJLEVBQUU7UUFDdEMsT0FBTyxFQUFFLEtBQUs7UUFDZCxNQUFNLEVBQUUsQ0FBQztRQUNULEtBQUssRUFBRSxJQUFJO1FBQ1gsS0FBSyxFQUFFLEtBQUs7S0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZDLE1BQU0sUUFBUSxHQUFHLElBQUEsdUJBQWMsRUFBQztRQUM5QixJQUFJO1FBQ0osTUFBTSxFQUFFLEVBQUU7UUFDVixPQUFPLEVBQUUs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
@@ -1,7 +1,6 @@
1
1
  import * as cache from '@pulumi/azure-native/cache';
2
- import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType, ResourceInfoWithInstance } from '../types';
3
- interface Props extends BasicResourceArgs {
4
- vaultInfo?: KeyVaultInfo;
2
+ import { BasicResourceWithVaultArgs, NetworkPropsType, ResourceInfoWithInstance } from '../types';
3
+ interface Props extends BasicResourceWithVaultArgs {
5
4
  network?: NetworkPropsType;
6
5
  sku?: {
7
6
  name: cache.SkuName | string;
@@ -9,5 +8,8 @@ interface Props extends BasicResourceArgs {
9
8
  capacity: number;
10
9
  };
11
10
  }
11
+ /**
12
+ * There is no encryption available for Redis yet
13
+ * */
12
14
  declare const _default: ({ name, group, network, vaultInfo, sku, dependsOn, ignoreChanges, importUri, }: Props) => ResourceInfoWithInstance<cache.Redis>;
13
15
  export default _default;
@@ -31,10 +31,13 @@ const pulumi = __importStar(require("@pulumi/pulumi"));
31
31
  const to_words_1 = require("to-words");
32
32
  const Helper_1 = require("../VNet/Helper");
33
33
  const Common_1 = require("../Common");
34
- const AzureEnv_1 = require("../Common/AzureEnv");
34
+ const Common_2 = require("../Common");
35
35
  const CustomHelper_1 = require("../KeyVault/CustomHelper");
36
36
  const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
37
37
  const toWord = new to_words_1.ToWords();
38
+ /**
39
+ * There is no encryption available for Redis yet
40
+ * */
38
41
  exports.default = ({ name, group, network, vaultInfo, sku = { name: 'Basic', family: 'C', capacity: 0 }, dependsOn, ignoreChanges, importUri, }) => {
39
42
  name = (0, Common_1.getRedisCacheName)(name);
40
43
  const redis = new cache.Redis(name, {
@@ -44,7 +47,7 @@ exports.default = ({ name, group, network, vaultInfo, sku = { name: 'Basic', fam
44
47
  enableNonSslPort: false,
45
48
  identity: { type: cache.ManagedServiceIdentityType.SystemAssigned },
46
49
  sku,
47
- zones: AzureEnv_1.isPrd && sku.name === 'Premium' ? ['1', '2', '3'] : undefined,
50
+ zones: Common_2.isPrd && sku.name === 'Premium' ? ['1', '2', '3'] : undefined,
48
51
  subnetId: network?.subnetId,
49
52
  publicNetworkAccess: network?.privateLink ? 'Disabled' : 'Enabled',
50
53
  }, { dependsOn, import: importUri, ignoreChanges });
@@ -82,29 +85,20 @@ exports.default = ({ name, group, network, vaultInfo, sku = { name: 'Basic', fam
82
85
  name: n,
83
86
  resourceGroupName: group.resourceGroupName,
84
87
  });
85
- (0, CustomHelper_1.addCustomSecret)({
86
- name: `${name}-primary-key`,
87
- value: keys.primaryKey,
88
- vaultInfo,
89
- contentType: 'Redis Cache',
90
- });
91
- (0, CustomHelper_1.addCustomSecret)({
92
- name: `${name}-secondary-key`,
93
- value: keys.secondaryKey,
94
- vaultInfo,
95
- contentType: 'Redis Cache',
96
- });
97
- (0, CustomHelper_1.addCustomSecret)({
98
- name: `${name}-primary-connection`,
99
- value: `${name}.redis.cache.windows.net:6380,password=${keys.primaryKey},ssl=True,abortConnect=False`,
100
- vaultInfo,
101
- contentType: 'Redis Cache',
102
- });
103
- (0, CustomHelper_1.addCustomSecret)({
104
- name: `${name}-secondary-connection`,
105
- value: `${name}.redis.cache.windows.net:6380,password=${keys.secondaryKey},ssl=True,abortConnect=False`,
88
+ (0, CustomHelper_1.addCustomSecrets)({
106
89
  vaultInfo,
107
90
  contentType: 'Redis Cache',
91
+ dependsOn: redis,
92
+ items: [
93
+ {
94
+ name: `${name}-primary-connection`,
95
+ value: `${name}.redis.cache.windows.net:6380,password=${keys.primaryKey},ssl=True,abortConnect=False`,
96
+ },
97
+ {
98
+ name: `${name}-secondary-connection`,
99
+ value: `${name}.redis.cache.windows.net:6380,password=${keys.secondaryKey},ssl=True,abortConnect=False`,
100
+ },
101
+ ],
108
102
  });
109
103
  });
110
104
  }
@@ -115,4 +109,4 @@ exports.default = ({ name, group, network, vaultInfo, sku = { name: 'Basic', fam
115
109
  instance: redis,
116
110
  };
117
111
  };
118
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUmVkaXNDYWNoZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0VBQW9EO0FBQ3BELHVEQUF5QztBQVN6Qyx1Q0FBbUM7QUFDbkMsMkNBQWtEO0FBQ2xELHNDQUE4QztBQUM5QyxpREFBMkM7QUFDM0MsMkRBQTJEO0FBQzNELDhFQUE2RDtBQUU3RCxNQUFNLE1BQU0sR0FBRyxJQUFJLGtCQUFPLEVBQUUsQ0FBQztBQVk3QixrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxPQUFPLEVBQ1AsU0FBUyxFQUNULEdBQUcsR0FBRyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsQ0FBQyxFQUFFLEVBQ2pELFNBQVMsRUFDVCxhQUFhLEVBQ2IsU0FBUyxHQUNILEVBQXlDLEVBQUU7SUFDakQsSUFBSSxHQUFHLElBQUEsMEJBQWlCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0IsTUFBTSxLQUFLLEdBQUcsSUFBSSxLQUFLLENBQUMsS0FBSyxDQUMzQixJQUFJLEVBQ0o7UUFDRSxJQUFJO1FBQ0osR0FBRyxLQUFLO1FBQ1IsaUJBQWlCLEVBQUUsS0FBSztRQUN4QixnQkFBZ0IsRUFBRSxLQUFLO1FBQ3ZCLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsMEJBQTBCLENBQUMsY0FBYyxFQUFFO1FBQ25FLEdBQUc7UUFDSCxLQUFLLEVBQUUsZ0JBQUssSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTO1FBQ3BFLFFBQVEsRUFBRSxPQUFPLEVBQUUsUUFBUTtRQUMzQixtQkFBbUIsRUFBRSxPQUFPLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLFNBQVM7S0FDbkUsRUFDRCxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxDQUNoRCxDQUFDO0lBRUYscUJBQXFCO0lBQ3JCLElBQUksT0FBTyxFQUFFLFdBQVcsRUFBRSxDQUFDO1FBQ3pCLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1lBQy9DLElBQUEseUJBQWdCLEVBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUMsRUFBRSxFQUFFO2dCQUNyQyxNQUFNLENBQUMsR0FBRyxZQUFZLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztnQkFDeEQsT0FBTyxJQUFJLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQyxFQUFFO29CQUMvQixRQUFRLEVBQUUsQ0FBQztvQkFDWCxTQUFTLEVBQUUsS0FBSyxDQUFDLElBQUk7b0JBQ3JCLEdBQUcsS0FBSztvQkFDUixPQUFPLEVBQUUsS0FBSyxDQUFDLEtBQUs7b0JBQ3BCLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRztpQkFDakIsQ0FBQyxDQUFDO1lBQ0wsQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxjQUFjO0lBQ2QsSUFBSSxPQUFPLEVBQUUsV0FBVyxFQUFFLENBQUM7UUFDekIsSUFBQSx5QkFBc0IsRUFBQztZQUNyQixHQUFHLE9BQU8sQ0FBQyxXQUFXO1lBQ3RCLFlBQVksRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUU7WUFDM0Msa0JBQWtCLEVBQUUscUNBQXFDO1lBQ3pELG1CQUFtQixFQUFFLE9BQU8sQ0FBQyxXQUFXLENBQUMsSUFBSTtnQkFDM0MsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUM7Z0JBQzVCLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQztTQUNuQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUM5RCxJQUFJLENBQUMsQ0FBQztnQkFBRSxPQUFPO1lBRWYsTUFBTSxJQUFJLEdBQUcsTUFBTSxLQUFLLENBQUMsYUFBYSxDQUFDO2dCQUNyQyxJQUFJLEVBQUUsQ0FBQztnQkFDUCxpQkFBaUIsRUFBRSxLQUFLLENBQUMsaUJBQWlCO2FBQzNDLENBQUMsQ0FBQztZQUVILElBQUEsOEJBQWUsRUFBQztnQkFDZCxJQUFJLEVBQUUsR0FBRyxJQUFJLGNBQWM7Z0JBQzNCLEtBQUssRUFBRSxJQUFJLENBQUMsVUFBVTtnQkFDdEIsU0FBUztnQkFDVCxXQUFXLEVBQUUsYUFBYTthQUMzQixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSxnQkFBZ0I7Z0JBQzdCLEtBQUssRUFBRSxJQUFJLENBQUMsWUFBWTtnQkFDeEIsU0FBUztnQkFDVCxXQUFXLEVBQUUsYUFBYTthQUMzQixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSxxQkFBcUI7Z0JBQ2xDLEtBQUssRUFBRSxHQUFHLElBQUksMENBQTBDLElBQUksQ0FBQyxVQUFVLDhCQUE4QjtnQkFDckcsU0FBUztnQkFDVCxXQUFXLEVBQUUsYUFBYTthQUMzQixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSx1QkFBdUI7Z0JBQ3BDLEtBQUssRUFBRSxHQUFHLElBQUksMENBQTBDLElBQUksQ0FBQyxZQUFZLDhCQUE4QjtnQkFDdkcsU0FBUztnQkFDVCxXQUFXLEVBQUUsYUFBYTthQUMzQixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPO1FBQ0wsSUFBSTtRQUNKLEtBQUs7UUFDTCxFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUU7UUFDWixRQUFRLEVBQUUsS0FBSztLQUNoQixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
112
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUmVkaXNDYWNoZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0VBQW9EO0FBQ3BELHVEQUF5QztBQVF6Qyx1Q0FBbUM7QUFDbkMsMkNBQWtEO0FBQ2xELHNDQUE4QztBQUM5QyxzQ0FBa0M7QUFDbEMsMkRBQTZFO0FBQzdFLDhFQUE2RDtBQUU3RCxNQUFNLE1BQU0sR0FBRyxJQUFJLGtCQUFPLEVBQUUsQ0FBQztBQVU3Qjs7S0FFSztBQUNMLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLE9BQU8sRUFDUCxTQUFTLEVBQ1QsR0FBRyxHQUFHLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxDQUFDLEVBQUUsRUFDakQsU0FBUyxFQUNULGFBQWEsRUFDYixTQUFTLEdBQ0gsRUFBeUMsRUFBRTtJQUNqRCxJQUFJLEdBQUcsSUFBQSwwQkFBaUIsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUMvQixNQUFNLEtBQUssR0FBRyxJQUFJLEtBQUssQ0FBQyxLQUFLLENBQzNCLElBQUksRUFDSjtRQUNFLElBQUk7UUFDSixHQUFHLEtBQUs7UUFDUixpQkFBaUIsRUFBRSxLQUFLO1FBQ3hCLGdCQUFnQixFQUFFLEtBQUs7UUFDdkIsUUFBUSxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssQ0FBQywwQkFBMEIsQ0FBQyxjQUFjLEVBQUU7UUFDbkUsR0FBRztRQUNILEtBQUssRUFBRSxjQUFLLElBQUksR0FBRyxDQUFDLElBQUksS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUztRQUNwRSxRQUFRLEVBQUUsT0FBTyxFQUFFLFFBQVE7UUFDM0IsbUJBQW1CLEVBQUUs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
@@ -1,6 +1,6 @@
1
1
  import * as bus from '@pulumi/azure-native/servicebus';
2
2
  import * as pulumi from '@pulumi/pulumi';
3
- import { BasicArgs, BasicMonitorArgs, BasicResourceArgs, KeyVaultInfo, NetworkPropsType, ResourceGroupInfo, ResourceInfoWithInstance } from '../types';
3
+ import { OptsArgs, BasicMonitorArgs, BasicResourceArgs, KeyVaultInfo, NetworkPropsType, ResourceGroupInfo, ResourceInfoWithInstance, NamedType } from '../types';
4
4
  import { BusConnectionTypes } from './ServiceBusHelper';
5
5
  type TransportTypes = 'AmqpWebSockets' | 'Amqp' | null;
6
6
  type OptionsType = {
@@ -10,7 +10,7 @@ type OptionsType = {
10
10
  enablePartitioning?: pulumi.Input<boolean>;
11
11
  autoDeleteOnIdle?: pulumi.Input<string>;
12
12
  };
13
- interface ConnCreatorProps extends BasicArgs {
13
+ interface ConnCreatorProps extends OptsArgs {
14
14
  topicName?: string;
15
15
  queueName?: string;
16
16
  namespaceName: string;
@@ -20,7 +20,7 @@ interface ConnCreatorProps extends BasicArgs {
20
20
  removeEntityPath?: boolean;
21
21
  vaultInfo: KeyVaultInfo;
22
22
  }
23
- interface TopicProps extends Pick<ConnCreatorProps, 'removeEntityPath' | 'transportType'>, BasicArgs {
23
+ interface TopicProps extends Pick<ConnCreatorProps, 'removeEntityPath' | 'transportType'>, OptsArgs {
24
24
  shortName: string;
25
25
  namespaceFullName: string;
26
26
  version: number;
@@ -35,7 +35,7 @@ interface TopicProps extends Pick<ConnCreatorProps, 'removeEntityPath' | 'transp
35
35
  supportOrdering?: boolean;
36
36
  };
37
37
  }
38
- interface QueueProps extends Pick<ConnCreatorProps, 'removeEntityPath' | 'transportType'>, BasicArgs {
38
+ interface QueueProps extends Pick<ConnCreatorProps, 'removeEntityPath' | 'transportType'>, OptsArgs {
39
39
  shortName: string;
40
40
  version: number;
41
41
  namespaceFullName: string;
@@ -44,13 +44,11 @@ interface QueueProps extends Pick<ConnCreatorProps, 'removeEntityPath' | 'transp
44
44
  enableConnections?: boolean;
45
45
  options?: OptionsType;
46
46
  }
47
- interface TopicResultProps {
48
- name: string;
47
+ interface TopicResultProps extends NamedType {
49
48
  topic: bus.Topic;
50
49
  subs?: Array<ResourceInfoWithInstance<bus.Subscription>>;
51
50
  }
52
- interface QueueResultProps {
53
- name: string;
51
+ interface QueueResultProps extends NamedType {
54
52
  queue: bus.Queue;
55
53
  }
56
54
  interface Props extends BasicResourceArgs, Pick<ConnCreatorProps, 'removeEntityPath' | 'transportType'> {
@@ -28,18 +28,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
29
  const bus = __importStar(require("@pulumi/azure-native/servicebus"));
30
30
  const ServiceBusHelper_1 = require("./ServiceBusHelper");
31
- const AzureEnv_1 = require("../Common/AzureEnv");
32
31
  const ResourceCreator_1 = __importDefault(require("../Core/ResourceCreator"));
33
32
  const Common_1 = require("../Common");
34
33
  const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
35
34
  const CustomHelper_1 = require("../KeyVault/CustomHelper");
36
35
  const Helper_1 = require("../KeyVault/Helper");
37
- const duplicateDetectedTime = AzureEnv_1.isPrd ? 'P3D' : 'PT10M';
36
+ const duplicateDetectedTime = Common_1.isPrd ? 'P3D' : 'PT10M';
38
37
  const defaultValues = {
39
38
  maxDeliveryCount: 10,
40
39
  enableBatchedOperations: true,
41
- defaultMessageTtl: AzureEnv_1.isPrd ? 'P30D' : 'P1D',
42
- defaultMessageTimeToLive: AzureEnv_1.isPrd ? 'P30D' : 'P1D',
40
+ defaultMessageTtl: Common_1.isPrd ? 'P30D' : 'P1D',
41
+ defaultMessageTimeToLive: Common_1.isPrd ? 'P30D' : 'P1D',
43
42
  deadLetteringOnMessageExpiration: true,
44
43
  maxSizeInMegabytes: 1024,
45
44
  lockDuration: 'PT1M',
@@ -119,24 +118,19 @@ const createAndStoreConnection = ({ namespaceName, topicName, queueName, connect
119
118
  : keys.primaryConnectionString;
120
119
  if (typeof transportType === 'string')
121
120
  primaryConn += `;TransportType=${transportType};`;
122
- (0, CustomHelper_1.addCustomSecret)({
123
- name: primaryName,
124
- value: primaryConn,
125
- vaultInfo,
126
- contentType: `ServiceBus ${namespaceName}/${name}`,
127
- dependsOn: rule,
128
- });
129
121
  let secondConn = removeEntityPath
130
122
  ? keys.secondaryConnectionString.replace(`;EntityPath=${name}`, '')
131
123
  : keys.secondaryConnectionString;
132
124
  if (typeof transportType === 'string')
133
125
  secondConn += `;TransportType=${transportType};`;
134
- (0, CustomHelper_1.addCustomSecret)({
135
- name: secondaryName,
136
- value: secondConn,
126
+ (0, CustomHelper_1.addCustomSecrets)({
137
127
  vaultInfo,
138
128
  contentType: `ServiceBus ${namespaceName}/${name}`,
139
129
  dependsOn: rule,
130
+ items: [
131
+ { name: primaryName, value: primaryConn },
132
+ { name: secondaryName, value: secondConn },
133
+ ],
140
134
  });
141
135
  });
142
136
  return { primaryName, secondaryName };
@@ -406,4 +400,4 @@ exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultI
406
400
  diagnostic,
407
401
  };
408
402
  };
409
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ServiceBus/index.ts"],"names":[],"mappings":"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"}
403
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ServiceBus/index.ts"],"names":[],"mappings":"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"}
@@ -1,17 +1,19 @@
1
1
  import * as ss from '@pulumi/azure-native/signalrservice';
2
2
  import * as pulumi from '@pulumi/pulumi';
3
- import { BasicResourceArgs, KeyVaultInfo, PrivateLinkPropsType, ResourceInfoWithInstance } from '../types';
3
+ import { BasicResourceWithVaultArgs, PrivateLinkPropsType, ResourceInfoWithInstance } from '../types';
4
4
  interface ResourceSkuArgs {
5
5
  capacity?: 1 | 2 | 5 | 10 | 20 | 50 | 100;
6
6
  name: 'Standard_S1' | 'Free_F1';
7
7
  tier?: 'Standard' | 'Free';
8
8
  }
9
- interface Props extends BasicResourceArgs {
10
- vaultInfo?: KeyVaultInfo;
9
+ interface Props extends BasicResourceWithVaultArgs {
11
10
  allowedOrigins?: pulumi.Input<pulumi.Input<string>[]>;
12
11
  privateLink?: PrivateLinkPropsType;
13
12
  kind?: ss.ServiceKind | string;
14
13
  sku?: pulumi.Input<ResourceSkuArgs>;
15
14
  }
15
+ /**
16
+ * There is no encryption available for SignalR yet
17
+ * */
16
18
  declare const _default: ({ name, group, vaultInfo, privateLink, kind, sku, allowedOrigins, }: Props) => ResourceInfoWithInstance<ss.SignalR>;
17
19
  export default _default;
package/SignalR/index.js CHANGED
@@ -30,6 +30,9 @@ const ss = __importStar(require("@pulumi/azure-native/signalrservice"));
30
30
  const Common_1 = require("../Common");
31
31
  const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
32
32
  const CustomHelper_1 = require("../KeyVault/CustomHelper");
33
+ /**
34
+ * There is no encryption available for SignalR yet
35
+ * */
33
36
  exports.default = ({ name, group, vaultInfo, privateLink, kind = ss.ServiceKind.SignalR, sku = Common_1.isPrd
34
37
  ? {
35
38
  name: 'Standard_S1',
@@ -100,38 +103,26 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = ss.ServiceKind.
100
103
  resourceName: name,
101
104
  resourceGroupName: group.resourceGroupName,
102
105
  });
103
- (0, CustomHelper_1.addCustomSecret)({
104
- name: `${name}-host`,
105
- value: h,
106
- vaultInfo,
107
- contentType: 'SignalR',
108
- });
109
- (0, CustomHelper_1.addCustomSecret)({
110
- name: `${name}-primaryKey`,
111
- value: keys.primaryKey || '',
112
- vaultInfo,
113
- contentType: 'SignalR',
114
- });
115
- (0, CustomHelper_1.addCustomSecret)({
116
- name: `${name}-primaryConnection`,
117
- value: keys.primaryConnectionString || '',
118
- vaultInfo,
119
- contentType: 'SignalR',
120
- });
121
- (0, CustomHelper_1.addCustomSecret)({
122
- name: `${name}-secondaryKey`,
123
- value: keys.secondaryKey || '',
124
- vaultInfo,
125
- contentType: 'SignalR',
126
- });
127
- (0, CustomHelper_1.addCustomSecret)({
128
- name: `${name}-secondaryConnection`,
129
- value: keys.secondaryConnectionString || '',
106
+ (0, CustomHelper_1.addCustomSecrets)({
130
107
  vaultInfo,
131
108
  contentType: 'SignalR',
109
+ dependsOn: signalR,
110
+ items: [
111
+ { name: `${name}-host`, value: h },
112
+ //{ name: `${name}-primaryKey`, value: keys.primaryKey! },
113
+ {
114
+ name: `${name}-primaryConnection`,
115
+ value: keys.primaryConnectionString,
116
+ },
117
+ //{ name: `${name}-secondaryKey`, value: keys.secondaryKey! },
118
+ {
119
+ name: `${name}-secondaryConnection`,
120
+ value: keys.secondaryConnectionString,
121
+ },
122
+ ],
132
123
  });
133
124
  });
134
125
  }
135
126
  return { name, group, id: signalR.id, instance: signalR };
136
127
  };
137
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2lnbmFsUi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsd0VBQTBEO0FBRTFELHNDQUEwRTtBQU8xRSw4RUFBc0Q7QUFDdEQsMkRBQTJEO0FBZ0IzRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsV0FBVyxFQUNYLElBQUksR0FBRyxFQUFFLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFDN0IsR0FBRyxHQUFHLGNBQUs7SUFDVCxDQUFDLENBQUM7UUFDRSxJQUFJLEVBQUUsYUFBYTtRQUNuQixJQUFJLEVBQUUsRUFBRSxDQUFDLGNBQWMsQ0FBQyxRQUFRO1FBQ2hDLFFBQVEsRUFBRSxDQUFDO0tBQ1o7SUFDSCxDQUFDLENBQUM7UUFDRSxJQUFJLEVBQUUsU0FBUztRQUNmLElBQUksRUFBRSxNQUFNO0tBQ2IsRUFDTCxjQUFjLEdBQ1IsRUFBd0MsRUFBRTtJQUNoRCxJQUFJLEdBQUcsSUFBQSx1QkFBYyxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTVCLE1BQU0sT0FBTyxHQUFHLElBQUksRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUU7UUFDbkMsWUFBWSxFQUFFLElBQUk7UUFDbEIsR0FBRyxLQUFLO1FBQ1IsSUFBSTtRQUVKLElBQUksRUFBRSxFQUFFLGNBQWMsRUFBRTtRQUN4QixRQUFRLEVBQUU7WUFDUixFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRTtZQUN6Qyx1REFBdUQ7U0FDeEQ7UUFDRCxXQUFXLEVBQUUsV0FBVztZQUN0QixDQUFDLENBQUM7Z0JBQ0UsYUFBYSxFQUFFLEVBQUUsQ0FBQyxTQUFTLENBQUMsS0FBSztnQkFDakMsYUFBYSxFQUFFO29CQUNiLEtBQUssRUFBRSxDQUFDLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0FBQztvQkFDL0MsSUFBSSxFQUFFO3dCQUNKLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0I7d0JBQ3RDLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPO3FCQUM5QjtpQkFDRjtnQkFDRCxnQkFBZ0IsRUFBRTtvQkFDaEI7d0JBQ0UsSUFBSSxFQUFFLElBQUEsK0JBQXNCLEVBQUMsSUFBSSxDQUFDO3dCQUNsQyxLQUFLLEVBQUU7NEJBQ0wsRUFBRSxDQUFDLGtCQUFrQixDQUFDLGdCQUFnQjs0QkFDdEMsRUFBRSxDQUFDLGtCQUFrQixDQUFDLGdCQUFnQjt5QkFDdkM7d0JBQ0QsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDLGtCQUFrQixDQUFDLE9BQU8sQ0FBQztxQkFDdEM7aUJBQ0Y7YUFDRjtZQUNILENBQUMsQ0FBQztnQkFDRSxhQUFhLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxLQUFLO2dCQUNqQyxhQUFhLEVBQUU7b0JBQ2IsS0FBSyxFQUFFO3dCQUNMLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0I7d0JBQ3RDLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0I7cUJBQ3ZDO29CQUNELElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLENBQUM7aUJBQ3RDO2FBQ0Y7UUFDTCxHQUFHO0tBQ0osQ0FBQyxDQUFDO0lBRUgsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixvRUFBb0U7UUFDcEUsSUFBQSx5QkFBZSxFQUFDO1lBQ2QsR0FBRyxXQUFXO1lBQ2QsWUFBWSxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsT0FBTyxDQUFDLEVBQUUsRUFBRTtZQUM3QyxrQkFBa0IsRUFBRSxpQ0FBaUM7WUFDckQsbUJBQW1CLEVBQUUsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO1NBQ3pFLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLENBQUMsRUFBRSxFQUFFO1lBQ2pDLElBQUksQ0FBQyxDQUFDO2dCQUFFLE9BQU87WUFFZixNQUFNLElBQUksR0FBRyxNQUFNLEVBQUUsQ0FBQyxlQUFlLENBQUM7Z0JBQ3BDLFlBQVksRUFBRSxJQUFJO2dCQUNsQixpQkFBaUIsRUFBRSxLQUFLLENBQUMsaUJBQWlCO2FBQzNDLENBQUMsQ0FBQztZQUVILElBQUEsOEJBQWUsRUFBQztnQkFDZCxJQUFJLEVBQUUsR0FBRyxJQUFJLE9BQU87Z0JBQ3BCLEtBQUssRUFBRSxDQUFDO2dCQUNSLFNBQVM7Z0JBQ1QsV0FBVyxFQUFFLFNBQVM7YUFDdkIsQ0FBQyxDQUFDO1lBRUgsSUFBQSw4QkFBZSxFQUFDO2dCQUNkLElBQUksRUFBRSxHQUFHLElBQUksYUFBYTtnQkFDMUIsS0FBSyxFQUFFLElBQUksQ0FBQyxVQUFVLElBQUksRUFBRTtnQkFDNUIsU0FBUztnQkFDVCxXQUFXLEVBQUUsU0FBUzthQUN2QixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSxvQkFBb0I7Z0JBQ2pDLEtBQUssRUFBRSxJQUFJLENBQUMsdUJBQXVCLElBQUksRUFBRTtnQkFDekMsU0FBUztnQkFDVCxXQUFXLEVBQUUsU0FBUzthQUN2QixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSxlQUFlO2dCQUM1QixLQUFLLEVBQUUsSUFBSSxDQUFDLFlBQVksSUFBSSxFQUFFO2dCQUM5QixTQUFTO2dCQUNULFdBQVcsRUFBRSxTQUFTO2FBQ3ZCLENBQUMsQ0FBQztZQUVILElBQUEsOEJBQWUsRUFBQztnQkFDZCxJQUFJLEVBQUUsR0FBRyxJQUFJLHNCQUFzQjtnQkFDbkMsS0FBSyxFQUFFLElBQUksQ0FBQyx5QkFBeUIsSUFBSSxFQUFFO2dCQUMzQyxTQUFTO2dCQUNULFdBQVcsRUFBRSxTQUFTO2FBQ3ZCLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxPQUFPLENBQUMsRUFBRSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsQ0FBQztBQUM1RCxDQUFDLENBQUMifQ==
128
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2lnbmFsUi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsd0VBQTBEO0FBRTFELHNDQUEwRTtBQU0xRSw4RUFBc0Q7QUFDdEQsMkRBQTZFO0FBZTdFOztLQUVLO0FBQ0wsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsU0FBUyxFQUNULFdBQVcsRUFDWCxJQUFJLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxPQUFPLEVBQzdCLEdBQUcsR0FBRyxjQUFLO0lBQ1QsQ0FBQyxDQUFDO1FBQ0UsSUFBSSxFQUFFLGFBQWE7UUFDbkIsSUFBSSxFQUFFLEVBQUUsQ0FBQyxjQUFjLENBQUMsUUFBUTtRQUNoQyxRQUFRLEVBQUUsQ0FBQztLQUNaO0lBQ0gsQ0FBQyxDQUFDO1FBQ0UsSUFBSSxFQUFFLFNBQVM7UUFDZixJQUFJLEVBQUUsTUFBTTtLQUNiLEVBQ0wsY0FBYyxHQUNSLEVBQXdDLEVBQUU7SUFDaEQsSUFBSSxHQUFHLElBQUEsdUJBQWMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU1QixNQUFNLE9BQU8sR0FBRyxJQUFJLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFO1FBQ25DLFlBQVksRUFBRSxJQUFJO1FBQ2xCLEdBQUcsS0FBSztRQUNSLElBQUk7UUFFSixJQUFJLEVBQUUsRUFBRSxjQUFjLEVBQUU7UUFDeEIsUUFBUSxFQUFFO1lBQ1IsRUFBRSxJQUFJLEVBQUUsYUFBYSxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUU7WUFDekMsdURBQXVEO1NBQ3hEO1FBQ0QsV0FBVyxFQUFFLFdBQVc7WUFDdEIsQ0FBQyxDQUFDO2dCQUNFLGFBQWEsRUFBRSxFQUFFLENBQUMsU0FBUyxDQUFDLEtBQUs7Z0JBQ2pDLGFBQWEsRUFBRTtvQkFDYixLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUMsa0JB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
package/Sql/SqlDb.d.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  import * as sql from '@pulumi/azure-native/sql';
2
- import { BasicResourceArgs, ResourceInfoWithInstance } from '../types';
2
+ import { BasicResourceArgs, LockableType, ResourceInfoWithInstance } from '../types';
3
3
  import { Input, Output } from '@pulumi/pulumi';
4
4
  export type SqlDbSku = 'Basic' | 'S0' | 'S1' | 'S2' | 'S3' | 'P1' | 'P2' | 'P4' | 'P6' | 'P11';
5
- export interface SqlDbProps extends BasicResourceArgs {
5
+ export interface SqlDbProps extends BasicResourceArgs, LockableType {
6
6
  sqlServerName: Input<string>;
7
7
  elasticPoolId?: Output<string>;
8
8
  /** Provide this if elasticPoolId is not provided. Default is S0 */
@@ -10,5 +10,5 @@ export interface SqlDbProps extends BasicResourceArgs {
10
10
  asSecondaryFrom?: Input<string>;
11
11
  sku?: SqlDbSku;
12
12
  }
13
- declare const _default: ({ group, name, sqlServerName, elasticPoolId, copyFrom, asSecondaryFrom, sku, dependsOn, importUri, ignoreChanges, }: SqlDbProps) => ResourceInfoWithInstance<sql.Database>;
13
+ declare const _default: ({ group, name, sqlServerName, elasticPoolId, copyFrom, asSecondaryFrom, sku, dependsOn, importUri, ignoreChanges, lock, }: SqlDbProps) => ResourceInfoWithInstance<sql.Database>;
14
14
  export default _default;
package/Sql/SqlDb.js CHANGED
@@ -22,11 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
22
22
  __setModuleDefault(result, mod);
23
23
  return result;
24
24
  };
25
+ var __importDefault = (this && this.__importDefault) || function (mod) {
26
+ return (mod && mod.__esModule) ? mod : { "default": mod };
27
+ };
25
28
  Object.defineProperty(exports, "__esModule", { value: true });
26
29
  const sql = __importStar(require("@pulumi/azure-native/sql"));
30
+ const Locker_1 = __importDefault(require("../Core/Locker"));
27
31
  const Common_1 = require("../Common");
28
32
  //https://blog.bredvid.no/handling-azure-managed-identity-access-to-azure-sql-in-an-azure-devops-pipeline-1e74e1beb10b
29
- exports.default = ({ group, name, sqlServerName, elasticPoolId, copyFrom, asSecondaryFrom, sku = 'S0', dependsOn, importUri, ignoreChanges, }) => {
33
+ exports.default = ({ group, name, sqlServerName, elasticPoolId, copyFrom, asSecondaryFrom, sku = 'S0', dependsOn, importUri, ignoreChanges, lock, }) => {
30
34
  name = (0, Common_1.getSqlDbName)(name);
31
35
  const dbProps = {
32
36
  databaseName: name,
@@ -55,7 +59,12 @@ exports.default = ({ group, name, sqlServerName, elasticPoolId, copyFrom, asSeco
55
59
  ignoreChanges,
56
60
  import: importUri,
57
61
  deleteBeforeReplace: true,
62
+ protect: lock,
58
63
  });
64
+ //Lock from delete
65
+ if (lock) {
66
+ (0, Locker_1.default)({ name, resource: sqlDb });
67
+ }
59
68
  return { name, group, id: sqlDb.id, instance: sqlDb };
60
69
  };
61
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsRGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3FsL1NxbERiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4REFBZ0Q7QUFHaEQsc0NBQWdEO0FBdUJoRCxzSEFBc0g7QUFDdEgsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osYUFBYSxFQUNiLGFBQWEsRUFDYixRQUFRLEVBQ1IsZUFBZSxFQUNmLEdBQUcsR0FBRyxJQUFJLEVBQ1YsU0FBUyxFQUNULFNBQVMsRUFDVCxhQUFhLEdBQ0YsRUFBMEMsRUFBRTtJQUN2RCxJQUFJLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTFCLE1BQU0sT0FBTyxHQUFxQjtRQUNoQyxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFDUixVQUFVLEVBQUUsYUFBYTtRQUN6QixhQUFhO1FBQ2IsR0FBRyxFQUFFLGFBQWE7WUFDaEIsQ0FBQyxDQUFDLFNBQVM7WUFDWCxDQUFDLENBQUM7Z0JBQ0UsSUFBSSxFQUFFLEdBQUc7YUFDVjtRQUNMLGdDQUFnQyxFQUFFLGNBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxPQUFPO1FBQzFELFVBQVUsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLE9BQU87S0FDbkMsQ0FBQztJQUVGLElBQUksUUFBUSxFQUFFLENBQUM7UUFDYixPQUFPLENBQUMsZ0JBQWdCLEdBQUcsUUFBUSxDQUFDO1FBQ3BDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUM7SUFDM0MsQ0FBQztTQUFNLElBQUksZUFBZSxFQUFFLENBQUM7UUFDM0IsT0FBTyxDQUFDLGdCQUFnQixHQUFHLGVBQWUsQ0FBQztRQUMzQyxPQUFPLENBQUMsVUFBVSxHQUFHLEdBQUcsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDO1FBQzlDLE9BQU8sQ0FBQyxhQUFhLEdBQUcsR0FBRyxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUM7SUFDaEQsQ0FBQztJQUVELE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFO1FBQzVDLFNBQVM7UUFDVCxhQUFhO1FBQ2IsTUFBTSxFQUFFLFNBQVM7UUFDakIsbUJBQW1CLEVBQUUsSUFBSTtLQUMxQixDQUFDLENBQUM7SUFFSCxPQUFPLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUM7QUFDeEQsQ0FBQyxDQUFDIn0=
70
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsRGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3FsL1NxbERiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4REFBZ0Q7QUFDaEQsNERBQW9DO0FBT3BDLHNDQUFnRDtBQXVCaEQsc0hBQXNIO0FBQ3RILGtCQUFlLENBQUMsRUFDZCxLQUFLLEVBQ0wsSUFBSSxFQUNKLGFBQWEsRUFDYixhQUFhLEVBQ2IsUUFBUSxFQUNSLGVBQWUsRUFDZixHQUFHLEdBQUcsSUFBSSxFQUNWLFNBQVMsRUFDVCxTQUFTLEVBQ1QsYUFBYSxFQUNiLElBQUksR0FDTyxFQUEwQyxFQUFFO0lBQ3ZELElBQUksR0FBRyxJQUFBLHFCQUFZLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFMUIsTUFBTSxPQUFPLEdBQXFCO1FBQ2hDLFlBQVksRUFBRSxJQUFJO1FBQ2xCLEdBQUcsS0FBSztRQUNSLFVBQVUsRUFBRSxhQUFhO1FBQ3pCLGFBQWE7UUFDYixHQUFHLEVBQUUsYUFBYTtZQUNoQixDQUFDLENBQUMsU0FBUztZQUNYLENBQUMsQ0FBQztnQkFDRSxJQUFJLEVBQUUsR0FBRzthQUNWO1FBQ0wsZ0NBQWdDLEVBQUUsY0FBSyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLE9BQU87UUFDMUQsVUFBVSxFQUFFLEdBQUcsQ0FBQyxVQUFVLENBQUMsT0FBTztLQUNuQyxDQUFDO0lBRUYsSUFBSSxRQUFRLEVBQUUsQ0FBQztRQUNiLE9BQU8sQ0FBQyxnQkFBZ0IsR0FBRyxRQUFRLENBQUM7UUFDcEMsT0FBTyxDQUFDLFVBQVUsR0FBRyxHQUFHLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQztJQUMzQyxDQUFDO1NBQU0sSUFBSSxlQUFlLEVBQUUsQ0FBQztRQUMzQixPQUFPLENBQUMsZ0JBQWdCLEdBQUcsZUFBZSxDQUFDO1FBQzNDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7UUFDOUMsT0FBTyxDQUFDLGFBQWEsR0FBRyxHQUFHLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQztJQUNoRCxDQUFDO0lBRUQsTUFBTSxLQUFLLEdBQUcsSUFBSSxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUU7UUFDNUMsU0FBUztRQUNULGFBQWE7UUFDYixNQUFNLEVBQUUsU0FBUztRQUNqQixtQkFBbUIsRUFBRSxJQUFJO1FBQ3pCLE9BQU8sRUFBRSxJQUFJO0tBQ2QsQ0FBQyxDQUFDO0lBQ0gsa0JBQWtCO0lBQ2xCLElBQUksSUFBSSxFQUFFLENBQUM7UUFDVCxJQUFBLGdCQUFNLEVBQUMsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUVELE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FBQztBQUN4RCxDQUFDLENBQUMifQ==
package/Sql/index.d.ts CHANGED
@@ -1,11 +1,9 @@
1
1
  import * as sql from '@pulumi/azure-native/sql';
2
2
  import { Input } from '@pulumi/pulumi';
3
- import { FullSqlDbPropsType, LoginBuilderProps } from '../Builder';
4
- import { EnvRolesResults } from '../AzAd/EnvRoles';
5
- import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType, ResourceInfo, ResourceInfoWithInstance } from '../types';
3
+ import { FullSqlDbPropsType } from '../Builder';
4
+ import { BasicEncryptResourceArgs, LockableType, LoginWithEnvRolesArgs, NetworkPropsType, ResourceInfo, ResourceInfoWithInstance } from '../types';
6
5
  type ElasticPoolCapacityProps = 50 | 100 | 200 | 300 | 400 | 800 | 1200;
7
- export type SqlAuthType = LoginBuilderProps & {
8
- envRoles?: EnvRolesResults;
6
+ export type SqlAuthType = LoginWithEnvRolesArgs & {
9
7
  azureAdOnlyAuthentication?: boolean;
10
8
  defaultLoginManagedId?: Input<string>;
11
9
  };
@@ -27,9 +25,7 @@ export type SqlVulnerabilityAssessmentType = {
27
25
  storageAccessKey: Input<string>;
28
26
  storageEndpoint: Input<string>;
29
27
  };
30
- interface Props extends BasicResourceArgs {
31
- vaultInfo?: KeyVaultInfo;
32
- enableEncryption?: boolean;
28
+ interface Props extends BasicEncryptResourceArgs, LockableType {
33
29
  /** if Auth is not provided it will be auto generated */
34
30
  auth: SqlAuthType;
35
31
  elasticPool?: SqlElasticPoolType;
@@ -37,5 +33,5 @@ interface Props extends BasicResourceArgs {
37
33
  network?: SqlNetworkType;
38
34
  vulnerabilityAssessment?: SqlVulnerabilityAssessmentType;
39
35
  }
40
- declare const _default: ({ name, auth, group, enableEncryption, elasticPool, databases, vaultInfo, network, vulnerabilityAssessment, ignoreChanges, }: Props) => SqlResults;
36
+ declare const _default: ({ name, auth, group, elasticPool, databases, vaultInfo, enableEncryption, envRoles, network, vulnerabilityAssessment, ignoreChanges, lock, dependsOn, }: Props) => SqlResults;
41
37
  export default _default;