@drunk-pulumi/azure 1.0.7 → 1.0.9

package/Builder/VnetBuilder.js

@@ -1,20 +1,54 @@
 "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;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const IpAddressPrefix_1 = __importDefault(require("../VNet/IpAddressPrefix"));
+const NSGRules_1 = require("../VNet/NSGRules");
 const Firewall_1 = __importDefault(require("../VNet/Firewall"));
 const Vnet_1 = __importDefault(require("../VNet/Vnet"));
 const NatGateway_1 = __importDefault(require("../VNet/NatGateway"));
+const pulumi = __importStar(require("@pulumi/pulumi"));
 const NetworkPeering_1 = __importDefault(require("../VNet/NetworkPeering"));
 const VPNGateway_1 = __importDefault(require("../VNet/VPNGateway"));
 const PrivateDnsZoneBuilder_1 = __importDefault(require("./PrivateDnsZoneBuilder"));
-const types_1 = require("./types");
-const Helper_1 = require("../VNet/Helper");
+const types = __importStar(require("./types"));
 const Bastion_1 = __importDefault(require("../VNet/Bastion"));
-const outboundIpName = "outbound";
-class VnetBuilder extends types_1.Builder {
+const Common_1 = require("../Common");
+const outboundIpName = 'outbound';
+class VnetBuilder extends types.Builder {
+    args;
+    /** The Instances */
+    _ipAddressInstance = undefined;
+    _firewallInstance = undefined;
+    _vnetInstance = undefined;
+    _natGatewayInstance = undefined;
+    _vnpGatewayInstance = undefined;
+    _privateDnsInstances = {};
+    _finalIpAddressIds = [];
     /** The Props */
     _subnetProps = undefined;
     _vnetProps = {};
@@ -27,18 +61,12 @@ class VnetBuilder extends types_1.Builder {
     _routeRules = [];
     _enableRoute = false;
     _peeringProps = [];
-    _logInfo = undefined;
-    _ipType = "prefix";
+    //private _logInfo: LogInfo | undefined = undefined;
+    _ipType = 'individual';
     _privateDns = {};
-    /** The Instances */
-    _ipAddressInstance = undefined;
-    _firewallInstance = undefined;
-    _vnetInstance = undefined;
-    _natGatewayInstance = undefined;
-    _vnpGatewayInstance = undefined;
-    _privateDnsInstances = {};
-    constructor(commonProps) {
-        super(commonProps);
+    constructor(args) {
+        super(args);
+        this.args = args;
     }
     asHub(props = {}) {
         this._subnetProps = props.subnets;
@@ -56,10 +84,15 @@ class VnetBuilder extends types_1.Builder {
         };
         return this;
     }
-    withPublicIpAddress(type) {
+    withPublicIP(type) {
         this._ipType = type;
         return this;
     }
+    withPublicIPFrom(id) {
+        this._finalIpAddressIds.push(id);
+        this._ipType = 'existing';
+        return this;
+    }
     withNatGateway() {
         this._natGatewayEnabled = true;
         return this;
@@ -72,16 +105,20 @@ class VnetBuilder extends types_1.Builder {
         this._firewallProps = props;
         return this;
     }
+    withFirewallAndNatGateway(props) {
+        this.withFirewall(props);
+        return this.withNatGateway();
+    }
     withBastion(props) {
         this._bastionProps = props;
         return this;
     }
-    withSecurityRules(rules) {
+    withSecurityRules(...rules) {
         this._securityRules.push(...rules);
         this._enableSG = true;
         return this;
     }
-    withRouteRules(rules) {
+    withRouteRules(...rules) {
         this._routeRules.push(...rules);
         this._enableRoute = true;
         return this;
@@ -94,42 +131,50 @@ class VnetBuilder extends types_1.Builder {
         this._peeringProps.push(props);
         return this;
     }
-    withLogInfo(info) {
-        this._logInfo = info;
-        return this;
-    }
+    // public withLogInfo(info: LogInfo): types.IVnetBuilder {
+    //   this._logInfo = info;
+    //   return this;
+    // }
     /** Builders methods */
     buildIpAddress() {
+        //IP Address Already provided
+        if (this._ipType === 'existing')
+            return;
         const ipNames = [];
         //No gateway and no firewall then Do nothing
         if (!this._natGatewayEnabled && !this._firewallProps)
             return;
         //Add outbound Ipaddress for Firewall alone
-        if (!this._natGatewayEnabled && this._firewallProps) {
+        if (this._natGatewayEnabled || this._firewallProps) {
             ipNames.push(outboundIpName);
         }
         //Create IpPrefix
         this._ipAddressInstance = (0, IpAddressPrefix_1.default)({
             ...this.commonProps,
             ipAddresses: ipNames.map((n) => ({ name: n })),
-            createPrefix: this._ipType === "prefix",
-            config: { version: "IPv4", allocationMethod: "Static" },
+            createPrefix: this._ipType === 'prefix',
+            config: { version: 'IPv4', allocationMethod: 'Static' },
         });
+        //Collect All IpAddresses
+        if (this._ipAddressInstance.addresses) {
+            Object.values(this._ipAddressInstance.addresses).forEach((ip) => this._finalIpAddressIds.push(ip.id));
+        }
     }
     buildNatGateway() {
-        if (!this._natGatewayEnabled || !this._ipAddressInstance)
+        if (!this._natGatewayEnabled)
             return;
         this._natGatewayInstance = (0, NatGateway_1.default)({
             ...this.commonProps,
-            publicIpAddresses: this._ipType === "individual"
-                ? Object.keys(this._ipAddressInstance.addresses).map((k) => this._ipAddressInstance.addresses[k].id)
-                : undefined,
-            publicIpPrefixes: this._ipType === "prefix"
+            publicIpAddresses: this._finalIpAddressIds,
+            publicIpPrefixes: this._ipAddressInstance?.addressPrefix
                 ? [this._ipAddressInstance.addressPrefix.id]
                 : undefined,
         });
     }
     buildVnet() {
+        if (!this._firewallProps) {
+            this.withSecurityRules(...(0, NSGRules_1.BlockInternetSecurityRule)(this.commonProps.name));
+        }
         const subnets = this._subnetProps
             ? Object.keys(this._subnetProps).map((k) => ({
                 name: k,
@@ -148,7 +193,7 @@ class VnetBuilder extends types_1.Builder {
                 //Only create Security group when firewall is not there
                 securityGroup: {
                     enabled: this._enableSG,
-                    allowOutboundInternetAccess: !Boolean(this._ipAddressInstance) && !this._natGatewayEnabled,
+                    allowOutboundInternetAccess: !this._ipAddressInstance && !this._natGatewayEnabled,
                     rules: this._securityRules,
                 },
                 //Route tables
@@ -177,15 +222,12 @@ class VnetBuilder extends types_1.Builder {
             //networkPeerings: peerings,
             dependsOn: this._firewallInstance?.firewall
                 ? this._firewallInstance?.firewall
-                : this._natGatewayInstance
-                    ? this._natGatewayInstance
-                    : undefined,
+                : this._natGatewayInstance,
         });
     }
     buildFirewall() {
         if (!this._firewallProps)
             return;
-        const publicIpAddress = this._ipAddressInstance?.addresses[outboundIpName];
         const firewallSubnetId = this._vnetInstance?.firewallSubnet?.apply((s) => s?.id);
         const manageSubnetId = this._vnetInstance?.firewallManageSubnet?.apply((s) => s?.id);
         this._firewallInstance = (0, Firewall_1.default)({
@@ -195,9 +237,9 @@ class VnetBuilder extends types_1.Builder {
                 {
                     subnetId: firewallSubnetId,
                     //Using Force Tunneling mode if Nat gateway is enabled.
-                    publicIpAddress: this._natGatewayEnabled
+                    publicIpAddressId: this._natGatewayEnabled
                         ? undefined
-                        : publicIpAddress,
+                        : this._finalIpAddressIds[0],
                 },
             ],
             //This is required for Force Tunneling mode
@@ -206,12 +248,11 @@ class VnetBuilder extends types_1.Builder {
                     subnetId: manageSubnetId,
                 }
                 : undefined,
-            monitorConfig: this._logInfo
-                ? {
-                    logWpId: this._logInfo.logWp.id,
-                }
-                : undefined,
-            dependsOn: this._ipAddressInstance?.addressPrefix,
+            logInfo: this.args.logInfo,
+            dependsOn: this._ipAddressInstance?.addressPrefix ??
+                (this._ipAddressInstance?.addresses
+                    ? Object.values(this._ipAddressInstance.addresses)
+                    : undefined),
         });
     }
     buildVpnGateway() {
@@ -257,20 +298,26 @@ class VnetBuilder extends types_1.Builder {
             return;
         this._peeringProps.forEach((p) => {
             let info = undefined;
-            if ("groupName" in p) {
-                info = (0, Helper_1.getVnetInfo)(p.groupName);
+            if ('groupName' in p) {
+                info = Common_1.rsInfo.getVnetInfo(p.groupName);
             }
-            else if ("vnetId" in p) {
-                info = (0, Helper_1.parseVnetInfoFromId)(p.vnetId);
+            else if ('vnetId' in p) {
+                info = pulumi
+                    .output(p.vnetId)
+                    .apply((id) => Common_1.rsInfo.getResourceInfoFromId(id));
             }
             if (info)
                 (0, NetworkPeering_1.default)({
-                    direction: p.direction ?? "Bidirectional",
-                    firstVnet: {
-                        vnetName: this._vnetInstance.vnet.name,
-                        resourceGroupName: this.commonProps.group.resourceGroupName,
+                    direction: p.direction ?? 'Bidirectional',
+                    from: {
+                        options: p.options,
+                        vnetInfo: {
+                            name: this._vnetInstance.name,
+                            group: this.commonProps.group,
+                            id: this._vnetInstance.id,
+                        },
                     },
-                    secondVnet: info,
+                    to: { vnetInfo: info },
                 });
         });
     }
@@ -295,4 +342,4 @@ class VnetBuilder extends types_1.Builder {
     }
 }
 exports.default = (props) => new VnetBuilder(props);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"VnetBuilder.js","sourceRoot":"","sources":["../../src/Builder/VnetBuilder.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"VnetBuilder.js","sourceRoot":"","sources":["../../src/Builder/VnetBuilder.ts"],"names":[],"mappings":"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"}

package/Builder/types/apimBuilder.d.ts

@@ -1,8 +1,7 @@
-import { SkuType } from "@pulumi/azure-native/apimanagement";
-import { Input } from "@pulumi/pulumi";
-import { IBuilder } from "./genericBuilder";
-import { PrivateLinkPropsType, ResourceInfo } from "../../types";
-import { AppInsightInfo } from "../../Logs/Helpers";
+import { SkuType } from '@pulumi/azure-native/apimanagement';
+import { Input } from '@pulumi/pulumi';
+import { IBuilder } from './genericBuilder';
+import { AppInsightInfo, PrivateLinkPropsType, ResourceInfo } from '../../types';
 export type ApimSkuBuilderType = {
     sku: SkuType;
     capacity?: number;
@@ -12,7 +11,7 @@ export type ApimPublisherBuilderType = {
     /** default is organization name */
     publisherName?: Input<string>;
     /** default is apimgmt-noreply@mail.windowsazure.com */
-    notificationSenderEmail?: "apimgmt-noreply@mail.windowsazure.com" | Input<string>;
+    notificationSenderEmail?: 'apimgmt-noreply@mail.windowsazure.com' | Input<string>;
 };
 export type ApimCertBuilderType = {
     certificate: Input<string>;
@@ -25,7 +24,7 @@ export type ApimAdditionalLocationType = {
     disableGateway?: Input<boolean>;
     location: string;
 };
-export type ApimZoneType = ["1", "2"] | ["1", "2", "3"];
+export type ApimZoneType = ['1', '2'] | ['1', '2', '3'];
 export type ApimVnetType = {
     enableGateway?: Input<boolean>;
     subnetId: Input<string>;
@@ -34,7 +33,7 @@ export type ApimVnetType = {
      * External means the API Management deployment is set up inside a Virtual Network having an Internet Facing Endpoint,
      * and Internal means that API Management deployment is setup inside a Virtual Network having an Intranet Facing Endpoint only.
      * */
-    type: "External" | "Internal";
+    type: 'External' | 'Internal';
 };
 export type ApimPrivateLinkType = PrivateLinkPropsType & {
     disablePublicAccess?: boolean;
@@ -43,7 +42,7 @@ export type ApimAuthType = {
     clientId: Input<string>;
     clientSecret: Input<string>;
     authority?: Input<string>;
-    type: "facebook" | "google" | "microsoft" | "twitter" | "aad" | "aadB2C" | string;
+    type: 'facebook' | 'google' | 'microsoft' | 'twitter' | 'aad' | 'aadB2C' | string;
 };
 export interface IApimSkuBuilder {
     withSku(props: ApimSkuBuilderType): IApimPublisherBuilder;

package/Builder/types/apimPolicyBuilder.d.ts

@@ -1,4 +1,4 @@
-import { NamedType } from '../../types';
+import { WithNamedType } from '../../types';
 export declare enum SetHeaderTypes {
     delete = "delete",
     override = "override",
@@ -8,11 +8,11 @@ export declare enum SetHeaderTypes {
 export type ApimBaseUrlType = {
     url: string;
 };
-export type ApimSetHeaderType = NamedType & {
+export type ApimSetHeaderType = WithNamedType & {
     value?: string;
     type: SetHeaderTypes;
 };
-export type ApimCheckHeaderType = NamedType & {
+export type ApimCheckHeaderType = WithNamedType & {
     value?: string[];
 };
 export type ApimMockPropsType = {

package/Builder/types/apimProductBuilder.d.ts

@@ -1,6 +1,6 @@
 import { input as inputs } from '@pulumi/azure-native/types';
 import { Input } from '@pulumi/pulumi';
-import { NamedType, ResourceInfo } from '../../types';
+import { WithNamedType, ResourceInfo } from '../../types';
 import { IApimPolicyBuilder } from './apimPolicyBuilder';
 import { BuilderProps, IBuilderAsync } from './genericBuilder';
 export type ApimChildBuilderProps = BuilderProps & {
@@ -22,7 +22,7 @@ export type ApimApiKeysType = {
 export type ApimApiPolicyType = (builder: IApimPolicyBuilder) => IApimPolicyBuilder;
 export type VersionBuilderFunction = (builder: IApimApiRevisionBuilder) => IApimApiRevisionBuilder;
 export type ApimApiVersionType = 'v1' | 'v2' | 'v3' | 'v4' | 'v5' | string;
-export type ApimApiOperationType = NamedType & {
+export type ApimApiOperationType = WithNamedType & {
     method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'OPTIONS';
     urlTemplate: Input<string>;
     responses?: Input<Input<inputs.apimanagement.ResponseContractArgs>[]>;

package/Builder/types/askBuilder.d.ts

@@ -1,12 +1,15 @@
 import * as cs from '@pulumi/azure-native/containerservice';
 import { SshGenerationProps } from '../../Core/KeyGenerators';
-import { IBuilderAsync } from './genericBuilder';
-import { AksAccessProps, AksNetworkProps, AksNodePoolProps, AksResults, AskAddonProps, AskFeatureProps, DefaultAksNodePoolProps } from '../../Aks';
+import { BuilderProps, IBuilderAsync } from './genericBuilder';
+import { AksAccessProps, AksNetworkProps, NodePoolProps, AksResults, AskAddonProps, AskFeatureProps, DefaultAksNodePoolProps } from '../../Aks';
+import { WithDiskEncryption, WithEnvRoles } from '../../types';
+export type AksBuilderArgs = BuilderProps & WithEnvRoles;
 export type SshBuilderProps = Omit<SshGenerationProps, 'vaultInfo' | 'name'>;
 export type AksImportProps = {
     id: string;
     ignoreChanges?: string[];
 };
+export type AksEncryptionType = Required<WithDiskEncryption>;
 export interface ISshBuilder {
     withNewSsh(props: SshBuilderProps): IAksNetworkBuilder;
 }
@@ -18,10 +21,12 @@ export interface IAksDefaultNodePoolBuilder {
 }
 export interface IAksBuilder extends IBuilderAsync<AksResults> {
     withAuth(props: Omit<AksAccessProps, 'envRoles'>): IAksBuilder;
-    withNodePool(props: AksNodePoolProps): IAksBuilder;
+    withNodePool(props: NodePoolProps): IAksBuilder;
     withAddon(props: AskAddonProps): IAksBuilder;
     withFeature(props: AskFeatureProps): IAksBuilder;
     withTier(tier: cs.ManagedClusterSKUTier): IAksBuilder;
+    /** This must be enabled before resource be created*/
+    enableEncryption(props: AksEncryptionType): IAksBuilder;
     import(props: AksImportProps): IAksBuilder;
     lock(): IBuilderAsync<AksResults>;
 }

package/Builder/types/envRoleBuilder.d.ts

@@ -1,9 +1,9 @@
 import { Input } from '@pulumi/pulumi';
 import { EnvRoleKeyTypes, EnvRolesInfo } from '../../AzAd/EnvRoles';
 import { RoleEnableTypes } from '../../AzAd/EnvRoles.Consts';
-import { KeyVaultInfo, NamedType } from '../../types';
+import { KeyVaultInfo, WithNamedType } from '../../types';
 import { IInfo } from './genericBuilder';
-export type EnvRoleBuilderGrantType = NamedType & {
+export type EnvRoleBuilderGrantType = WithNamedType & {
     permissions: RoleEnableTypes;
     scope: Input<string>;
 };

package/Builder/types/genericBuilder.d.ts

@@ -1,11 +1,5 @@
-import { Input, Resource } from '@pulumi/pulumi';
-import { EncryptResourceArgs, LoginArgs, ResourceInfo, TypeOmit } from '../../types';
-import { IEnvRoleBuilder } from './envRoleBuilder';
-export type BuilderProps = EncryptResourceArgs & {
-    /** the below are optionals property and will be available depend on the situation*/
-    envRoles?: IEnvRoleBuilder;
-    dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
-};
+import { BasicResourceWithVaultArgs, LoginArgs, ResourceInfo, TypeOmit, WithDependsOn } from '../../types';
+export type BuilderProps = BasicResourceWithVaultArgs & WithDependsOn;
 export type OmitBuilderProps<T> = TypeOmit<T, BuilderProps>;
 export interface ILoginBuilder<IReturnInterface> {
     generateLogin(): IReturnInterface;

package/Builder/types/genericBuilder.js

@@ -15,4 +15,4 @@ class BuilderAsync {
     }
 }
 exports.BuilderAsync = BuilderAsync;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJpY0J1aWxkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQnVpbGRlci90eXBlcy9nZW5lcmljQnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUE2QkEsTUFBc0IsT0FBTztJQUdFO0lBQTdCLFlBQTZCLFdBQXlCO1FBQXpCLGdCQUFXLEdBQVgsV0FBVyxDQUFjO0lBQUcsQ0FBQztDQUUzRDtBQUxELDBCQUtDO0FBUUQsTUFBc0IsWUFBWTtJQUdIO0lBQTdCLFlBQTZCLFdBQXlCO1FBQXpCLGdCQUFXLEdBQVgsV0FBVyxDQUFjO0lBQUcsQ0FBQztDQUUzRDtBQUxELG9DQUtDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJpY0J1aWxkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQnVpbGRlci90eXBlcy9nZW5lcmljQnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUF1QkEsTUFBc0IsT0FBTztJQUdFO0lBQTdCLFlBQTZCLFdBQXlCO1FBQXpCLGdCQUFXLEdBQVgsV0FBVyxDQUFjO0lBQUcsQ0FBQztDQUUzRDtBQUxELDBCQUtDO0FBUUQsTUFBc0IsWUFBWTtJQUdIO0lBQTdCLFlBQTZCLFdBQXlCO1FBQXpCLGdCQUFXLEdBQVgsV0FBVyxDQUFjO0lBQUcsQ0FBQztDQUUzRDtBQUxELG9DQUtDIn0=

package/Builder/types/resourceBuilder.d.ts

@@ -1,13 +1,11 @@
 import { EnvRolesInfo } from '../../AzAd/EnvRoles';
 import { RoleEnableTypes } from '../../AzAd/EnvRoles.Consts';
-import { KeyVaultInfo, ResourceGroupInfo, ResourceInfo } from '../../types';
-import { IEnvRoleBuilder } from './envRoleBuilder';
+import { KeyVaultInfo, ResourceGroupInfo, ResourceInfo, WithEncryptionInfo, WithLogInfo } from '../../types';
 import { BuilderProps, IBuilder, IBuilderAsync, ILockable } from './genericBuilder';
 import { CertBuilderType } from './vaultBuilder';
 import { IVnetBuilder, IVnetBuilderStart, VnetBuilderResults } from './vnetBuilder';
 import { Input } from '@pulumi/pulumi';
-export type ResourceBuilderResults = BuilderProps & {
-    envRoles: IEnvRoleBuilder;
+export type ResourceBuilderResults = BuilderProps & WithEncryptionInfo & WithLogInfo & {
     vnetInstance?: VnetBuilderResults;
     otherInstances: Record<string, any>;
 };
@@ -29,21 +27,29 @@ export interface IResourceGroupBuilder {
     createRG(props?: RoleEnableTypes): IResourceVaultBuilder;
     withRG(props: ResourceGroupInfo): IResourceVaultBuilder;
 }
+/** Key Vault is compulsory for resource builder*/
 export interface IResourceVaultBuilder {
     createVault(name?: string): IResourceBuilder;
     withVault(props: KeyVaultInfo): IResourceBuilder;
-    getVaultInfoBy(name: string): IResourceBuilder;
+    withVaultFrom(name: string): IResourceBuilder;
 }
 export interface IResourceVaultItemsBuilder {
     addSecrets(items: Record<string, Input<string>>): IResourceBuilder;
     addCerts(props: CertBuilderType): IResourceBuilder;
 }
+export interface IEnvUserAssignedIdentityBuilder {
+    /** Create User Assigned Identity for encryption purposes*/
+    createEnvUID(): IResourceBuilder;
+    /** Create User Assigned Identity for encryption purposes*/
+    withEnvUIDFromVault(): IResourceBuilder;
+}
 export interface IResourceVnetBuilder {
     withVnet(props: ResourceVnetBuilderType): IResourceBuilder;
     linkVaultTo(props: ResourceVaultLinkingBuilderType): IResourceBuilder;
 }
-export interface IResourceBuilder extends IResourceVnetBuilder, IResourceVaultItemsBuilder, ILockable<IResourceBuilder> {
+export interface IResourceBuilder extends IResourceVnetBuilder, IEnvUserAssignedIdentityBuilder, IResourceVaultItemsBuilder, ILockable<IResourceBuilder> {
     enableEncryption(): IResourceBuilder;
+    withLogFrom(name: string): IResourceBuilder;
     withBuilder(props: BuilderFunctionType): IResourceBuilder;
     withBuilderAsync(props: BuilderAsyncFunctionType): IResourceBuilder;
     withResource(builder: ResourceFunction): IResourceBuilder;

package/Builder/types/sqlBuilder.d.ts

@@ -1,8 +1,9 @@
 import { Input } from '@pulumi/pulumi';
-import { IBuilder, IIgnoreChanges, ILockable, ILoginBuilder } from './genericBuilder';
+import { BuilderProps, IBuilder, IIgnoreChanges, ILockable, ILoginBuilder } from './genericBuilder';
 import { SqlAuthType, SqlElasticPoolType, SqlNetworkType, SqlResults, SqlVulnerabilityAssessmentType } from '../../Sql';
 import { SqlDbProps, SqlDbSku } from '../../Sql/SqlDb';
-import { LogStorageInfo } from '../../Logs/Helpers';
+import { WithEnvRoles, WithLogInfo } from '../../types';
+export type SqlBuilderArgs = BuilderProps & WithEnvRoles & WithLogInfo;
 export type SqlBuilderAuthOptionsType = Omit<SqlAuthType, 'password' | 'adminLogin' | 'envRoles'>;
 export type SqlDbBuilderType = {
     name: string;
@@ -15,9 +16,7 @@ export type SqlDbReplicaType = SqlDbBuilderType & {
     replicaFromDbId: Input<string>;
 };
 export type FullSqlDbPropsType = Omit<SqlDbProps, 'dependsOn' | 'importUri' | 'ignoreChanges' | 'group' | 'elasticPoolId' | 'sqlServerName'>;
-export type SqlBuilderVulnerabilityAssessmentType = {
-    logInfo: LogStorageInfo;
-} & Pick<SqlVulnerabilityAssessmentType, 'alertEmails'>;
+export type SqlBuilderVulnerabilityAssessmentType = Pick<SqlVulnerabilityAssessmentType, 'alertEmails'>;
 export interface ISqlLoginBuilder extends ILoginBuilder<ISqlAuthBuilder> {
 }
 export interface ISqlAuthBuilder {

package/Builder/types/vaultBuilder.d.ts

@@ -1,7 +1,9 @@
 import { CertArgs } from '@drunk-pulumi/azure-providers';
-import { BasicMonitorArgs, KeyVaultInfo, NamedType } from '../../types';
+import { KeyVaultInfo, WithNamedType } from '../../types';
 import { Input } from '@pulumi/pulumi';
-export type CertBuilderType = NamedType & {
+import { BuilderProps } from './genericBuilder';
+export type VaultBuilderArgs = Omit<BuilderProps, 'vaultInfo'>;
+export type CertBuilderType = WithNamedType & {
     cert: CertArgs;
 };
 export interface IVaultBuilderResults extends KeyVaultInfo {
@@ -15,6 +17,5 @@ export interface IVaultBuilderResults extends KeyVaultInfo {
     }): IVaultBuilderResults;
 }
 export interface IVaultBuilder {
-    withDiagnostic(logInfo: BasicMonitorArgs): IVaultBuilder;
     build(): IVaultBuilderResults;
 }

package/Builder/types/vmBuilder.d.ts

@@ -1,7 +1,8 @@
-import { ResourceInfo } from '../../types';
+import { ResourceInfo, WithDiskEncryption, WithEncryption } from '../../types';
 import { VmScheduleType } from '../../VM';
-import { IBuilder, ILoginBuilder } from './genericBuilder';
+import { BuilderProps, IBuilder, ILoginBuilder } from './genericBuilder';
 import { Input } from '@pulumi/pulumi';
+export type VmBuilderArgs = BuilderProps & WithEncryption;
 export type VmOsBuilderWindowsProps = {
     offer: 'WindowsServer' | 'CentOS' | 'Windows-10' | 'windows-11' | string;
     publisher: 'MicrosoftWindowsServer' | 'MicrosoftWindowsDesktop' | string;
@@ -13,6 +14,7 @@ export type VmOsBuilderLinuxProps = {
     sku: '22_04-lts' | string;
 };
 export type VmSizeTypes = 'Standard_D2a_v4' | 'Standard_D4a_v4' | 'Standard_D8a_v4' | 'Standard_D16a_v4' | 'Standard_D32a_v4' | 'Standard_D48a_v4' | 'Standard_D64a_v4' | 'Standard_D96a_v4' | 'Standard_D2as_v4' | 'Standard_D4as_v4' | 'Standard_D8as_v4' | 'Standard_D16as_v4' | 'Standard_D32as_v4' | 'Standard_D48as_v4' | 'Standard_D64as_v4' | 'Standard_D96as_v4' | 'Standard_E2_v4' | 'Standard_E4_v4' | 'Standard_E8_v4' | 'Standard_E16_v4' | 'Standard_E20_v4' | 'Standard_E32_v4' | 'Standard_E48_v4' | 'Standard_E64_v4' | 'Standard_E8-4ads_v5' | 'Standard_E16-4ads_v5' | 'Standard_E32-8ads_v5' | 'Standard_E64-16ads_v5' | 'Standard_E96-24ads_v5' | string;
+export type VmEncryptionType = Required<WithDiskEncryption>;
 export interface IVmOsBuilder {
     withWindowsImage(props: VmOsBuilderWindowsProps): IVmSizeBuilder;
     withLinuxImage(props: VmOsBuilderLinuxProps): IVmSizeBuilder;
@@ -26,6 +28,8 @@ export interface IVmVnetBuilder {
     withSubnetId(props: Input<string>): IVmBuilder;
 }
 export interface IVmBuilder extends IBuilder<ResourceInfo> {
+    /** This must be enabled before resource be created*/
+    enableEncryption(props: VmEncryptionType): IVmBuilder;
     withTags(props: Record<string, Input<string>>): IVmBuilder;
     withSchedule(props: VmScheduleType): IVmBuilder;
 }