@drunk-pulumi/azure 0.0.37 → 0.0.38

package/Logs/Helpers.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLogStorageInfo = exports.getLogWpInfo = exports.getLogWpSecretsById = exports.getLogWpSecrets = exports.createThreatProtection = exports.createDiagnostic = void 0;
+exports.getLogInfo = exports.getLogStorageInfo = exports.getLogWpInfo = exports.getLogWpSecretsById = exports.getLogWpSecrets = exports.createThreatProtection = exports.createDiagnostic = void 0;
 const native = require("@pulumi/azure-native");
 const pulumi_1 = require("@pulumi/pulumi");
 const AzureEnv_1 = require("../Common/AzureEnv");
-const GlobalEnv_1 = require("../Common/GlobalEnv");
 const Naming_1 = require("../Common/Naming");
 const Helper_1 = require("../KeyVault/Helper");
 const Helper_2 = require("../Storage/Helper");
-const createDiagnostic = ({ name, targetResourceId, logWpId, logStorageId, metricsCategories = ['AllMetrics'], logsCategories, dependsOn, }) => {
+const ResourceEnv_1 = require("../Common/ResourceEnv");
+const createDiagnostic = ({ name, targetResourceId, logWpId, logStorageId, metricsCategories = ["AllMetrics"], logsCategories, dependsOn, }) => {
     //Ensure logWpId or logStorageId is provided
     if (!logWpId && !logStorageId) {
         console.error(`Diagnostic for "${name}" must have either a "logWpId" or "logStorageId".`);
@@ -23,7 +23,7 @@ const createDiagnostic = ({ name, targetResourceId, logWpId, logStorageId, metri
     return new native.insights.DiagnosticSetting(n, {
         name: n,
         resourceUri: targetResourceId,
-        logAnalyticsDestinationType: 'AzureDiagnostics',
+        logAnalyticsDestinationType: "AzureDiagnostics",
         workspaceId: logWpId,
         storageAccountId: logWpId ? undefined : logStorageId,
         //Metric
@@ -48,48 +48,61 @@ exports.createDiagnostic = createDiagnostic;
 const createThreatProtection = ({ name, targetResourceId, }) => new native.security.AdvancedThreatProtection(name, {
     isEnabled: true,
     resourceId: targetResourceId,
+    settingName: "current",
 });
 exports.createThreatProtection = createThreatProtection;
-const getLogWpSecrets = async ({ fullName, 
-//group,
-vaultInfo, }) => {
+const getLogWpSecrets = async ({ fullName, vaultInfo, }) => {
     const workspaceIdKeyName = `${fullName}-Id`;
-    const primaryKeyName = (0, Naming_1.getKeyName)(fullName, 'primary');
-    const secondaryKeyName = (0, Naming_1.getKeyName)(fullName, 'secondary');
+    const primaryKeyName = (0, Naming_1.getKeyName)(fullName, "primary");
+    const secondaryKeyName = (0, Naming_1.getKeyName)(fullName, "secondary");
     const [wpId, primaryKey, secondaryKey] = await Promise.all([
-        (0, Helper_1.getSecret)({ name: workspaceIdKeyName, vaultInfo }),
-        (0, Helper_1.getSecret)({ name: primaryKeyName, nameFormatted: true, vaultInfo }),
-        (0, Helper_1.getSecret)({ name: secondaryKeyName, nameFormatted: true, vaultInfo }),
+        (0, Helper_1.getSecret)({ name: workspaceIdKeyName, vaultInfo }).then((i) => i?.value),
+        (0, Helper_1.getSecret)({ name: primaryKeyName, nameFormatted: true, vaultInfo }).then((i) => i?.value),
+        (0, Helper_1.getSecret)({ name: secondaryKeyName, nameFormatted: true, vaultInfo }).then((i) => i?.value),
     ]);
     return { wpId, primaryKey, secondaryKey };
 };
 exports.getLogWpSecrets = getLogWpSecrets;
 const getLogWpSecretsById = async ({ logWpId, vaultInfo, }) => {
-    const info = (0, AzureEnv_1.getResourceInfoFromId)(logWpId);
+    const info = (0, AzureEnv_1.parseResourceInfoFromId)(logWpId);
     const secrets = info
         ? await (0, exports.getLogWpSecrets)({ fullName: info.name, vaultInfo })
         : undefined;
     return secrets ? { info, secrets } : undefined;
 };
 exports.getLogWpSecretsById = getLogWpSecretsById;
-const getLogWpInfo = async ({ logWpName, vaultInfo, }) => {
+const getLogWpInfo = ({ logWpName, vaultInfo, group, }) => {
     const name = (0, Naming_1.getLogWpName)(logWpName);
-    const group = GlobalEnv_1.logGroupInfo;
     const id = (0, pulumi_1.interpolate) `/subscriptions/${AzureEnv_1.subscriptionId}/resourcegroups/${group.resourceGroupName}/providers/microsoft.operationalinsights/workspaces/${name}`;
     const secrets = vaultInfo
-        ? await (0, exports.getLogWpSecrets)({ fullName: name, vaultInfo })
+        ? (0, pulumi_1.output)((0, exports.getLogWpSecrets)({ fullName: name, vaultInfo }))
         : undefined;
     return { name, group, id, secrets };
 };
 exports.getLogWpInfo = getLogWpInfo;
-const getLogStorageInfo = async ({ storageName, vaultInfo, }) => {
+const getLogStorageInfo = ({ storageName, group, vaultInfo, }) => {
     const name = (0, Naming_1.getStorageName)(storageName);
-    const group = GlobalEnv_1.logGroupInfo;
     const id = (0, pulumi_1.interpolate) `/subscriptions/${AzureEnv_1.subscriptionId}/resourcegroups/${group.resourceGroupName}/providers/Microsoft.Storage/storageAccounts/${name}`;
     const secrets = vaultInfo
-        ? await (0, Helper_2.getStorageSecrets)({ name, vaultInfo })
+        ? (0, pulumi_1.output)((0, Helper_2.getStorageSecrets)({ name, vaultInfo }))
         : undefined;
     return { name, group, id, secrets };
 };
 exports.getLogStorageInfo = getLogStorageInfo;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0NBQStDO0FBQy9DLDJDQUFvRDtBQUVwRCxpREFBMkU7QUFDM0UsbURBQW1EO0FBQ25ELDZDQUE0RTtBQUM1RSwrQ0FBK0M7QUFDL0MsOENBQXNEO0FBRy9DLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxFQUMvQixJQUFJLEVBQ0osZ0JBQWdCLEVBQ2hCLE9BQU8sRUFDUCxZQUFZLEVBQ1osaUJBQWlCLEdBQUcsQ0FBQyxZQUFZLENBQUMsRUFDbEMsY0FBYyxFQUNkLFNBQVMsR0FDTyxFQUFFLEVBQUU7SUFDcEIsNENBQTRDO0lBQzVDLElBQUksQ0FBQyxPQUFPLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUM5QixPQUFPLENBQUMsS0FBSyxDQUNYLG1CQUFtQixJQUFJLG1EQUFtRCxDQUMzRSxDQUFDO1FBQ0YsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVELGtDQUFrQztJQUNsQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztRQUN0QixPQUFPLENBQUMsS0FBSyxDQUFDLHVCQUF1QixJQUFJLHFCQUFxQixDQUFDLENBQUM7UUFDaEUsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVELE1BQU0sQ0FBQyxHQUFHLEdBQUcsSUFBSSxPQUFPLENBQUM7SUFDekIsT0FBTyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQzFDLENBQUMsRUFDRDtRQUNFLElBQUksRUFBRSxDQUFDO1FBQ1AsV0FBVyxFQUFFLGdCQUFnQjtRQUM3QiwyQkFBMkIsRUFBRSxrQkFBa0I7UUFFL0MsV0FBVyxFQUFFLE9BQU87UUFDcEIsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLFlBQVk7UUFFcEQsUUFBUTtRQUNSLE9BQU8sRUFBRSxp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
+const getLogInfo = (groupName, vaultInfo = undefined) => {
+    const rgName = (0, Naming_1.getResourceGroupName)(groupName);
+    const name = (0, ResourceEnv_1.getResourceName)(groupName, { suffix: "logs" });
+    const logWp = (0, exports.getLogWpInfo)({
+        logWpName: name,
+        vaultInfo,
+        group: { resourceGroupName: rgName, location: AzureEnv_1.currentRegionName },
+    });
+    const logStorage = (0, exports.getLogStorageInfo)({
+        storageName: name,
+        vaultInfo,
+        group: { resourceGroupName: rgName, location: AzureEnv_1.currentRegionName },
+    });
+    return { logWp, logStorage };
+};
+exports.getLogInfo = getLogInfo;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0NBQStDO0FBQy9DLDJDQUFvRTtBQUNwRSxpREFJNEI7QUFDNUIsNkNBSzBCO0FBQzFCLCtDQUErQztBQUMvQyw4Q0FBNkU7QUFFN0UsdURBQXdEO0FBRWpELE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxFQUMvQixJQUFJLEVBQ0osZ0JBQWdCLEVBQ2hCLE9BQU8sRUFDUCxZQUFZLEVBQ1osaUJBQWlCLEdBQUcsQ0FBQyxZQUFZLENBQUMsRUFDbEMsY0FBYyxFQUNkLFNBQVMsR0FDTyxFQUFFLEVBQUU7SUFDcEIsNENBQTRDO0lBQzVDLElBQUksQ0FBQyxPQUFPLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUM5QixPQUFPLENBQUMsS0FBSyxDQUNYLG1CQUFtQixJQUFJLG1EQUFtRCxDQUMzRSxDQUFDO1FBQ0YsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVELGtDQUFrQztJQUNsQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztRQUN0QixPQUFPLENBQUMsS0FBSyxDQUFDLHVCQUF1QixJQUFJLHFCQUFxQixDQUFDLENBQUM7UUFDaEUsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVELE1BQU0sQ0FBQyxHQUFHLEdBQUcsSUFBSSxPQUFPLENBQUM7SUFDekIsT0FBTyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQzFDLENBQUMsRUFDRDtRQUNFLElBQUksRUFBRSxDQUFDO1FBQ1AsV0FBVyxFQUFFLGdCQUFnQjtRQUM3QiwyQkFBMkIsRUFBRSxrQkFBa0I7UUFFL0MsV0FBVyxFQUFFLE9BQU87UUFDcEIsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLFlBQVk7UUFFcEQsUUFBUTtRQUNSLE9BQU8sRUFBRSxp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

package/Logs/LogAnalytics.d.ts

@@ -1,5 +1,5 @@
-import * as operationalinsights from '@pulumi/azure-native/operationalinsights';
-import { KeyVaultInfo, ResourceGroupInfo } from '../types';
+import * as operationalinsights from "@pulumi/azure-native/operationalinsights";
+import { KeyVaultInfo, ResourceGroupInfo } from "../types";
 interface Props {
     name: string;
     group: ResourceGroupInfo;

package/Logs/LogAnalytics.js

@@ -6,11 +6,20 @@ const CustomHelper_1 = require("../KeyVault/CustomHelper");
 exports.default = ({ name, group, sku = operationalinsights.WorkspaceSkuNameEnum.Free, dailyQuotaGb = 0.023, vaultInfo, }) => {
     name = (0, Naming_1.getLogWpName)(name);
     const workspaceIdKeyName = `${name}-Id`;
-    const primaryKeyName = (0, Naming_1.getKeyName)(name, 'primary');
-    const secondaryKeyName = (0, Naming_1.getKeyName)(name, 'secondary');
+    const primaryKeyName = (0, Naming_1.getKeyName)(name, "primary");
+    const secondaryKeyName = (0, Naming_1.getKeyName)(name, "secondary");
     const log = new operationalinsights.Workspace(name, {
         workspaceName: name,
         ...group,
+        publicNetworkAccessForIngestion: "Enabled",
+        publicNetworkAccessForQuery: "Enabled",
+        features: {
+            //clusterResourceId?: pulumi.Input<string>;
+            //disableLocalAuth: true,
+            //enableDataExport: false,
+            //enableLogAccessUsingOnlyResourcePermissions?: pulumi.Input<boolean>;
+            immediatePurgeDataOn30Days: true,
+        },
         workspaceCapping: sku === operationalinsights.WorkspaceSkuNameEnum.Free
             ? undefined
             : { dailyQuotaGb }, //Fee is 2.99 USD/GB - Carefully
@@ -28,25 +37,25 @@ exports.default = ({ name, group, sku = operationalinsights.WorkspaceSkuNameEnum
             (0, CustomHelper_1.addCustomSecret)({
                 name: workspaceIdKeyName,
                 value: id,
-                contentType: 'Log Analytics',
+                contentType: "Log Analytics",
                 vaultInfo,
             });
             (0, CustomHelper_1.addCustomSecret)({
                 name: primaryKeyName,
                 formattedName: true,
                 value: keys.primarySharedKey,
-                contentType: 'Log Analytics',
+                contentType: "Log Analytics",
                 vaultInfo,
             });
             (0, CustomHelper_1.addCustomSecret)({
                 name: secondaryKeyName,
                 formattedName: true,
                 value: keys.secondarySharedKey,
-                contentType: 'Log Analytics',
+                contentType: "Log Analytics",
                 vaultInfo,
             });
         });
     }
     return { log, vaultNames: { primaryKeyName, secondaryKeyName } };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nQW5hbHl0aWNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0xvZ3MvTG9nQW5hbHl0aWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsZ0ZBQWdGO0FBRWhGLDZDQUE0RDtBQUM1RCwyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsR0FBRyxHQUFHLG1CQUFtQixDQUFDLG9CQUFvQixDQUFDLElBQUksRUFDbkQsWUFBWSxHQUFHLEtBQUssRUFDcEIsU0FBUyxHQUNILEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxJQUFBLHFCQUFZLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDMUIsTUFBTSxrQkFBa0IsR0FBRyxHQUFHLElBQUksS0FBSyxDQUFDO0lBQ3hDLE1BQU0sY0FBYyxHQUFHLElBQUEsbUJBQVUsRUFBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDbkQsTUFBTSxnQkFBZ0IsR0FBRyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBRXZELE1BQU0sR0FBRyxHQUFHLElBQUksbUJBQW1CLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTtRQUNsRCxhQUFhLEVBQUUsSUFBSTtRQUNuQixHQUFHLEtBQUs7UUFFUixnQkFBZ0IsRUFDZCxHQUFHLEtBQUssbUJBQW1CLENBQUMsb0JBQW9CLENBQUMsSUFBSTtZQUNuRCxDQUFDLENBQUMsU0FBUztZQUNYLENBQUMsQ0FBQyxFQUFFLFlBQVksRUFBRSxFQUFFLGdDQUFnQztRQUV4RCxlQUFlLEVBQ2IsR0FBRyxLQUFLLG1CQUFtQixDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUscUJBQXFCO1FBQ3ZGLEdBQUcsRUFBRSxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUU7S0FFbkIsQ0FBQyxDQUFDO0lBRUgsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLEdBQUcsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRTtZQUNoQyxJQUFJLENBQUMsRUFBRTtnQkFBRSxPQUFPO1lBRWhCLE1BQU0sSUFBSSxHQUFHLE1BQU0sbUJBQW1CLENBQUMsYUFBYSxDQUFDO2dCQUNuRCxhQUFhLEVBQUUsSUFBSTtnQkFDbkIsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjthQUMzQyxDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLGtCQUFrQjtnQkFDeEIsS0FBSyxFQUFFLEVBQUU7Z0JBQ1QsV0FBVyxFQUFFLGVBQWU7Z0JBQzVCLFNBQVM7YUFDVixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLGNBQWM7Z0JBQ3BCLGFBQWEsRUFBRSxJQUFJO2dCQUNuQixLQUFLLEVBQUUsSUFBSSxDQUFDLGdCQUFpQjtnQkFDN0IsV0FBVyxFQUFFLGVBQWU7Z0JBQzVCLFNBQVM7YUFDVixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLGdCQUFnQjtnQkFDdEIsYUFBYSxFQUFFLElBQUk7Z0JBQ25CLEtBQUssRUFBRSxJQUFJLENBQUMsa0JBQW1CO2dCQUMvQixXQUFXLEVBQUUsZUFBZTtnQkFDNUIsU0FBUzthQUNWLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFLEVBQUUsY0FBYyxFQUFFLGdCQUFnQixFQUFFLEVBQUUsQ0FBQztBQUNuRSxDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nQW5hbHl0aWNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0xvZ3MvTG9nQW5hbHl0aWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsZ0ZBQWdGO0FBRWhGLDZDQUE0RDtBQUM1RCwyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsR0FBRyxHQUFHLG1CQUFtQixDQUFDLG9CQUFvQixDQUFDLElBQUksRUFDbkQsWUFBWSxHQUFHLEtBQUssRUFDcEIsU0FBUyxHQUNILEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxJQUFBLHFCQUFZLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDMUIsTUFBTSxrQkFBa0IsR0FBRyxHQUFHLElBQUksS0FBSyxDQUFDO0lBQ3hDLE1BQU0sY0FBYyxHQUFHLElBQUEsbUJBQVUsRUFBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDbkQsTUFBTSxnQkFBZ0IsR0FBRyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBRXZELE1BQU0sR0FBRyxHQUFHLElBQUksbUJBQW1CLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTtRQUNsRCxhQUFhLEVBQUUsSUFBSTtRQUNuQixHQUFHLEtBQUs7UUFFUiwrQkFBK0IsRUFBRSxTQUFTO1FBQzFDLDJCQUEyQixFQUFFLFNBQVM7UUFDdEMsUUFBUSxFQUFFO1lBQ1IsMkNBQTJDO1lBQzNDLHlCQUF5QjtZQUN6QiwwQkFBMEI7WUFDMUIsc0VBQXNFO1lBQ3RFLDBCQUEwQixFQUFFLElBQUk7U0FDakM7UUFDRCxnQkFBZ0IsRUFDZCxHQUFHLEtBQUssbUJBQW1CLENBQUMsb0JBQW9CLENBQUMsSUFBSTtZQUNuRCxDQUFDLENBQUMsU0FBUztZQUNYLENBQUMsQ0FBQyxFQUFFLFlBQVksRUFBRSxFQUFFLGdDQUFnQztRQUV4RCxlQUFlLEVBQ2IsR0FBRyxLQUFLLG1CQUFtQixDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUscUJBQXFCO1FBQ3ZGLEdBQUcsRUFBRSxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUU7S0FDbkIsQ0FBQyxDQUFDO0lBRUgsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLEdBQUcsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRTtZQUNoQyxJQUFJLENBQUMsRUFBRTtnQkFBRSxPQUFPO1lBRWhCLE1BQU0sSUFBSSxHQUFHLE1BQU0sbUJBQW1CLENBQUMsYUFBYSxDQUFDO2dCQUNuRCxhQUFhLEVBQUUsSUFBSTtnQkFDbkIsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjthQUMzQyxDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLGtCQUFrQjtnQkFDeEIsS0FBSyxFQUFFLEVBQUU7Z0JBQ1QsV0FBVyxFQUFFLGVBQWU7Z0JBQzVCLFNBQVM7YUFDVixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLGNBQWM7Z0JBQ3BCLGFBQWEsRUFBRSxJQUFJO2dCQUNuQixLQUFLLEVBQUUsSUFBSSxDQUFDLGdCQUFpQjtnQkFDN0IsV0FBVyxFQUFFLGVBQWU7Z0JBQzVCLFNBQVM7YUFDVixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLGdCQUFnQjtnQkFDdEIsYUFBYSxFQUFFLElBQUk7Z0JBQ25CLEtBQUssRUFBRSxJQUFJLENBQUMsa0JBQW1CO2dCQUMvQixXQUFXLEVBQUUsZUFBZTtnQkFDNUIsU0FBUzthQUNWLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFLEVBQUUsY0FBYyxFQUFFLGdCQUFnQixFQUFFLEVBQUUsQ0FBQztBQUNuRSxDQUFDLENBQUMifQ==

package/Logs/index.d.ts

@@ -1,6 +1,6 @@
-import { BasicMonitorArgs, KeyVaultInfo, ResourceGroupInfo } from '../types';
-import * as operationalinsights from '@pulumi/azure-native/operationalinsights';
-import { DefaultManagementRules } from '../Storage/ManagementRules';
+import { BasicMonitorArgs, KeyVaultInfo, ResourceGroupInfo } from "../types";
+import * as operationalinsights from "@pulumi/azure-native/operationalinsights";
+import { DefaultManagementRules } from "../Storage/ManagementRules";
 type WorkspaceType = {
     createAppInsight?: boolean;
     sku?: operationalinsights.WorkspaceSkuNameEnum;

package/Logs/index.js

@@ -13,11 +13,11 @@ const defaultLogWorkspace = {
 const defaultStorageRules = [
     {
         actions: { baseBlob: { delete: { daysAfterModificationGreaterThan: 30 } } },
-        filters: { blobTypes: ['blockBlob'] },
+        filters: { blobTypes: ["blockBlob"] },
     },
 ];
 exports.default = ({ group, name, workspace, storage, vaultInfo }) => {
-    name = (0, ResourceEnv_1.getResourceName)(name, { suffix: 'logs' });
+    name = (0, ResourceEnv_1.getResourceName)(name, { suffix: "logs" });
     const createWp = workspace
         ? { ...defaultLogWorkspace, ...workspace }
         : undefined;
@@ -37,7 +37,7 @@ exports.default = ({ group, name, workspace, storage, vaultInfo }) => {
             dailyCapGb: createWp.dailyQuotaGb,
             immediatePurgeDataOn30Days: true,
             workspaceResourceId: logWp.log.id,
-            ingestionMode: 'ApplicationInsights',
+            ingestionMode: "LogAnalytics",
             vaultInfo,
         })
         : undefined;
@@ -66,4 +66,4 @@ exports.default = ({ group, name, workspace, storage, vaultInfo }) => {
         }),
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTG9ncy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLGdGQUFnRjtBQUNoRixpREFBbUM7QUFDbkMsd0NBQWlDO0FBQ2pDLHVEQUF3RDtBQUV4RCw2Q0FBc0M7QUFRdEMsTUFBTSxtQkFBbUIsR0FBa0I7SUFDekMsZ0JBQWdCLEVBQUUsS0FBSztJQUN2QixHQUFHLEVBQUUsbUJBQW1CLENBQUMsb0JBQW9CLENBQUMsU0FBUztJQUN2RCxZQUFZLEVBQUUsR0FBRztDQUNsQixDQUFDO0FBRUYsTUFBTSxtQkFBbUIsR0FBa0M7SUFDekQ7UUFDRSxPQUFPLEVBQUUsRUFBRSxRQUFRLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxnQ0FBZ0MsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFO1FBQzNFLE9BQU8sRUFBRSxFQUFFLFNBQVMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxFQUFFO0tBQ3RDO0NBQ0YsQ0FBQztBQWFGLGtCQUFlLENBQUMsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFTLEVBQUUsRUFBRTtJQUN2RSxJQUFJLEdBQUcsSUFBQSw2QkFBZSxFQUFDLElBQUksRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBRWpELE1BQU0sUUFBUSxHQUE4QixTQUFTO1FBQ25ELENBQUMsQ0FBQyxFQUFFLEdBQUcsbUJBQW1CLEVBQUUsR0FBRyxTQUFTLEVBQUU7UUFDMUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVkLE1BQU0sS0FBSyxHQUFHLFFBQVE7UUFDcEIsQ0FBQyxDQUFDLElBQUEsc0JBQUssRUFBQztZQUNKLEtBQUs7WUFDTCxJQUFJO1lBQ0osR0FBRyxFQUFFLFFBQVEsQ0FBQyxHQUFHO1lBQ2pCLFlBQVksRUFBRSxRQUFRLENBQUMsWUFBWTtZQUNuQyxTQUFTO1NBQ1YsQ0FBQztRQUNKLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFFZCxNQUFNLFVBQVUsR0FDZCxLQUFLLElBQUksUUFBUSxFQUFFLGdCQUFnQjtRQUNqQyxDQUFDLENBQUMsSUFBQSxvQkFBVSxFQUFDO1lBQ1QsS0FBSztZQUNMLElBQUk7WUFDSixVQUFVLEVBQUUsUUFBUSxDQUFDLFlBQVk7WUFDakMsMEJBQTBCLEVBQUUsSUFBSTtZQUNoQyxtQkFBbUIsRUFBRSxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDakMsYUFBYSxFQUFFLHFCQUFxQjtZQUNwQyxTQUFTO1NBQ1YsQ0FBQztRQUNKLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFFaEIsTUFBTSxVQUFVLEdBQUcsT0FBTztRQUN4QixDQUFDLENBQUMsSUFBQSxpQkFBTyxFQUFDO1lBQ04sS0FBSztZQUNMLElBQUk7WUFDSixTQUFTO1lBQ1Qsc0JBQXNCLEVBQUUsT0FBTyxDQUFDLFlBQVksSUFBSSxtQkFBbUI7WUFDbkUsWUFBWSxFQUFFLEVBQUUsb0JBQW9CLEVBQUUsSUFBSSxFQUFFO1NBQzdDLENBQUM7UUFDSixDQUFDLENBQUMsU0FBUyxDQUFDO0lBRWQsT0FBTztRQUNMLEtBQUs7UUFDTCxVQUFVO1FBQ1YsVUFBVTtRQUNWLFNBQVMsRUFBRSxHQUFxQixFQUFFLENBQUMsQ0FBQztZQUNsQyxPQUFPLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxFQUFFO1lBQ3RCLFlBQVksRUFBRSxVQUFVLEVBQUUsT0FBTyxDQUFDLEVBQUU7U0FDckMsQ0FBQztRQUNGLGdCQUFnQixFQUFFLEdBQXFCLEVBQUUsQ0FBQyxDQUFDO1lBQ3pDLFlBQVksRUFBRSxVQUFVLEVBQUUsT0FBTyxDQUFDLEVBQUU7U0FDckMsQ0FBQztRQUNGLFdBQVcsRUFBRSxHQUFxQixFQUFFLENBQUMsQ0FBQztZQUNwQyxPQUFPLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxFQUFFO1NBQ3ZCLENBQUM7S0FDSCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTG9ncy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLGdGQUFnRjtBQUNoRixpREFBbUM7QUFDbkMsd0NBQWlDO0FBQ2pDLHVEQUF3RDtBQUV4RCw2Q0FBc0M7QUFRdEMsTUFBTSxtQkFBbUIsR0FBa0I7SUFDekMsZ0JBQWdCLEVBQUUsS0FBSztJQUN2QixHQUFHLEVBQUUsbUJBQW1CLENBQUMsb0JBQW9CLENBQUMsU0FBUztJQUN2RCxZQUFZLEVBQUUsR0FBRztDQUNsQixDQUFDO0FBRUYsTUFBTSxtQkFBbUIsR0FBa0M7SUFDekQ7UUFDRSxPQUFPLEVBQUUsRUFBRSxRQUFRLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxnQ0FBZ0MsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFO1FBQzNFLE9BQU8sRUFBRSxFQUFFLFNBQVMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxFQUFFO0tBQ3RDO0NBQ0YsQ0FBQztBQWFGLGtCQUFlLENBQUMsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFTLEVBQUUsRUFBRTtJQUN2RSxJQUFJLEdBQUcsSUFBQSw2QkFBZSxFQUFDLElBQUksRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBRWpELE1BQU0sUUFBUSxHQUE4QixTQUFTO1FBQ25ELENBQUMsQ0FBQyxFQUFFLEdBQUcsbUJBQW1CLEVBQUUsR0FBRyxTQUFTLEVBQUU7UUFDMUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVkLE1BQU0sS0FBSyxHQUFHLFFBQVE7UUFDcEIsQ0FBQyxDQUFDLElBQUEsc0JBQUssRUFBQztZQUNKLEtBQUs7WUFDTCxJQUFJO1lBQ0osR0FBRyxFQUFFLFFBQVEsQ0FBQyxHQUFHO1lBQ2pCLFlBQVksRUFBRSxRQUFRLENBQUMsWUFBWTtZQUNuQyxTQUFTO1NBQ1YsQ0FBQztRQUNKLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFFZCxNQUFNLFVBQVUsR0FDZCxLQUFLLElBQUksUUFBUSxFQUFFLGdCQUFnQjtRQUNqQyxDQUFDLENBQUMsSUFBQSxvQkFBVSxFQUFDO1lBQ1QsS0FBSztZQUNMLElBQUk7WUFDSixVQUFVLEVBQUUsUUFBUSxDQUFDLFlBQVk7WUFDakMsMEJBQTBCLEVBQUUsSUFBSTtZQUNoQyxtQkFBbUIsRUFBRSxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDakMsYUFBYSxFQUFFLGNBQWM7WUFDN0IsU0FBUztTQUNWLENBQUM7UUFDSixDQUFDLENBQUMsU0FBUyxDQUFDO0lBRWhCLE1BQU0sVUFBVSxHQUFHLE9BQU87UUFDeEIsQ0FBQyxDQUFDLElBQUEsaUJBQU8sRUFBQztZQUNOLEtBQUs7WUFDTCxJQUFJO1lBQ0osU0FBUztZQUNULHNCQUFzQixFQUFFLE9BQU8sQ0FBQyxZQUFZLElBQUksbUJBQW1CO1lBQ25FLFlBQVksRUFBRSxFQUFFLG9CQUFvQixFQUFFLElBQUksRUFBRTtTQUM3QyxDQUFDO1FBQ0osQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVkLE9BQU87UUFDTCxLQUFLO1FBQ0wsVUFBVTtRQUNWLFVBQVU7UUFDVixTQUFTLEVBQUUsR0FBcUIsRUFBRSxDQUFDLENBQUM7WUFDbEMsT0FBTyxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsRUFBRTtZQUN0QixZQUFZLEVBQUUsVUFBVSxFQUFFLE9BQU8sQ0FBQyxFQUFFO1NBQ3JDLENBQUM7UUFDRixnQkFBZ0IsRUFBRSxHQUFxQixFQUFFLENBQUMsQ0FBQztZQUN6QyxZQUFZLEVBQUUsVUFBVSxFQUFFLE9BQU8sQ0FBQyxFQUFFO1NBQ3JDLENBQUM7UUFDRixXQUFXLEVBQUUsR0FBcUIsRUFBRSxDQUFDLENBQUM7WUFDcEMsT0FBTyxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsRUFBRTtTQUN2QixDQUFDO0tBQ0gsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9

package/MySql/index.d.ts

@@ -2,13 +2,12 @@ import { BasicResourceArgs, KeyVaultInfo } from "../types";
 import * as pulumi from "@pulumi/pulumi";
 import * as dbformysql from "@pulumi/azure-native/dbformysql";
 import * as inputs from "@pulumi/azure-native/types/input";
-import { EnvRoleNamesType } from "../AzAd/EnvRoles";
+import { EnvRolesResults } from "../AzAd/EnvRoles";
 export interface MySqlProps extends BasicResourceArgs {
     enableEncryption?: boolean;
     vaultInfo: KeyVaultInfo;
     auth?: {
-        enableAdAdministrator?: boolean;
-        envRoleNames?: EnvRoleNamesType;
+        envRoles: EnvRolesResults;
         adminLogin?: pulumi.Input<string>;
         password?: pulumi.Input<string>;
     };

package/MySql/index.js

@@ -6,10 +6,8 @@ const Random_1 = require("../Core/Random");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
 const AzureEnv_1 = require("../Common/AzureEnv");
 const Group_1 = require("../AzAd/Group");
-const Role_1 = require("../AzAd/Role");
 const Helper_1 = require("../KeyVault/Helper");
-const UserIdentity_1 = require("../AzAd/UserIdentity");
-const VaultPermissions_1 = require("../KeyVault/VaultPermissions");
+const UserAssignedIdentity_1 = require("../AzAd/UserAssignedIdentity");
 const random_1 = require("@pulumi/random");
 const PrivateEndpoint_1 = require("../VNet/PrivateEndpoint");
 const Locker_1 = require("../Core/Locker");
@@ -36,19 +34,11 @@ sku = {
             options: { special: false },
         }).result;
     const encryptKey = enableEncryption
-        ? (0, Helper_1.getEncryptionKey)(name, vaultInfo)
+        ? (0, Helper_1.getEncryptionKeyOutput)(name, vaultInfo)
         : undefined;
     const userIdentity = enableEncryption
-        ? (0, UserIdentity_1.default)({ name, group })
+        ? (0, UserAssignedIdentity_1.default)({ name, group, vaultInfo })
         : undefined;
-    if (userIdentity) {
-        //Allows to Read Key Vault
-        (0, VaultPermissions_1.grantVaultAccessToIdentity)({
-            name,
-            identity: userIdentity.principalId.apply((i) => ({ principalId: i })),
-            vaultInfo,
-        });
-    }
     const mySql = new dbformysql.Server(name, {
         serverName: name,
         ...group,
@@ -70,7 +60,7 @@ sku = {
             ? {
                 type: dbformysql.DataEncryptionType.AzureKeyVault,
                 primaryUserAssignedIdentityId: userIdentity?.id,
-                primaryKeyURI: encryptKey.apply((c) => `https://${vaultInfo.name}.vault.azure.net/keys/${c.name}/${c.properties.version}`),
+                primaryKeyURI: encryptKey.url,
             }
             : { type: dbformysql.DataEncryptionType.SystemManaged },
         //maintenanceWindow: { dayOfWeek: 6 },
@@ -98,10 +88,17 @@ sku = {
     if (lock) {
         (0, Locker_1.default)({ name, resource: mySql });
     }
-    if (auth?.enableAdAdministrator) {
-        const adminGroup = auth.envRoleNames
-            ? (0, Group_1.getAdGroup)(auth.envRoleNames.admin)
-            : (0, Role_1.default)({ env: AzureEnv_1.currentEnv, roleName: "ADMIN", appName: "MYSQL" });
+    //Enable AD Administrator
+    if (auth) {
+        if (userIdentity) {
+            //Allows to Read Key Vault
+            (0, Group_1.addMemberToGroup)({
+                name: `${name}-contributor-role`,
+                objectId: userIdentity.principalId,
+                groupObjectId: auth?.envRoles.contributor.objectId,
+            });
+        }
+        const adminGroup = auth.envRoles.contributor;
         new dbformysql.AzureADAdministrator(name, {
             serverName: mySql.name,
             ...group,
@@ -162,4 +159,4 @@ sku = {
     }
     return mySql;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTXlTcWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSw2Q0FBZ0Q7QUFFaEQsOERBQThEO0FBQzlELDJDQUFnRDtBQUVoRCwyREFBMkQ7QUFDM0QsaURBQWlFO0FBQ2pFLHlDQUEyQztBQUMzQyx1Q0FBZ0M7QUFFaEMsK0NBQXNEO0FBQ3RELHVEQUFnRDtBQUNoRCxtRUFBMEU7QUFDMUUsMkNBQThDO0FBQzlDLDZEQUFzRDtBQUN0RCwyQ0FBb0M7QUE2QnBDLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLElBQUksRUFDSixnQkFBZ0IsRUFDaEIsT0FBTyxHQUFHLFVBQVUsQ0FBQyxhQUFhLENBQUMsb0JBQW9CLEVBQ3ZELGFBQWEsR0FBRyxFQUFFO0FBQ2xCOztHQUVHO0FBQ0gsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLGVBQWU7SUFDckIsSUFBSSxFQUFFLFdBQVc7Q0FDbEIsRUFDRCxPQUFPLEVBQ1AsU0FBUyxFQUNULFNBQVMsRUFDVCxTQUFTLEVBQ1QsSUFBSSxHQUFHLElBQUksR0FDQSxFQUFFLEVBQUU7SUFDZixJQUFJLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTFCLE1BQU0sUUFBUSxHQUNaLElBQUksRUFBRSxVQUFVO1FBQ2hCLElBQUkscUJBQVksQ0FBQyxJQUFJLEVBQUU7WUFDckIsT0FBTyxFQUFFLEtBQUs7WUFDZCxNQUFNLEVBQUUsQ0FBQztZQUNULEtBQUssRUFBRSxJQUFJO1lBQ1gsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRXRDLE1BQU0sUUFBUSxHQUNaLElBQUksRUFBRSxRQUFRO1FBQ2QsSUFBQSx1QkFBYyxFQUFDO1lBQ2IsSUFBSTtZ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTXlTcWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSw2Q0FBZ0Q7QUFFaEQsOERBQThEO0FBQzlELDJDQUFnRDtBQUVoRCwyREFBMkQ7QUFDM0QsaURBQXFEO0FBQ3JELHlDQUFpRDtBQUVqRCwrQ0FBNEQ7QUFDNUQsdUVBQWdFO0FBQ2hFLDJDQUE4QztBQUM5Qyw2REFBc0Q7QUFDdEQsMkNBQW9DO0FBMkJwQyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxJQUFJLEVBQ0osZ0JBQWdCLEVBQ2hCLE9BQU8sR0FBRyxVQUFVLENBQUMsYUFBYSxDQUFDLG9CQUFvQixFQUN2RCxhQUFhLEdBQUcsRUFBRTtBQUNsQjs7R0FFRztBQUNILEdBQUcsR0FBRztJQUNKLElBQUksRUFBRSxlQUFlO0lBQ3JCLElBQUksRUFBRSxXQUFXO0NBQ2xCLEVBQ0QsT0FBTyxFQUNQLFNBQVMsRUFDVCxTQUFTLEVBQ1QsU0FBUyxFQUNULElBQUksR0FBRyxJQUFJLEdBQ0EsRUFBRSxFQUFFO0lBQ2YsSUFBSSxHQUFHLElBQUEscUJBQVksRUFBQyxJQUFJLENBQUMsQ0FBQztJQUUxQixNQUFNLFFBQVEsR0FDWixJQUFJLEVBQUUsVUFBVTtRQUNoQixJQUFJLHFCQUFZLENBQUMsSUFBSSxFQUFFO1lBQ3JCLE9BQU8sRUFBRSxLQUFLO1lBQ2QsTUFBTSxFQUFFLENBQUM7WUFDVCxLQUFLLEVBQUUsSUFBSTtZQUNYLEtBQUssRUFBRSxLQUFLO1NBQ2IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUV0QyxNQUFNLFFBQVEsR0FDWixJQUFJLEVBQUUsUUFBUTtRQUNkLElBQUEsdUJBQWMsRUFBQztZQUNiLElBQUk7WUFDSixNQUFNLEVBQUUsRUFBRTtZQUNWLE9BQU8sRUFBRSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUU7U0FDNUIsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUVaLE1BQU0sVUFBVSxHQUFHLGdCQUFnQjtRQUNqQyxDQUFDLENBQUMsSUFBQSwrQkFBc0IsRUFBQyxJQUFJLEVBQUUsU0FBUyxDQUFDO1FBQ3pDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFFZCxNQUFNLFlBQVksR0FBRyxnQkFBZ0I7UUFDbkMsQ0FBQyxDQUFDLElBQUEsOEJBQW9CLEVBQUMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxDQUFDO1FBQ2xELENBQUMsQ0FBQyxTQUFTLENBQUM7SUFFZCxNQUFNLEtBQUssR0FBRyxJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQ2pDLElBQUksRUFDSjtRQUNFLFVBQVUsRUFBRSxJQUFJO1FBQ2hCLEdBQUcsS0FBSztRQUNSLE9BQU87UUFDUCxPQUFPLEVBQUU7WUFDUCxhQUFhO1lBQ2IsUUFBUSxFQUFFLGdCQUFLLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsVUFBVTtZQUN4QyxhQUFhLEVBQUUsZ0JBQUssQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxVQUFVO1NBQzlDO1FBRUQsY0FBYztRQUNkLDhEQUE4RDtRQUM5RCw4QkFBOEI7UUFDOUIsb0NBQW9DO1FBQ3BDLE9BQU87UUFDUCxLQUFLO1FBRUwsa0JBQWtCLEVBQUUsUUFBUTtRQUM1QiwwQkFBMEIsRUFBRSxRQUFRO1FBQ3BDLGNBQWMsRUFBRSxVQUFVO1lBQ3hCLENBQUMsQ0FBQztnQkFDRSxJQUFJLEVBQUUsVUFBVSxDQUFDLGtCQUFrQixDQUFDLGFBQWE7Z0JBQ2pELDZCQUE2QixFQUFFLFlBQVksRUFBRSxFQUFFO2dCQUMvQyxhQUFhLEVBQUUsVUFBVSxDQUFDLEdBQUc7YUFDOUI7WUFDSCxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsVUFBVSxDQUFDLGtCQUFrQixDQUFDLGFBQWEsRUFBRTtRQUN6RCxzQ0FBc0M7UUFDdEMsR0FBRztRQUNILE1BQU0sRUFBRTtZQUNOLGtCQUFrQixFQUFFLGdCQUFLLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsVUFBVTtZQUNsRCxtQkFBbUIsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7U0FDbkM7UUFDRCxnQkFBZ0IsRUFBRTtZQUNoQixJQUFJLEVBQUUsZ0JBQUssQ0FBQyxDQUFDLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxVQUFVO1lBQzFDLHVCQUF1QixFQUFFLEdBQUc7U0FDN0I7UUFDRCxnQkFBZ0IsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUc7S0FDcEMsRUFDRDtRQUNFLFNBQVM7UUFDVCxPQUFPLEVBQUUsSUFBSTtRQUNiLGFBQWEsRUFBRTtZQUNiLFlBQVk7WUFDWixrQkFBa0I7WUFDbEIsa0JBQWtCO1lBQ2xCLG9CQUFvQjtZQUNwQixnQkFBZ0I7U0FDakI7S0FDRixDQUNGLENBQUM7SUFFRixJQUFJLElBQUksRUFBRSxDQUFDO1FBQ1QsSUFBQSxnQkFBTSxFQUFDLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFFRCx5QkFBeUI7SUFDekIsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUNULElBQUksWUFBWSxFQUFFLENBQUM7WUFDakIsMEJBQTBCO1lBQzFCLElBQUEsd0JBQWdCLEVBQUM7Z0JBQ2YsSUFBSSxFQUFFLEdBQUcsSUFBSSxtQkFBbUI7Z0JBQ2hDLFFBQVEsRUFBRSxZQUFZLENBQUMsV0FBVztnQkFDbEMsYUFBYSxFQUFFLElBQUksRUFBRSxRQUFRLENBQUMsV0FBVyxDQUFDLFFBQVE7YUFDbkQsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztRQUVELE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDO1FBQzdDLElBQUksVUFBVSxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRTtZQUN4QyxVQUFVLEVBQUUsS0FBSyxDQUFDLElBQUk7WUFDdEIsR0FBRyxLQUFLO1lBQ1IsS0FBSyxFQUFFLFFBQVE7WUFDZixpQkFBaUIsRUFBRSxpQkFBaUI7WUFDcEMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxRQUFRO1lBQ3hCLFFBQVEsRUFBUixtQkFBUTtTQUNULENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQ1osSUFBSSxPQUFPLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDMUIsT0FBTyxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQ3ZCLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQ1AsSUFBSSxVQUFVLENBQUMsWUFBWSxDQUFDLEdBQUcsSUFBSSxhQUFhLENBQUMsRUFBRSxFQUFFO2dCQUNuRCxnQkFBZ0IsRUFBRSxHQUFHLElBQUksYUFBYSxDQUFDLEVBQUU7Z0JBQ3pDLFVBQVUsRUFBRSxLQUFLLENBQUMsSUFBSTtnQkFDdEIsR0FBRyxLQUFLO2dCQUNSLEdBQUcsQ0FBQzthQUNMLENBQUMsQ0FDTCxDQUFDO1FBQ0osQ0FBQztRQUVELElBQUksT0FBTyxDQUFDLGtCQUFrQjtZQUM1QixJQUFJLFVBQVUsQ0FBQyxZQUFZLENBQUMsR0FBRyxJQUFJLHVCQUF1QixFQUFFO2dCQUMxRCxnQkFBZ0IsRUFBRSxHQUFHLElBQUksdUJBQXVCO2dCQUNoRCxVQUFVLEVBQUUsS0FBSyxDQUFDLElBQUk7Z0JBQ3RCLEdBQUcsS0FBSztnQkFDUixjQUFjLEVBQUUsU0FBUztnQkFDekIsWUFBWSxFQUFFLGlCQUFpQjthQUNoQyxDQUFDLENBQUM7UUFFTCxJQUFJLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN4QixJQUFBLHlCQUFlLEVBQUM7Z0JBQ2QsSUFBSTtnQkFDSixLQUFLO2dCQUNMLFVBQVUsRUFBRSxLQUFLLENBQUMsRUFBRTtnQkFDcEIsa0JBQWtCLEVBQUUsMEJBQTBCO2dCQUM5QyxtQkFBbUIsRUFBRSxDQUFDLE9BQU8sQ0FBQztnQkFDOUIsUUFBUSxFQUFFLE9BQU8sQ0FBQyxXQUFXLENBQUMsUUFBUTthQUN2QyxDQUFDLENBQUM7UUFDTCxDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxJQUFBLDhCQUFlLEVBQUM7WUFDZCxJQUFJLEVBQUUsR0FBRyxJQUFJLFFBQVE7WUFDckIsS0FBSyxFQUFFLFFBQVE7WUFDZixTQUFTO1lBQ1QsV0FBVyxFQUFFLElBQUk7U0FDbEIsQ0FBQyxDQUFDO1FBQ0gsSUFBQSw4QkFBZSxFQUFDO1lBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSxPQUFPO1lBQ3BCLEtBQUssRUFBRSxRQUFRO1lBQ2YsU0FBUztZQUNULFdBQVcsRUFBRSxJQUFJO1NBQ2xCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsU0FBUyxDQUFDLEdBQUcsQ0FDWCxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ0osSUFBSSxVQUFVLENBQUMsUUFBUSxDQUNyQixHQUFHLElBQUksSUFBSSxDQUFDLEVBQUUsRUFDZDtZQUNFLFVBQVUsRUFBRSxLQUFLLENBQUMsSUFBSTtZQUN0QixZQUFZLEVBQUUsQ0FBQztZQUNmLEdBQUcsS0FBSztTQUNULEVBQ0QsRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FDcEMsQ0FDSixDQUFDO0lBQ0osQ0FBQztJQUVELE9BQU8sS0FBSyxDQUFDO0FBQ2YsQ0FBQyxDQUFDIn0=

package/{ReadMe.md → README.md}

@@ -38,6 +38,11 @@ $ pulumi config set azure-native:clientSecret <clientSecret> --secret
 $ pulumi config set azure-native:tenantId <tenantID>
 $ pulumi config set azure-native:subscriptionId <subscriptionId>
 
-# optional default location, otherwise set in code
+## optional default location, otherwise set in code
 
 $ pulumi config set azure-native:location SoutheastAsia
+
+# Azure Resources
+
+-List All Azure Firewall FQDN Tags
+https://learn.microsoft.com/en-us/rest/api/firewall/azure-firewall-fqdn-tags/list-all?view=rest-firewall-2023-09-01&tabs=HTTP#code-try-0

package/Sql/index.d.ts

@@ -1,14 +1,14 @@
-import { Input, Output } from '@pulumi/pulumi';
-import { EnvRoleNamesType } from '../AzAd/EnvRoles';
-import { BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, PrivateLinkProps } from '../types';
-import { SqlDbProps } from './SqlDb';
+import { Input, Output } from "@pulumi/pulumi";
+import { EnvRolesResults } from "../AzAd/EnvRoles";
+import { BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, PrivateLinkProps } from "../types";
+import { SqlDbProps } from "./SqlDb";
 type ElasticPoolCapacityProps = 50 | 100 | 200 | 300 | 400 | 800 | 1200;
 interface Props extends BasicResourceArgs {
     vaultInfo: KeyVaultInfo;
     enableEncryption?: boolean;
     /** if Auth is not provided it will be auto generated */
     auth: {
-        envRoleNames?: EnvRoleNamesType;
+        envRoles: EnvRolesResults;
         /** create an Admin group on AzAD for SQL accessing.*/
         enableAdAdministrator?: boolean;
         azureAdOnlyAuthentication?: boolean;
@@ -16,16 +16,16 @@ interface Props extends BasicResourceArgs {
         password: Input<string>;
     };
     elasticPool?: {
-        name: 'Standard' | 'Basic';
+        name: "Standard" | "Basic";
         capacity: ElasticPoolCapacityProps;
     };
-    databases: Array<Omit<SqlDbProps, 'sqlServerName' | 'group' | 'elasticPoolId' | 'dependsOn'>>;
+    databases: Array<Omit<SqlDbProps, "sqlServerName" | "group" | "elasticPoolId" | "dependsOn">>;
     network?: {
         acceptAllInternetConnect?: boolean;
         subnetId?: Input<string>;
         ipAddresses?: Input<string>[];
         /** To enable Private Link need to ensure the subnetId is provided. */
-        privateLink?: Omit<PrivateLinkProps, 'subnetId'>;
+        privateLink?: Omit<PrivateLinkProps, "subnetId">;
     };
     vulnerabilityAssessment?: {
         alertEmails: Array<string>;
@@ -41,6 +41,12 @@ declare const _default: ({ name, auth, group, enableEncryption, elasticPool, dat
     resource: import("@pulumi/azure-native/sql/server").Server;
     elasticPool: BasicResourceResultProps<import("@pulumi/azure-native/sql/elasticPool").ElasticPool> | undefined;
     databases: BasicResourceResultProps<import("@pulumi/azure-native/sql/database").Database>[];
-    adminGroup: Output<import("@pulumi/pulumi").UnwrappedObject<import("@pulumi/azuread").GetGroupResult>> | Output<import("@pulumi/azuread/group").Group> | undefined;
+    adminGroup: {
+        objectId: string;
+        displayName: string;
+    } | Output<{
+        objectId: string;
+        displayName: string;
+    }>;
 };
 export default _default;