@drunk-pulumi/azure 1.0.4 → 1.0.6

package/VNet/types.d.ts

@@ -1,6 +1,7 @@
 import { enums, input as inputs } from '@pulumi/azure-native/types';
 import { Input, Output } from '@pulumi/pulumi';
 import * as pulumi from '@pulumi/pulumi';
+import { NamedType } from '../types';
 export type VnetInfoType = {
     vnetName: Input<string>;
     resourceGroupName: Input<string>;
@@ -78,13 +79,11 @@ export interface ApplicationRuleArgs {
     terminateTLS?: Input<boolean>;
     webCategories?: Input<Input<string>[]>;
 }
-export type FirewallPolicyRuleCollectionResults = {
-    name: string;
+export type FirewallPolicyRuleCollectionResults = NamedType & {
     priority: number;
     ruleCollections: Input<Input<inputs.network.FirewallPolicyFilterRuleCollectionArgs | inputs.network.FirewallPolicyNatRuleCollectionArgs>[]>;
 };
-export type FirewallPolicyResults = {
-    name: string;
+export type FirewallPolicyResults = NamedType & {
     dnatRules?: Array<Input<NatRuleArgs>>;
     netRules?: Array<Input<NetworkRuleArgs>>;
     appRules?: Array<Input<ApplicationRuleArgs>>;

package/Web/AppCertOrder.d.ts

@@ -1,9 +1,8 @@
 import * as cert from '@pulumi/azure-native/certificateregistration';
-import { BasicResourceArgs, KeyVaultInfo } from '../types';
-interface Props extends BasicResourceArgs {
+import { BasicResourceWithVaultArgs } from '../types';
+interface Props extends BasicResourceWithVaultArgs {
     domain: string;
     productType?: cert.CertificateProductType;
-    vaultInfo?: KeyVaultInfo;
 }
 declare const _default: ({ domain, productType, vaultInfo, ...others }: Props) => import("@pulumi/azure-native/certificateregistration/appServiceCertificateOrder").AppServiceCertificateOrder;
 export default _default;

package/Web/AppCertOrder.js

@@ -49,4 +49,4 @@ exports.default = ({ domain, productType = cert.CertificateProductType.StandardD
     }
     return order;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ2VydE9yZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDZXJ0T3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG1GQUFxRTtBQUVyRSxzQ0FBcUQ7QUFRckQsa0JBQWUsQ0FBQyxFQUNkLE1BQU0sRUFDTixXQUFXLEdBQUcsSUFBSSxDQUFDLHNCQUFzQixDQUFDLGtDQUFrQyxFQUM1RSxTQUFTLEVBQ1QsR0FBRyxNQUFNLEVBQ0gsRUFBRSxFQUFFO0lBQ1YsTUFBTSxDQUFDLEdBQUcsSUFBQSx5QkFBZ0IsRUFBQyxNQUFNLENBQUMsQ0FBQztJQUVuQyxNQUFNLEtBQUssR0FBRyxJQUFJLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxDQUFDLEVBQUU7UUFDbkQsb0JBQW9CLEVBQUUsQ0FBQztRQUN2QixHQUFHLGVBQU0sQ0FBQyxTQUFTO1FBQ25CLFFBQVEsRUFBRSxRQUFRO1FBQ2xCLFdBQVc7UUFDWCxTQUFTLEVBQUUsSUFBSTtRQUNmLGlCQUFpQixFQUFFLFFBQVEsTUFBTSxFQUFFO1FBQ25DLE9BQU8sRUFBRSxJQUFJO1FBQ2IsZUFBZSxFQUFFLENBQUM7UUFDbEIsR0FBRyxNQUFNO0tBQ1YsQ0FBQyxDQUFDO0lBRUgsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLElBQUksSUFBSSxDQUFDLHFDQUFxQyxDQUM1QyxDQUFDLEVBQ0Q7WUFDRSxvQkFBb0IsRUFBRSxDQUFDO1lBQ3ZCLEdBQUcsZUFBTSxDQUFDLFNBQVM7WUFDbkIsUUFBUSxFQUFFLFFBQVE7WUFDbEIsa0JBQWtCLEVBQUUsQ0FBQztZQUNyQixVQUFVLEVBQUUsU0FBUyxDQUFDLEVBQUU7U0FDekIsRUFDRCxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsQ0FDckIsQ0FBQztJQUNKLENBQUM7SUFDRCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ2VydE9yZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDZXJ0T3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG1GQUFxRTtBQUVyRSxzQ0FBcUQ7QUFPckQsa0JBQWUsQ0FBQyxFQUNkLE1BQU0sRUFDTixXQUFXLEdBQUcsSUFBSSxDQUFDLHNCQUFzQixDQUFDLGtDQUFrQyxFQUM1RSxTQUFTLEVBQ1QsR0FBRyxNQUFNLEVBQ0gsRUFBRSxFQUFFO0lBQ1YsTUFBTSxDQUFDLEdBQUcsSUFBQSx5QkFBZ0IsRUFBQyxNQUFNLENBQUMsQ0FBQztJQUVuQyxNQUFNLEtBQUssR0FBRyxJQUFJLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxDQUFDLEVBQUU7UUFDbkQsb0JBQW9CLEVBQUUsQ0FBQztRQUN2QixHQUFHLGVBQU0sQ0FBQyxTQUFTO1FBQ25CLFFBQVEsRUFBRSxRQUFRO1FBQ2xCLFdBQVc7UUFDWCxTQUFTLEVBQUUsSUFBSTtRQUNmLGlCQUFpQixFQUFFLFFBQVEsTUFBTSxFQUFFO1FBQ25DLE9BQU8sRUFBRSxJQUFJO1FBQ2IsZUFBZSxFQUFFLENBQUM7UUFDbEIsR0FBRyxNQUFNO0tBQ1YsQ0FBQyxDQUFDO0lBRUgsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLElBQUksSUFBSSxDQUFDLHFDQUFxQyxDQUM1QyxDQUFDLEVBQ0Q7WUFDRSxvQkFBb0IsRUFBRSxDQUFDO1lBQ3ZCLEdBQUcsZUFBTSxDQUFDLFNBQVM7WUFDbkIsUUFBUSxFQUFFLFFBQVE7WUFDbEIsa0JBQWtCLEVBQUUsQ0FBQztZQUNyQixVQUFVLEVBQUUsU0FBUyxDQUFDLEVBQUU7U0FDekIsRUFDRCxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsQ0FDckIsQ0FBQztJQUNKLENBQUM7SUFDRCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUMsQ0FBQyJ9

package/Web/AppConfig.d.ts

@@ -1,11 +1,8 @@
 import * as appConfig from '@pulumi/azure-native/appconfiguration';
-import { KeyVaultInfo, PrivateLinkPropsType, ResourceGroupInfo, ResourceInfo } from '../types';
-export type AppConfigProps = {
-    name: string;
-    group: ResourceGroupInfo;
+import { PrivateLinkPropsType, ResourceInfo, ResourceWithVaultArgs } from '../types';
+export type AppConfigProps = ResourceWithVaultArgs & {
     privateLink?: PrivateLinkPropsType;
     disableLocalAuth?: boolean;
-    vaultInfo?: KeyVaultInfo;
 };
 declare const _default: ({ group, name, vaultInfo, disableLocalAuth, privateLink, }: AppConfigProps) => ResourceInfo & {
     instance: appConfig.ConfigurationStore;

package/Web/AppConfig.js

@@ -27,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const appConfig = __importStar(require("@pulumi/azure-native/appconfiguration"));
-const AzureEnv_1 = require("../Common/AzureEnv");
 const Common_1 = require("../Common");
 const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
@@ -39,8 +38,8 @@ exports.default = ({ group, name, vaultInfo, disableLocalAuth, privateLink, }) =
         configStoreName: name,
         ...group,
         identity: { type: 'SystemAssigned' },
-        enablePurgeProtection: AzureEnv_1.isPrd,
-        softDeleteRetentionInDays: AzureEnv_1.isPrd ? 7 : 1,
+        enablePurgeProtection: Common_1.isPrd,
+        softDeleteRetentionInDays: Common_1.isPrd ? 7 : 1,
         disableLocalAuth,
         publicNetworkAccess: privateLink
             ? appConfig.PublicNetworkAccess.Disabled
@@ -90,4 +89,4 @@ exports.default = ({ group, name, vaultInfo, disableLocalAuth, privateLink, }) =
         instance: app,
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlGQUFtRTtBQUNuRSxpREFBMkM7QUFDM0Msc0NBQTZDO0FBTzdDLDhFQUFzRDtBQUN0RCwyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixFQUNoQixXQUFXLEdBQ0ksRUFFZixFQUFFO0lBQ0YsSUFBSSxHQUFHLElBQUEseUJBQWdCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUIsTUFBTSw4QkFBOEIsR0FBRyxHQUFHLElBQUksaUNBQWlDLENBQUM7SUFDaEYsTUFBTSxnQ0FBZ0MsR0FBRyxHQUFHLElBQUksbUNBQW1DLENBQUM7SUFFcEYsTUFBTSxHQUFHLEdBQUcsSUFBSSxTQUFTLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFO1FBQ2pELGVBQWUsRUFBRSxJQUFJO1FBQ3JCLEdBQUcsS0FBSztRQUNSLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRTtRQUNwQyxxQkFBcUIsRUFBRSxnQkFBSztRQUM1Qix5QkFBeUIsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEMsZ0JBQWdCO1FBQ2hCLG1CQUFtQixFQUFFLFdBQVc7WUFDOUIsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRO1lBQ3hDLENBQUMsQ0FBQyxTQUFTLENBQUMsbUJBQW1CLENBQUMsT0FBTztRQUV6QyxHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFO0tBQzFCLENBQUMsQ0FBQztJQUVILGFBQWE7SUFDYixJQUFJLFNBQVMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDbkMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ3hCLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFDaEIsMkJBQTJCO1lBQzNCLE1BQU0sSUFBSSxHQUFHLE1BQU0sU0FBUyxDQUFDLDBCQUEwQixDQUFDO2dCQUN0RCxlQUFlLEVBQUUsSUFBSTtnQkFDckIsR0FBRyxLQUFLO2FBQ1QsQ0FBQyxDQUFDO1lBRUgsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2YsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtvQkFDckIsa0NBQWtDO29CQUNsQyxJQUFJLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQzt3QkFDakIsSUFBQSw4QkFBZSxFQUFDOzRCQUNkLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUM7Z0NBQ2hDLENBQUMsQ0FBQyw4QkFBOEI7Z0NBQ2hDLENBQUMsQ0FBQyxnQ0FBZ0M7NEJBQ3BDLEtBQUssRUFBRSxHQUFHLENBQUMsZ0JBQWdCOzRCQUMzQixXQUFXLEVBQUUsYUFBYSxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksRUFBRTs0QkFDNUMsU0FBUzt5QkFDVixDQUFDLENBQUM7b0JBQ0wsQ0FBQztnQkFDSCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxjQUFjO0lBQ2QsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixJQUFBLHlCQUFlLEVBQUM7WUFDZCxZQUFZLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFO1lBQ3pDLGtCQUFrQixFQUFFLHlCQUF5QjtZQUM3QyxtQkFBbUIsRUFBRSxDQUFDLFdBQVcsQ0FBQztZQUNsQyxHQUFHLFdBQVc7U0FDZixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTztRQUNMLElBQUk7UUFDSixLQUFLO1FBQ0wsRUFBRSxFQUFFLEdBQUcsQ0FBQyxFQUFFO1FBQ1YsUUFBUSxFQUFFLEdBQUc7S0FDZCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlGQUFtRTtBQUNuRSxzQ0FBb0Q7QUFNcEQsOEVBQXNEO0FBQ3RELDJEQUEyRDtBQU8zRCxrQkFBZSxDQUFDLEVBQ2QsS0FBSyxFQUNMLElBQUksRUFDSixTQUFTLEVBQ1QsZ0JBQWdCLEVBQ2hCLFdBQVcsR0FDSSxFQUVmLEVBQUU7SUFDRixJQUFJLEdBQUcsSUFBQSx5QkFBZ0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUM5QixNQUFNLDhCQUE4QixHQUFHLEdBQUcsSUFBSSxpQ0FBaUMsQ0FBQztJQUNoRixNQUFNLGdDQUFnQyxHQUFHLEdBQUcsSUFBSSxtQ0FBbUMsQ0FBQztJQUVwRixNQUFNLEdBQUcsR0FBRyxJQUFJLFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLEVBQUU7UUFDakQsZUFBZSxFQUFFLElBQUk7UUFDckIsR0FBRyxLQUFLO1FBQ1IsUUFBUSxFQUFFLEVBQUUsSUFBSSxFQUFFLGdCQUFnQixFQUFFO1FBQ3BDLHFCQUFxQixFQUFFLGNBQUs7UUFDNUIseUJBQXlCLEVBQUUsY0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEMsZ0JBQWdCO1FBQ2hCLG1CQUFtQixFQUFFLFdBQVc7WUFDOUIsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRO1lBQ3hDLENBQUMsQ0FBQyxTQUFTLENBQUMsbUJBQW1CLENBQUMsT0FBTztRQUV6QyxHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFO0tBQzFCLENBQUMsQ0FBQztJQUVILGFBQWE7SUFDYixJQUFJLFNBQVMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDbkMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ3hCLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFDaEIsMkJBQTJCO1lBQzNCLE1BQU0sSUFBSSxHQUFHLE1BQU0sU0FBUyxDQUFDLDBCQUEwQixDQUFDO2dCQUN0RCxlQUFlLEVBQUUsSUFBSTtnQkFDckIsR0FBRyxLQUFLO2FBQ1QsQ0FBQyxDQUFDO1lBRUgsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2YsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtvQkFDckIsa0NBQWtDO29CQUNsQyxJQUFJLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQzt3QkFDakIsSUFBQSw4QkFBZSxFQUFDOzRCQUNkLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUM7Z0NBQ2hDLENBQUMsQ0FBQyw4QkFBOEI7Z0NBQ2hDLENBQUMsQ0FBQyxnQ0FBZ0M7NEJBQ3BDLEtBQUssRUFBRSxHQUFHLENBQUMsZ0JBQWdCOzRCQUMzQixXQUFXLEVBQUUsYUFBYSxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksRUFBRTs0QkFDNUMsU0FBUzt5QkFDVixDQUFDLENBQUM7b0JBQ0wsQ0FBQztnQkFDSCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxjQUFjO0lBQ2QsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixJQUFBLHlCQUFlLEVBQUM7WUFDZCxZQUFZLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFO1lBQ3pDLGtCQUFrQixFQUFFLHlCQUF5QjtZQUM3QyxtQkFBbUIsRUFBRSxDQUFDLFdBQVcsQ0FBQztZQUNsQyxHQUFHLFdBQVc7U0FDZixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTztRQUNMLElBQUk7UUFDSixLQUFLO1FBQ0wsRUFBRSxFQUFFLEdBQUcsQ0FBQyxFQUFFO1FBQ1YsUUFBUSxFQUFFLEdBQUc7S0FDZCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drunk-pulumi/azure",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "author": "drunkcoding@outlook.com",
   "description": "The custom helpers pulumi-azure",
   "license": "MIT",
@@ -17,10 +17,10 @@
     "url": "https://github.com/baoduy/drunk-pulumi-azure.git"
   },
   "dependencies": {
-    "@drunk-pulumi/azure-providers": "^0.0.30",
-    "@pulumi/azure-native": "^2.50.1",
-    "@pulumi/azuread": "5.53.2",
-    "@pulumi/pulumi": "^3.125.0",
+    "@drunk-pulumi/azure-providers": "^0.0.31",
+    "@pulumi/azure-native": "^2.51.0",
+    "@pulumi/azuread": "5.53.3",
+    "@pulumi/pulumi": "^3.127.0",
     "@pulumi/random": "^4.16.3",
     "@pulumi/tls": "^5.0.4",
     "axios": "^1.7.2",

package/types.d.ts

@@ -1,5 +1,6 @@
 import { Input, Output, Resource } from '@pulumi/pulumi';
 import { EnvRoleKeyTypes } from './AzAd/EnvRoles';
+import { IEnvRoleBuilder } from './Builder';
 export declare namespace NodeJS {
     interface ProcessEnv {
         DPA_NAMING_DISABLE_PREFIX?: string;
@@ -7,29 +8,55 @@ export declare namespace NodeJS {
         DPA_NAMING_DISABLE_SUFFIX?: string;
     }
 }
-export type NamedResourceType = {
-    name: string;
+/** Omit all the key of OT from T */
+export type TypeOmit<T, OT> = Omit<T, keyof OT>;
+export type OmitOpts<T> = TypeOmit<T, OptsArgs>;
+export type LockableType = {
+    lock?: boolean;
 };
 export type ResourceGroupInfo = {
     resourceGroupName: string;
     location?: Input<string>;
 };
-export type BasicResourceInfo = NamedResourceType & {
-    id: Output<string>;
-};
-export type ResourceInfo = BasicResourceInfo & {
-    group: ResourceGroupInfo;
-};
-export type BasicArgs = {
+export type OptsArgs = {
     dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
     importUri?: string;
     ignoreChanges?: string[];
 };
-export interface BasicResourceArgs extends BasicArgs {
+export type LoginArgs = {
+    adminLogin: Input<string>;
+    password: Input<string>;
+};
+export type LoginWithEnvRolesArgs = LoginArgs & {
+    envRoles?: IEnvRoleBuilder;
+};
+export type NamedType = {
     name: string;
+};
+export type NamedWithVaultType = NamedType & {
+    vaultInfo?: KeyVaultInfo;
+};
+export type NamedBasicArgs = NamedType & OptsArgs;
+export type NamedWithVaultBasicArgs = NamedWithVaultType & OptsArgs;
+export type ResourceArgs = NamedType & {
     group: ResourceGroupInfo;
-}
+};
+export type ResourceWithVaultArgs = ResourceArgs & NamedWithVaultType;
+export type EncryptResourceArgs = ResourceWithVaultArgs & {
+    enableEncryption?: boolean;
+    envRoles?: IEnvRoleBuilder;
+};
+export type BasicResourceArgs = ResourceArgs & OptsArgs;
+export type BasicResourceWithVaultArgs = NamedWithVaultType & BasicResourceArgs;
+export type BasicEncryptResourceArgs = EncryptResourceArgs & OptsArgs;
+export type BasicResourceInfo = NamedType & {
+    id: Output<string>;
+};
+export type ResourceInfo = BasicResourceInfo & ResourceArgs;
 export type KeyVaultInfo = ResourceInfo;
+export type IdentityInfo = ResourceInfo & {
+    principalId: string;
+};
 export interface BasicResourceInfoWithInstance<InstanceType> extends BasicResourceInfo {
     instance: InstanceType;
 }
@@ -50,20 +77,8 @@ export type NetworkPropsType = {
 };
 export type IdentityRoleAssignment = {
     vaultInfo?: KeyVaultInfo;
-    roles?: Array<{
-        name: string;
-        scope: Input<string>;
-    }>;
-    envRole?: EnvRoleKeyTypes;
-};
-export interface ResourceInfoArg {
-    /**If name and provider of the resource is not provided then the Id will be resource group Id*/
-    name?: Input<string>;
-    /**The provider name of the resource ex: "Microsoft.Network/virtualNetworks" or "Microsoft.Network/networkSecurityGroups"*/
-    provider?: string;
-    group: ResourceGroupInfo;
-    subscriptionId?: Input<string>;
-}
+    role?: EnvRoleKeyTypes;
+};
 export type ConventionProps = {
     prefix?: string;
     suffix?: string;
@@ -72,12 +87,11 @@ export type ConventionProps = {
     /**Whether include the organization name at the end of the name or not*/
     includeOrgName?: boolean;
 };
-export type BasicMonitorArgs = BasicArgs & {
+export type BasicMonitorArgs = OptsArgs & {
     logWpId?: Input<string>;
     logStorageId?: Input<string>;
 };
-export interface DiagnosticProps extends BasicMonitorArgs {
-    name: string;
+export interface DiagnosticProps extends NamedType, BasicMonitorArgs {
     targetResourceId: Input<string>;
     metricsCategories?: string[];
     logsCategories?: string[];