@drunk-pulumi/azure 0.0.38 → 0.0.40

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 (96) hide show
  1. package/Aks/Helper.d.ts +2 -2
  2. package/Aks/Helper.js +2 -2
  3. package/Aks/index.d.ts +2 -1
  4. package/Aks/index.js +39 -46
  5. package/Apim/index.d.ts +4 -4
  6. package/Apim/index.js +2 -3
  7. package/AzAd/B2C.d.ts +3 -4
  8. package/AzAd/B2C.js +11 -15
  9. package/AzAd/EnvRoles.d.ts +2 -1
  10. package/AzAd/EnvRoles.js +2 -2
  11. package/AzAd/Helper.js +9 -5
  12. package/AzAd/Identities/AzDevOpsManagedIdentity.d.ts +0 -1
  13. package/AzAd/Identities/AzDevOpsManagedIdentity.js +1 -2
  14. package/AzAd/RoleDefinitions/JustInTimeRequestRole.js +1 -2
  15. package/AzAd/UserAssignedIdentity.d.ts +1 -2
  16. package/AzAd/UserAssignedIdentity.js +2 -8
  17. package/Builder/AksBuilder.d.ts +2 -2
  18. package/Builder/AksBuilder.js +6 -7
  19. package/Builder/ResourceBuilder.d.ts +3 -0
  20. package/Builder/ResourceBuilder.js +198 -0
  21. package/Builder/SqlBuilder.d.ts +3 -0
  22. package/Builder/SqlBuilder.js +81 -0
  23. package/Builder/VaultBuilder.d.ts +18 -0
  24. package/Builder/VaultBuilder.js +74 -0
  25. package/Builder/VmBuilder.d.ts +3 -0
  26. package/Builder/VmBuilder.js +83 -0
  27. package/Builder/VnetBuilder.d.ts +2 -2
  28. package/Builder/VnetBuilder.js +17 -9
  29. package/Builder/index.d.ts +5 -0
  30. package/Builder/index.js +25 -2
  31. package/Builder/types/askBuilder.d.ts +30 -0
  32. package/Builder/types/askBuilder.js +3 -0
  33. package/Builder/types/genericBuilder.d.ts +36 -0
  34. package/Builder/types/genericBuilder.js +18 -0
  35. package/Builder/types/index.d.ts +6 -0
  36. package/Builder/types/index.js +23 -0
  37. package/Builder/types/resourceBuilder.d.ts +46 -0
  38. package/Builder/types/resourceBuilder.js +3 -0
  39. package/Builder/types/sqlBuilder.d.ts +20 -0
  40. package/Builder/types/sqlBuilder.js +3 -0
  41. package/Builder/types/vaultBuilder.d.ts +16 -0
  42. package/Builder/types/vaultBuilder.js +3 -0
  43. package/Builder/types/vmBuilder.d.ts +29 -0
  44. package/Builder/types/vmBuilder.js +3 -0
  45. package/Builder/types/vnetBuilder.d.ts +64 -0
  46. package/Builder/types/vnetBuilder.js +3 -0
  47. package/Certificate/p12.js +2 -3
  48. package/Common/GlobalEnv.d.ts +1 -1
  49. package/Common/Helpers.js +3 -3
  50. package/ContainerRegistry/index.d.ts +4 -5
  51. package/ContainerRegistry/index.js +14 -16
  52. package/Core/Random.d.ts +1 -1
  53. package/Core/Random.js +6 -2
  54. package/Core/ResourceCreator.d.ts +7 -4
  55. package/Core/ResourceCreator.js +5 -5
  56. package/Core/ResourceGroup.d.ts +10 -8
  57. package/Core/ResourceGroup.js +2 -2
  58. package/IOT/Hub/index.d.ts +1 -2
  59. package/IOT/Hub/index.js +2 -6
  60. package/KeyVault/CustomHelper.d.ts +5 -5
  61. package/KeyVault/CustomHelper.js +8 -9
  62. package/KeyVault/index.d.ts +15 -6
  63. package/KeyVault/index.js +45 -36
  64. package/MySql/index.d.ts +1 -2
  65. package/MySql/index.js +3 -8
  66. package/Postgresql/index.js +2 -2
  67. package/ServiceBus/index.d.ts +12 -15
  68. package/ServiceBus/index.js +20 -32
  69. package/SignalR/index.d.ts +6 -9
  70. package/SignalR/index.js +16 -17
  71. package/Sql/SqlDb.d.ts +5 -6
  72. package/Sql/SqlDb.js +4 -18
  73. package/Sql/index.d.ts +37 -38
  74. package/Sql/index.js +43 -55
  75. package/VM/index.js +2 -2
  76. package/VNet/Bastion.js +1 -2
  77. package/VNet/FirewallPolicies/AksFirewallPolicy.js +6 -21
  78. package/VNet/FirewallPolicies/CFTunnelFirewallPolicy.d.ts +9 -0
  79. package/VNet/FirewallPolicies/CFTunnelFirewallPolicy.js +59 -0
  80. package/VNet/FirewallPolicies/CloudPCFirewallPolicy.js +2 -2
  81. package/VNet/FirewallPolicies/index.d.ts +4 -4
  82. package/VNet/FirewallPolicies/index.js +10 -8
  83. package/VNet/IpAddressPrefix.js +1 -1
  84. package/VNet/PrivateDns.d.ts +7 -7
  85. package/VNet/PrivateDns.js +11 -6
  86. package/VNet/PrivateEndpoint.d.ts +1 -1
  87. package/VNet/PrivateEndpoint.js +29 -49
  88. package/VNet/index.d.ts +3 -3
  89. package/Web/FuncApp.d.ts +5 -6
  90. package/Web/FuncApp.js +2 -6
  91. package/Web/WebAppPlan.d.ts +3 -4
  92. package/Web/WebAppPlan.js +5 -9
  93. package/package.json +5 -5
  94. package/types.d.ts +2 -4
  95. package/Builder/types.d.ts +0 -120
  96. package/Builder/types.js +0 -18
