@drunk-pulumi/azure 1.0.13 → 1.0.14
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/Builder/SqlBuilder.js +1 -1
- package/Sql/index.js +7 -13
- package/Storage/index.d.ts +3 -2
- package/Storage/index.js +19 -10
- package/package.json +1 -1
package/Builder/SqlBuilder.js
CHANGED
|
@@ -131,4 +131,4 @@ class SqlBuilder extends types_1.Builder {
|
|
|
131
131
|
}
|
|
132
132
|
}
|
|
133
133
|
exports.default = (props) => new SqlBuilder(props);
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
134
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9CdWlsZGVyL1NxbEJ1aWxkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxpREFBNkU7QUFHN0UsbUNBY2lCO0FBQ2pCLDJDQUE2QztBQUU3QyxNQUFNLFVBQ0osU0FBUSxlQUFtQjtJQXlCUDtJQWpCcEIsV0FBVztJQUNILFlBQVksR0FBMkIsU0FBUyxDQUFDO0lBRXpELFFBQVE7SUFDQSxjQUFjLEdBQVksS0FBSyxDQUFDO0lBQ2hDLFVBQVUsR0FBMEIsU0FBUyxDQUFDO0lBQzlDLFlBQVksR0FBOEIsRUFBRSxDQUFDO0lBQzdDLGFBQWEsR0FBK0IsU0FBUyxDQUFDO0lBQ3RELGlCQUFpQixHQUFtQyxTQUFTLENBQUM7SUFDOUQsZUFBZSxHQUF1QyxFQUFFLENBQUM7SUFDekQsV0FBVyxHQUFhLElBQUksQ0FBQztJQUM3Qix3QkFBd0IsR0FFaEIsU0FBUyxDQUFDO0lBQ2xCLGNBQWMsR0FBeUIsU0FBUyxDQUFDO0lBQ2pELEtBQUssR0FBWSxLQUFLLENBQUM7SUFFL0IsWUFBb0IsSUFBb0I7UUFDdEMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRE0sU0FBSSxHQUFKLElBQUksQ0FBZ0I7SUFFeEMsQ0FBQztJQUVELDJCQUEyQixDQUN6QixLQUE0QztRQUU1QyxJQUFJLENBQUMsd0JBQXdCLEdBQUcsS0FBSyxDQUFDO1FBQ3RDLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVNLGVBQWUsQ0FBQyxLQUF5QjtRQUM5QyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsS0FBSyxDQUFDO1FBQy9CLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNNLFFBQVEsQ0FBQyxHQUFhO1FBQzNCLElBQUksQ0FBQyxXQUFXLEdBQUcsR0FBRyxDQUFDO1FBQ3ZCLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNNLGFBQWEsQ0FBQyxLQUF1QjtRQUMxQyxJ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
|
package/Sql/index.js
CHANGED
|
@@ -103,16 +103,10 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, enabl
|
|
|
103
103
|
});
|
|
104
104
|
//Lock from delete
|
|
105
105
|
if (lock) {
|
|
106
|
-
(0, Locker_1.Locker)({ name, resource: sqlServer });
|
|
106
|
+
(0, Locker_1.Locker)({ name: sqlName, resource: sqlServer });
|
|
107
107
|
}
|
|
108
108
|
//Allows to Read Key Vault
|
|
109
109
|
envRoles?.addMember('readOnly', sqlServer.identity.apply((s) => s.principalId));
|
|
110
|
-
// grantIdentityPermissions({
|
|
111
|
-
// name,
|
|
112
|
-
// vaultInfo,
|
|
113
|
-
// role: 'readOnly',
|
|
114
|
-
// principalId: sqlServer.identity.apply((s) => s!.principalId),
|
|
115
|
-
// });
|
|
116
110
|
const ep = elasticPool
|
|
117
111
|
? createElasticPool({
|
|
118
112
|
name,
|
|
@@ -136,7 +130,7 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, enabl
|
|
|
136
130
|
if (network?.privateLink) {
|
|
137
131
|
(0, PrivateEndpoint_1.default)({
|
|
138
132
|
...network.privateLink,
|
|
139
|
-
resourceInfo: { name, group, id: sqlServer.id },
|
|
133
|
+
resourceInfo: { name: sqlName, group, id: sqlServer.id },
|
|
140
134
|
privateDnsZoneName: 'privatelink.database.windows.net',
|
|
141
135
|
linkServiceGroupIds: network.privateLink.type
|
|
142
136
|
? [network.privateLink.type]
|
|
@@ -169,7 +163,7 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, enabl
|
|
|
169
163
|
//Grant Storage permission
|
|
170
164
|
envRoles?.addMember('contributor', sqlServer.identity.apply((i) => i.principalId));
|
|
171
165
|
//ServerSecurityAlertPolicy
|
|
172
|
-
const alertPolicy = new sql.ServerSecurityAlertPolicy(
|
|
166
|
+
const alertPolicy = new sql.ServerSecurityAlertPolicy(sqlName, {
|
|
173
167
|
securityAlertPolicyName: 'default',
|
|
174
168
|
...group,
|
|
175
169
|
serverName: sqlServer.name,
|
|
@@ -181,7 +175,7 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, enabl
|
|
|
181
175
|
state: 'Enabled',
|
|
182
176
|
}, { dependsOn: sqlServer });
|
|
183
177
|
//Server Audit
|
|
184
|
-
new sql.ExtendedServerBlobAuditingPolicy(
|
|
178
|
+
new sql.ExtendedServerBlobAuditingPolicy(sqlName, {
|
|
185
179
|
auditActionsAndGroups: [
|
|
186
180
|
'SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP',
|
|
187
181
|
'FAILED_DATABASE_AUTHENTICATION_GROUP',
|
|
@@ -202,8 +196,8 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, enabl
|
|
|
202
196
|
storageEndpoint: vulnerabilityAssessment.logStorage.endpoints.blob,
|
|
203
197
|
}, { dependsOn: alertPolicy });
|
|
204
198
|
//ServerVulnerabilityAssessment
|
|
205
|
-
new sql.ServerVulnerabilityAssessment(
|
|
206
|
-
vulnerabilityAssessmentName:
|
|
199
|
+
new sql.ServerVulnerabilityAssessment(sqlName, {
|
|
200
|
+
vulnerabilityAssessmentName: sqlName,
|
|
207
201
|
...group,
|
|
208
202
|
serverName: sqlServer.name,
|
|
209
203
|
recurringScans: {
|
|
@@ -284,4 +278,4 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, enabl
|
|
|
284
278
|
databases: dbs,
|
|
285
279
|
};
|
|
286
280
|
};
|
|
287
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
|
|
281
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,2CAAiE;AAEjE,2CAAwC;AACxC,+CAAmD;AACnD,sCAA4D;AAC5D,sCAAiE;AAWjE,2CAAkD;AAClD,8EAA6D;AAC7D,oDAAmC;AACnC,2DAA2D;AAW3D,MAAM,iBAAiB,GAAG,CAAC,EACzB,KAAK,EACL,IAAI,EACJ,OAAO;AACP,kBAAkB;AAClB,cAAc,GAAG,EAAE,EACnB,GAAG,GAAG,EAAE,IAAI,EAAE,cAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,GACzC,EAA6C,EAAE;IAChE,oBAAoB;IACpB,MAAM,WAAW,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,EAAE,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE;QAC1C,eAAe,EAAE,WAAW;QAC5B,UAAU,EAAE,OAAO;QACnB,GAAG,KAAK;QAER,YAAY,EAAE,cAAK,CAAC,CAAC,CAAC,cAAc,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS;QACrE,GAAG,EAAE;YACH,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,MAAM;YACvB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;SACvB;QACD,mBAAmB,EAAE;YACnB,WAAW,EAAE,CAAC;YACd,WAAW,EAAE,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ;SACrD;QACD,aAAa,EAAE,cAAK;QACpB,oDAAoD;QACpD,uBAAuB;KACxB,CAAC,CAAC;IAEH,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;AAC/D,CAAC,CAAC;AAuCF,kBAAe,CAAC,EACd,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,WAAW,EACX,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,QAAQ,EACR,OAAO,EACP,uBAAuB,EACvB,aAAa,GAAG,EAAE,EAClB,IAAI,EACJ,SAAS,GACH,EAAc,EAAE;IACtB,MAAM,OAAO,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,gBAAgB;QACjC,CAAC,CAAC,IAAA,sBAAa,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAU,EAAE,CAAC;QACzD,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC;IAE9C,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5B,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACnC,aAAa,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACzC,aAAa,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAC9B,OAAO,EACP;QACE,UAAU,EAAE,OAAO;QACnB,GAAG,KAAK;QACR,OAAO,EAAE,MAAM;QACf,iBAAiB,EAAE,KAAK;QAExB,QAAQ,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;QACpC,kBAAkB,EAAE,IAAI,EAAE,UAAU;QACpC,0BAA0B,EAAE,IAAI,EAAE,QAAQ;QAC1C,KAAK,EAAE,UAAU,EAAE,GAAG;QAEtB,cAAc,EAAE;YACd,iBAAiB,EAAE,UAAU;gBAC3B,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,eAAe;gBACvC,CAAC,CAAC,SAAS;YACb,yBAAyB,EAAE,UAAU;gBACnC,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,IAAI,IAAI,CAAC;gBAC1C,CAAC,CAAC,KAAK;YAET,aAAa,EAAE,GAAG,CAAC,aAAa,CAAC,KAAK;YACtC,QAAQ,EAAR,iBAAQ;YACR,GAAG,EAAE,UAAU,EAAE,QAAQ;YACzB,KAAK,EAAE,UAAU,EAAE,WAAW;SAC/B;QACD,mBAAmB,EAAE,OAAO,EAAE,WAAW;YACvC,CAAC,CAAC,GAAG,CAAC,uBAAuB,CAAC,QAAQ;YACtC,CAAC,CAAC,GAAG,CAAC,uBAAuB,CAAC,OAAO;KACxC,EACD;QACE,SAAS;QACT,aAAa;QACb,OAAO,EAAE,IAAI;KACd,CACF,CAAC;IACF,kBAAkB;IAClB,IAAI,IAAI,EAAE,CAAC;QACT,IAAA,eAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,0BAA0B;IAC1B,QAAQ,EAAE,SAAS,CACjB,UAAU,EACV,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC,WAAW,CAAC,CAChD,CAAC;IAEF,MAAM,EAAE,GAAG,WAAW;QACpB,CAAC,CAAC,iBAAiB,CAAC;YAChB,IAAI;YACJ,KAAK;YACL,OAAO,EAAE,SAAS,CAAC,IAAI;YACvB,GAAG,EAAE,WAAW;SACjB,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IAEd,QAAQ;IACR,IAAI,OAAO,EAAE,QAAQ,EAAE,CAAC;QACtB,cAAc;QACd,IAAI,GAAG,CAAC,kBAAkB,CAAC,OAAO,EAAE;YAClC,sBAAsB,EAAE,GAAG,OAAO,WAAW;YAC7C,UAAU,EAAE,SAAS,CAAC,IAAI;YAC1B,GAAG,KAAK;YAER,sBAAsB,EAAE,OAAO,CAAC,QAAQ;YACxC,gCAAgC,EAAE,KAAK;SACxC,CAAC,CAAC;IACL,CAAC;IACD,cAAc;IACd,IAAI,OAAO,EAAE,WAAW,EAAE,CAAC;QACzB,IAAA,yBAAsB,EAAC;YACrB,GAAG,OAAO,CAAC,WAAW;YACtB,YAAY,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE;YACxD,kBAAkB,EAAE,kCAAkC;YACtD,mBAAmB,EAAE,OAAO,CAAC,WAAW,CAAC,IAAI;gBAC3C,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC5B,CAAC,CAAC,CAAC,WAAW,CAAC;SAClB,CAAC,CAAC;IACL,CAAC;IAED,2BAA2B;IAC3B,IAAI,OAAO,EAAE,sBAAsB,EAAE,CAAC;QACpC,IAAI,GAAG,CAAC,YAAY,CAAC,uBAAuB,EAAE;YAC5C,gBAAgB,EAAE,uBAAuB;YACzC,UAAU,EAAE,SAAS,CAAC,IAAI;YAC1B,GAAG,KAAK;YACR,cAAc,EAAE,SAAS;YACzB,YAAY,EAAE,iBAAiB;SAChC,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,OAAO,EAAE,WAAW,EAAE,CAAC;QAChC,IAAA,YAAG,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CACrC,IAAA,yBAAgB,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;YAClC,MAAM,CAAC,GAAG,GAAG,OAAO,WAAW,CAAC,EAAE,CAAC;YAEnC,OAAO,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,EAAE;gBAC7B,gBAAgB,EAAE,CAAC;gBACnB,UAAU,EAAE,SAAS,CAAC,IAAI;gBAC1B,GAAG,KAAK;gBACR,cAAc,EAAE,EAAE,CAAC,KAAK;gBACxB,YAAY,EAAE,EAAE,CAAC,GAAG;aACrB,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,IAAI,uBAAuB,EAAE,UAAU,EAAE,CAAC;QACxC,0BAA0B;QAC1B,QAAQ,EAAE,SAAS,CACjB,aAAa,EACb,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC,WAAY,CAAC,CACjD,CAAC;QAEF,2BAA2B;QAC3B,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,yBAAyB,CACnD,OAAO,EACP;YACE,uBAAuB,EAAE,SAAS;YAClC,GAAG,KAAK;YACR,UAAU,EAAE,SAAS,CAAC,IAAI;YAC1B,kBAAkB,EAAE,CAAC,uBAAuB,CAAC,WAAW;YACxD,cAAc,EAAE,uBAAuB,CAAC,WAAW;YAEnD,aAAa,EAAE,CAAC;YAEhB,uBAAuB,EAAE,uBAAuB,CAAC,UAAU,CAAC,UAAU;YACtE,eAAe,EAAE,uBAAuB,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI;YAClE,KAAK,EAAE,SAAS;SACjB,EACD,EAAE,SAAS,EAAE,SAAS,EAAE,CACzB,CAAC;QAEF,cAAc;QACd,IAAI,GAAG,CAAC,gCAAgC,CACtC,OAAO,EACP;YACE,qBAAqB,EAAE;gBACrB,0CAA0C;gBAC1C,sCAAsC;gBACtC,uBAAuB;aACxB;YACD,UAAU,EAAE,SAAS,CAAC,IAAI;YAC1B,GAAG,KAAK;YAER,sBAAsB,EAAE,SAAS;YACjC,2BAA2B,EAAE,IAAI;YACjC,0BAA0B,EAAE,KAAK;YACjC,mBAAmB,EAAE,+BAA+B;YACpD,YAAY,EAAE,IAAI;YAClB,aAAa,EAAE,cAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC7B,KAAK,EAAE,SAAS;YAChB,oBAAoB,EAAE,IAAI;YAE1B,uBAAuB,EAAE,uBAAuB,CAAC,UAAU,CAAC,UAAU;YACtE,4BAA4B,EAAE,uBAAc;YAC5C,eAAe,EAAE,uBAAuB,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI;SACnE,EACD,EAAE,SAAS,EAAE,WAAW,EAAE,CAC3B,CAAC;QAEF,+BAA+B;QAC/B,IAAI,GAAG,CAAC,6BAA6B,CACnC,OAAO,EACP;YACE,2BAA2B,EAAE,OAAO;YACpC,GAAG,KAAK;YACR,UAAU,EAAE,SAAS,CAAC,IAAI;YAE1B,cAAc,EAAE;gBACd,SAAS,EAAE,IAAI;gBACf,uBAAuB,EAAE,CAAC,uBAAuB,CAAC,WAAW;gBAC7D,MAAM,EAAE,uBAAuB,CAAC,WAAW;aAC5C;YAED,oBAAoB,EAAE,IAAA,oBAAW,EAAA,GAAG,uBAAuB,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,IAAI,OAAO,EAAE;YAClG,uBAAuB,EAAE,uBAAuB,CAAC,UAAU,CAAC,UAAU;SACvE,EACD,EAAE,SAAS,EAAE,WAAW,EAAE,CAC3B,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,4EAA4E;QAC5E,MAAM,OAAO,GAAG,IAAA,oBAAW,EAAA,GAAG,SAAS,EAAE,IAAI,IAAI,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;QAE/F,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,SAAS,CACjC,GAAG,OAAO,YAAY,EACtB;YACE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,UAAU,EAAE,OAAO;YACnB,aAAa,EAAE,eAAe;YAC9B,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,UAAU,CAAC,GAAG;SACpB,EACD,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,CACxC,CAAC;QAEF,IAAI,GAAG,CAAC,mBAAmB,CACzB,GAAG,OAAO,sBAAsB,EAChC;YACE,uBAAuB,EAAE,SAAS;YAClC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,UAAU,EAAE,OAAO;YACnB,aAAa,EAAE,eAAe;YAC9B,aAAa,EAAE,SAAS,CAAC,IAAI;YAC7B,mBAAmB,EAAE,IAAI;SAC1B,EACD,EAAE,SAAS,EAAE,SAAS,EAAE,CACzB,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAA2D,EAAE,CAAC;IACvE,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACrC,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YAC1B,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC;YACzB,MAAM,CAAC,GAAG,IAAA,eAAY,EAAC;gBACrB,GAAG,EAAE;gBACL,IAAI,EAAE,CAAC;gBACP,KAAK;gBACL,aAAa,EAAE,OAAO;gBACtB,SAAS,EAAE,SAAS;gBACpB,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;gBACrC,IAAI;aACL,CAAC,CAAC;YAEH,IAAI,SAAS,EAAE,CAAC;gBACd,iKAAiK;gBACjK,MAAM,gBAAgB,GAAG,IAAI,EAAE,yBAAyB;oBACtD,CAAC,CAAC,IAAI,EAAE,qBAAqB;wBAC3B,CAAC,CAAC,IAAA,oBAAW,EAAA,eAAe,OAAO,0CAA0C,CAAC,CAAC,IAAI,+DAA+D,IAAI,CAAC,qBAAqB,sGAAsG;wBAClR,CAAC,CAAC,IAAA,oBAAW,EAAA,eAAe,OAAO,0CAA0C,CAAC,CAAC,IAAI,8IAA8I;oBACnO,CAAC,CAAC,IAAA,oBAAW,EAAA,eAAe,OAAO,0CAA0C,CAAC,CAAC,IAAI,aAAa,IAAI,CAAC,UAAU,cAAc,IAAI,CAAC,QAAQ,sGAAsG,CAAC;gBAEnP,IAAA,8BAAe,EAAC;oBACd,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,KAAK,EAAE,gBAAgB;oBACvB,SAAS;oBACT,WAAW,EAAE,OAAO,CAAC,CAAC,IAAI,oBAAoB;oBAC9C,SAAS,EAAE,CAAC,CAAC,QAAQ;iBACtB,CAAC,CAAC;YACL,CAAC;YAED,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,oBAAoB;IACpB,yDAAyD;IACzD,iEAAiE;IACjE,2BAA2B;IAC3B,4BAA4B;IAC5B,kDAAkD;IAClD,wBAAwB;IACxB,QAAQ;IACR,IAAI;IAEJ,OAAO;QACL,IAAI,EAAE,OAAO;QACb,KAAK;QACL,EAAE,EAAE,SAAS,CAAC,EAAE;QAChB,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,EAAE;QACf,SAAS,EAAE,GAAG;KACf,CAAC;AACJ,CAAC,CAAC"}
|
package/Storage/index.d.ts
CHANGED
|
@@ -23,6 +23,7 @@ export type StoragePolicyType = {
|
|
|
23
23
|
/** The management rule applied to Storage level (all containers)*/
|
|
24
24
|
defaultManagementRules?: Array<DefaultManagementRules>;
|
|
25
25
|
};
|
|
26
|
+
export type StorageEndpointTypes = 'blob' | 'table' | 'queue' | 'file' | 'web' | 'dfs';
|
|
26
27
|
export type StorageNetworkType = {
|
|
27
28
|
defaultByPass?: 'AzureServices' | 'None';
|
|
28
29
|
vnet?: Array<{
|
|
@@ -30,7 +31,7 @@ export type StorageNetworkType = {
|
|
|
30
31
|
ipAddresses?: Array<string>;
|
|
31
32
|
}>;
|
|
32
33
|
privateEndpoint?: Omit<PrivateLinkPropsType, 'type'> & {
|
|
33
|
-
type:
|
|
34
|
+
type: StorageEndpointTypes | StorageEndpointTypes[];
|
|
34
35
|
};
|
|
35
36
|
};
|
|
36
37
|
interface StorageProps extends BasicEncryptResourceArgs {
|
|
@@ -47,5 +48,5 @@ export type StorageResults = ResourceInfo & {
|
|
|
47
48
|
getConnectionString?: (name?: string) => Promise<KeyVaultSecret | undefined>;
|
|
48
49
|
};
|
|
49
50
|
/** Storage Creator */
|
|
50
|
-
declare function Storage({ name, group, vaultInfo, enableEncryption, envRoles, containers, queues, fileShares, network, features, policies, lock, dependsOn, ignoreChanges, }: StorageProps): StorageResults;
|
|
51
|
+
declare function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInfo, containers, queues, fileShares, network, features, policies, lock, dependsOn, ignoreChanges, }: StorageProps): StorageResults;
|
|
51
52
|
export default Storage;
|
package/Storage/index.js
CHANGED
|
@@ -35,7 +35,7 @@ const Locker_1 = require("../Core/Locker");
|
|
|
35
35
|
const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
36
36
|
const ManagementRules_1 = require("./ManagementRules");
|
|
37
37
|
/** Storage Creator */
|
|
38
|
-
function Storage({ name, group, vaultInfo, enableEncryption, envRoles, containers = [], queues = [], fileShares = [], network, features = {}, policies = { keyExpirationPeriodInDays: 365 }, lock = true, dependsOn, ignoreChanges, }) {
|
|
38
|
+
function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInfo, containers = [], queues = [], fileShares = [], network, features = {}, policies = { keyExpirationPeriodInDays: 365 }, lock = true, dependsOn, ignoreChanges, }) {
|
|
39
39
|
name = (0, Common_2.getStorageName)(name);
|
|
40
40
|
const primaryKeyName = (0, Common_2.getKeyName)(name, 'primary');
|
|
41
41
|
const secondaryKeyName = (0, Common_2.getKeyName)(name, 'secondary');
|
|
@@ -44,6 +44,7 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, container
|
|
|
44
44
|
const encryptionKey = enableEncryption
|
|
45
45
|
? (0, Helper_1.addEncryptKey)({ name, vaultInfo: vaultInfo })
|
|
46
46
|
: undefined;
|
|
47
|
+
const allowSharedKeyAccess = features.allowSharedKeyAccess || features.enableStaticWebsite;
|
|
47
48
|
//To fix identity issue then using this approach https://github.com/pulumi/pulumi-azure-native/blob/master/examples/keyvault/index.ts
|
|
48
49
|
const stg = new storage.StorageAccount(name, {
|
|
49
50
|
accountName: name,
|
|
@@ -58,12 +59,17 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, container
|
|
|
58
59
|
isHnsEnabled: true,
|
|
59
60
|
enableHttpsTrafficOnly: true,
|
|
60
61
|
allowBlobPublicAccess: Boolean(policies?.allowBlobPublicAccess),
|
|
61
|
-
allowSharedKeyAccess
|
|
62
|
+
allowSharedKeyAccess,
|
|
62
63
|
allowedCopyScope: network?.privateEndpoint ? 'PrivateLink' : 'AAD',
|
|
63
64
|
defaultToOAuthAuthentication: !Boolean(features.allowSharedKeyAccess),
|
|
64
65
|
isSftpEnabled: Boolean(features.isSftpEnabled),
|
|
65
66
|
allowCrossTenantReplication: Boolean(features.allowCrossTenantReplication),
|
|
66
|
-
identity: {
|
|
67
|
+
identity: {
|
|
68
|
+
type: envUIDInfo
|
|
69
|
+
? storage.IdentityType.SystemAssigned_UserAssigned
|
|
70
|
+
: storage.IdentityType.SystemAssigned,
|
|
71
|
+
userAssignedIdentities: envUIDInfo ? [envUIDInfo.id] : undefined,
|
|
72
|
+
},
|
|
67
73
|
minimumTlsVersion: 'TLS1_2',
|
|
68
74
|
//1 Year Months
|
|
69
75
|
keyPolicy: {
|
|
@@ -112,13 +118,16 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, container
|
|
|
112
118
|
},
|
|
113
119
|
}, { dependsOn, ignoreChanges });
|
|
114
120
|
if (network?.privateEndpoint) {
|
|
121
|
+
const linkTypes = Array.isArray(network.privateEndpoint.type)
|
|
122
|
+
? network.privateEndpoint.type
|
|
123
|
+
: [network.privateEndpoint.type];
|
|
115
124
|
//Create Private Endpoints
|
|
116
|
-
(0, PrivateEndpoint_1.default)({
|
|
125
|
+
linkTypes.map((type) => (0, PrivateEndpoint_1.default)({
|
|
117
126
|
...network.privateEndpoint,
|
|
118
127
|
resourceInfo: { name, group, id: stg.id },
|
|
119
|
-
privateDnsZoneName: `privatelink.${
|
|
120
|
-
linkServiceGroupIds: [
|
|
121
|
-
});
|
|
128
|
+
privateDnsZoneName: `privatelink.${type}.core.windows.net`,
|
|
129
|
+
linkServiceGroupIds: [type],
|
|
130
|
+
}));
|
|
122
131
|
}
|
|
123
132
|
//Life Cycle Management
|
|
124
133
|
if (policies?.defaultManagementRules) {
|
|
@@ -184,9 +193,9 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, container
|
|
|
184
193
|
return;
|
|
185
194
|
//Allows to Read Key Vault
|
|
186
195
|
if (envRoles)
|
|
187
|
-
envRoles.
|
|
196
|
+
envRoles.addIdentity('readOnly', stg.identity);
|
|
188
197
|
//Add connection into Key vault
|
|
189
|
-
if (vaultInfo &&
|
|
198
|
+
if (vaultInfo && allowSharedKeyAccess) {
|
|
190
199
|
const keys = (await storage.listStorageAccountKeys({
|
|
191
200
|
accountName: name,
|
|
192
201
|
resourceGroupName: group.resourceGroupName,
|
|
@@ -232,4 +241,4 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, container
|
|
|
232
241
|
};
|
|
233
242
|
}
|
|
234
243
|
exports.default = Storage;
|
|
235
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
244
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Storage/index.ts"],"names":[],"mappings":"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"}
|