@drunk-pulumi/azure 1.0.5 → 1.0.7

package/Sql/index.js

@@ -28,25 +28,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const sql = __importStar(require("@pulumi/azure-native/sql"));
 const pulumi_1 = require("@pulumi/pulumi");
+const Locker_1 = __importDefault(require("../Core/Locker"));
 const Helper_1 = require("../KeyVault/Helper");
-const RoleAssignment_1 = require("../AzAd/RoleAssignment");
-const AzureEnv_1 = require("../Common/AzureEnv");
 const Common_1 = require("../Common");
+const Common_2 = require("../Common");
 const Helper_2 = require("../VNet/Helper");
 const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
 const SqlDb_1 = __importDefault(require("./SqlDb"));
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
-const Helper_3 = require("../AzAd/Helper");
 const createElasticPool = ({ group, name, sqlName, 
 //Minimum is 50 GD
-maxSizeBytesGb = 50, sku = { name: AzureEnv_1.isPrd ? 'Standard' : 'Basic', capacity: 50 }, }) => {
+maxSizeBytesGb = 50, sku = { name: Common_1.isPrd ? 'Standard' : 'Basic', capacity: 50 }, }) => {
     //Create Sql Elastic
-    const elasticName = (0, Common_1.getElasticPoolName)(name);
+    const elasticName = (0, Common_2.getElasticPoolName)(name);
     const ep = new sql.ElasticPool(elasticName, {
         elasticPoolName: elasticName,
         serverName: sqlName,
         ...group,
-        maxSizeBytes: AzureEnv_1.isPrd ? maxSizeBytesGb * 1024 * 1024 * 1024 : undefined,
+        maxSizeBytes: Common_1.isPrd ? maxSizeBytesGb * 1024 * 1024 * 1024 : undefined,
         sku: {
             name: `${sku.name}Pool`,
             tier: sku.name,
@@ -56,18 +55,19 @@ maxSizeBytesGb = 50, sku = { name: AzureEnv_1.isPrd ? 'Standard' : 'Basic', capa
             minCapacity: 0,
             maxCapacity: sku.name === 'Basic' ? 5 : sku.capacity,
         },
-        zoneRedundant: AzureEnv_1.isPrd,
+        zoneRedundant: Common_1.isPrd,
         //licenseType: sql.ElasticPoolLicenseType.BasePrice,
         //zoneRedundant: isPrd,
     });
     return { name: elasticName, group, id: ep.id, instance: ep };
 };
-exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases, vaultInfo, network, vulnerabilityAssessment, ignoreChanges = ['administratorLogin'], }) => {
-    const sqlName = (0, Common_1.getSqlServerName)(name);
+exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, enableEncryption, envRoles, network, vulnerabilityAssessment, ignoreChanges = [], lock, dependsOn, }) => {
+    const sqlName = (0, Common_2.getSqlServerName)(name);
     const encryptKey = enableEncryption
-        ? (0, Helper_1.getEncryptionKeyOutput)(name, vaultInfo)
+        ? (0, Helper_1.addEncryptKey)({ name: sqlName, vaultInfo: vaultInfo })
         : undefined;
     const adminGroup = auth.envRoles?.contributor;
+    ignoreChanges.push('keyId');
     if (auth.azureAdOnlyAuthentication) {
         ignoreChanges.push('administratorLogin');
         ignoreChanges.push('administratorLoginPassword');
@@ -80,6 +80,7 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
         identity: { type: 'SystemAssigned' },
         administratorLogin: auth?.adminLogin,
         administratorLoginPassword: auth?.password,
+        keyId: encryptKey?.url,
         administrators: {
             administratorType: adminGroup
                 ? sql.AdministratorType.ActiveDirectory
@@ -88,7 +89,7 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
                 ? auth.azureAdOnlyAuthentication ?? true
                 : false,
             principalType: sql.PrincipalType.Group,
-            tenantId: AzureEnv_1.tenantId,
+            tenantId: Common_1.tenantId,
             sid: adminGroup?.objectId,
             login: adminGroup?.displayName,
         },
@@ -96,15 +97,22 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
             ? sql.ServerNetworkAccessFlag.Disabled
             : sql.ServerNetworkAccessFlag.Enabled,
     }, {
+        dependsOn,
         ignoreChanges,
+        protect: lock,
     });
