@drunk-pulumi/azure 1.0.28 → 1.0.29
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/Logs/index.js +2 -1
- package/Storage/ManagementRules.d.ts +3 -2
- package/Storage/ManagementRules.js +5 -5
- package/Storage/index.d.ts +0 -2
- package/Storage/index.js +10 -11
- package/package.json +1 -1
package/Logs/index.js
CHANGED
|
@@ -37,6 +37,7 @@ const defaultLogWorkspace = {
|
|
|
37
37
|
};
|
|
38
38
|
const getStorageAutoDeleteRules = (days = 90) => [
|
|
39
39
|
{
|
|
40
|
+
name: 'auto-delete-all-containers',
|
|
40
41
|
actions: {
|
|
41
42
|
baseBlob: { delete: { daysAfterModificationGreaterThan: days } },
|
|
42
43
|
},
|
|
@@ -80,4 +81,4 @@ exports.default = ({ group, name, deleteAfterDays, workspace, vaultInfo, ...othe
|
|
|
80
81
|
appInsight,
|
|
81
82
|
};
|
|
82
83
|
};
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTG9ncy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsbUZBQXFFO0FBQ3JFLGtFQUFtQztBQUNuQyx5REFBaUM7QUFDakMsc0NBQTRDO0FBRTVDLDhEQUFzQztBQU90QyxNQUFNLG1CQUFtQixHQUFrQjtJQUN6QyxHQUFHLEVBQUUsUUFBUSxDQUFDLG9CQUFvQixDQUFDLFNBQVM7SUFDNUMsWUFBWSxFQUFFLEdBQUc7Q0FDbEIsQ0FBQztBQUVGLE1BQU0seUJBQXlCLEdBQUcsQ0FDaEMsT0FBZSxFQUFFLEVBQ08sRUFBRSxDQUFDO0lBQzNCO1FBQ0UsSUFBSSxFQUFFLDRCQUE0QjtRQUNsQyxPQUFPLEVBQUU7WUFDUCxRQUFRLEVBQUUsRUFBRSxNQUFNLEVBQUUsRUFBRSxnQ0FBZ0MsRUFBRSxJQUFJLEVBQUUsRUFBRTtTQUNqRTtRQUNELE9BQU8sRUFBRSxFQUFFLFNBQVMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxFQUFFO0tBQ3RDO0NBQ0YsQ0FBQztBQVFGLGtCQUFlLENBQUMsRUFDZCxLQUFLLEVBQ0wsSUFBSSxFQUNKLGVBQWUsRUFDZixTQUFTLEVBQ1QsU0FBUyxFQUNULEdBQUcsTUFBTSxFQUNILEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxFQUFFLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7SUFDakQsTUFBTSxZQUFZLEdBQ2hCLFNBQVMsRUFBRSxZQUFZLElBQUksbUJBQW1CLENBQUMsWUFBWSxDQUFDO0lBRTlELE1BQU0sS0FBSyxHQUFHLElBQUEsc0JBQUssRUFBQztRQUNsQixHQUFHLE1BQU07UUFDVCxLQUFLO1FBQ0wsSUFBSTtRQUNKLEdBQUcsRUFBRSxTQUFTLEVBQUUsR0FBRyxJQUFJLG1CQUFtQixDQUFDLEdBQUc7UUFDOUMsWUFBWTtRQUNaLFNBQVM7S0FDVixDQUFDLENBQUM7SUFFSCxNQUFNLFVBQVUsR0FBRyxJQUFBLG9CQUFVLEVBQUM7UUFDNUIsR0FBRyxNQUFNO1FBQ1QsS0FBSztRQUNMLElBQUk7UUFDSixVQUFVLEVBQUUsWUFBWTtRQUN4QiwwQkFBMEIsRUFBRSxJQUFJO1FBQ2hDLG1CQUFtQixFQUFFLEtBQUssQ0FBQyxFQUFFO1FBQzdCLGFBQWEsRUFBRSxjQUFjO1FBQzdCLFNBQVM7S0FDVixDQUFDLENBQUM7SUFFSCxNQUFNLFVBQVUsR0FBRyxJQUFBLGlCQUFPLEVBQUM7UUFDekIsR0FBRyxNQUFNO1FBQ1QsS0FBSztRQUNMLElBQUk7UUFDSixTQUFTO1FBQ1QsUUFBUSxFQUFFO1lBQ1Isc0JBQXNCLEVBQUUseUJBQXlCLENBQUMsZUFBZSxDQUFDO1NBQ25FO1FBQ0QsUUFBUSxFQUFFLEVBQUUsb0JBQW9CLEVBQUUsSUFBSSxFQUFFO0tBQ3pDLENBQUMsQ0FBQztJQUVILE9BQU87UUFDTCxLQUFLO1FBQ0wsVUFBVTtRQUNWLFVBQVU7S0FDWCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
|
|
@@ -33,12 +33,13 @@ type ManagementRuleFilters = {
|
|
|
33
33
|
};
|
|
34
34
|
/**This rule will be applied to an specific container*/
|
|
35
35
|
export type ManagementRules = {
|
|
36
|
+
name: string;
|
|
37
|
+
containerNames?: pulumi.Input<string>[];
|
|
36
38
|
actions: ManagementRuleActions;
|
|
37
39
|
filters?: ManagementRuleFilters;
|
|
38
40
|
};
|
|
39
|
-
export declare const createManagementRules: ({ name, storageAccount, group, rules,
|
|
41
|
+
export declare const createManagementRules: ({ name, storageAccount, group, rules, dependsOn, }: ResourceArgs & WithDependsOn & {
|
|
40
42
|
storageAccount: storage.StorageAccount;
|
|
41
|
-
containerNames?: pulumi.Input<string>[];
|
|
42
43
|
rules: Array<ManagementRules>;
|
|
43
44
|
}) => import("@pulumi/azure-native/storage/managementPolicy").ManagementPolicy;
|
|
44
45
|
export {};
|
|
@@ -25,23 +25,23 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.createManagementRules = void 0;
|
|
27
27
|
const storage = __importStar(require("@pulumi/azure-native/storage"));
|
|
28
|
-
const createManagementRules = ({ name, storageAccount, group, rules,
|
|
28
|
+
const createManagementRules = ({ name, storageAccount, group, rules, dependsOn, }) => {
|
|
29
29
|
name = `${name}-mnp`;
|
|
30
30
|
return new storage.ManagementPolicy(name, {
|
|
31
31
|
...group,
|
|
32
32
|
managementPolicyName: 'default',
|
|
33
33
|
accountName: storageAccount.name,
|
|
34
34
|
policy: {
|
|
35
|
-
rules: rules.map((m
|
|
35
|
+
rules: rules.map((m) => ({
|
|
36
36
|
enabled: true,
|
|
37
|
-
name: `${name}-${
|
|
37
|
+
name: `${name}-${m.name}`,
|
|
38
38
|
type: 'Lifecycle',
|
|
39
39
|
definition: {
|
|
40
40
|
actions: m.actions,
|
|
41
41
|
filters: m.filters
|
|
42
42
|
? {
|
|
43
43
|
blobTypes: m.filters.blobTypes,
|
|
44
|
-
prefixMatch: containerNames,
|
|
44
|
+
prefixMatch: m.containerNames,
|
|
45
45
|
blobIndexMatch: m.filters.tagFilters,
|
|
46
46
|
}
|
|
47
47
|
: undefined,
|
|
@@ -51,4 +51,4 @@ const createManagementRules = ({ name, storageAccount, group, rules, containerNa
|
|
|
51
51
|
}, { dependsOn: dependsOn ?? storageAccount });
|
|
52
52
|
};
|
|
53
53
|
exports.createManagementRules = createManagementRules;
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFuYWdlbWVudFJ1bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JhZ2UvTWFuYWdlbWVudFJ1bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0Esc0VBQXdEO0FBNENqRCxNQUFNLHFCQUFxQixHQUFHLENBQUMsRUFDcEMsSUFBSSxFQUNKLGNBQWMsRUFDZCxLQUFLLEVBQ0wsS0FBSyxFQUNMLFNBQVMsR0FLUixFQUFFLEVBQUU7SUFDTCxJQUFJLEdBQUcsR0FBRyxJQUFJLE1BQU0sQ0FBQztJQUNyQixPQUFPLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUNqQyxJQUFJLEVBQ0o7UUFDRSxHQUFHLEtBQUs7UUFDUixvQkFBb0IsRUFBRSxTQUFTO1FBQy9CLFdBQVcsRUFBRSxjQUFjLENBQUMsSUFBSTtRQUVoQyxNQUFNLEVBQUU7WUFDTixLQUFLLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztnQkFDdkIsT0FBTyxFQUFFLElBQUk7Z0JBQ2IsSUFBSSxFQUFFLEdBQUcsSUFBSSxJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQUU7Z0JBQ3pCLElBQUksRUFBRSxXQUFXO2dCQUVqQixVQUFVLEVBQUU7b0JBQ1YsT0FBTyxFQUFFLENBQUMsQ0FBQyxPQUFPO29CQUNsQixPQUFPLEVBQUUsQ0FBQyxDQUFDLE9BQU87d0JBQ2hCLENBQUMsQ0FBQzs0QkFDRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTOzRCQUM5QixXQUFXLEVBQUUsQ0FBQyxDQUFDLGNBQWM7NEJBQzdCLGNBQWMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLFVBQVU7eUJBQ3JDO3dCQUNILENBQUMsQ0FBQyxTQUFTO2lCQUNkO2FBQ0YsQ0FBQyxDQUFDO1NBQ0o7S0FDRixFQUNELEVBQUUsU0FBUyxFQUFFLFNBQVMsSUFBSSxjQUFjLEVBQUUsQ0FDM0MsQ0FBQztBQUNKLENBQUMsQ0FBQztBQXhDVyxRQUFBLHFCQUFxQix5QkF3Q2hDIn0=
|
package/Storage/index.d.ts
CHANGED
|
@@ -5,8 +5,6 @@ import { ManagementRules } from './ManagementRules';
|
|
|
5
5
|
export type ContainerProps = {
|
|
6
6
|
name: string;
|
|
7
7
|
public?: boolean;
|
|
8
|
-
/** The management rule applied to Container level*/
|
|
9
|
-
managementRules?: Array<ManagementRules>;
|
|
10
8
|
};
|
|
11
9
|
export type StorageFeatureType = {
|
|
12
10
|
allowSharedKeyAccess?: boolean;
|
package/Storage/index.js
CHANGED
|
@@ -170,7 +170,6 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInf
|
|
|
170
170
|
name,
|
|
171
171
|
group,
|
|
172
172
|
storageAccount: stg,
|
|
173
|
-
//containerNames: containers?.map((c) => c.name),
|
|
174
173
|
rules: policies.defaultManagementRules,
|
|
175
174
|
dependsOn: props,
|
|
176
175
|
});
|
|
@@ -197,15 +196,15 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInf
|
|
|
197
196
|
//denyEncryptionScopeOverride: true,
|
|
198
197
|
publicAccess: c.public ? 'Blob' : 'None',
|
|
199
198
|
});
|
|
200
|
-
if (c.managementRules) {
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
}
|
|
199
|
+
// if (c.managementRules) {
|
|
200
|
+
// createManagementRules({
|
|
201
|
+
// name: `${name}-${c.name.toLowerCase()}`,
|
|
202
|
+
// storageAccount: stg,
|
|
203
|
+
// group,
|
|
204
|
+
// containerNames: [container.name],
|
|
205
|
+
// rules: c.managementRules,
|
|
206
|
+
// });
|
|
207
|
+
// }
|
|
209
208
|
return container;
|
|
210
209
|
});
|
|
211
210
|
//Create Queues
|
|
@@ -282,4 +281,4 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInf
|
|
|
282
281
|
};
|
|
283
282
|
}
|
|
284
283
|
exports.default = Storage;
|
|
285
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
284
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Storage/index.ts"],"names":[],"mappings":"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"}
|