@@ -6,23 +6,22 @@ const AzureEnv_1 = require("../Common/AzureEnv");
6
6
  const ResourceCreator_1 = require("../Core/ResourceCreator");
7
7
  const Naming_1 = require("../Common/Naming");
8
8
  const PrivateEndpoint_1 = require("../VNet/PrivateEndpoint");
9
- const Locker_1 = require("../Core/Locker");
10
9
  const CustomHelper_1 = require("../KeyVault/CustomHelper");
11
10
  const Helper_1 = require("../KeyVault/Helper");
12
- const duplicateDetectedTime = AzureEnv_1.isPrd ? 'P3D' : 'PT10M';
11
+ const duplicateDetectedTime = AzureEnv_1.isPrd ? "P3D" : "PT10M";
13
12
  const defaultValues = {
14
13
  maxDeliveryCount: 10,
15
14
  enableBatchedOperations: true,
16
- defaultMessageTtl: AzureEnv_1.isPrd ? 'P30D' : 'P1D',
17
- defaultMessageTimeToLive: AzureEnv_1.isPrd ? 'P30D' : 'P1D',
15
+ defaultMessageTtl: AzureEnv_1.isPrd ? "P30D" : "P1D",
16
+ defaultMessageTimeToLive: AzureEnv_1.isPrd ? "P30D" : "P1D",
18
17
  deadLetteringOnMessageExpiration: true,
19
18
  maxSizeInMegabytes: 1024,
20
- lockDuration: 'PT1M',
19
+ lockDuration: "PT1M",
21
20
  //Auto delete subscription after 30 idle.
22
21
  //autoDeleteOnIdle: 'P30D',
23
22
  //enableExpress: true, this and requiresDuplicateDetection are not able to enabled together
24
23
  };