+    //Lock from delete
+    if (lock) {
+        (0, Locker_1.default)({ name, resource: sqlServer });
+    }
     //Allows to Read Key Vault
-    (0, Helper_3.grantIdentityPermissions)({
-        name,
-        vaultInfo,
-        envRole: 'readOnly',
-        principalId: sqlServer.identity.apply((s) => s.principalId),
-    });
+    envRoles?.addMember('readOnly', sqlServer.identity.apply((s) => s.principalId));
+    // grantIdentityPermissions({
+    //   name,
+    //   vaultInfo,
+    //   role: 'readOnly',
+    //   principalId: sqlServer.identity.apply((s) => s!.principalId),
+    // });
     const ep = elasticPool
         ? createElasticPool({
             name,
@@ -160,13 +168,14 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
     if (vulnerabilityAssessment) {
         //Grant Storage permission
         if (vulnerabilityAssessment.logStorageId) {
-            (0, RoleAssignment_1.roleAssignment)({
-                name,
-                principalId: sqlServer.identity.apply((i) => i?.principalId || ''),
-                principalType: 'ServicePrincipal',
-                roleName: 'Storage Blob Data Contributor',
-                scope: vulnerabilityAssessment.logStorageId,
-            });
+            envRoles?.addMember('contributor', sqlServer.identity.apply((i) => i.principalId));
+            // roleAssignment({
+            //   name,
+            //   principalId: sqlServer.identity.apply((i) => i?.principalId || ''),
+            //   principalType: 'ServicePrincipal',
+            //   roleName: 'Storage Blob Data Contributor',
+            //   scope: vulnerabilityAssessment.logStorageId,
+            // });
         }
         //ServerSecurityAlertPolicy
         const alertPolicy = new sql.ServerSecurityAlertPolicy(name, {
@@ -194,11 +203,11 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
             isStorageSecondaryKeyInUse: false,
             predicateExpression: "object_name = 'SensitiveData'",
             queueDelayMs: 4000,
-            retentionDays: AzureEnv_1.isPrd ? 30 : 6,
+            retentionDays: Common_1.isPrd ? 30 : 6,
             state: 'Enabled',
             isDevopsAuditEnabled: true,
             storageAccountAccessKey: vulnerabilityAssessment.storageAccessKey,
-            storageAccountSubscriptionId: AzureEnv_1.subscriptionId,
+            storageAccountSubscriptionId: Common_1.subscriptionId,
             storageEndpoint: vulnerabilityAssessment.storageEndpoint,
         }, { dependsOn: alertPolicy });
         //ServerVulnerabilityAssessment
@@ -217,19 +226,20 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
     }
     if (encryptKey) {
         // Enable a server key in the SQL Server with reference to the Key Vault Key
+        const keyName = (0, pulumi_1.interpolate) `${vaultInfo?.name}_${encryptKey.keyName}_${encryptKey.keyVersion}`;
         const serverKey = new sql.ServerKey(`${sqlName}-serverKey`, {
             resourceGroupName: group.resourceGroupName,
             serverName: sqlName,
             serverKeyType: 'AzureKeyVault',
-            keyName: encryptKey.keyName,
+            keyName: keyName,
             uri: encryptKey.url,
-        }, { dependsOn: sqlServer, ignoreChanges: ['keyName', 'uri'] });
+        }, { dependsOn: sqlServer, ignoreChanges });
         new sql.EncryptionProtector(`${sqlName}-encryptionProtector`, {
             encryptionProtectorName: 'current',
             resourceGroupName: group.resourceGroupName,
             serverName: sqlName,
             serverKeyType: 'AzureKeyVault',
-            serverKeyName: encryptKey.keyName,
+            serverKeyName: serverKey.name,
             autoRotationEnabled: true,
         }, { dependsOn: serverKey });
     }
@@ -245,6 +255,7 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
                 sqlServerName: sqlName,
                 dependsOn: sqlServer,
                 elasticPoolId: ep ? ep.id : undefined,
+                lock,
             });
             if (vaultInfo) {
                 //Refer here to build connection correctly: https://learn.microsoft.com/en-us/sql/connect/ado-net/sql/azure-active-directory-authentication?view=sql-server-ver16
@@ -282,4 +293,4 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
         databases: dbs,
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}

package/Storage/ManagementRules.d.ts

