@drunk-pulumi/azure 1.0.6 → 1.0.8

package/Storage/Helper.js

@@ -1,89 +1,70 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccountSAS = exports.getStorageSecretsById = exports.getStorageSecrets = void 0;
-const storage = __importStar(require("@pulumi/azure-native/storage"));
+exports.getStorageInfo = void 0;
 const Common_1 = require("../Common");
 const Helper_1 = require("../KeyVault/Helper");
-const AzureEnv_1 = require("../Common/AzureEnv");
-const getStorageSecrets = async ({ name, nameFormatted, vaultInfo, }) => {
-    name = nameFormatted ? name : (0, Common_1.getStorageName)(name);
-    const primaryKeyName = (0, Common_1.getKeyName)(name, 'primary');
-    const secondaryKeyName = (0, Common_1.getKeyName)(name, 'secondary');
-    const primaryConnectionKeyName = (0, Common_1.getConnectionName)(name, 'primary');
-    const secondConnectionKeyName = (0, Common_1.getConnectionName)(name, 'secondary');
-    const [primaryConnection, secondaryConnection, primaryKey, secondaryKey] = await Promise.all([
-        primaryConnectionKeyName,
-        secondConnectionKeyName,
-        primaryKeyName,
-        secondaryKeyName,
-    ].map((k) => {
-        const n = (0, Common_1.getSecretName)(k);
-        return (0, Helper_1.getSecret)({ name: n, vaultInfo, nameFormatted: true });
-    }));
+const pulumi_1 = require("@pulumi/pulumi");
+const getStorageSecrets = ({ storageName, vaultInfo, }) => {
+    const primaryKey = Common_1.naming.getKeyName(storageName, 'primary');
+    const secondaryKey = Common_1.naming.getKeyName(storageName, 'secondary');
+    const primaryConnection = Common_1.naming.getConnectionName(storageName, 'primary');
+    const secondaryConnection = Common_1.naming.getConnectionName(storageName, 'secondary');
+    return (0, Helper_1.getSecrets)({
+        nameFormatted: true,
+        vaultInfo,
+        names: { primaryKey, secondaryKey, primaryConnection, secondaryConnection },
+    });
+};
+const getStorageInfo = ({ name, group, vaultInfo, }) => {
+    name = Common_1.naming.getStorageName(Common_1.naming.cleanName(name));
+    const secrets = vaultInfo
+        ? getStorageSecrets({ storageName: name, vaultInfo })
+        : {};
     return {
-        primaryConnection: primaryConnection?.value,
-        secondaryConnection: secondaryConnection?.value,
-        primaryKey: primaryKey?.value,
-        secondaryKey: secondaryKey?.value,
+        name,
+        group,
         endpoints: {
             blob: `https://${name}.blob.core.windows.net`,
             file: `https://${name}.file.core.windows.net`,
             table: `https://${name}.table.core.windows.net`,
-            staticSite: `https://${name}.z23.web.core.windows.net`,
-            DataLake: `https://${name}.dfs.core.windows.net`,
         },
+        ...secrets,
+        id: (0, pulumi_1.interpolate) `${Common_1.defaultSubScope}/resourceGroups/${group.resourceGroupName}/providers/Microsoft.Storage/storageAccounts/${name}`,
     };
 };
-exports.getStorageSecrets = getStorageSecrets;
-const getStorageSecretsById = async ({ storageId, vaultInfo, }) => {
-    const info = (0, AzureEnv_1.parseResourceInfoFromId)(storageId);
-    const secrets = info
-        ? await (0, exports.getStorageSecrets)({
-            name: info.name,
-            nameFormatted: true,
-            vaultInfo,
-        })
-        : undefined;
-    return secrets ? { info, secrets } : undefined;
-};
-exports.getStorageSecretsById = getStorageSecretsById;
-const getAccountSAS = ({ group, name }) => {
-    const now = new Date();
-    const expireDate = new Date();
-    expireDate.setMonth(expireDate.getMonth() + 3);
-    return storage.listStorageAccountSAS({
-        accountName: name,
-        ...group,
-        resourceTypes: storage.SignedResourceTypes.C,
-        services: storage.Services.B,
-        permissions: storage.Permissions.W,
-        protocols: storage.HttpProtocol.Https,
-        sharedAccessStartTime: now.toISOString(),
-        sharedAccessExpiryTime: expireDate.toISOString(),
-    });
-};
-exports.getAccountSAS = getAccountSAS;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JhZ2UvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBRXhELHNDQUttQjtBQUNuQiwrQ0FBK0M7QUFFL0MsaURBQTZEO0FBaUJ0RCxNQUFNLGlCQUFpQixHQUFHLEtBQUssRUFBRSxFQUN0QyxJQUFJLEVBQ0osYUFBYSxFQUNiLFNBQVMsR0FLVixFQUFrQyxFQUFFO0lBQ25DLElBQUksR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSx1QkFBYyxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ25ELE1BQU0sY0FBYyxHQUFHLElBQUEsbUJBQVUsRUFBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDbkQsTUFBTSxnQkFBZ0IsR0FBRyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQ3ZELE1BQU0sd0JBQXdCLEdBQUcsSUFBQSwwQkFBaUIsRUFBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDcEUsTUFBTSx1QkFBdUIsR0FBRyxJQUFBLDBCQUFpQixFQUFDLElBQUksRUFBRSxXQUFXLENBQUMsQ0FBQztJQUVyRSxNQUFNLENBQUMsaUJBQWlCLEVBQUUsbUJBQW1CLEVBQUUsVUFBVSxFQUFFLFlBQVksQ0FBQyxHQUN0RSxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQ2Y7UUFDRSx3QkFBd0I7UUFDeEIsdUJBQXVCO1FBQ3ZCLGNBQWM7UUFDZCxnQkFBZ0I7S0FDakIsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNWLE1BQU0sQ0FBQyxHQUFHLElBQUEsc0JBQWEsRUFBQyxDQUFDLENBQUMsQ0FBQztRQUMzQixPQUFPLElBQUEsa0JBQVMsRUFBQyxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ2hFLENBQUMsQ0FBQyxDQUNILENBQUM7SUFFSixPQUFPO1FBQ0wsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQUUsS0FBTTtRQUM1QyxtQkFBbUIsRUFBRSxtQkFBbUIsRUFBRSxLQUFNO1FBQ2hELFVBQVUsRUFBRSxVQUFVLEVBQUUsS0FBTTtRQUM5QixZQUFZLEVBQUUsWUFBWSxFQUFFLEtBQU07UUFFbEMsU0FBUyxFQUFFO1lBQ1QsSUFBSSxFQUFFLFdBQVcsSUFBSSx3QkFBd0I7WUFDN0MsSUFBSSxFQUFFLFdBQVcsSUFBSSx3QkFBd0I7WUFDN0MsS0FBSyxFQUFFLFdBQVcsSUFBSSx5QkFBeUI7WUFDL0MsVUFBVSxFQUFFLFdBQVcsSUFBSSwyQkFBMkI7WUFDdEQsUUFBUSxFQUFFLFdBQVcsSUFBSSx1QkFBdUI7U0FDakQ7S0FDRixDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBMUNXLFFBQUEsaUJBQWlCLHFCQTBDNUI7QUFFSyxNQUFNLHFCQUFxQixHQUFHLEtBQUssRUFBRSxFQUMxQyxTQUFTLEVBQ1QsU0FBUyxHQUlWLEVBQUUsRUFBRTtJQUNILE1BQU0sSUFBSSxHQUFHLElBQUEsa0NBQXVCLEVBQUMsU0FBUyxDQUFDLENBQUM7SUFDaEQsTUFBTSxPQUFPLEdBQUcsSUFBSTtRQUNsQixDQUFDLENBQUMsTUFBTSxJQUFBLHlCQUFpQixFQUFDO1lBQ3RCLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSTtZQUNmLGFBQWEsRUFBRSxJQUFJO1lBQ25CLFNBQVM7U0FDVixDQUFDO1FBQ0osQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVkLE9BQU8sT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO0FBQ2pELENBQUMsQ0FBQztBQWpCVyxRQUFBLHFCQUFxQix5QkFpQmhDO0FBRUssTUFBTSxhQUFhLEdBQUcsQ0FBQyxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQXFCLEVBQUUsRUFBRTtJQUNsRSxNQUFNLEdBQUcsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO0lBQ3ZCLE1BQU0sVUFBVSxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7SUFDOUIsVUFBVSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFFL0MsT0FBTyxPQUFPLENBQUMscUJBQXFCLENBQUM7UUFDbkMsV0FBVyxFQUFFLElBQUk7UUFDakIsR0FBRyxLQUFLO1FBQ1IsYUFBYSxFQUFFLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO1FBQzVDLFFBQVEsRUFBRSxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDNUIsV0FBVyxFQUFFLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNsQyxTQUFTLEVBQUUsT0FBTyxDQUFDLFlBQVksQ0FBQyxLQUFLO1FBQ3JDLHFCQUFxQixFQUFFLEdBQUcsQ0FBQyxXQUFXLEVBQUU7UUFDeEMsc0JBQXNCLEVBQUUsVUFBVSxDQUFDLFdBQVcsRUFBRTtLQUNqRCxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFmVyxRQUFBLGFBQWEsaUJBZXhCIn0=
+exports.getStorageInfo = getStorageInfo;
+// export const getStorageSecretsById = async ({
+//   storageId,
+//   vaultInfo,
+// }: {
+//   storageId: string;
+//   vaultInfo: KeyVaultInfo;
+// }) => {
+//   const info = rsInfo.getResourceInfoFromId(storageId);
+//   const secrets = info
+//     ? await getStorageSecrets({
+//         name: info.name,
+//         nameFormatted: true,
+//         vaultInfo,
+//       })
+//     : undefined;
+//
+//   return secrets ? { info, secrets } : undefined;
+// };
+// export const getAccountSAS = ({ group, name }: BasicResourceArgs) => {
+//   const now = new Date();
+//   const expireDate = new Date();
+//   expireDate.setMonth(expireDate.getMonth() + 3);
+//
+//   return storage.listStorageAccountSAS({
+//     accountName: name,
+//     ...group,
+//     resourceTypes: storage.SignedResourceTypes.C,
+//     services: storage.Services.B,
+//     permissions: storage.Permissions.W,
+//     protocols: storage.HttpProtocol.Https,
+//     sharedAccessStartTime: now.toISOString(),
+//     sharedAccessExpiryTime: expireDate.toISOString(),
+//   });
+// };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JhZ2UvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUFvRDtBQUNwRCwrQ0FBZ0Q7QUFPaEQsMkNBQTZDO0FBRTdDLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxFQUN6QixXQUFXLEVBQ1gsU0FBUyxHQUlWLEVBQXlCLEVBQUU7SUFDMUIsTUFBTSxVQUFVLEdBQUcsZUFBTSxDQUFDLFVBQVUsQ0FBQyxXQUFXLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDN0QsTUFBTSxZQUFZLEdBQUcsZUFBTSxDQUFDLFVBQVUsQ0FBQyxXQUFXLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDakUsTUFBTSxpQkFBaUIsR0FBRyxlQUFNLENBQUMsaUJBQWlCLENBQUMsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQzNFLE1BQU0sbUJBQW1CLEdBQUcsZUFBTSxDQUFDLGlCQUFpQixDQUNsRCxXQUFXLEVBQ1gsV0FBVyxDQUNaLENBQUM7SUFFRixPQUFPLElBQUEsbUJBQVUsRUFBQztRQUNoQixhQUFhLEVBQUUsSUFBSTtRQUNuQixTQUFTO1FBQ1QsS0FBSyxFQUFFLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxtQkFBbUIsRUFBRTtLQUM1RSxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFSyxNQUFNLGNBQWMsR0FBRyxDQUFDLEVBQzdCLElBQUksRUFDSixLQUFLLEVBQ0wsU0FBUyxHQUNhLEVBQWUsRUFBRTtJQUN2QyxJQUFJLEdBQUcsZUFBTSxDQUFDLGNBQWMsQ0FBQyxlQUFNLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDckQsTUFBTSxPQUFPLEdBQUcsU0FBUztRQUN2QixDQUFDLENBQUMsaUJBQWlCLENBQUMsRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxDQUFDO1FBQ3JELENBQUMsQ0FBQyxFQUFFLENBQUM7SUFFUCxPQUFPO1FBQ0wsSUFBSTtRQUNKLEtBQUs7UUFDTCxTQUFTLEVBQUU7WUFDVCxJQUFJLEVBQUUsV0FBVyxJQUFJLHdCQUF3QjtZQUM3QyxJQUFJLEVBQUUsV0FBVyxJQUFJLHdCQUF3QjtZQUM3QyxLQUFLLEVBQUUsV0FBVyxJQUFJLHlCQUF5QjtTQUNoRDtRQUNELEdBQUcsT0FBTztRQUNWLEVBQUUsRUFBRSxJQUFBLG9CQUFXLEVBQUEsR0FBRyx3QkFBZSxtQkFBbUIsS0FBSyxDQUFDLGlCQUFpQixnREFBZ0QsSUFBSSxFQUFFO0tBQ2xJLENBQUM7QUFDSixDQUFDLENBQUM7QUFyQlcsUUFBQSxjQUFjLGtCQXFCekI7QUFFRixnREFBZ0Q7QUFDaEQsZUFBZTtBQUNmLGVBQWU7QUFDZixPQUFPO0FBQ1AsdUJBQXVCO0FBQ3ZCLDZCQUE2QjtBQUM3QixVQUFVO0FBQ1YsMERBQTBEO0FBQzFELHlCQUF5QjtBQUN6QixrQ0FBa0M7QUFDbEMsMkJBQTJCO0FBQzNCLCtCQUErQjtBQUMvQixxQkFBcUI7QUFDckIsV0FBVztBQUNYLG1CQUFtQjtBQUNuQixFQUFFO0FBQ0Ysb0RBQW9EO0FBQ3BELEtBQUs7QUFFTCx5RUFBeUU7QUFDekUsNEJBQTRCO0FBQzVCLG1DQUFtQztBQUNuQyxvREFBb0Q7QUFDcEQsRUFBRTtBQUNGLDJDQUEyQztBQUMzQyx5QkFBeUI7QUFDekIsZ0JBQWdCO0FBQ2hCLG9EQUFvRDtBQUNwRCxvQ0FBb0M7QUFDcEMsMENBQTBDO0FBQzFDLDZDQUE2QztBQUM3QyxnREFBZ0Q7QUFDaEQsd0RBQXdEO0FBQ3hELFFBQVE7QUFDUixLQUFLIn0=

package/Storage/index.d.ts

@@ -47,5 +47,5 @@ export type StorageResults = ResourceInfo & {
     getConnectionString?: (name?: string) => Promise<KeyVaultSecret | undefined>;
 };
 /** Storage Creator */
-declare const _default: ({ name, group, vaultInfo, enableEncryption, envRoles, containers, queues, fileShares, network, features, policies, lock, }: StorageProps) => StorageResults;
-export default _default;
+declare function Storage({ name, group, vaultInfo, enableEncryption, envRoles, containers, queues, fileShares, network, features, policies, lock, dependsOn, ignoreChanges, }: StorageProps): StorageResults;
+export default Storage;

package/Storage/index.js

@@ -31,11 +31,11 @@ const Helper_1 = require("../KeyVault/Helper");
 const Common_1 = require("../Common");
 const Common_2 = require("../Common");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
-const Locker_1 = __importDefault(require("../Core/Locker"));
+const Locker_1 = require("../Core/Locker");
 const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
 const ManagementRules_1 = require("./ManagementRules");
 /** Storage Creator */
-exports.default = ({ name, group, vaultInfo, enableEncryption, envRoles, containers = [], queues = [], fileShares = [], network, features = {}, policies = { keyExpirationPeriodInDays: 365 }, lock = true, }) => {
+function Storage({ name, group, vaultInfo, enableEncryption, envRoles, containers = [], queues = [], fileShares = [], network, features = {}, policies = { keyExpirationPeriodInDays: 365 }, lock = true, dependsOn, ignoreChanges, }) {
     name = (0, Common_2.getStorageName)(name);
     const primaryKeyName = (0, Common_2.getKeyName)(name, 'primary');
     const secondaryKeyName = (0, Common_2.getKeyName)(name, 'secondary');
@@ -110,7 +110,7 @@ exports.default = ({ name, group, vaultInfo, enableEncryption, envRoles, contain
                 }))
                 : undefined,
         },
-    });
+    }, { dependsOn, ignoreChanges });
     if (network?.privateEndpoint) {
         //Create Private Endpoints
         (0, PrivateEndpoint_1.default)({
@@ -131,7 +131,7 @@ exports.default = ({ name, group, vaultInfo, enableEncryption, envRoles, contain
     }
     //Lock the resources
     if (lock) {
-        (0, Locker_1.default)({ name, resource: stg });
+        (0, Locker_1.Locker)({ name, resource: stg });
     }
     //Enable Static Website for SPA
     if (features.enableStaticWebsite) {
@@ -230,5 +230,6 @@ exports.default = ({ name, group, vaultInfo, enableEncryption, envRoles, contain
             ? (name = primaryConnectionKeyName) => (0, Helper_1.getSecret)({ name, nameFormatted: true, vaultInfo })
             : undefined,
     };
-};
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Storage/index.ts"],"names":[],"mappings":"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"}
+}
+exports.default = Storage;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Storage/index.ts"],"names":[],"mappings":"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"}

package/VM/DiskEncryptionSet.d.ts

@@ -1,8 +1,6 @@
-import { Input } from '@pulumi/pulumi';
-import { BasicResourceWithVaultArgs, KeyVaultInfo } from '../types';
-interface DiskEncryptionProps extends BasicResourceWithVaultArgs {
-    vaultInfo: KeyVaultInfo;
-    userAssignedId: Input<string>;
+import * as compute from '@pulumi/azure-native/compute';
+import { BasicResourceWithVaultArgs, ResourceInfoWithInstance, WithEnvRoles } from '../types';
+interface DiskEncryptionProps extends BasicResourceWithVaultArgs, WithEnvRoles {
 }
-declare const _default: ({ name, group, vaultInfo, userAssignedId, dependsOn, ignoreChanges, importUri, }: DiskEncryptionProps) => import("@pulumi/azure-native/compute/diskEncryptionSet").DiskEncryptionSet;
+declare const _default: ({ name, group, vaultInfo, envUIDInfo, envRoles, dependsOn, ignoreChanges, importUri, }: DiskEncryptionProps) => ResourceInfoWithInstance<compute.DiskEncryptionSet>;
 export default _default;

package/VM/DiskEncryptionSet.js

@@ -26,18 +26,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const compute = __importStar(require("@pulumi/azure-native/compute"));
 const Common_1 = require("../Common");
 const Helper_1 = require("../KeyVault/Helper");
-exports.default = ({ name, group, vaultInfo, userAssignedId, dependsOn, ignoreChanges, importUri, }) => {
+exports.default = ({ name, group, vaultInfo, envUIDInfo, envRoles, dependsOn, ignoreChanges = [], importUri, }) => {
+    if (!envUIDInfo || !vaultInfo)
+        throw new Error('The "vaultInfo" and "envUIDInfo" are required for  DiskEncryptionSet.');
     name = (0, Common_1.getDiskEncryptionName)(name);
     const keyEncryption = (0, Helper_1.addEncryptKey)({ name, vaultInfo });
-    return new compute.DiskEncryptionSet(name, {
+    const diskEncrypt = new compute.DiskEncryptionSet(name, {
         ...group,
+        diskEncryptionSetName: name,
         rotationToLatestKeyVersionEnabled: true,
         encryptionType: 'EncryptionAtRestWithCustomerKey',
         identity: {
-            type: compute.ResourceIdentityType.UserAssigned,
-            userAssignedIdentities: [userAssignedId],
+            type: compute.ResourceIdentityType.SystemAssigned_UserAssigned,
+            userAssignedIdentities: [envUIDInfo.id],
         },
         activeKey: { keyUrl: keyEncryption.url },
-    }, { dependsOn, ignoreChanges, import: importUri });
+    }, {
+        dependsOn,
+        ignoreChanges: [...ignoreChanges, 'diskEncryptionSetName'],
+        import: importUri,
+    });
+    diskEncrypt.identity.apply((i) => {
+        if (i)
+            envRoles?.addMember('readOnly', i.principalId);
+    });
+    return { name, group, id: diskEncrypt.id, instance: diskEncrypt };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlza0VuY3J5cHRpb25TZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk0vRGlza0VuY3J5cHRpb25TZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNFQUF3RDtBQUV4RCxzQ0FBa0Q7QUFDbEQsK0NBQW1EO0FBU25ELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFNBQVMsRUFDVCxjQUFjLEVBQ2QsU0FBUyxFQUNULGFBQWEsRUFDYixTQUFTLEdBQ1csRUFBRSxFQUFFO0lBQ3hCLElBQUksR0FBRyxJQUFBLDhCQUFxQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ25DLE1BQU0sYUFBYSxHQUFHLElBQUEsc0JBQWEsRUFBQyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO0lBRXpELE9BQU8sSUFBSSxPQUFPLENBQUMsaUJBQWlCLENBQ2xDLElBQUksRUFDSjtRQUNFLEdBQUcsS0FBSztRQUNSLGlDQUFpQyxFQUFFLElBQUk7UUFDdkMsY0FBYyxFQUFFLGlDQUFpQztRQUNqRCxRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsT0FBTyxDQUFDLG9CQUFvQixDQUFDLFlBQVk7WUFDL0Msc0JBQXNCLEVBQUUsQ0FBQyxjQUFjLENBQUM7U0FDekM7UUFDRCxTQUFTLEVBQUUsRUFBRSxNQUFNLEVBQUUsYUFBYSxDQUFDLEdBQUcsRUFBRTtLQUN6QyxFQUNELEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLENBQ2hELENBQUM7QUFDSixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlza0VuY3J5cHRpb25TZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk0vRGlza0VuY3J5cHRpb25TZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNFQUF3RDtBQUN4RCxzQ0FBa0Q7QUFDbEQsK0NBQW1EO0FBV25ELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFNBQVMsRUFDVCxVQUFVLEVBQ1YsUUFBUSxFQUNSLFNBQVMsRUFDVCxhQUFhLEdBQUcsRUFBRSxFQUNsQixTQUFTLEdBQ1csRUFBdUQsRUFBRTtJQUM3RSxJQUFJLENBQUMsVUFBVSxJQUFJLENBQUMsU0FBUztRQUMzQixNQUFNLElBQUksS0FBSyxDQUNiLHVFQUF1RSxDQUN4RSxDQUFDO0lBRUosSUFBSSxHQUFHLElBQUEsOEJBQXFCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDbkMsTUFBTSxhQUFhLEdBQUcsSUFBQSxzQkFBYSxFQUFDLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDekQsTUFBTSxXQUFXLEdBQUcsSUFBSSxPQUFPLENBQUMsaUJBQWlCLENBQy9DLElBQUksRUFDSjtRQUNFLEdBQUcsS0FBSztRQUNSLHFCQUFxQixFQUFFLElBQUk7UUFDM0IsaUNBQWlDLEVBQUUsSUFBSTtRQUN2QyxjQUFjLEVBQUUsaUNBQWlDO1FBQ2pELFFBQVEsRUFBRTtZQUNSLElBQUksRUFBRSxPQUFPLENBQUMsb0JBQW9CLENBQUMsMkJBQTJCO1lBQzlELHNCQUFzQixFQUFFLENBQUMsVUFBVyxDQUFDLEVBQUUsQ0FBQztTQUN6QztRQUNELFNBQVMsRUFBRSxFQUFFLE1BQU0sRUFBRSxhQUFhLENBQUMsR0FBRyxFQUFFO0tBQ3pDLEVBQ0Q7UUFDRSxTQUFTO1FBQ1QsYUFBYSxFQUFFLENBQUMsR0FBRyxhQUFhLEVBQUUsdUJBQXVCLENBQUM7UUFDMUQsTUFBTSxFQUFFLFNBQVM7S0FDbEIsQ0FDRixDQUFDO0lBRUYsV0FBVyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUMvQixJQUFJLENBQUM7WUFBRSxRQUFRLEVBQUUsU0FBUyxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDeEQsQ0FBQyxDQUFDLENBQUM7SUFFSCxPQUFPLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsV0FBVyxDQUFDLEVBQUUsRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLENBQUM7QUFDcEUsQ0FBQyxDQUFDIn0=

package/VM/index.d.ts

@@ -1,6 +1,6 @@
 import { Input } from '@pulumi/pulumi';
 import * as compute from '@pulumi/azure-native/compute';
-import { BasicEncryptResourceArgs, LoginArgs } from '../types';
+import { BasicEncryptResourceArgs, LoginArgs, WithDiskEncryption } from '../types';
 import { VmExtensionProps } from './Extension';
 export type VmScheduleType = {
     /** The time zone ID: https://stackoverflow.com/questions/7908343/list-of-timezone-ids-for-use-with-findtimezonebyid-in-c */
@@ -8,7 +8,7 @@ export type VmScheduleType = {
     /** The format is ISO 8601 Standard ex: 2200 */
     autoShutdownTime?: Input<string>;
 };
-interface Props extends BasicEncryptResourceArgs {
+interface Props extends BasicEncryptResourceArgs, WithDiskEncryption {
     subnetId: Input<string>;
     storageAccountType?: compute.StorageAccountTypes;
     vmSize?: Input<string>;
@@ -28,5 +28,5 @@ interface Props extends BasicEncryptResourceArgs {
         [key: string]: Input<string>;
     };
 }
-declare const _default: ({ name, group, subnetId, osType, vmSize, extensions, storageAccountType, osDiskSizeGB, dataDiskSizeGB, enableEncryption, vaultInfo, envRoles, schedule, login, image, lock, tags, dependsOn, ...others }: Props) => import("@pulumi/azure-native/compute/virtualMachine").VirtualMachine;
+declare const _default: ({ name, group, subnetId, osType, vmSize, extensions, storageAccountType, osDiskSizeGB, dataDiskSizeGB, enableEncryption, diskEncryptionSetId, vaultInfo, envUIDInfo, schedule, login, image, lock, tags, dependsOn, ...others }: Props) => import("@pulumi/azure-native/compute/virtualMachine").VirtualMachine;
 export default _default;

package/VM/index.js

@@ -29,13 +29,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const compute = __importStar(require("@pulumi/azure-native/compute"));
 const network = __importStar(require("@pulumi/azure-native/network"));
 const Common_1 = require("../Common");
-const Locker_1 = __importDefault(require("../Core/Locker"));
+const Locker_1 = require("../Core/Locker");
 const Random_1 = require("../Core/Random");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
 const Helper_1 = require("../KeyVault/Helper");
 const GlobalSchedule_1 = __importDefault(require("./GlobalSchedule"));
 const Extension_1 = __importDefault(require("./Extension"));
-exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standard_B2s', extensions, storageAccountType = compute.StorageAccountTypes.Premium_LRS, osDiskSizeGB = 128, dataDiskSizeGB, enableEncryption, vaultInfo, envRoles, schedule = { timeZone: 'Singapore Standard Time' }, login, image, lock = true, tags = {}, dependsOn, ...others }) => {
+exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standard_B2s', extensions, storageAccountType = compute.StorageAccountTypes.Premium_LRS, osDiskSizeGB = 128, dataDiskSizeGB, enableEncryption, diskEncryptionSetId, 
+//encryptionAtHost,
+vaultInfo, envUIDInfo, schedule = { timeZone: 'Singapore Standard Time' }, login, image, lock = true, tags = {}, dependsOn, ...others }) => {
     const vmName = (0, Common_1.getVMName)(name);
     const nicName = (0, Common_1.getNICName)(name);
     const nic = new network.NetworkInterface(nicName, {
@@ -46,11 +48,11 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
         ],
         nicType: network.NetworkInterfaceNicType.Standard,
     });
-    //All VM will using the same Key
-    const keyEncryption = enableEncryption
+    //All VM will use the same Key
+    const keyEncryption = enableEncryption && vaultInfo && !diskEncryptionSetId
         ? (0, Helper_1.addEncryptKey)({ name: vmName, vaultInfo: vaultInfo })
         : undefined;
-    const diskEncryption = enableEncryption
+    const diskEncryption = enableEncryption && vaultInfo && !diskEncryptionSetId
         ? (0, CustomHelper_1.addCustomSecret)({
             name: `${vmName}-disk-secret`,
             vaultInfo: vaultInfo,
@@ -64,11 +66,18 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
         ...group,
         ...others,
         hardwareProfile: { vmSize },
-        identity: { type: 'SystemAssigned' },
+        identity: {
+            type: envUIDInfo
+                ? compute.ResourceIdentityType.SystemAssigned_UserAssigned
+                : compute.ResourceIdentityType.SystemAssigned,
+            userAssignedIdentities: envUIDInfo ? [envUIDInfo.id] : undefined,
+        },
         licenseType: 'None',
         networkProfile: {
             networkInterfaces: [{ id: nic.id, primary: true }],
         },
+        //az feature register --name EncryptionAtHost  --namespace Microsoft.Compute
+        securityProfile: { encryptionAtHost: true },
         osProfile: {
             computerName: name,
             adminUsername: login.adminLogin,
@@ -116,7 +125,7 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
                 caching: 'ReadWrite',
                 createOption: 'FromImage',
                 osType,
-                encryptionSettings: enableEncryption && vaultInfo
+                encryptionSettings: diskEncryption && keyEncryption
                     ? {
                         diskEncryptionKey: diskEncryption
                             ? {
@@ -138,7 +147,11 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
                     }
                     : undefined,
                 managedDisk: {
-                    //Changes storage account type need to be done manually through portal.
+                    diskEncryptionSet: diskEncryptionSetId
+                        ? {
+                            id: diskEncryptionSetId,
+                        }
+                        : undefined,
                     storageAccountType,
                 },
             },
@@ -149,6 +162,14 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
                         diskSizeGB: dataDiskSizeGB,
                         createOption: compute.DiskCreateOptionTypes.Empty,
                         lun: 1,
+                        managedDisk: {
+                            diskEncryptionSet: diskEncryptionSetId
+                                ? {
+                                    id: diskEncryptionSetId,
+                                }
+                                : undefined,
+                            storageAccountType,
+                        },
                     },
                 ]
                 : [],
@@ -178,12 +199,15 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
         }));
     }
     if (lock) {
-        (0, Locker_1.default)({ name: vmName, resource: vm });
+        (0, Locker_1.Locker)({ name: vmName, resource: vm });
     }
     //Add Identity to readonly to be able to read key from vault
-    if (envRoles) {
-        envRoles.addMember('readOnly', vm.identity.apply((i) => i.principalId));
-    }
+    // if (envRoles) {
+    //   envRoles.addMember(
+    //     'readOnly',
+    //     vm.identity.apply((i) => i!.principalId),
+    //   );
+    // }
     //Auto shutdown
     if (schedule?.autoShutdownTime) {
         (0, GlobalSchedule_1.default)({
@@ -210,4 +234,4 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
     // }
     return vm;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk0vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLHNFQUF3RDtBQUN4RCxzRUFBd0Q7QUFDeEQsc0NBQWtEO0FBQ2xELDREQUFvQztBQUNwQywyQ0FBZ0Q7QUFDaEQsMkRBQTJEO0FBQzNELCtDQUFtRDtBQUVuRCxzRUFBOEM7QUFDOUMsNERBQTBEO0FBc0MxRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxRQUFRLEVBQ1IsTUFBTSxHQUFHLFNBQVMsRUFDbEIsTUFBTSxHQUFHLGNBQWMsRUFDdkIsVUFBVSxFQUNWLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxXQUFXLEVBQzVELFlBQVksR0FBRyxHQUFHLEVBQ2xCLGNBQWMsRUFDZCxnQkFBZ0IsRUFDaEIsU0FBUyxFQUNULFFBQVEsRUFDUixRQUFRLEdBQUcsRUFBRSxRQUFRLEVBQUUseUJBQXlCLEVBQUUsRUFDbEQsS0FBSyxFQUNMLEtBQUssRUFDTCxJQUFJLEdBQUcsSUFBSSxFQUNYLElBQUksR0FBRyxFQUFFLEVBQ1QsU0FBUyxFQUNULEdBQUcsTUFBTSxFQUNILEVBQUUsRUFBRTtJQUNWLE1BQU0sTUFBTSxHQUFHLElBQUEsa0JBQVMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUMvQixNQUFNLE9BQU8sR0FBRyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFakMsTUFBTSxHQUFHLEdBQUcsSUFBSSxPQUFPLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxFQUFFO1FBQ2hELG9CQUFvQixFQUFFLE9BQU87UUFDN0IsR0FBRyxLQUFLO1FBQ1IsZ0JBQWdCLEVBQUU7WUFDaEIsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk0vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLHNFQUF3RDtBQUN4RCxzRUFBd0Q7QUFDeEQsc0NBQWtEO0FBQ2xELDJDQUF3QztBQUN4QywyQ0FBZ0Q7QUFDaEQsMkRBQTJEO0FBQzNELCtDQUFtRDtBQU1uRCxzRUFBOEM7QUFDOUMsNERBQTBEO0FBc0MxRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxRQUFRLEVBQ1IsTUFBTSxHQUFHLFNBQVMsRUFDbEIsTUFBTSxHQUFHLGNBQWMsRUFDdkIsVUFBVSxFQUNWLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxXQUFXLEVBQzVELFlBQVksR0FBRyxHQUFHLEVBQ2xCLGNBQWMsRUFDZCxnQkFBZ0IsRUFDaEIsbUJBQW1CO0FBQ25CLG1CQUFtQjtBQUNuQixTQUFTLEVBQ1QsVUFBVSxFQUNWLFFBQVEsR0FBRyxFQUFFLFFBQVEsRUFBRSx5QkFBeUIsRUFBRSxFQUNsRCxLQUFLLEVBQ0wsS0FBSyxFQUNMLElBQUksR0FBRyxJQUFJLEVBQ1gsSUFBSSxHQUFHLEVBQUUsRUFDVCxTQUFTLEVBQ1QsR0FBRyxNQUFNLEVBQ0gsRUFBRSxFQUFFO0lBQ1YsTUFBTSxNQUFNLEdBQUcsSUFBQSxrQkFBUyxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQy9CLE1BQU0sT0FBTyxHQUFHLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUVqQyxNQUFNLEdBQUcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLEVBQUU7UUFDaEQsb0JBQW9CLEVBQUUsT0FBTztRQUM3QixHQUFHLEtBQUs7UUFDUixnQkFBZ0IsRUFBRTtZQUNoQixFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFF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

package/VNet/Firewall.d.ts

@@ -1,21 +1,22 @@
 import * as network from '@pulumi/azure-native/network';
 import * as pulumi from '@pulumi/pulumi';
 import { Input } from '@pulumi/pulumi';
-import { BasicMonitorArgs, BasicResourceArgs } from '../types';
+import { BasicResourceArgs, LogInfo } from '../types';
 import { FirewallPolicyProps } from './types';
 export interface FwOutboundConfig {
     subnetId: pulumi.Input<string>;
-    publicIpAddress?: network.PublicIPAddress;
+    /** The IDs of public Ip Address.*/
+    publicIpAddressId?: pulumi.Input<string>;
 }
 export type FirewallSkus = {
     name: network.AzureFirewallSkuName;
     tier: network.AzureFirewallSkuTier;
 };
 export interface FirewallProps extends BasicResourceArgs {
-    /** The public outbound IP address ignores this property if want to enable the Force Tunneling mode */
+    /** The public outbound IP address can be ignores this property if want to enable the Force Tunneling mode */
     outbound: Array<FwOutboundConfig>;
     /** This must be provided if sku is Basic or want to enable the Force Tunneling mode */
-    management?: FwOutboundConfig;
+    management?: Pick<FwOutboundConfig, 'subnetId'>;
     snat?: {
         privateRanges?: Input<string>;
         autoLearnPrivateRanges?: boolean;
@@ -24,11 +25,12 @@ export interface FirewallProps extends BasicResourceArgs {
     policy: FirewallPolicyProps;
     enableDnsProxy?: boolean;
     sku?: FirewallSkus;
-    monitorConfig?: Omit<BasicMonitorArgs, 'dependsOn'>;
+    /**This is required in order to search firewall logs*/
+    logInfo?: LogInfo;
 }
 export type FirewallResult = {
     firewall: network.AzureFirewall;
     policy: network.FirewallPolicy | undefined;
 };
-declare const _default: ({ name, group, snat, policy, outbound, management, monitorConfig, enableDnsProxy, sku, ...others }: FirewallProps) => FirewallResult;
+declare const _default: ({ name, group, snat, policy, outbound, management, logInfo, enableDnsProxy, sku, dependsOn, ignoreChanges, }: FirewallProps) => FirewallResult;
 export default _default;

package/VNet/Firewall.js

@@ -28,29 +28,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const network = __importStar(require("@pulumi/azure-native/network"));
 const Common_1 = require("../Common");
-const ResourceCreator_1 = __importDefault(require("../Core/ResourceCreator"));
 const FirewallPolicy_1 = __importStar(require("./FirewallPolicy"));
 const IpAddress_1 = __importDefault(require("./IpAddress"));
-exports.default = ({ name, group, snat, policy, outbound, management, monitorConfig, enableDnsProxy, sku = {
+const Helpers_1 = require("../Logs/Helpers");
+exports.default = ({ name, group, snat, policy, outbound, management, logInfo, enableDnsProxy, sku = {
     name: network.AzureFirewallSkuName.AZFW_VNet,
     tier: network.AzureFirewallSkuTier.Basic,
-}, ...others }) => {
-    // Validation
-    if (!Common_1.isDryRun) {
-        if (!outbound && !management)
-            throw new Error('Management Public Ip Address is required for the Force Tunneling mode.');
-        if (sku.tier === network.AzureFirewallSkuTier.Basic && !management)
-            throw new Error('Management Subnet is required for Firewall Basic tier.');
-    }
+}, dependsOn, ignoreChanges, }) => {
     const fwName = (0, Common_1.getFirewallName)(name);
     //Create Public IpAddress for Management
     const manageIpAddress = management
-        ? management.publicIpAddress ??
-            (0, IpAddress_1.default)({
-                name: `${name}-mag`,
-                group,
-                lock: false,
-            })
+        ? (0, IpAddress_1.default)({
+            name: `${name}-mag`,
+            group,
+            lock: false,
+        })
         : undefined;
     const additionalProperties = {};
     if (enableDnsProxy && sku.tier !== network.AzureFirewallSkuTier.Basic) {
@@ -78,13 +70,14 @@ exports.default = ({ name, group, snat, policy, outbound, management, monitorCon
                 : undefined,
         })
         : undefined;
-    const { resource } = (0, ResourceCreator_1.default)(network.AzureFirewall, {
+    const firewall = new network.AzureFirewall(fwName, {
         azureFirewallName: fwName,
         ...group,
         sku,
         firewallPolicy: fwPolicy ? { id: fwPolicy.id } : undefined,
         zones: Common_1.isPrd ? ['1', '2', '3'] : undefined,
-        threatIntelMode: sku.tier !== network.AzureFirewallSkuTier.Basic && sku.name !== 'AZFW_Hub'
+        threatIntelMode: sku.tier !== network.AzureFirewallSkuTier.Basic &&
+            sku.name !== 'AZFW_Hub'
             ? network.AzureFirewallThreatIntelMode.Deny
             : undefined,
         managementIpConfiguration: management && manageIpAddress
@@ -97,23 +90,27 @@ exports.default = ({ name, group, snat, policy, outbound, management, monitorCon
         ipConfigurations: outbound
             ? outbound.map((o, i) => ({
                 name: `outbound-${i}`,
-                publicIPAddress: o.publicIpAddress
-                    ? { id: o.publicIpAddress.id }
+                publicIPAddress: o.publicIpAddressId
+                    ? { id: o.publicIpAddressId }
                     : undefined,
                 subnet: { id: o.subnetId },
             }))
             : undefined,
         additionalProperties,
-        monitoring: {
-            ...monitorConfig,
+    }, { dependsOn, ignoreChanges });
+    if (logInfo) {
+        (0, Helpers_1.createDiagnostic)({
+            name,
+            targetResourceId: firewall.id,
+            logInfo,
             logsCategories: [
                 'AzureFirewallApplicationRule',
                 'AzureFirewallNetworkRule',
                 'AzureFirewallDnsProxy',
             ],
-        },
-        ...others,
-    });
+            dependsOn: firewall,
+        });
+    }
     //Link Rule to Policy
     if (fwPolicy && policy?.rules) {
         (0, FirewallPolicy_1.linkRulesToPolicy)({
@@ -121,9 +118,9 @@ exports.default = ({ name, group, snat, policy, outbound, management, monitorCon
             //priority: 201,
             firewallPolicyName: fwPolicy.name,
             rules: policy.rules,
-            dependsOn: [fwPolicy, resource],
+            dependsOn: [fwPolicy, firewall],
         });
     }
-    return { firewall: resource, policy: fwPolicy };
+    return { firewall, policy: fwPolicy };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmlyZXdhbGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9GaXJld2FsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBR3hELHNDQUE2RDtBQUM3RCw4RUFBc0Q7QUFFdEQsbUVBQXFFO0FBRXJFLDREQUFvQztBQW1DcEMsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsSUFBSSxFQUNKLE1BQU0sRUFDTixRQUFRLEVBQ1IsVUFBVSxFQUNWLGFBQWEsRUFDYixjQUFjLEVBQ2QsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxTQUFTO0lBQzVDLElBQUksRUFBRSxPQUFPLENBQUMsb0JBQW9CLENBQUMsS0FBSztDQUN6QyxFQUNELEdBQUcsTUFBTSxFQUNLLEVBQWtCLEVBQUU7SUFDbEMsYUFBYTtJQUNiLElBQUksQ0FBQyxpQkFBUSxFQUFFLENBQUM7UUFDZCxJQUFJLENBQUMsUUFBUSxJQUFJLENBQUMsVUFBVTtZQUMxQixNQUFNLElBQUksS0FBSyxDQUNiLHdFQUF3RSxDQUN6RSxDQUFDO1FBRUosSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLElBQUksQ0FBQyxVQUFVO1lBQ2hFLE1BQU0sSUFBSSxLQUFLLENBQUMsd0RBQXdELENBQUMsQ0FBQztJQUM5RSxDQUFDO0lBRUQsTUFBTSxNQUFNLEdBQUcsSUFBQSx3QkFBZSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXJDLHdDQUF3QztJQUN4QyxNQUFNLGVBQWUsR0FBRyxVQUFVO1FBQ2hDLENBQUMsQ0FBQyxVQUFVLENBQUMsZUFBZTtZQUMxQixJQUFBLG1CQUFTLEVBQUM7Z0JBQ1IsSUFBSSxFQUFFLEdBQUcsSUFBSSxNQUFNO2dCQUNuQixLQUFLO2dCQUNMLElBQUksRUFBRSxLQUFLO2FBQ1os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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmlyZXdhbGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9GaXJld2FsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBR3hELHNDQUFtRDtBQUVuRCxtRUFBcUU7QUFFckUsNERBQW9DO0FBQ3BDLDZDQUFtRDtBQWlDbkQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsSUFBSSxFQUNKLE1BQU0sRUFDTixRQUFRLEVBQ1IsVUFBVSxFQUNWLE9BQU8sRUFDUCxjQUFjLEVBQ2QsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxTQUFTO0lBQzVDLElBQUksRUFBRSxPQUFPLENBQUMsb0JBQW9CLENBQUMsS0FBSztDQUN6QyxFQUNELFNBQVMsRUFDVCxhQUFhLEdBQ0MsRUFBa0IsRUFBRTtJQUNsQyxNQUFNLE1BQU0sR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFckMsd0NBQXdDO0lBQ3hDLE1BQU0sZUFBZSxHQUFHLFVBQVU7UUFDaEMsQ0FBQyxDQUFDLElBQUEsbUJBQVMsRUFBQztZQUNSLElBQUksRUFBRSxHQUFHLElBQUksTUFBTTtZQUNuQixLQUFLO1lBQ0wsSUFBSSxFQUFFLEtBQUs7U0FDWixDQUFDO1FBQ0osQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVkLE1BQU0sb0JBQW9CLEdBQWtDLEVBQUUsQ0FBQztJQUMvRCxJQUFJLGNBQWMsSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUN0RSxvQkFBb0IsQ0FBQyx5QkFBeUIsQ0FBQyxHQUFHLFNBQVMsQ0FBQztJQUM5RCxDQUFDO0lBQ0QsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUNULElBQUksSUFBSSxDQUFDLGFBQWE7WUFDcEIsb0JBQW9CLENBQUMs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