@drunk-pulumi/azure 0.0.53 → 1.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Aks/index.js +9 -9
- package/Automation/index.d.ts +1 -1
- package/Automation/index.js +4 -4
- package/AzAd/EnvRoles.Consts.d.ts +4 -3
- package/AzAd/EnvRoles.Consts.js +67 -36
- package/Builder/AksBuilder.js +7 -1
- package/Builder/ApimBuilder.js +7 -3
- package/Builder/PrivateDnsZoneBuilder.js +4 -3
- package/Builder/ResourceBuilder.js +5 -1
- package/Builder/StorageBuilder.js +2 -2
- package/Builder/types/askBuilder.d.ts +1 -0
- package/Builder/types/resourceBuilder.d.ts +4 -4
- package/ContainerRegistry/index.js +2 -2
- package/Core/ResourceGroup.d.ts +2 -5
- package/Core/ResourceGroup.js +1 -1
- package/Logs/LogAnalytics.d.ts +2 -2
- package/Logs/LogAnalytics.js +10 -10
- package/Logs/index.d.ts +5 -5
- package/Logs/index.js +6 -6
- package/MySql/index.js +2 -2
- package/Postgresql/index.js +2 -2
- package/SignalR/index.js +3 -3
- package/Storage/index.d.ts +4 -2
- package/Storage/index.js +10 -6
- package/VNet/PrivateEndpoint.d.ts +2 -2
- package/VNet/PrivateEndpoint.js +3 -3
- package/Web/AppConfig.d.ts +1 -1
- package/Web/AppConfig.js +3 -3
- package/package.json +6 -3
- package/types.d.ts +3 -0
|
@@ -23,4 +23,5 @@ export interface IAksBuilder extends IBuilderAsync<AksResults> {
|
|
|
23
23
|
withFeature(props: AskFeatureProps): IAksBuilder;
|
|
24
24
|
withTier(tier: native.containerservice.ManagedClusterSKUTier): IAksBuilder;
|
|
25
25
|
import(props: AksImportProps): IAksBuilder;
|
|
26
|
+
lock(): IBuilderAsync<AksResults>;
|
|
26
27
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EnvRolesResults } from '../../AzAd/EnvRoles';
|
|
2
|
-
import {
|
|
2
|
+
import { RoleEnableTypes } from '../../AzAd/EnvRoles.Consts';
|
|
3
3
|
import { KeyVaultInfo, ResourceGroupInfo, ResourceInfo } from '../../types';
|
|
4
4
|
import { BuilderProps, IBuilder, IBuilderAsync } from './genericBuilder';
|
|
5
5
|
import { IVnetBuilder, IVnetBuilderStart, VnetBuilderResults } from './vnetBuilder';
|
|
@@ -9,7 +9,6 @@ export type ResourceBuilderResults = BuilderProps & {
|
|
|
9
9
|
vnetInstance?: VnetBuilderResults;
|
|
10
10
|
otherInstances: Record<string, any>;
|
|
11
11
|
};
|
|
12
|
-
export type ResourceGroupBuilderType = Omit<RGPermissionType, 'envRoles'>;
|
|
13
12
|
export type BuilderFunctionType = (props: ResourceBuilderResults) => IBuilder<any>;
|
|
14
13
|
export type BuilderAsyncFunctionType = (props: ResourceBuilderResults) => IBuilderAsync<any>;
|
|
15
14
|
export type ResourceVnetBuilderType = (builder: IVnetBuilderStart) => IVnetBuilder;
|
|
@@ -25,12 +24,13 @@ export interface IResourceRoleBuilder {
|
|
|
25
24
|
withRolesFromVault(): IResourceGroupBuilder;
|
|
26
25
|
}
|
|
27
26
|
export interface IResourceGroupBuilder {
|
|
28
|
-
createRG(props?:
|
|
27
|
+
createRG(props?: RoleEnableTypes): IResourceVaultBuilder;
|
|
29
28
|
withRG(props: ResourceGroupInfo): IResourceVaultBuilder;
|
|
30
29
|
}
|
|
31
30
|
export interface IResourceVaultBuilder {
|
|
32
31
|
createVault(name?: string): IResourceBuilder;
|
|
33
32
|
withVault(props: KeyVaultInfo): IResourceBuilder;
|
|
33
|
+
getVaultInfoBy(name: string): IResourceBuilder;
|
|
34
34
|
}
|
|
35
35
|
export interface IResourceVaultItemsBuilder {
|
|
36
36
|
addSecrets(items: Record<string, Input<string>>): IResourceBuilder;
|
|
@@ -40,9 +40,9 @@ export interface IResourceVnetBuilder {
|
|
|
40
40
|
linkVaultTo(props: ResourceVaultLinkingBuilderType): IResourceBuilder;
|
|
41
41
|
}
|
|
42
42
|
export interface IResourceBuilder extends IResourceVnetBuilder, IResourceVaultItemsBuilder {
|
|
43
|
-
lock(): IResourceBuilder;
|
|
44
43
|
withBuilder(props: BuilderFunctionType): IResourceBuilder;
|
|
45
44
|
withBuilderAsync(props: BuilderAsyncFunctionType): IResourceBuilder;
|
|
46
45
|
withResource(builder: ResourceFunction): IResourceBuilder;
|
|
46
|
+
lock(): IResourceBuilder;
|
|
47
47
|
build(): Promise<ResourceBuilderResults>;
|
|
48
48
|
}
|
|
@@ -57,9 +57,9 @@ exports.default = ({ name, group = global.groupInfo, sku = registry.SkuName.Basi
|
|
|
57
57
|
}, { dependsOn, ignoreChanges });
|
|
58
58
|
if (sku === 'Premium' && network?.privateLink) {
|
|
59
59
|
(0, PrivateEndpoint_1.default)({
|
|
60
|
+
...network.privateLink,
|
|
60
61
|
resourceInfo: { name, group, id: resource.id },
|
|
61
62
|
privateDnsZoneName: 'privatelink.azurecr.io',
|
|
62
|
-
subnetIds: network.privateLink.subnetIds,
|
|
63
63
|
linkServiceGroupIds: network.privateLink.type
|
|
64
64
|
? [network.privateLink.type]
|
|
65
65
|
: ['azurecr'],
|
|
@@ -114,4 +114,4 @@ exports.default = ({ name, group = global.groupInfo, sku = registry.SkuName.Basi
|
|
|
114
114
|
instance: resource,
|
|
115
115
|
};
|
|
116
116
|
};
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
117
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29udGFpbmVyUmVnaXN0cnkvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlGQUFtRTtBQVFuRSw0REFBOEM7QUFDOUMsc0NBQXdEO0FBQ3hELDhFQUFzRDtBQUN0RCwyREFBMkQ7QUFhM0Q7O0dBRUc7QUFDSCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssR0FBRyxNQUFNLENBQUMsU0FBUyxFQUN4QixHQUFHLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQzVCLGdCQUFnQixHQUFHLElBQUksRUFDdkIsU0FBUyxFQUNULE9BQU8sRUFDUCxTQUFTLEVBQ1QsYUFBYSxHQUNQLEVBQStDLEVBQUU7SUFDdkQsSUFBSSxHQUFHLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUV4QixNQUFNLE1BQU0sR0FBRyxHQUFHLElBQUksTUFBTSxDQUFDO0lBQzdCLE1BQU0sV0FBVyxHQUFHLEdBQUcsSUFBSSxZQUFZLENBQUM7SUFDeEMsTUFBTSxrQkFBa0IsR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQzVELE1BQU0sb0JBQW9CLEdBQUcsSUFBQSx3QkFBZSxFQUFDLElBQUksRUFBRSxXQUFXLENBQUMsQ0FBQztJQUVoRSxNQUFNLFFBQVEsR0FBRyxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQ3BDLElBQUksRUFDSjtRQUNFLFlBQVksRUFBRSxJQUFJO1FBQ2xCLEdBQUcsS0FBSztRQUVSLEdBQUcsRUFBRSxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUU7UUFDbEIsZ0JBQWdCO1FBQ2hCLG1CQUFtQixFQUFFLE9BQU8sRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsU0FBUztRQUVsRSxjQUFjLEVBQ1osR0FBRyxL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
|
package/Core/ResourceGroup.d.ts
CHANGED
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
import { BasicResourceArgs, BasicResourceInfoWithInstance, ResourceGroupInfo } from '../types';
|
|
2
2
|
import { ResourceGroup } from '@pulumi/azure-native/resources';
|
|
3
3
|
import { EnvRolesResults } from '../AzAd/EnvRoles';
|
|
4
|
-
|
|
4
|
+
import { RoleEnableTypes } from '../AzAd/EnvRoles.Consts';
|
|
5
|
+
export type RGPermissionType = RoleEnableTypes & {
|
|
5
6
|
envRoles: EnvRolesResults;
|
|
6
|
-
enableRGRoles?: boolean;
|
|
7
|
-
enableAksRoles?: boolean;
|
|
8
|
-
enableIotRoles?: boolean;
|
|
9
|
-
enableVaultRoles?: boolean;
|
|
10
7
|
};
|
|
11
8
|
interface Props extends Omit<BasicResourceArgs, 'group'> {
|
|
12
9
|
formattedName?: boolean;
|
package/Core/ResourceGroup.js
CHANGED
|
@@ -32,4 +32,4 @@ exports.default = ({ name, formattedName, permissions, ...others }) => {
|
|
|
32
32
|
}),
|
|
33
33
|
};
|
|
34
34
|
};
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VHcm91cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Db3JlL1Jlc291cmNlR3JvdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFNQSw4REFHd0M7QUFDeEMsd0VBQWdEO0FBQ2hELHNDQUFpRDtBQUVqRCxpREFBdUQ7QUFDdkQsNkRBQStFO0FBZS9FLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osYUFBYSxFQUNiLFdBQVcsRUFDWCxHQUFHLE1BQU0sRUFDSCxFQUVOLEVBQUU7SUFDRixJQUFJLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsNkJBQW9CLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFekQsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLEdBQUcsSUFBQSx5QkFBZSxFQUFDLHlCQUFhLEVBQUU7UUFDdEUsaUJBQWlCLEVBQUUsSUFBSTtRQUN2QixHQUFHLE1BQU07S0FDdUIsQ0FBQyxDQUFDO0lBRXBDLElBQUksV0FBVyxFQUFFLENBQUM7UUFDaEIsSUFBQSxxQ0FBbUIsRUFBQztZQUNsQixJQUFJO1lBQ0osR0FBRyxXQUFXO1lBQ2QsS0FBSyxFQUFFLFFBQVEsQ0FBQyxFQUFFO1lBQ2xCLFNBQVMsRUFBRSxRQUFRO1NBQ3BCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPO1FBQ0wsSUFBSTtRQUNKLFFBQVEsRUFBRSxRQUF5QjtRQUNuQyxFQUFFLEVBQUUsUUFBUSxDQUFDLEVBQUU7UUFDZixJQUFJLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztZQUNYLGlCQUFpQixFQUFFLElBQUk7WUFDdkIsUUFBUSxFQUFFLDRCQUFpQjtTQUM1QixDQUFDO0tBQ0gsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9
|
package/Logs/LogAnalytics.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as operationalinsights from
|
|
2
|
-
import { KeyVaultInfo, ResourceGroupInfo } from
|
|
1
|
+
import * as operationalinsights from '@pulumi/azure-native/operationalinsights';
|
|
2
|
+
import { KeyVaultInfo, ResourceGroupInfo } from '../types';
|
|
3
3
|
interface Props {
|
|
4
4
|
name: string;
|
|
5
5
|
group: ResourceGroupInfo;
|
package/Logs/LogAnalytics.js
CHANGED
|
@@ -24,18 +24,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
const operationalinsights = __importStar(require("@pulumi/azure-native/operationalinsights"));
|
|
27
|
-
const
|
|
27
|
+
const Common_1 = require("../Common");
|
|
28
28
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
29
29
|
exports.default = ({ name, group, sku = operationalinsights.WorkspaceSkuNameEnum.Free, dailyQuotaGb = 0.023, vaultInfo, }) => {
|
|
30
|
-
name = (0,
|
|
30
|
+
name = (0, Common_1.getLogWpName)(name);
|
|
31
31
|
const workspaceIdKeyName = `${name}-Id`;
|
|
32
|
-
const primaryKeyName = (0,
|
|
33
|
-
const secondaryKeyName = (0,
|
|
32
|
+
const primaryKeyName = (0, Common_1.getKeyName)(name, 'primary');
|
|
33
|
+
const secondaryKeyName = (0, Common_1.getKeyName)(name, 'secondary');
|
|
34
34
|
const log = new operationalinsights.Workspace(name, {
|
|
35
35
|
workspaceName: name,
|
|
36
36
|
...group,
|
|
37
|
-
publicNetworkAccessForIngestion:
|
|
38
|
-
publicNetworkAccessForQuery:
|
|
37
|
+
publicNetworkAccessForIngestion: 'Enabled',
|
|
38
|
+
publicNetworkAccessForQuery: 'Enabled',
|
|
39
39
|
features: {
|
|
40
40
|
//clusterResourceId?: pulumi.Input<string>;
|
|
41
41
|
//disableLocalAuth: true,
|
|
@@ -60,25 +60,25 @@ exports.default = ({ name, group, sku = operationalinsights.WorkspaceSkuNameEnum
|
|
|
60
60
|
(0, CustomHelper_1.addCustomSecret)({
|
|
61
61
|
name: workspaceIdKeyName,
|
|
62
62
|
value: id,
|
|
63
|
-
contentType:
|
|
63
|
+
contentType: 'Log Analytics',
|
|
64
64
|
vaultInfo,
|
|
65
65
|
});
|
|
66
66
|
(0, CustomHelper_1.addCustomSecret)({
|
|
67
67
|
name: primaryKeyName,
|
|
68
68
|
formattedName: true,
|
|
69
69
|
value: keys.primarySharedKey,
|
|
70
|
-
contentType:
|
|
70
|
+
contentType: 'Log Analytics',
|
|
71
71
|
vaultInfo,
|
|
72
72
|
});
|
|
73
73
|
(0, CustomHelper_1.addCustomSecret)({
|
|
74
74
|
name: secondaryKeyName,
|
|
75
75
|
formattedName: true,
|
|
76
76
|
value: keys.secondarySharedKey,
|
|
77
|
-
contentType:
|
|
77
|
+
contentType: 'Log Analytics',
|
|
78
78
|
vaultInfo,
|
|
79
79
|
});
|
|
80
80
|
});
|
|
81
81
|
}
|
|
82
82
|
return { log, vaultNames: { primaryKeyName, secondaryKeyName } };
|
|
83
83
|
};
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nQW5hbHl0aWNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0xvZ3MvTG9nQW5hbHl0aWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4RkFBZ0Y7QUFFaEYsc0NBQXFEO0FBQ3JELDJEQUEyRDtBQVUzRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxHQUFHLEdBQUcsbUJBQW1CLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUNuRCxZQUFZLEdBQUcsS0FBSyxFQUNwQixTQUFTLEdBQ0gsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLElBQUEscUJBQVksRUFBQyxJQUFJLENBQUMsQ0FBQztJQUMxQixNQUFNLGtCQUFrQixHQUFHLEdBQUcsSUFBSSxLQUFLLENBQUM7SUFDeEMsTUFBTSxjQUFjLEdBQUcsSUFBQSxtQkFBVSxFQUFDLElBQUksRUFBRSxTQUFTLENBQUMsQ0FBQztJQUNuRCxNQUFNLGdCQUFnQixHQUFHLElBQUEsbUJBQVUsRUFBQyxJQUFJLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFFdkQsTUFBTSxHQUFHLEdBQUcsSUFBSSxtQkFBbUIsQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFO1FBQ2xELGFBQWEsRUFBRSxJQUFJO1FBQ25CLEdBQUcsS0FBSztRQUVSLCtCQUErQixFQUFFLFNBQVM7UUFDMUMsMkJBQTJCLEVBQUUsU0FBUztRQUN0QyxRQUFRLEVBQUU7WUFDUiwyQ0FBMkM7WUFDM0MseUJBQXlCO1lBQ3pCLDBCQUEwQjtZQUMxQixzRUFBc0U7WUFDdEUsMEJBQTBCLEVBQUUsSUFBSTtTQUNqQztRQUNELGdCQUFnQixFQUNkLEdBQUcsS0FBSyxtQkFBbUIsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJO1lBQ25ELENBQUMsQ0FBQyxTQUFTO1lBQ1gsQ0FBQyxDQUFDLEVBQUUsWUFBWSxFQUFFLEVBQUUsZ0NBQWdDO1FBRXhELGVBQWUsRUFDYixHQUFHLEtBQUssbUJBQW1CLENBQUMsb0JBQW9CLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxxQkFBcUI7UUFDdkYsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRTtLQUNuQixDQUFDLENBQUM7SUFFSCxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ2hDLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFFaEIsTUFBTSxJQUFJLEdBQUcsTUFBTSxtQkFBbUIsQ0FBQyxhQUFhLENBQUM7Z0JBQ25ELGFBQWEsRUFBRSxJQUFJO2dCQUNuQixpQkFBaUIsRUFBRSxLQUFLLENBQUMsaUJBQWlCO2FBQzNDLENBQUMsQ0FBQztZQUVILElBQUEsOEJBQWUsRUFBQztnQkFDZCxJQUFJLEVBQUUsa0JBQWtCO2dCQUN4QixLQUFLLEVBQUUsRUFBRTtnQkFDVCxXQUFXLEVBQUUsZUFBZTtnQkFDNUIsU0FBUzthQUNWLENBQUMsQ0FBQztZQUVILElBQUEsOEJBQWUsRUFBQztnQkFDZCxJQUFJLEVBQUUsY0FBYztnQkFDcEIsYUFBYSxFQUFFLElBQUk7Z0JBQ25CLEtBQUssRUFBRSxJQUFJLENBQUMsZ0JBQWlCO2dCQUM3QixXQUFXLEVBQUUsZUFBZTtnQkFDNUIsU0FBUzthQUNWLENBQUMsQ0FBQztZQUVILElBQUEsOEJBQWUsRUFBQztnQkFDZCxJQUFJLEVBQUUsZ0JBQWdCO2dCQUN0QixhQUFhLEVBQUUsSUFBSTtnQkFDbkIsS0FBSyxFQUFFLElBQUksQ0FBQyxrQkFBbUI7Z0JBQy9CLFdBQVcsRUFBRSxlQUFlO2dCQUM1QixTQUFTO2FBQ1YsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTyxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUUsRUFBRSxjQUFjLEVBQUUsZ0JBQWdCLEVBQUUsRUFBRSxDQUFDO0FBQ25FLENBQUMsQ0FBQyJ9
|
package/Logs/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { BasicMonitorArgs, KeyVaultInfo, ResourceGroupInfo } from
|
|
2
|
-
import * as operationalinsights from
|
|
3
|
-
import { DefaultManagementRules } from
|
|
1
|
+
import { BasicMonitorArgs, KeyVaultInfo, ResourceGroupInfo } from '../types';
|
|
2
|
+
import * as operationalinsights from '@pulumi/azure-native/operationalinsights';
|
|
3
|
+
import { DefaultManagementRules } from '../Storage/ManagementRules';
|
|
4
4
|
type WorkspaceType = {
|
|
5
5
|
createAppInsight?: boolean;
|
|
6
6
|
sku?: operationalinsights.WorkspaceSkuNameEnum;
|
|
@@ -14,7 +14,7 @@ interface Props {
|
|
|
14
14
|
/** The management rule applied to Storage level (all containers)*/
|
|
15
15
|
storageRules?: Array<DefaultManagementRules>;
|
|
16
16
|
};
|
|
17
|
-
vaultInfo
|
|
17
|
+
vaultInfo?: KeyVaultInfo;
|
|
18
18
|
}
|
|
19
19
|
declare const _default: ({ group, name, workspace, storage, vaultInfo }: Props) => {
|
|
20
20
|
logWp: {
|
|
@@ -26,7 +26,7 @@ declare const _default: ({ group, name, workspace, storage, vaultInfo }: Props)
|
|
|
26
26
|
} | undefined;
|
|
27
27
|
logStorage: import("../Storage").StorageResults | undefined;
|
|
28
28
|
appInsight: import("@pulumi/azure-native/insights/component").Component | undefined;
|
|
29
|
-
|
|
29
|
+
info: () => BasicMonitorArgs;
|
|
30
30
|
toLogStorageInfo: () => BasicMonitorArgs;
|
|
31
31
|
toLogWpInfo: () => BasicMonitorArgs;
|
|
32
32
|
};
|
package/Logs/index.js
CHANGED
|
@@ -39,11 +39,11 @@ const defaultLogWorkspace = {
|
|
|
39
39
|
const defaultStorageRules = [
|
|
40
40
|
{
|
|
41
41
|
actions: { baseBlob: { delete: { daysAfterModificationGreaterThan: 30 } } },
|
|
42
|
-
filters: { blobTypes: [
|
|
42
|
+
filters: { blobTypes: ['blockBlob'] },
|
|
43
43
|
},
|
|
44
44
|
];
|
|
45
45
|
exports.default = ({ group, name, workspace, storage, vaultInfo }) => {
|
|
46
|
-
name = (0, ResourceEnv_1.getResourceName)(name, { suffix:
|
|
46
|
+
name = (0, ResourceEnv_1.getResourceName)(name, { suffix: 'logs' });
|
|
47
47
|
const createWp = workspace
|
|
48
48
|
? { ...defaultLogWorkspace, ...workspace }
|
|
49
49
|
: undefined;
|
|
@@ -63,7 +63,7 @@ exports.default = ({ group, name, workspace, storage, vaultInfo }) => {
|
|
|
63
63
|
dailyCapGb: createWp.dailyQuotaGb,
|
|
64
64
|
immediatePurgeDataOn30Days: true,
|
|
65
65
|
workspaceResourceId: logWp.log.id,
|
|
66
|
-
ingestionMode:
|
|
66
|
+
ingestionMode: 'LogAnalytics',
|
|
67
67
|
vaultInfo,
|
|
68
68
|
})
|
|
69
69
|
: undefined;
|
|
@@ -75,14 +75,14 @@ exports.default = ({ group, name, workspace, storage, vaultInfo }) => {
|
|
|
75
75
|
policies: {
|
|
76
76
|
defaultManagementRules: storage.storageRules ?? defaultStorageRules,
|
|
77
77
|
},
|
|
78
|
-
|
|
78
|
+
features: { allowSharedKeyAccess: true },
|
|
79
79
|
})
|
|
80
80
|
: undefined;
|
|
81
81
|
return {
|
|
82
82
|
logWp,
|
|
83
83
|
logStorage,
|
|
84
84
|
appInsight,
|
|
85
|
-
|
|
85
|
+
info: () => ({
|
|
86
86
|
logWpId: logWp?.log.id,
|
|
87
87
|
logStorageId: logStorage?.id,
|
|
88
88
|
}),
|
|
@@ -94,4 +94,4 @@ exports.default = ({ group, name, workspace, storage, vaultInfo }) => {
|
|
|
94
94
|
}),
|
|
95
95
|
};
|
|
96
96
|
};
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTG9ncy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsOEZBQWdGO0FBQ2hGLGtFQUFtQztBQUNuQyx5REFBaUM7QUFDakMsdURBQXdEO0FBRXhELDhEQUFzQztBQVF0QyxNQUFNLG1CQUFtQixHQUFrQjtJQUN6QyxnQkFBZ0IsRUFBRSxLQUFLO0lBQ3ZCLEdBQUcsRUFBRSxtQkFBbUIsQ0FBQyxvQkFBb0IsQ0FBQyxTQUFTO0lBQ3ZELFlBQVksRUFBRSxHQUFHO0NBQ2xCLENBQUM7QUFFRixNQUFNLG1CQUFtQixHQUFrQztJQUN6RDtRQUNFLE9BQU8sRUFBRSxFQUFFLFFBQVEsRUFBRSxFQUFFLE1BQU0sRUFBRSxFQUFFLGdDQUFnQyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUU7UUFDM0UsT0FBTyxFQUFFLEVBQUUsU0FBUyxFQUFFLENBQUMsV0FBVyxDQUFDLEVBQUU7S0FDdEM7Q0FDRixDQUFDO0FBYUYsa0JBQWUsQ0FBQyxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQVMsRUFBRSxFQUFFO0lBQ3ZFLElBQUksR0FBRyxJQUFBLDZCQUFlLEVBQUMsSUFBSSxFQUFFLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7SUFFakQsTUFBTSxRQUFRLEdBQThCLFNBQVM7UUFDbkQsQ0FBQyxDQUFDLEVBQUUsR0FBRyxtQkFBbUIsRUFBRSxHQUFHLFNBQVMsRUFBRTtRQUMxQyxDQUFDLENBQUMsU0FBUyxDQUFDO0lBRWQsTUFBTSxLQUFLLEdBQUcsUUFBUTtRQUNwQixDQUFDLENBQUMsSUFBQSxzQkFBSyxFQUFDO1lBQ0osS0FBSztZQUNMLElBQUk7WUFDSixHQUFHLEVBQUUsUUFBUSxDQUFDLEdBQUc7WUFDakIsWUFBWSxFQUFFLFFBQVEsQ0FBQyxZQUFZO1lBQ25DLFNBQVM7U0FDVixDQUFDO1FBQ0osQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVkLE1BQU0sVUFBVSxHQUNkLEtBQUssSUFBSSxRQUFRLEVBQUUsZ0JBQWdCO1FBQ2pDLENBQUMsQ0FBQyxJQUFBLG9CQUFVLEVBQUM7WUFDVCxLQUFLO1lBQ0wsSUFBSTtZQUNKLFVBQVUsRUFBRSxRQUFRLENBQUMsWUFBWTtZQUNqQywwQkFBMEIsRUFBRSxJQUFJO1lBQ2hDLG1CQUFtQixFQUFFLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRTtZQUNqQyxhQUFhLEVBQUUsY0FBYztZQUM3QixTQUFTO1NBQ1YsQ0FBQztRQUNKLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFFaEIsTUFBTSxVQUFVLEdBQUcsT0FBTztRQUN4QixDQUFDLENBQUMsSUFBQSxpQkFBTyxFQUFDO1lBQ04sS0FBSztZQUNMLElBQUk7WUFDSixTQUFTO1lBQ1QsUUFBUSxFQUFFO2dCQUNSLHNCQUFzQixFQUFFLE9BQU8sQ0FBQyxZQUFZLElBQUksbUJBQW1CO2FBQ3BFO1lBQ0QsUUFBUSxFQUFFLEVBQUUsb0JBQW9CLEVBQUUsSUFBSSxFQUFFO1NBQ3pDLENBQUM7UUFDSixDQUFDLENBQUMsU0FBUyxDQUFDO0lBRWQsT0FBTztRQUNMLEtBQUs7UUFDTCxVQUFVO1FBQ1YsVUFBVTtRQUNWLElBQUksRUFBRSxHQUFxQixFQUFFLENBQUMsQ0FBQztZQUM3QixPQUFPLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxFQUFFO1lBQ3RCLFlBQVksRUFBRSxVQUFVLEVBQUUsRUFBRTtTQUM3QixDQUFDO1FBQ0YsZ0JBQWdCLEVBQUUsR0FBcUIsRUFBRSxDQUFDLENBQUM7WUFDekMsWUFBWSxFQUFFLFVBQVUsRUFBRSxFQUFFO1NBQzdCLENBQUM7UUFDRixXQUFXLEVBQUUsR0FBcUIsRUFBRSxDQUFDLENBQUM7WUFDcEMsT0FBTyxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsRUFBRTtTQUN2QixDQUFDO0tBQ0gsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9
|
package/MySql/index.js
CHANGED
|
@@ -155,12 +155,12 @@ sku = {
|
|
|
155
155
|
});
|
|
156
156
|
if (network.privateLink) {
|
|
157
157
|
(0, PrivateEndpoint_1.default)({
|
|
158
|
+
...network.privateLink,
|
|
158
159
|
resourceInfo: { name, group, id: mySql.id },
|
|
159
160
|
privateDnsZoneName: 'mysql.database.azure.com',
|
|
160
161
|
linkServiceGroupIds: network.privateLink.type
|
|
161
162
|
? [network.privateLink.type]
|
|
162
163
|
: ['mysql'],
|
|
163
|
-
subnetIds: network.privateLink.subnetIds,
|
|
164
164
|
});
|
|
165
165
|
}
|
|
166
166
|
}
|
|
@@ -187,4 +187,4 @@ sku = {
|
|
|
187
187
|
}
|
|
188
188
|
return mySql;
|
|
189
189
|
};
|
|
190
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
190
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTXlTcWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDREQUE4QztBQUU5QyxzQ0FBeUM7QUFDekMsdURBQXlDO0FBQ3pDLDRFQUE4RDtBQUM5RCwyQ0FBZ0Q7QUFFaEQsMkRBQTJEO0FBQzNELGlEQUFxRDtBQUNyRCx5Q0FBaUQ7QUFFakQsK0NBQTREO0FBQzVELHdGQUFnRTtBQUNoRSwyQ0FBOEM7QUFDOUMsMkNBQWtEO0FBQ2xELDhFQUFzRDtBQW1CdEQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsSUFBSSxFQUNKLGdCQUFnQixFQUNoQixPQUFPLEdBQUcsVUFBVSxDQUFDLGFBQWEsQ0FBQyxvQkFBb0IsRUFDdkQsYUFBYSxHQUFHLEVBQUU7QUFDbEI7O0dBRUc7QUFDSCxHQUFHLEdBQUc7SUFDSixJQUFJLEVBQUUsZUFBZTtJQUNyQixJQUFJLEVBQUUsV0FBVztDQUNsQixFQUNELE9BQU8sRUFDUCxTQUFTLEVBQ1QsU0FBUyxFQUNULFNBQVMsR0FDRSxFQUFFLEVBQUU7SUFDZixJQUFJLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTFCLE1BQU0sUUFBUSxHQUNaLElBQUksRUFBRSxVQUFVO1FBQ2hCLElBQUkscUJBQVksQ0FBQyxJQUFJLEVBQUU7WUFDckIsT0FBTyxFQUFFLEtBQUs7WUFDZCxNQUFNLEVBQUUsQ0FBQztZQUNULEtBQUssRUFBRSxJQUFJO1lBQ1gsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRXRDLE1BQU0sUUFBUSxHQUNaLElBQUksRUFBRSxRQUFRO1FBQ2QsSUFBQSx1QkFBYyxFQUFDO1lBQ2Is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
|
package/Postgresql/index.js
CHANGED
|
@@ -116,12 +116,12 @@ sku = {
|
|
|
116
116
|
});
|
|
117
117
|
if (network.privateLink) {
|
|
118
118
|
(0, PrivateEndpoint_1.default)({
|
|
119
|
+
...network.privateLink,
|
|
119
120
|
resourceInfo: { name, group, id: postgres.id },
|
|
120
121
|
privateDnsZoneName: 'postgres.database.azure.com',
|
|
121
122
|
linkServiceGroupIds: network.privateLink.type
|
|
122
123
|
? [network.privateLink.type]
|
|
123
124
|
: ['postgresql'],
|
|
124
|
-
subnetIds: network.privateLink.subnetIds,
|
|
125
125
|
});
|
|
126
126
|
}
|
|
127
127
|
}
|
|
@@ -148,4 +148,4 @@ sku = {
|
|
|
148
148
|
}
|
|
149
149
|
return postgres;
|
|
150
150
|
};
|
|
151
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUG9zdGdyZXNxbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0Esc0NBQThDO0FBQzlDLHVEQUF5QztBQUN6Qyw0REFBOEM7QUFDOUMsaURBQXFEO0FBQ3JELDJDQUFnRDtBQUVoRCwyREFBMkQ7QUFDM0QsMkNBQThDO0FBQzlDLDJDQUFrRDtBQUNsRCw4RUFBc0Q7QUFDdEQsNERBQW9DO0FBa0JwQyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUs7QUFDTCxPQUFPO0FBQ1AsT0FBTyxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLGdCQUFnQixFQUM5RCxhQUFhLEdBQUcsR0FBRztBQUNuQjs7R0FFRztBQUNILEdBQUcsR0FBRztJQUNKLElBQUksRUFBRSxlQUFlO0lBQ3JCLElBQUksRUFBRSxXQUFXO0NBQ2xCLEVBQ0QsT0FBTyxFQUNQLFNBQVMsRUFDVCxTQUFTLEVBQ1QsU0FBUyxFQUNULElBQUksR0FBRyxJQUFJLEdBQ0csRUFBRSxFQUFFO0lBQ2xCLElBQUksR0FBRyxJQUFBLDBCQUFpQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRS9CLE1BQU0sUUFBUSxHQUFHLElBQUkscUJBQVksQ0FBQyxJQUFJLEVBQUU7UUFDdEMsT0FBTyxFQUFFLEtBQUs7UUFDZCxNQUFNLEVBQUUsQ0FBQztRQUNULEtBQUssRUFBRSxJQUFJO1FBQ1gsS0FBSyxFQUFFLEtBQUs7S0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZDLE1BQU0sUUFBUSxHQUFHLElBQUEsdUJBQWMsRUFBQztRQUM5QixJQUFJO1FBQ0osTUFBTSxFQUFFLEVBQUU7UUFDVixPQUFPLEVBQUUsRUFBRSxPQUFPLEVBQUUs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
|
package/SignalR/index.js
CHANGED
|
@@ -81,10 +81,10 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrs
|
|
|
81
81
|
if (privateLink) {
|
|
82
82
|
//The Private Zone will create in Dev and reuse for sandbox and prd.
|
|
83
83
|
(0, PrivateEndpoint_1.default)({
|
|
84
|
+
...privateLink,
|
|
84
85
|
resourceInfo: { name, group, id: signalR.id },
|
|
85
86
|
privateDnsZoneName: 'privatelink.service.signalr.net',
|
|
86
|
-
|
|
87
|
-
linkServiceGroupIds: ['signalr'],
|
|
87
|
+
linkServiceGroupIds: privateLink.type ? [privateLink.type] : ['signalr'],
|
|
88
88
|
});
|
|
89
89
|
}
|
|
90
90
|
if (vaultInfo) {
|
|
@@ -129,4 +129,4 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrs
|
|
|
129
129
|
}
|
|
130
130
|
return signalR;
|
|
131
131
|
};
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
132
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2lnbmFsUi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkRBQStDO0FBRS9DLHNDQUFtRTtBQU1uRSw4RUFBc0Q7QUFDdEQsMkRBQTJEO0FBZ0IzRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsV0FBVyxFQUNYLElBQUksR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxPQUFPLEVBQ2hELEdBQUcsR0FBRztJQUNKLElBQUksRUFBRSxhQUFhO0lBQ25CLElBQUksRUFBRSxNQUFNLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxRQUFRO0lBQ25ELFFBQVEsRUFBRSxDQUFDO0NBQ1osRUFDRCxjQUFjLEdBQ1IsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLElBQUEsdUJBQWMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU1QixNQUFNLE9BQU8sR0FBRyxJQUFJLE1BQU0sQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRTtRQUN0RCxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFDUixJQUFJO1FBRUosSUFBSSxFQUFFLEVBQUUsY0FBYyxFQUFFO1FBQ3hCLFFBQVEsRUFBRTtZQUNSLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFO1lBQ3pDLHVEQUF1RDtTQUN4RDtRQUNELFdBQVcsRUFBRSxXQUFXO1lBQ3RCLENBQUMsQ0FBQztnQkFDRSxhQUFhLEVBQUUsTUFBTSxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsS0FBSztnQkFDcEQsYUFBYSxFQUFFO29CQUNiLEtBQUssRUFBRSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCLENBQUM7b0JBQ2xFLElBQUksRUFBRTt3QkFDSixNQUFNLENBQUMsY0FBYyxDQUFDLGtCQUFrQixDQUFDLGdCQUFnQjt3QkFDekQsTUFBTSxDQUFDLGNBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPO3FCQUNqRDtpQkFDRjtnQkFDRCxnQkFBZ0IsRUFBRTtvQkFDaEI7d0JBQ0UsSUFBSSxFQUFFLElBQUEsK0JBQXNCLEVBQUMsSUFBSSxDQUFDO3dCQUNsQyxLQUFLLEVBQUU7NEJBQ0wsTUFBTSxDQUFDLGNBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0I7NEJBQ3pELE1BQU0sQ0FBQyxjQUFjLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCOzRCQUN6RCxNQUFNLENBQUMsY0FBYyxDQUFDLGtCQUFrQixDQUFDLE9BQU87eUJBQ2pEO3FCQUNGO2lCQUNGO2FBQ0Y7WUFDSCxDQUFDLENBQUM7Z0JBQ0UsYUFBYSxFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUMsU0FBUyxDQUFDLEtBQUs7Z0JBQ3BELGFBQWEsRUFBRTtvQkFDYixLQUFLLEVBQUU7d0JBQ0wsTUFBTSxDQUFDLGNBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0I7d0JBQ3pELE1BQU0sQ0FBQyxjQUFjLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCO3dCQUN6RCxNQUFNLENBQUMsY0FBYyxDQUFDLGtCQUFrQixDQUFDLE9BQU87cUJBQ2pEO2lCQUNGO2FBQ0Y7UUFDTCxHQUFHO0tBQ0osQ0FBQyxDQUFDO0lBRUgsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixvRUFBb0U7UUFDcEUsSUFBQSx5QkFBZSxFQUFDO1lBQ2QsR0FBRyxXQUFXO1lBQ2QsWUFBWSxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsT0FBTyxDQUFDLEVBQUUsRUFBRTtZQUM3QyxrQkFBa0IsRUFBRSxpQ0FBaUM7WUFDckQsbUJBQW1CLEVBQUUsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO1NBQ3pFLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLENBQUMsRUFBRSxFQUFFO1lBQ2pDLElBQUksQ0FBQyxDQUFDO2dCQUFFLE9BQU87WUFFZixNQUFNLElBQUksR0FBRyxNQUFNLE1BQU0sQ0FBQyxjQUFjLENBQUMsZUFBZSxDQUFDO2dCQUN2RCxZQUFZLEVBQUUsSUFBSTtnQkFDbEIsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjthQUMzQyxDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSxPQUFPO2dCQUNwQixLQUFLLEVBQUUsQ0FBQztnQkFDUixTQUFTO2dCQUNULFdBQVcsRUFBRSxTQUFTO2FBQ3ZCLENBQUMsQ0FBQztZQUVILElBQUEsOEJBQWUsRUFBQztnQkFDZCxJQUFJLEVBQUUsR0FBRyxJQUFJLGFBQWE7Z0JBQzFCLEtBQUssRUFBRSxJQUFJLENBQUMsVUFBVSxJQUFJLEVBQUU7Z0JBQzVCLFNBQVM7Z0JBQ1QsV0FBVyxFQUFFLFNBQVM7YUFDdkIsQ0FBQyxDQUFDO1lBRUgsSUFBQSw4QkFBZSxFQUFDO2dCQUNkLElBQUksRUFBRSxHQUFHLElBQUksb0JBQW9CO2dCQUNqQyxLQUFLLEVBQUUsSUFBSSxDQUFDLHVCQUF1QixJQUFJLEVBQUU7Z0JBQ3pDLFNBQVM7Z0JBQ1QsV0FBVyxFQUFFLFNBQVM7YUFDdkIsQ0FBQyxDQUFDO1lBRUgsSUFBQSw4QkFBZSxFQUFDO2dCQUNkLElBQUksRUFBRSxHQUFHLElBQUksZUFBZTtnQkFDNUIsS0FBSyxFQUFFLElBQUksQ0FBQyxZQUFZLElBQUksRUFBRTtnQkFDOUIsU0FBUztnQkFDVCxXQUFXLEVBQUUsU0FBUzthQUN2QixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSxzQkFBc0I7Z0JBQ25DLEtBQUssRUFBRSxJQUFJLENBQUMseUJBQXlCLElBQUksRUFBRTtnQkFDM0MsU0FBUztnQkFDVCxXQUFXLEVBQUUsU0FBUzthQUN2QixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPLE9BQU8sQ0FBQztBQUNqQixDQUFDLENBQUMifQ==
|
package/Storage/index.d.ts
CHANGED
|
@@ -15,6 +15,8 @@ export type StorageFeatureType = {
|
|
|
15
15
|
enableStaticWebsite?: boolean;
|
|
16
16
|
/** This option only able to enable once Account is created, and the Principal added to the Key Vault Read Permission Group */
|
|
17
17
|
enableKeyVaultEncryption?: boolean;
|
|
18
|
+
allowCrossTenantReplication?: boolean;
|
|
19
|
+
isSftpEnabled?: boolean;
|
|
18
20
|
};
|
|
19
21
|
export type StoragePolicyType = {
|
|
20
22
|
keyExpirationPeriodInDays?: number;
|
|
@@ -39,7 +41,7 @@ interface StorageProps extends BasicResourceArgs {
|
|
|
39
41
|
containers?: Array<ContainerProps>;
|
|
40
42
|
queues?: Array<string>;
|
|
41
43
|
fileShares?: Array<string>;
|
|
42
|
-
|
|
44
|
+
features?: StorageFeatureType;
|
|
43
45
|
policies?: StoragePolicyType;
|
|
44
46
|
network?: StorageNetworkType;
|
|
45
47
|
lock?: boolean;
|
|
@@ -49,5 +51,5 @@ export type StorageResults = ResourceInfo & {
|
|
|
49
51
|
getConnectionString?: (name?: string) => Promise<KeyVaultSecret | undefined>;
|
|
50
52
|
};
|
|
51
53
|
/** Storage Creator */
|
|
52
|
-
declare const _default: ({ name, group, vaultInfo, containers, queues, fileShares, network,
|
|
54
|
+
declare const _default: ({ name, group, vaultInfo, containers, queues, fileShares, network, features, policies, lock, }: StorageProps) => StorageResults;
|
|
53
55
|
export default _default;
|
package/Storage/index.js
CHANGED
|
@@ -36,13 +36,13 @@ const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
|
36
36
|
const ManagementRules_1 = require("./ManagementRules");
|
|
37
37
|
const Helper_2 = require("../AzAd/Helper");
|
|
38
38
|
/** Storage Creator */
|
|
39
|
-
exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileShares = [], network,
|
|
39
|
+
exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileShares = [], network, features = {}, policies = { keyExpirationPeriodInDays: 365 }, lock = true, }) => {
|
|
40
40
|
name = (0, Common_1.getStorageName)(name);
|
|
41
41
|
const primaryKeyName = (0, Common_1.getKeyName)(name, 'primary');
|
|
42
42
|
const secondaryKeyName = (0, Common_1.getKeyName)(name, 'secondary');
|
|
43
43
|
const primaryConnectionKeyName = (0, Common_1.getConnectionName)(name, 'primary');
|
|
44
44
|
const secondConnectionKeyName = (0, Common_1.getConnectionName)(name, 'secondary');
|
|
45
|
-
const encryptionKey =
|
|
45
|
+
const encryptionKey = features.enableKeyVaultEncryption
|
|
46
46
|
? (0, Helper_1.getEncryptionKeyOutput)(name, vaultInfo)
|
|
47
47
|
: undefined;
|
|
48
48
|
//To fix identity issue then using this approach https://github.com/pulumi/pulumi-azure-native/blob/master/examples/keyvault/index.ts
|
|
@@ -58,8 +58,12 @@ exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileS
|
|
|
58
58
|
accessTier: 'Hot',
|
|
59
59
|
isHnsEnabled: true,
|
|
60
60
|
enableHttpsTrafficOnly: true,
|
|
61
|
-
allowBlobPublicAccess: policies?.allowBlobPublicAccess,
|
|
62
|
-
allowSharedKeyAccess:
|
|
61
|
+
allowBlobPublicAccess: Boolean(policies?.allowBlobPublicAccess),
|
|
62
|
+
allowSharedKeyAccess: Boolean(features.allowSharedKeyAccess),
|
|
63
|
+
allowedCopyScope: network?.privateEndpoint ? 'PrivateLink' : 'AAD',
|
|
64
|
+
defaultToOAuthAuthentication: !Boolean(features.allowSharedKeyAccess),
|
|
65
|
+
isSftpEnabled: Boolean(features.isSftpEnabled),
|
|
66
|
+
allowCrossTenantReplication: Boolean(features.allowCrossTenantReplication),
|
|
63
67
|
identity: { type: 'SystemAssigned' },
|
|
64
68
|
minimumTlsVersion: 'TLS1_2',
|
|
65
69
|
//1 Year Months
|
|
@@ -130,7 +134,7 @@ exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileS
|
|
|
130
134
|
(0, Locker_1.default)({ name, resource: stg });
|
|
131
135
|
}
|
|
132
136
|
//Enable Static Website for SPA
|
|
133
|
-
if (
|
|
137
|
+
if (features.enableStaticWebsite) {
|
|
134
138
|
new storage.StorageAccountStaticWebsite(name, {
|
|
135
139
|
accountName: stg.name,
|
|
136
140
|
...group,
|
|
@@ -230,4 +234,4 @@ exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileS
|
|
|
230
234
|
: undefined,
|
|
231
235
|
};
|
|
232
236
|
};
|
|
233
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
237
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Storage/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { BasicArgs, PrivateLinkPropsType, ResourceInfo } from '../types';
|
|
2
|
-
export type PrivateEndpointProps =
|
|
2
|
+
export type PrivateEndpointProps = Omit<PrivateLinkPropsType, 'type'> & Pick<BasicArgs, 'dependsOn'> & {
|
|
3
3
|
resourceInfo: ResourceInfo;
|
|
4
4
|
/** check the private link DNS Zone here https://learn.microsoft.com/en-us/azure/private-link/private-endpoint-dns */
|
|
5
5
|
privateDnsZoneName: string;
|
|
6
6
|
linkServiceGroupIds: string[];
|
|
7
7
|
};
|
|
8
|
-
declare const _default: ({ resourceInfo, subnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }: PrivateEndpointProps) => import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint[];
|
|
8
|
+
declare const _default: ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }: PrivateEndpointProps) => import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint[];
|
|
9
9
|
export default _default;
|
package/VNet/PrivateEndpoint.js
CHANGED
|
@@ -28,7 +28,7 @@ const pulumi_1 = require("@pulumi/pulumi");
|
|
|
28
28
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
29
29
|
const Common_1 = require("../Common");
|
|
30
30
|
const Builder_1 = require("../Builder");
|
|
31
|
-
exports.default = ({ resourceInfo, subnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }) => {
|
|
31
|
+
exports.default = ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }) => {
|
|
32
32
|
const name = (0, Common_1.getPrivateEndpointName)(resourceInfo.name);
|
|
33
33
|
const endpoints = subnetIds.map((s, index) => new network.PrivateEndpoint(`${name}-${index}`, {
|
|
34
34
|
privateEndpointName: `${name}-${index}`,
|
|
@@ -52,9 +52,9 @@ exports.default = ({ resourceInfo, subnetIds, privateDnsZoneName, linkServiceGro
|
|
|
52
52
|
dependsOn,
|
|
53
53
|
})
|
|
54
54
|
.withARecord({ ipAddresses: ip, recordName: '@' })
|
|
55
|
-
.linkTo({ subnetIds, registrationEnabled: false })
|
|
55
|
+
.linkTo({ subnetIds, vnetIds: extraVnetIds, registrationEnabled: false })
|
|
56
56
|
.build();
|
|
57
57
|
});
|
|
58
58
|
return endpoints;
|
|
59
59
|
};
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUVuZHBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvUHJpdmF0ZUVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFDeEQsMkNBQXdDO0FBRXhDLGlEQUE2RDtBQUM3RCxzQ0FBbUQ7QUFDbkQsd0NBQW1EO0FBVW5ELGtCQUFlLENBQUMsRUFDZCxZQUFZLEVBQ1osU0FBUyxFQUNULFlBQVksRUFDWixrQkFBa0IsRUFDbEIsbUJBQW1CLEVBQ25CLFNBQVMsR0FDWSxFQUFFLEVBQUU7SUFDekIsTUFBTSxJQUFJLEdBQUcsSUFBQSwrQkFBc0IsRUFBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdkQsTUFBTSxTQUFTLEdBQUcsU0FBUyxDQUFDLEdBQUcsQ0FDN0IsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FDWCxJQUFJLE9BQU8sQ0FBQyxlQUFlLENBQ3pCLEdBQUcsSUFBSSxJQUFJLEtBQUssRUFBRSxFQUNsQjtRQUNFLG1CQUFtQixFQUFFLEdBQUcsSUFBSSxJQUFJLEtBQUssRUFBRTtRQUN2QyxHQUFHLFlBQVksQ0FBQyxLQUFLO1FBQ3JCLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQUU7UUFDakIsNkJBQTZCLEVBQUU7WUFDN0I7Z0JBQ0UsUUFBUSxFQUFFLG1CQUFtQjtnQkFDN0IsSUFBSSxFQUFFLEdBQUcsSUFBSSxPQUFPO2dCQUNwQixvQkFBb0IsRUFBRSxZQUFZLENBQUMsRUFBRTthQUN0QztTQUNGO0tBQ0YsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQ0osQ0FBQztJQUVGLGtCQUFrQjtJQUNsQixNQUFNLFdBQVcsR0FBRyxJQUFBLGVBQU0sRUFDeEIsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ2xCLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFZLENBQUMsQ0FBQyxDQUNuRSxDQUNGLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFFLENBQUMsQ0FBQyxDQUFDO0lBRXJDLElBQUEsZUFBTSxFQUFDLENBQUMsWUFBWSxDQUFDLEVBQUUsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUU7UUFDeEQsTUFBTSxZQUFZLEdBQUcsSUFBQSxrQ0FBdUIsRUFBQyxFQUFZLENBQUMsQ0FBQztRQUMzRCxPQUFPLElBQUEsK0JBQXFCLEVBQUM7WUFDM0IsSUFBSSxFQUFFLEdBQUcsWUFBYSxDQUFDLElBQUksSUFBSSxrQkFBa0IsRUFBRTtZQUNuRCxLQUFLLEVBQUUsWUFBYSxDQUFDLEtBQUs7WUFDMUIsU0FBUztTQUNWLENBQUM7YUFDQyxXQUFXLENBQUMsRUFBRSxXQUFXLEVBQUUsRUFBYyxFQUFFLFVBQVUsRUFBRSxHQUFHLEVBQUUsQ0FBQzthQUM3RCxNQUFNLENBQUMsRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxtQkFBbUIsRUFBRSxLQUFLLEVBQUUsQ0FBQzthQUN4RSxLQUFLLEVBQUUsQ0FBQztJQUNiLENBQUMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQyxDQUFDIn0=
|
package/Web/AppConfig.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export type AppConfigProps = {
|
|
|
5
5
|
group: ResourceGroupInfo;
|
|
6
6
|
privateLink?: PrivateLinkPropsType;
|
|
7
7
|
disableLocalAuth?: boolean;
|
|
8
|
-
vaultInfo
|
|
8
|
+
vaultInfo?: KeyVaultInfo;
|
|
9
9
|
};
|
|
10
10
|
declare const _default: ({ group, name, vaultInfo, disableLocalAuth, privateLink, }: AppConfigProps) => ResourceInfo & {
|
|
11
11
|
instance: appConfig.ConfigurationStore;
|
package/Web/AppConfig.js
CHANGED
|
@@ -28,11 +28,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
const appConfig = __importStar(require("@pulumi/azure-native/appconfiguration"));
|
|
30
30
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
31
|
-
const
|
|
31
|
+
const Common_1 = require("../Common");
|
|
32
32
|
const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
33
33
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
34
34
|
exports.default = ({ group, name, vaultInfo, disableLocalAuth, privateLink, }) => {
|
|
35
|
-
name = (0,
|
|
35
|
+
name = (0, Common_1.getAppConfigName)(name);
|
|
36
36
|
const readPrimaryConnectionStringKey = `${name}-read-primary-connection-string`;
|
|
37
37
|
const readSecondaryConnectionStringKey = `${name}-read-secondary-connection-string`;
|
|
38
38
|
const app = new appConfig.ConfigurationStore(name, {
|
|
@@ -90,4 +90,4 @@ exports.default = ({ group, name, vaultInfo, disableLocalAuth, privateLink, }) =
|
|
|
90
90
|
instance: app,
|
|
91
91
|
};
|
|
92
92
|
};
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlGQUFtRTtBQUNuRSxpREFBMkM7QUFDM0Msc0NBQTZDO0FBTzdDLDhFQUFzRDtBQUN0RCwyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixFQUNoQixXQUFXLEdBQ0ksRUFFZixFQUFFO0lBQ0YsSUFBSSxHQUFHLElBQUEseUJBQWdCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUIsTUFBTSw4QkFBOEIsR0FBRyxHQUFHLElBQUksaUNBQWlDLENBQUM7SUFDaEYsTUFBTSxnQ0FBZ0MsR0FBRyxHQUFHLElBQUksbUNBQW1DLENBQUM7SUFFcEYsTUFBTSxHQUFHLEdBQUcsSUFBSSxTQUFTLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFO1FBQ2pELGVBQWUsRUFBRSxJQUFJO1FBQ3JCLEdBQUcsS0FBSztRQUNSLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRTtRQUNwQyxxQkFBcUIsRUFBRSxnQkFBSztRQUM1Qix5QkFBeUIsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEMsZ0JBQWdCO1FBQ2hCLG1CQUFtQixFQUFFLFdBQVc7WUFDOUIsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRO1lBQ3hDLENBQUMsQ0FBQyxTQUFTLENBQUMsbUJBQW1CLENBQUMsT0FBTztRQUV6QyxHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFO0tBQzFCLENBQUMsQ0FBQztJQUVILGFBQWE7SUFDYixJQUFJLFNBQVMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDbkMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ3hCLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFDaEIsMkJBQTJCO1lBQzNCLE1BQU0sSUFBSSxHQUFHLE1BQU0sU0FBUyxDQUFDLDBCQUEwQixDQUFDO2dCQUN0RCxlQUFlLEVBQUUsSUFBSTtnQkFDckIsR0FBRyxLQUFLO2FBQ1QsQ0FBQyxDQUFDO1lBRUgsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2YsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtvQkFDckIsa0NBQWtDO29CQUNsQyxJQUFJLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQzt3QkFDakIsSUFBQSw4QkFBZSxFQUFDOzRCQUNkLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUM7Z0NBQ2hDLENBQUMsQ0FBQyw4QkFBOEI7Z0NBQ2hDLENBQUMsQ0FBQyxnQ0FBZ0M7NEJBQ3BDLEtBQUssRUFBRSxHQUFHLENBQUMsZ0JBQWdCOzRCQUMzQixXQUFXLEVBQUUsYUFBYSxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksRUFBRTs0QkFDNUMsU0FBUzt5QkFDVixDQUFDLENBQUM7b0JBQ0wsQ0FBQztnQkFDSCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxjQUFjO0lBQ2QsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixJQUFBLHlCQUFlLEVBQUM7WUFDZCxZQUFZLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFO1lBQ3pDLGtCQUFrQixFQUFFLHlCQUF5QjtZQUM3QyxtQkFBbUIsRUFBRSxDQUFDLFdBQVcsQ0FBQztZQUNsQyxHQUFHLFdBQVc7U0FDZixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTztRQUNMLElBQUk7UUFDSixLQUFLO1FBQ0wsRUFBRSxFQUFFLEdBQUcsQ0FBQyxFQUFFO1FBQ1YsUUFBUSxFQUFFLEdBQUc7S0FDZCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@drunk-pulumi/azure",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "1.0.2",
|
|
4
4
|
"author": "drunkcoding@outlook.com",
|
|
5
5
|
"description": "The custom helpers pulumi-azure",
|
|
6
6
|
"license": "MIT",
|
|
@@ -18,9 +18,9 @@
|
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"@drunk-pulumi/azure-providers": "^0.0.24",
|
|
21
|
-
"@pulumi/azure-native": "^2.49.
|
|
21
|
+
"@pulumi/azure-native": "^2.49.1",
|
|
22
22
|
"@pulumi/azuread": "5.53.1",
|
|
23
|
-
"@pulumi/pulumi": "^3.
|
|
23
|
+
"@pulumi/pulumi": "^3.123.0",
|
|
24
24
|
"@pulumi/random": "^4.16.3",
|
|
25
25
|
"@pulumi/tls": "^5.0.4",
|
|
26
26
|
"axios": "^1.7.2",
|
|
@@ -28,5 +28,8 @@
|
|
|
28
28
|
"node-forge": "^1.3.1",
|
|
29
29
|
"to-words": "^4.0.1",
|
|
30
30
|
"xml-formatter": "^3.6.3"
|
|
31
|
+
},
|
|
32
|
+
"prettier": {
|
|
33
|
+
"singleQuote": true
|
|
31
34
|
}
|
|
32
35
|
}
|