@@ -1,6 +1,6 @@
-import * as pulumi from "@pulumi/pulumi";
-import * as storage from "@pulumi/azure-native/storage";
-import { ResourceGroupInfo } from "../types";
+import * as pulumi from '@pulumi/pulumi';
+import * as storage from '@pulumi/azure-native/storage';
+import { ResourceArgs } from '../types';
 interface DateAfterModificationArgs {
     daysAfterLastAccessTimeGreaterThan?: pulumi.Input<number>;
     daysAfterModificationGreaterThan?: pulumi.Input<number>;
@@ -24,10 +24,10 @@ type ManagementRuleActions = {
     version?: PolicyVersionArgs;
 };
 type ManagementRuleFilters = {
-    blobTypes: Array<"blockBlob" | "appendBlob">;
+    blobTypes: Array<'blockBlob' | 'appendBlob'>;
     tagFilters?: pulumi.Input<{
         name: pulumi.Input<string>;
-        op: "==";
+        op: '==';
         value: pulumi.Input<string>;
     }>[];
 };
@@ -42,9 +42,7 @@ export type ManagementRules = {
     actions: ManagementRuleActions;
     filters?: ManagementRuleFilters;
 };
-export declare const createManagementRules: ({ name, storageAccount, group, rules, containerNames, }: {
-    name: string;
-    group: ResourceGroupInfo;
+export declare const createManagementRules: ({ name, storageAccount, group, rules, containerNames, }: ResourceArgs & {
     storageAccount: storage.StorageAccount;
     containerNames?: pulumi.Input<string>[];
     rules: Array<ManagementRules | DefaultManagementRules>;

package/Storage/ManagementRules.js

@@ -28,14 +28,14 @@ const storage = __importStar(require("@pulumi/azure-native/storage"));
 const createManagementRules = ({ name, storageAccount, group, rules, containerNames, }) => {
     name = `${name}-mnp`;
     return new storage.ManagementPolicy(name, {
-        managementPolicyName: "default",
+        managementPolicyName: 'default',
         accountName: storageAccount.name,
         ...group,
         policy: {
             rules: rules.map((m, i) => ({
                 enabled: true,
                 name: `${name}-${i}`,
-                type: "Lifecycle",
+                type: 'Lifecycle',
                 definition: {
                     actions: m.actions,
                     filters: m.filters
@@ -52,4 +52,4 @@ const createManagementRules = ({ name, storageAccount, group, rules, containerNa
     }, { dependsOn: storageAccount });
 };
 exports.createManagementRules = createManagementRules;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFuYWdlbWVudFJ1bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JhZ2UvTWFuYWdlbWVudFJ1bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0Esc0VBQXdEO0FBa0RqRCxNQUFNLHFCQUFxQixHQUFHLENBQUMsRUFDcEMsSUFBSSxFQUNKLGNBQWMsRUFDZCxLQUFLLEVBQ0wsS0FBSyxFQUNMLGNBQWMsR0FPZixFQUFFLEVBQUU7SUFDSCxJQUFJLEdBQUcsR0FBRyxJQUFJLE1BQU0sQ0FBQztJQUNyQixPQUFPLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUNqQyxJQUFJLEVBQ0o7UUFDRSxvQkFBb0IsRUFBRSxTQUFTO1FBQy9CLFdBQVcsRUFBRSxjQUFjLENBQUMsSUFBSTtRQUNoQyxHQUFHLEtBQUs7UUFFUixNQUFNLEVBQUU7WUFDTixLQUFLLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7Z0JBQzFCLE9BQU8sRUFBRSxJQUFJO2dCQUNiLElBQUksRUFBRSxHQUFHLElBQUksSUFBSSxDQUFDLEVBQUU7Z0JBQ3BCLElBQUksRUFBRSxXQUFXO2dCQUVqQixVQUFVLEVBQUU7b0JBQ1YsT0FBTyxFQUFFLENBQUMsQ0FBQyxPQUFPO29CQUNsQixPQUFPLEVBQUUsQ0FBQyxDQUFDLE9BQU87d0JBQ2hCLENBQUMsQ0FBQzs0QkFDRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTOzRCQUM5QixXQUFXLEVBQ1QsY0FBYztnQ0FDYixDQUFDLENBQUMsT0FBd0MsQ0FBQyxjQUFjOzRCQUM1RCxjQUFjLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxVQUFVO3lCQUNyQzt3QkFDSCxDQUFDLENBQUMsU0FBUztpQkFDZDthQUNGLENBQUMsQ0FBQztTQUNKO0tBQ0YsRUFDRCxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsQ0FDOUIsQ0FBQztBQUNKLENBQUMsQ0FBQztBQTVDVyxRQUFBLHFCQUFxQix5QkE0Q2hDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFuYWdlbWVudFJ1bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JhZ2UvTWFuYWdlbWVudFJ1bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0Esc0VBQXdEO0FBa0RqRCxNQUFNLHFCQUFxQixHQUFHLENBQUMsRUFDcEMsSUFBSSxFQUNKLGNBQWMsRUFDZCxLQUFLLEVBQ0wsS0FBSyxFQUNMLGNBQWMsR0FLZixFQUFFLEVBQUU7SUFDSCxJQUFJLEdBQUcsR0FBRyxJQUFJLE1BQU0sQ0FBQztJQUNyQixPQUFPLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUNqQyxJQUFJLEVBQ0o7UUFDRSxvQkFBb0IsRUFBRSxTQUFTO1FBQy9CLFdBQVcsRUFBRSxjQUFjLENBQUMsSUFBSTtRQUNoQyxHQUFHLEtBQUs7UUFFUixNQUFNLEVBQUU7WUFDTixLQUFLLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7Z0JBQzFCLE9BQU8sRUFBRSxJQUFJO2dCQUNiLElBQUksRUFBRSxHQUFHLElBQUksSUFBSSxDQUFDLEVBQUU7Z0JBQ3BCLElBQUksRUFBRSxXQUFXO2dCQUVqQixVQUFVLEVBQUU7b0JBQ1YsT0FBTyxFQUFFLENBQUMsQ0FBQyxPQUFPO29CQUNsQixPQUFPLEVBQUUsQ0FBQyxDQUFDLE9BQU87d0JBQ2hCLENBQUMsQ0FBQzs0QkFDRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTOzRCQUM5QixXQUFXLEVBQ1QsY0FBYztnQ0FDYixDQUFDLENBQUMsT0FBd0MsQ0FBQyxjQUFjOzRCQUM1RCxjQUFjLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxVQUFVO3lCQUNyQzt3QkFDSCxDQUFDLENBQUMsU0FBUztpQkFDZDthQUNGLENBQUMsQ0FBQztTQUNKO0tBQ0YsRUFDRCxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsQ0FDOUIsQ0FBQztBQUNKLENBQUMsQ0FBQztBQTFDVyxRQUFBLHFCQUFxQix5QkEwQ2hDIn0=

package/Storage/index.d.ts

@@ -1,6 +1,6 @@
 import { KeyVaultSecret } from '@azure/keyvault-secrets';
 import * as storage from '@pulumi/azure-native/storage';
-import { BasicResourceArgs, KeyVaultInfo, PrivateLinkPropsType, ResourceInfo } from '../types';
+import { BasicEncryptResourceArgs, PrivateLinkPropsType, ResourceInfo } from '../types';
 import { Input } from '@pulumi/pulumi';
 import { DefaultManagementRules, ManagementRules } from './ManagementRules';
 export type ContainerProps = {
@@ -13,8 +13,6 @@ export type StorageFeatureType = {
     allowSharedKeyAccess?: boolean;
     /** Enable this storage as static website. */
     enableStaticWebsite?: boolean;
-    /** This option only able to enable once Account is created, and the Principal added to the Key Vault Read Permission Group */
-    enableKeyVaultEncryption?: boolean;
     allowCrossTenantReplication?: boolean;
     isSftpEnabled?: boolean;
 };
@@ -35,8 +33,7 @@ export type StorageNetworkType = {
         type: 'blob' | 'table' | 'queue' | 'file' | 'web' | 'dfs';
     };
 };
-interface StorageProps extends BasicResourceArgs {
-    vaultInfo?: KeyVaultInfo;
+interface StorageProps extends BasicEncryptResourceArgs {
     containers?: Array<ContainerProps>;
     queues?: Array<string>;
     fileShares?: Array<string>;
@@ -50,5 +47,5 @@ export type StorageResults = ResourceInfo & {
     getConnectionString?: (name?: string) => Promise<KeyVaultSecret | undefined>;
 };
 /** Storage Creator */
-declare const _default: ({ name, group, vaultInfo, containers, queues, fileShares, network, features, policies, lock, }: StorageProps) => StorageResults;
+declare const _default: ({ name, group, vaultInfo, enableEncryption, envRoles, containers, queues, fileShares, network, features, policies, lock, }: StorageProps) => StorageResults;
 export default _default;

package/Storage/index.js

@@ -28,22 +28,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const storage = __importStar(require("@pulumi/azure-native/storage"));
 const Helper_1 = require("../KeyVault/Helper");
-const AzureEnv_1 = require("../Common/AzureEnv");
 const Common_1 = require("../Common");
+const Common_2 = require("../Common");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
 const Locker_1 = __importDefault(require("../Core/Locker"));
 const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
 const ManagementRules_1 = require("./ManagementRules");
-const Helper_2 = require("../AzAd/Helper");
 /** Storage Creator */
-exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileShares = [], network, features = {}, policies = { keyExpirationPeriodInDays: 365 }, lock = true, }) => {
-    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 encryptionKey = features.enableKeyVaultEncryption
-        ? (0, Helper_1.getEncryptionKeyOutput)(name, vaultInfo)
+exports.default = ({ name, group, vaultInfo, enableEncryption, envRoles, containers = [], queues = [], fileShares = [], network, features = {}, policies = { keyExpirationPeriodInDays: 365 }, lock = true, }) => {
+    name = (0, Common_2.getStorageName)(name);
+    const primaryKeyName = (0, Common_2.getKeyName)(name, 'primary');
+    const secondaryKeyName = (0, Common_2.getKeyName)(name, 'secondary');
+    const primaryConnectionKeyName = (0, Common_2.getConnectionName)(name, 'primary');
+    const secondConnectionKeyName = (0, Common_2.getConnectionName)(name, 'secondary');
+    const encryptionKey = enableEncryption
+        ? (0, Helper_1.addEncryptKey)({ name, vaultInfo: vaultInfo })
         : undefined;
     //To fix identity issue then using this approach https://github.com/pulumi/pulumi-azure-native/blob/master/examples/keyvault/index.ts
     const stg = new storage.StorageAccount(name, {
@@ -51,7 +50,7 @@ exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileS
         ...group,
         kind: storage.Kind.StorageV2,
         sku: {
-            name: AzureEnv_1.isPrd
+            name: Common_1.isPrd
                 ? storage.SkuName.Standard_ZRS //Zone redundant in PRD
                 : storage.SkuName.Standard_LRS,
         },
@@ -130,6 +129,7 @@ exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileS
             rules: policies.defaultManagementRules,
         });
     }
+    //Lock the resources
     if (lock) {
         (0, Locker_1.default)({ name, resource: stg });
     }
@@ -183,21 +183,18 @@ exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileS
         if (!id)
             return;
         //Allows to Read Key Vault
-        (0, Helper_2.grantIdentityPermissions)({
-            name,
-            vaultInfo,
-            envRole: 'readOnly',
-            principalId: stg.identity.apply((s) => s.principalId),
-        });
-        const keys = (await storage.listStorageAccountKeys({
-            accountName: name,
-            resourceGroupName: group.resourceGroupName,
-        })).keys.map((k) => ({
-            name: k.keyName,
-            key: k.value,
-            connectionString: `DefaultEndpointsProtocol=https;AccountName=${name};AccountKey=${k.value};EndpointSuffix=core.windows.net`,
-        }));
-        if (vaultInfo) {
+        if (envRoles)
+            envRoles.addMember('readOnly', stg.identity.apply((s) => s.principalId));
+        //Add connection into Key vault
+        if (vaultInfo && features?.allowSharedKeyAccess) {
+            const keys = (await storage.listStorageAccountKeys({
+                accountName: name,
+                resourceGroupName: group.resourceGroupName,
+            })).keys.map((k) => ({
+                name: k.keyName,
+                key: k.value,
+                connectionString: `DefaultEndpointsProtocol=https;AccountName=${name};AccountKey=${k.value};EndpointSuffix=core.windows.net`,
+            }));
             //Keys
             (0, CustomHelper_1.addCustomSecrets)({
                 vaultInfo,
@@ -234,4 +231,4 @@ exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileS
             : undefined,
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Storage/index.ts"],"names":[],"mappings":"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"}
+//# 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

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

package/VM/DiskEncryptionSet.js

@@ -0,0 +1,43 @@
+"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 });
+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, }) => {
+    name = (0, Common_1.getDiskEncryptionName)(name);
+    const keyEncryption = (0, Helper_1.addEncryptKey)({ name, vaultInfo });
+    return new compute.DiskEncryptionSet(name, {
+        ...group,
+        rotationToLatestKeyVersionEnabled: true,
+        encryptionType: 'EncryptionAtRestWithCustomerKey',
+        identity: {
+            type: compute.ResourceIdentityType.UserAssigned,
+            userAssignedIdentities: [userAssignedId],
+        },
+        activeKey: { keyUrl: keyEncryption.url },
+    }, { dependsOn, ignoreChanges, import: importUri });
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlza0VuY3J5cHRpb25TZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk0vRGlza0VuY3J5cHRpb25TZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNFQUF3RDtBQUV4RCxzQ0FBa0Q7QUFDbEQsK0NBQW1EO0FBU25ELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFNBQVMsRUFDVCxjQUFjLEVBQ2QsU0FBUyxFQUNULGFBQWEsRUFDYixTQUFTLEdBQ1csRUFBRSxFQUFFO0lBQ3hCLElBQUksR0FBRyxJQUFBLDhCQUFxQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ25DLE1BQU0sYUFBYSxHQUFHLElBQUEsc0JBQWEsRUFBQyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO0lBRXpELE9BQU8sSUFBSSxPQUFPLENBQUMsaUJBQWlCLENBQ2xDLElBQUksRUFDSjtRQUNFLEdBQUcsS0FBSztRQUNSLGlDQUFpQyxFQUFFLElBQUk7UUFDdkMsY0FBYyxFQUFFLGlDQUFpQztRQUNqRCxRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsT0FBTyxDQUFDLG9CQUFvQixDQUFDLFlBQVk7WUFDL0Msc0JBQXNCLEVBQUUsQ0FBQyxjQUFjLENBQUM7U0FDekM7UUFDRCxTQUFTLEVBQUUsRUFBRSxNQUFNLEVBQUUsYUFBYSxDQUFDLEdBQUcsRUFBRTtLQUN6QyxFQUNELEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLENBQ2hELENBQUM7QUFDSixDQUFDLENBQUMifQ==

package/VM/index.d.ts

@@ -1,6 +1,6 @@
-import { Input, Resource } from '@pulumi/pulumi';
+import { Input } from '@pulumi/pulumi';
 import * as compute from '@pulumi/azure-native/compute';
-import { BasicResourceArgs, KeyVaultInfo } from '../types';
+import { BasicEncryptResourceArgs, LoginArgs } 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,22 +8,17 @@ export type VmScheduleType = {
     /** The format is ISO 8601 Standard ex: 2200 */
     autoShutdownTime?: Input<string>;
 };
-interface Props extends BasicResourceArgs {
+interface Props extends BasicEncryptResourceArgs {
     subnetId: Input<string>;
     storageAccountType?: compute.StorageAccountTypes;
     vmSize?: Input<string>;
-    login: {
-        userName: Input<string>;
-        password?: Input<string>;
-    };
+    login: LoginArgs;
     osType?: 'Windows' | 'Linux';
     image: {
         offer: 'WindowsServer' | 'CentOS' | 'Windows-10' | 'windows-11' | string;
         publisher: 'MicrosoftWindowsServer' | 'MicrosoftWindowsDesktop' | 'Canonical' | string;
         sku: '2019-Datacenter' | '21h1-pro' | 'win11-23h2-pro' | string;
     };
-    enableEncryption?: boolean;
-    vaultInfo?: KeyVaultInfo;
     osDiskSizeGB?: number;
     dataDiskSizeGB?: number;
     schedule?: VmScheduleType;
@@ -32,7 +27,6 @@ interface Props extends BasicResourceArgs {
     tags?: {
         [key: string]: Input<string>;
     };
-    dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
 }
-declare const _default: ({ name, group, subnetId, osType, vmSize, extensions, storageAccountType, osDiskSizeGB, dataDiskSizeGB, enableEncryption, vaultInfo, 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, vaultInfo, envRoles, schedule, login, image, lock, tags, dependsOn, ...others }: Props) => import("@pulumi/azure-native/compute/virtualMachine").VirtualMachine;
 export default _default;