25
- const createAndStoreConnection = ({ namespaceName, topicName, queueName, connectionType, transportType = 'AmqpWebSockets', resourceGroupName, removeEntityPath, vaultInfo, dependsOn, }) => {
24
+ const createAndStoreConnection = ({ namespaceName, topicName, queueName, connectionType, transportType = "AmqpWebSockets", resourceGroupName, removeEntityPath, vaultInfo, dependsOn, }) => {
26
25
  const name = (topicName || queueName);
27
26
  const key = name
28
27
  ? (0, ServiceBusHelper_1.getTopicOrQueueVaultName)({
@@ -90,9 +89,9 @@ const createAndStoreConnection = ({ namespaceName, topicName, queueName, connect
90
89
  resourceGroupName,
91
90
  }));
92
91
  let primaryConn = removeEntityPath
93
- ? keys.primaryConnectionString.replace(`;EntityPath=${name}`, '')
92
+ ? keys.primaryConnectionString.replace(`;EntityPath=${name}`, "")
94
93
  : keys.primaryConnectionString;
95
- if (typeof transportType === 'string')
94
+ if (typeof transportType === "string")
96
95
  primaryConn += `;TransportType=${transportType};`;
97
96
  (0, CustomHelper_1.addCustomSecret)({
98
97
  name: primaryName,
@@ -102,9 +101,9 @@ const createAndStoreConnection = ({ namespaceName, topicName, queueName, connect
102
101
  dependsOn: rule,
103
102
  });
104
103
  let secondConn = removeEntityPath
105
- ? keys.secondaryConnectionString.replace(`;EntityPath=${name}`, '')
104
+ ? keys.secondaryConnectionString.replace(`;EntityPath=${name}`, "")
106
105
  : keys.secondaryConnectionString;
107
- if (typeof transportType === 'string')
106
+ if (typeof transportType === "string")
108
107
  secondConn += `;TransportType=${transportType};`;
109
108
  (0, CustomHelper_1.addCustomSecret)({
110
109
  name: secondaryName,
@@ -117,7 +116,7 @@ const createAndStoreConnection = ({ namespaceName, topicName, queueName, connect
117
116
  return { primaryName, secondaryName };
118
117
  };
119
118
  /** Topic creator */
120
- const topicCreator = ({ group, namespaceFullName, subscriptions, shortName, vaultInfo, version, enableConnections, lock = true, dependsOn, options = {
119
+ const topicCreator = ({ group, namespaceFullName, subscriptions, shortName, vaultInfo, version, enableConnections, dependsOn, options = {
121
120
  duplicateDetectionHistoryTimeWindow: duplicateDetectedTime,
122
121
  requiresDuplicateDetection: true,
123
122
  enablePartitioning: true,
@@ -130,9 +129,6 @@ const topicCreator = ({ group, namespaceFullName, subscriptions, shortName, vaul
130
129
  ...defaultValues,
131
130
  ...options,
132
131
  }, { dependsOn });
133
- if (lock) {
134
- (0, Locker_1.default)({ name: topicName, resource: topic });
135
- }
136
132
  let primaryConnectionKeys = undefined;
137
133
  let secondaryConnectionKeys = undefined;
138
134
  if (vaultInfo && enableConnections) {
@@ -178,7 +174,6 @@ const topicCreator = ({ group, namespaceFullName, subscriptions, shortName, vaul
178
174
  topicFullName: topic.name,
179
175
  enableSession: s.enableSession,
180
176
  group,
181
- lock: false,
182
177
  dependsOn: topic,
183
178
  }));
184
179
  }
@@ -190,7 +185,7 @@ const topicCreator = ({ group, namespaceFullName, subscriptions, shortName, vaul
190
185
  };
191
186
  };
192
187
  /** Subscription creator */
193
- const subscriptionCreator = ({ group, shortName, topicFullName, namespaceFullName, enableSession, lock = true, dependsOn, }) => {
188
+ const subscriptionCreator = ({ group, shortName, topicFullName, namespaceFullName, enableSession, dependsOn, }) => {
194
189
  const name = (0, ServiceBusHelper_1.getSubscriptionName)(shortName);
195
190
  const resource = new bus.Subscription(name, {
196
191
  subscriptionName: name,
@@ -200,16 +195,13 @@ const subscriptionCreator = ({ group, shortName, topicFullName, namespaceFullNam
200
195
  requiresSession: enableSession,
201
196
  ...defaultValues,
202
197
  }, { dependsOn });
203
- if (lock) {
204
- (0, Locker_1.default)({ name, resource });
205
- }
206
198
  return {
207
199
  name,
208
200
  resource,
209
201
  };
210
202
  };
211
203
  /** Queue creator */
212
- const queueCreator = ({ group, namespaceFullName, shortName, vaultInfo, version, lock = true, enableConnections, options = {
204
+ const queueCreator = ({ group, namespaceFullName, shortName, vaultInfo, version, enableConnections, options = {
213
205
  requiresDuplicateDetection: false,
214
206
  enablePartitioning: true,
215
207
  }, dependsOn, ...others }) => {
@@ -221,9 +213,6 @@ const queueCreator = ({ group, namespaceFullName, shortName, vaultInfo, version,
221
213
  ...defaultValues,
222
214
  ...options,
223
215
  }, { dependsOn });
224
- if (lock) {
225
- (0, Locker_1.default)({ name, resource: queue });
226
- }
227
216
  let primaryConnectionKeys = undefined;
228
217
  let secondaryConnectionKeys = undefined;
229
218
  if (vaultInfo && enableConnections) {
@@ -267,7 +256,7 @@ const queueCreator = ({ group, namespaceFullName, shortName, vaultInfo, version,
267
256
  /** Azure Bus creator */
268
257
  exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultInfo, enableNamespaceConnections, enableTopicConnections, enableQueueConnections, sku = bus.SkuName.Basic, monitoring, ...others }) => {
269
258
  name = (0, Naming_1.getServiceBusName)(name);
270
- const { resource, locker, diagnostic } = (0, ResourceCreator_1.default)(bus.Namespace, {
259
+ const { resource, diagnostic } = (0, ResourceCreator_1.default)(bus.Namespace, {
271
260
  namespaceName: name,
272
261
  ...group,
273
262
  sku: { name: sku, tier: sku },
@@ -275,7 +264,7 @@ exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultI
275
264
  monitoring: monitoring
276
265
  ? {
277
266
  ...monitoring,
278
- logsCategories: ['OperationalLogs'],
267
+ logsCategories: ["OperationalLogs"],
279
268
  }
280
269
  : undefined,
281
270
  });
@@ -350,7 +339,7 @@ exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultI
350
339
  new bus.NamespaceNetworkRuleSet(name, {
351
340
  namespaceName: namespace.name,
352
341
  ...group,
353
- defaultAction: 'Deny',
342
+ defaultAction: "Deny",
354
343
  ipRules: network.whitelistIps
355
344
  ? network.whitelistIps.map((i) => ({
356
345
  ipMask: i,
@@ -371,11 +360,11 @@ exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultI
371
360
  (0, PrivateEndpoint_1.default)({
372
361
  name: (0, Naming_1.getPrivateEndpointName)(name),
373
362
  group,
374
- subnetId: network.subnetId,
375
- useGlobalDnsZone: network.useGlobalDnsZone,
363
+ subnetIds: [network.subnetId],
364
+ //useGlobalDnsZone: network.useGlobalDnsZone,
376
365
  resourceId: namespace.id,
377
- linkServiceGroupIds: ['namespace'],
378
- privateDnsZoneName: 'privatelink.servicebus.windows.net',
366
+ linkServiceGroupIds: ["namespace"],
367
+ privateDnsZoneName: "privatelink.servicebus.windows.net",
379
368
  });
380
369
  }
381
370
  }
@@ -388,8 +377,7 @@ exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultI
388
377
  getConnectionString: (name) => vaultInfo
389
378
  ? (0, Helper_1.getSecret)({ name, nameFormatted: true, vaultInfo })
390
379
  : undefined,
391
- locker,
392
380
  diagnostic,
393
381
  };
394
382
  };
395
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ServiceBus/index.ts"],"names":[],"mappings":"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"}
383
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ServiceBus/index.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,10 @@
1
- import * as native from '@pulumi/azure-native';
2
- import * as pulumi from '@pulumi/pulumi';
3
- import { BasicResourceArgs, KeyVaultInfo, PrivateLinkProps } from '../types';
1
+ import * as native from "@pulumi/azure-native";
2
+ import * as pulumi from "@pulumi/pulumi";
3
+ import { BasicResourceArgs, KeyVaultInfo, PrivateLinkProps } from "../types";
4
4
  interface ResourceSkuArgs {
5
5
  capacity?: 1 | 2 | 5 | 10 | 20 | 50 | 100;
6
- name: 'Standard_S1' | 'Free_F1';
7
- tier?: 'Standard' | 'Free';
6
+ name: "Standard_S1" | "Free_F1";
7
+ tier?: "Standard" | "Free";
8
8
  }
9
9
  interface Props extends BasicResourceArgs {
10
10
  vaultInfo?: KeyVaultInfo;
@@ -13,8 +13,5 @@ interface Props extends BasicResourceArgs {
13
13
  kind?: native.signalrservice.ServiceKind;
14
14
  sku?: pulumi.Input<ResourceSkuArgs>;
15
15
  }
16
- declare const _default: ({ name, group, vaultInfo, privateLink, kind, sku, allowedOrigins, }: Props) => {
17
- signalR: import("@pulumi/azure-native/signalrservice/signalR").SignalR;
18
- privateEndpoint: import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint | undefined;
19
- };
16
+ declare const _default: ({ name, group, vaultInfo, privateLink, kind, sku, allowedOrigins, }: Props) => import("@pulumi/azure-native/signalrservice/signalR").SignalR;
20
17
  export default _default;
package/SignalR/index.js CHANGED
@@ -6,7 +6,7 @@ const Naming_1 = require("../Common/Naming");
6
6
  const PrivateEndpoint_1 = require("../VNet/PrivateEndpoint");
7
7
  const CustomHelper_1 = require("../KeyVault/CustomHelper");
8
8
  exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrservice.ServiceKind.SignalR, sku = {
9
- name: 'Standard_S1',
9
+ name: "Standard_S1",
10
10
  tier: native.signalrservice.SignalRSkuTier.Standard,
11
11
  capacity: 1,
12
12
  }, allowedOrigins, }) => {
@@ -18,7 +18,7 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrs
18
18
  kind,
19
19
  cors: { allowedOrigins },
20
20
  features: [
21
- { flag: 'ServiceMode', value: 'Default' },
21
+ { flag: "ServiceMode", value: "Default" },
22
22
  //{ flag: 'EnableConnectivityLogs', value: 'Default' },
23
23
  ],
24
24
  networkACLs: privateLink
@@ -56,15 +56,14 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrs
56
56
  : undefined,
57
57
  sku,
58
58
  });
59
- let privateEndpoint = undefined;
60
59
  if (privateLink) {
61
60
  //The Private Zone will create in Dev and reuse for sandbox and prd.
62
- privateEndpoint = (0, PrivateEndpoint_1.default)({
61
+ (0, PrivateEndpoint_1.default)({
63
62
  name: privateEndpointName,
64
63
  group,
65
- privateDnsZoneName: 'privatelink.service.signalr.net',
64
+ privateDnsZoneName: "privatelink.service.signalr.net",
66
65
  ...privateLink,
67
- linkServiceGroupIds: ['signalr'],
66
+ linkServiceGroupIds: ["signalr"],
68
67
  resourceId: signalR.id,
69
68
  });
70
69
  }
@@ -80,34 +79,34 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrs
80
79
  name: `${name}-host`,
81
80
  value: h,
82
81
  vaultInfo,
83
- contentType: 'SignalR',
82
+ contentType: "SignalR",
84
83
  });
85
84
  (0, CustomHelper_1.addCustomSecret)({
86
85
  name: `${name}-primaryKey`,
87
- value: keys.primaryKey || '',
86
+ value: keys.primaryKey || "",
88
87
  vaultInfo,
89
- contentType: 'SignalR',
88
+ contentType: "SignalR",
90
89
  });
91
90
  (0, CustomHelper_1.addCustomSecret)({
92
91
  name: `${name}-primaryConnection`,
93
- value: keys.primaryConnectionString || '',
92
+ value: keys.primaryConnectionString || "",
94
93
  vaultInfo,
95
- contentType: 'SignalR',
94
+ contentType: "SignalR",
96
95
  });
97
96
  (0, CustomHelper_1.addCustomSecret)({
98
97
  name: `${name}-secondaryKey`,
99
- value: keys.secondaryKey || '',
98
+ value: keys.secondaryKey || "",
100
99
  vaultInfo,
101
- contentType: 'SignalR',
100
+ contentType: "SignalR",
102
101
  });
103
102
  (0, CustomHelper_1.addCustomSecret)({
104
103
  name: `${name}-secondaryConnection`,
105
- value: keys.secondaryConnectionString || '',
104
+ value: keys.secondaryConnectionString || "",
106
105
  vaultInfo,
107
- contentType: 'SignalR',
106
+ contentType: "SignalR",
108
107
  });
109
108
  });
110
109
  }
111
- return { signalR, privateEndpoint };
110
+ return signalR;
112
111
  };
113
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2lnbmFsUi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLCtDQUErQztBQUUvQyxpREFBNEM7QUFDNUMsNkNBQTBFO0FBRTFFLDZEQUFzRDtBQUN0RCwyREFBMkQ7QUFnQjNELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFNBQVMsRUFDVCxXQUFXLEVBQ1gsSUFBSSxHQUFHLE1BQU0sQ0FBQyxjQUFjLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFDaEQsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLGFBQWE7SUFDbkIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLFFBQVE7SUFDbkQsUUFBUSxFQUFFLENBQUM7Q0FDWixFQUNELGNBQWMsR0FDUixFQUFFLEVBQUU7SUFDVixNQUFNLG1CQUFtQixHQUFHLElBQUEsK0JBQXNCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDekQsSUFBSSxHQUFHLElBQUEsdUJBQWMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU1QixNQUFNLE9BQU8sR0FBRyxJQUFJLE1BQU0sQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRTtRQUN0RCxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFDUixJQUFJO1FBRUosSUFBSSxFQUFFLEVBQUUsY0FBYyxFQUFFO1FBQ3hCLFFBQVEsRUFBRTtZQUNSLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFO1lBQ3pDLHVEQUF1RDtTQUN4RDtRQUNELFdBQVcsRUFBRSxXQUFXO1lBQ3RCLENBQUMsQ0FBQztnQkFDRSxhQUFhLEVBQUUsTUFBTSxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsS0FBSztnQkFDcEQsYUFBYSxFQUFFLGdCQUFLO29CQUNsQixDQUFDLENBQUM7d0JBQ0UsS0FBSyxFQUFFOzRCQUNM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
112
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2lnbmFsUi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLCtDQUErQztBQUUvQyxpREFBMkM7QUFDM0MsNkNBQTBFO0FBRTFFLDZEQUFzRDtBQUN0RCwyREFBMkQ7QUFnQjNELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFNBQVMsRUFDVCxXQUFXLEVBQ1gsSUFBSSxHQUFHLE1BQU0sQ0FBQyxjQUFjLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFDaEQsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLGFBQWE7SUFDbkIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLFFBQVE7SUFDbkQsUUFBUSxFQUFFLENBQUM7Q0FDWixFQUNELGNBQWMsR0FDUixFQUFFLEVBQUU7SUFDVixNQUFNLG1CQUFtQixHQUFHLElBQUEsK0JBQXNCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDekQsSUFBSSxHQUFHLElBQUEsdUJBQWMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU1QixNQUFNLE9BQU8sR0FBRyxJQUFJLE1BQU0sQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRTtRQUN0RCxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFDUixJQUFJO1FBRUosSUFBSSxFQUFFLEVBQUUsY0FBYyxFQUFFO1FBQ3hCLFFBQVEsRUFBRTtZQUNSLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFO1lBQ3pDLHVEQUF1RDtTQUN4RDtRQUNELFdBQVcsRUFBRSxXQUFXO1lBQ3RCLENBQUMsQ0FBQztnQkFDRSxhQUFhLEVBQUUsTUFBTSxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsS0FBSztnQkFDcEQsYUFBYSxFQUFFLGdCQUFLO29CQUNsQixDQUFDLENBQUM7d0JBQ0UsS0FBSyxFQUFFOzRCQUNM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
package/Sql/SqlDb.d.ts CHANGED
@@ -1,14 +1,13 @@
1
- import * as sql from '@pulumi/azure-native/sql';
2
- import { BasicResourceArgs, BasicResourceResultProps } from '../types';
3
- import { Input, Output, Resource } from '@pulumi/pulumi';
4
- export type SqlDbSku = 'Basic' | 'S0' | 'S1' | 'S2' | 'S3' | 'P1' | 'P2' | 'P4' | 'P6' | 'P11';
1
+ import * as sql from "@pulumi/azure-native/sql";
2
+ import { BasicResourceArgs, BasicResourceResultProps } from "../types";
3
+ import { Input, Output, Resource } from "@pulumi/pulumi";
4
+ export type SqlDbSku = "Basic" | "S0" | "S1" | "S2" | "S3" | "P1" | "P2" | "P4" | "P6" | "P11";
5
5
  export interface SqlDbProps extends BasicResourceArgs {
6
6
  sqlServerName: Input<string>;
7
7
  elasticPoolId?: Output<string>;
8
8
  /**Provide this if elasticPoolId is not provided. Default is S0*/
9
9
  sku?: SqlDbSku;
10
- lock?: boolean;
11
10
  dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
12
11
  }
13
- declare const _default: ({ group, name, sqlServerName, elasticPoolId, sku, lock, dependsOn, }: SqlDbProps) => BasicResourceResultProps<sql.Database>;
12
+ declare const _default: ({ group, name, sqlServerName, elasticPoolId, sku, dependsOn, }: SqlDbProps) => BasicResourceResultProps<sql.Database>;
14
13
  export default _default;
package/Sql/SqlDb.js CHANGED
@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const sql = require("@pulumi/azure-native/sql");
4
4
  const AzureEnv_1 = require("../Common/AzureEnv");
5
5
  const Naming_1 = require("../Common/Naming");
6
- const Locker_1 = require("../Core/Locker");
7
6
  //https://blog.bredvid.no/handling-azure-managed-identity-access-to-azure-sql-in-an-azure-devops-pipeline-1e74e1beb10b
8
- exports.default = ({ group, name, sqlServerName, elasticPoolId, sku = 'S0', lock, dependsOn, }) => {
7
+ exports.default = ({ group, name, sqlServerName, elasticPoolId, sku = "S0", dependsOn, }) => {
9
8
  name = (0, Naming_1.getSqlDbName)(name);
10
9
  const sqlDb = new sql.Database(name, {
11
10
  databaseName: name,
12
- createMode: 'Default',
11
+ createMode: "Default",
13
12
  ...group,
14
13
  serverName: sqlServerName,
15
14
  elasticPoolId,
@@ -21,21 +20,8 @@ exports.default = ({ group, name, sqlServerName, elasticPoolId, sku = 'S0', lock
21
20
  // capacity: 5,
22
21
  },
23
22
  //zoneRedundant: isPrd,
24
- requestedBackupStorageRedundancy: AzureEnv_1.isPrd ? 'Zone' : 'Local',
23
+ requestedBackupStorageRedundancy: AzureEnv_1.isPrd ? "Zone" : "Local",
25
24
  }, { dependsOn });
26
- if (lock) {
27
- (0, Locker_1.default)({ name, resource: sqlDb });
28
- }
29
- //By Default is 7 Day
30
- // if (isPrd) {
31
- // new sql.BackupShortTermRetentionPolicy(name, {
32
- // policyName: 'default',
33
- // serverName: sqlServerName,
34
- // ...group,
35
- // databaseName: sqlDb.name,
36
- // retentionDays: 7,
37
- // });
38
- // }
39
25
  return { name, resource: sqlDb };
40
26
  };
41
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsRGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3FsL1NxbERiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsZ0RBQWdEO0FBS2hELGlEQUEyQztBQUMzQyw2Q0FBZ0Q7QUFDaEQsMkNBQW9DO0FBdUJwQyxzSEFBc0g7QUFDdEgsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osYUFBYSxFQUNiLGFBQWEsRUFDYixHQUFHLEdBQUcsSUFBSSxFQUNWLElBQUksRUFDSixTQUFTLEdBQ0UsRUFBMEMsRUFBRTtJQUN2RCxJQUFJLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTFCLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FDNUIsSUFBSSxFQUNKO1FBQ0UsWUFBWSxFQUFFLElBQUk7UUFDbEIsVUFBVSxFQUFFLFNBQVM7UUFDckIsR0FBRyxLQUFLO1FBQ1IsVUFBVSxFQUFFLGFBQWE7UUFDekIsYUFBYTtRQUViLEdBQUcsRUFBRSxhQUFhO1lBQ2hCLENBQUMsQ0FBQyxTQUFTO1lBQ1gsQ0FBQyxDQUFDO2dCQUNFLElBQUksRUFBRSxHQUFHO2dCQUNULGlCQUFpQjtnQkFDakIsZUFBZTthQUNoQjtRQUNMLHVCQUF1QjtRQUN2QixnQ0FBZ0MsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLE9BQU87S0FDM0QsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQUM7SUFFRixJQUFJLElBQUksRUFBRSxDQUFDO1FBQ1QsSUFBQSxnQkFBTSxFQUFDLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFFRCxxQkFBcUI7SUFDckIsZUFBZTtJQUNmLG1EQUFtRDtJQUNuRCw2QkFBNkI7SUFDN0IsaUNBQWlDO0lBQ2pDLGdCQUFnQjtJQUNoQixnQ0FBZ0M7SUFDaEMsd0JBQXdCO0lBQ3hCLFFBQVE7SUFDUixJQUFJO0lBRUosT0FBTyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUM7QUFDbkMsQ0FBQyxDQUFDIn0=
27
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsRGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3FsL1NxbERiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsZ0RBQWdEO0FBS2hELGlEQUEyQztBQUMzQyw2Q0FBZ0Q7QUF1QmhELHNIQUFzSDtBQUN0SCxrQkFBZSxDQUFDLEVBQ2QsS0FBSyxFQUNMLElBQUksRUFDSixhQUFhLEVBQ2IsYUFBYSxFQUNiLEdBQUcsR0FBRyxJQUFJLEVBQ1YsU0FBUyxHQUNFLEVBQTBDLEVBQUU7SUFDdkQsSUFBSSxHQUFHLElBQUEscUJBQVksRUFBQyxJQUFJLENBQUMsQ0FBQztJQUUxQixNQUFNLEtBQUssR0FBRyxJQUFJLEdBQUcsQ0FBQyxRQUFRLENBQzVCLElBQUksRUFDSjtRQUNFLFlBQVksRUFBRSxJQUFJO1FBQ2xCLFVBQVUsRUFBRSxTQUFTO1FBQ3JCLEdBQUcsS0FBSztRQUNSLFVBQVUsRUFBRSxhQUFhO1FBQ3pCLGFBQWE7UUFFYixHQUFHLEVBQUUsYUFBYTtZQUNoQixDQUFDLENBQUMsU0FBUztZQUNYLENBQUMsQ0FBQztnQkFDRSxJQUFJLEVBQUUsR0FBRztnQkFDVCxpQkFBaUI7Z0JBQ2pCLGVBQWU7YUFDaEI7UUFDTCx1QkFBdUI7UUFDdkIsZ0NBQWdDLEVBQUUsZ0JBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxPQUFPO0tBQzNELEVBQ0QsRUFBRSxTQUFTLEVBQUUsQ0FDZCxDQUFDO0lBRUYsT0FBTyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUM7QUFDbkMsQ0FBQyxDQUFDIn0=
package/Sql/index.d.ts CHANGED
@@ -1,52 +1,51 @@
1
- import { Input, Output } from "@pulumi/pulumi";
1
+ import * as sql from "@pulumi/azure-native/sql";
2
+ import { Input } from "@pulumi/pulumi";
2
3
  import { EnvRolesResults } from "../AzAd/EnvRoles";
3
- import { BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, PrivateLinkProps } from "../types";
4
- import { SqlDbProps } from "./SqlDb";
4
+ import { BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo } from "../types";
5
+ import { SqlDbSku } from "./SqlDb";
5
6
  type ElasticPoolCapacityProps = 50 | 100 | 200 | 300 | 400 | 800 | 1200;
7
+ export type SqlAuthType = {
8
+ envRoles: EnvRolesResults;
9
+ /** create an Admin group on AzAD for SQL accessing.*/
10
+ enableAdAdministrator?: boolean;
11
+ azureAdOnlyAuthentication?: boolean;
12
+ adminLogin: Input<string>;
13
+ password: Input<string>;
14
+ };
15
+ export type SqlNetworkType = {
16
+ acceptAllPublicConnect?: boolean;
17
+ subnetId?: Input<string>;
18
+ ipAddresses?: Input<string>[];
19
+ /** To enable Private Link need to ensure the subnetId is provided. */
20
+ asPrivateLink?: boolean;
21
+ };
22
+ export type SqlElasticPoolType = {
23
+ name: "Standard" | "Basic";
24
+ capacity: ElasticPoolCapacityProps;
25
+ };
26
+ export type SqlResults = {
27
+ name: string;
28
+ resource: sql.Server;
29
+ elasticPool?: BasicResourceResultProps<sql.ElasticPool>;
30
+ databases?: Record<string, BasicResourceResultProps<sql.Database>>;
31
+ };
6
32
  interface Props extends BasicResourceArgs {
7
33
  vaultInfo: KeyVaultInfo;
8
34
  enableEncryption?: boolean;
9
35
  /** if Auth is not provided it will be auto generated */
10
- auth: {
11
- envRoles: EnvRolesResults;
12
- /** create an Admin group on AzAD for SQL accessing.*/
13
- enableAdAdministrator?: boolean;
14
- azureAdOnlyAuthentication?: boolean;
15
- adminLogin: Input<string>;
16
- password: Input<string>;
17
- };
18
- elasticPool?: {
19
- name: "Standard" | "Basic";
20
- capacity: ElasticPoolCapacityProps;
21
- };
22
- databases: Array<Omit<SqlDbProps, "sqlServerName" | "group" | "elasticPoolId" | "dependsOn">>;
23
- network?: {
24
- acceptAllInternetConnect?: boolean;
25
- subnetId?: Input<string>;
26
- ipAddresses?: Input<string>[];
27
- /** To enable Private Link need to ensure the subnetId is provided. */
28
- privateLink?: Omit<PrivateLinkProps, "subnetId">;
29
- };
36
+ auth: SqlAuthType;
37
+ elasticPool?: SqlElasticPoolType;
38
+ databases?: Record<string, {
39
+ name?: string;
40
+ sku?: SqlDbSku;
41
+ }>;
42
+ network?: SqlNetworkType;
30
43
  vulnerabilityAssessment?: {
31
44
  alertEmails: Array<string>;
32
45
  logStorageId?: Input<string>;
33
46
  storageAccessKey: Input<string>;
34
47
  storageEndpoint: Input<string>;
35
48
  };
36
- ignoreChanges?: string[];
37
- lock?: boolean;
38
49
  }
39
- declare const _default: ({ name, auth, group, enableEncryption, elasticPool, databases, vaultInfo, network, vulnerabilityAssessment, ignoreChanges, lock, }: Props) => {
40
- name: string;
41
- resource: import("@pulumi/azure-native/sql/server").Server;
42
- elasticPool: BasicResourceResultProps<import("@pulumi/azure-native/sql/elasticPool").ElasticPool> | undefined;
43
- databases: BasicResourceResultProps<import("@pulumi/azure-native/sql/database").Database>[];
44
- adminGroup: {
45
- objectId: string;
46
- displayName: string;
47
- } | Output<{
48
- objectId: string;
49
- displayName: string;
50
- }>;
51
- };
50
+ declare const _default: ({ name, auth, group, enableEncryption, elasticPool, databases, vaultInfo, network, vulnerabilityAssessment, ignoreChanges, }: Props) => SqlResults;
52
51
  export default _default;