@drunk-pulumi/azure 0.0.40 → 0.0.41
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/types/sqlBuilder.d.ts +1 -1
- package/Sql/index.d.ts +0 -2
- package/Sql/index.js +12 -13
- package/VNet/PrivateDns.d.ts +1 -1
- package/VNet/PrivateDns.js +7 -6
- package/VNet/PrivateEndpoint.js +3 -3
- package/package.json +3 -3
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { IBuilder, ILoginBuilder } from "./genericBuilder";
|
|
2
2
|
import { SqlAuthType, SqlElasticPoolType, SqlNetworkType, SqlResults } from "../../Sql";
|
|
3
3
|
import { SqlDbSku } from "../../Sql/SqlDb";
|
|
4
|
-
export type SqlBuilderAuthOptionsType = Pick<SqlAuthType, "
|
|
4
|
+
export type SqlBuilderAuthOptionsType = Pick<SqlAuthType, "azureAdOnlyAuthentication">;
|
|
5
5
|
export type SqlDbBuilderType = Record<string, {
|
|
6
6
|
name?: string;
|
|
7
7
|
sku?: SqlDbSku;
|
package/Sql/index.d.ts
CHANGED
|
@@ -6,8 +6,6 @@ import { SqlDbSku } from "./SqlDb";
|
|
|
6
6
|
type ElasticPoolCapacityProps = 50 | 100 | 200 | 300 | 400 | 800 | 1200;
|
|
7
7
|
export type SqlAuthType = {
|
|
8
8
|
envRoles: EnvRolesResults;
|
|
9
|
-
/** create an Admin group on AzAD for SQL accessing.*/
|
|
10
|
-
enableAdAdministrator?: boolean;
|
|
11
9
|
azureAdOnlyAuthentication?: boolean;
|
|
12
10
|
adminLogin: Input<string>;
|
|
13
11
|
password: Input<string>;
|
package/Sql/index.js
CHANGED
|
@@ -42,8 +42,10 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
|
|
|
42
42
|
? (0, Helper_1.getEncryptionKeyOutput)(name, vaultInfo)
|
|
43
43
|
: undefined;
|
|
44
44
|
const adminGroup = auth.envRoles.contributor;
|
|
45
|
-
if (auth.azureAdOnlyAuthentication)
|
|
45
|
+
if (auth.azureAdOnlyAuthentication) {
|
|
46
|
+
ignoreChanges.push("administratorLogin");
|
|
46
47
|
ignoreChanges.push("administratorLoginPassword");
|
|
48
|
+
}
|
|
47
49
|
const sqlServer = new sql.Server(sqlName, {
|
|
48
50
|
serverName: sqlName,
|
|
49
51
|
...group,
|
|
@@ -52,17 +54,14 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
|
|
|
52
54
|
identity: { type: "SystemAssigned" },
|
|
53
55
|
administratorLogin: auth?.adminLogin,
|
|
54
56
|
administratorLoginPassword: auth?.password,
|
|
55
|
-
administrators:
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
login: adminGroup.displayName,
|
|
64
|
-
}
|
|
65
|
-
: undefined,
|
|
57
|
+
administrators: {
|
|
58
|
+
administratorType: sql.AdministratorType.ActiveDirectory,
|
|
59
|
+
azureADOnlyAuthentication: Boolean(auth.azureAdOnlyAuthentication),
|
|
60
|
+
principalType: sql.PrincipalType.Group,
|
|
61
|
+
tenantId: AzureEnv_1.tenantId,
|
|
62
|
+
sid: adminGroup?.objectId,
|
|
63
|
+
login: adminGroup?.displayName,
|
|
64
|
+
},
|
|
66
65
|
publicNetworkAccess: network?.asPrivateLink
|
|
67
66
|
? sql.ServerNetworkAccessFlag.Disabled
|
|
68
67
|
: sql.ServerNetworkAccessFlag.Enabled,
|
|
@@ -248,4 +247,4 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
|
|
|
248
247
|
databases: dbs,
|
|
249
248
|
};
|
|
250
249
|
};
|
|
251
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
250
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
|
package/VNet/PrivateDns.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ interface RecordProps {
|
|
|
9
9
|
}
|
|
10
10
|
export declare const addARecord: ({ recordName, dnsInfo, ipAddresses, dependsOn, }: RecordProps) => import("@pulumi/azure-native/network/privateRecordSet").PrivateRecordSet;
|
|
11
11
|
interface VnetToPrivateDnsProps extends BasicResourceArgs {
|
|
12
|
-
zoneName: string
|
|
12
|
+
zoneName: Input<string>;
|
|
13
13
|
vnetId: Input<string>;
|
|
14
14
|
registrationEnabled?: boolean;
|
|
15
15
|
}
|
package/VNet/PrivateDns.js
CHANGED
|
@@ -21,11 +21,12 @@ const addARecord = ({ recordName, dnsInfo, ipAddresses, dependsOn, }) => {
|
|
|
21
21
|
}, { dependsOn });
|
|
22
22
|
};
|
|
23
23
|
exports.addARecord = addARecord;
|
|
24
|
-
const linkVnetToPrivateDns = ({ name, group, zoneName, vnetId, registrationEnabled, ...others }) => {
|
|
25
|
-
return new native.network.VirtualNetworkLink(`${name}
|
|
24
|
+
const linkVnetToPrivateDns = ({ name, group, zoneName, vnetId, registrationEnabled = false, ...others }) => {
|
|
25
|
+
return new native.network.VirtualNetworkLink(`${name}-link`, {
|
|
26
26
|
...group,
|
|
27
|
+
location: "global",
|
|
27
28
|
privateZoneName: zoneName,
|
|
28
|
-
registrationEnabled
|
|
29
|
+
registrationEnabled,
|
|
29
30
|
virtualNetwork: { id: vnetId },
|
|
30
31
|
}, others);
|
|
31
32
|
};
|
|
@@ -39,14 +40,14 @@ exports.default = ({ name, group = global.groupInfo, vnetIds, records, dependsOn
|
|
|
39
40
|
}, { dependsOn });
|
|
40
41
|
const toDnsInfo = () => ({ resourceName: name, group, id: zone.id });
|
|
41
42
|
if (vnetIds) {
|
|
42
|
-
|
|
43
|
+
vnetIds.map((id) => (0, exports.linkVnetToPrivateDns)({
|
|
43
44
|
name,
|
|
44
45
|
vnetId: id,
|
|
45
46
|
zoneName: name,
|
|
46
47
|
group,
|
|
47
48
|
registrationEnabled: false,
|
|
48
49
|
dependsOn: zone,
|
|
49
|
-
}))
|
|
50
|
+
}));
|
|
50
51
|
}
|
|
51
52
|
if (records) {
|
|
52
53
|
if (records.aRecords) {
|
|
@@ -64,4 +65,4 @@ const getPrivateZone = ({ name, group = global.groupInfo, }) => native.network.g
|
|
|
64
65
|
resourceGroupName: group.resourceGroupName,
|
|
65
66
|
});
|
|
66
67
|
exports.getPrivateZone = getPrivateZone;
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZURucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1ByaXZhdGVEbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0NBQStDO0FBQy9DLDJDQUE4RDtBQUM5RCw4Q0FBOEM7QUFldkMsTUFBTSxVQUFVLEdBQUcsQ0FBQyxFQUN6QixVQUFVLEVBQ1YsT0FBTyxFQUNQLFdBQVcsRUFDWCxTQUFTLEdBQ0csRUFBRSxFQUFFO0lBQ2hCLFVBQVUsR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZFLCtCQUErQjtJQUUvQixPQUFPLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FDeEMsVUFBVSxLQUFLLEdBQUc7UUFDaEIsQ0FBQyxDQUFDLGFBQWE7UUFDZixDQUFDLENBQUMsVUFBVSxLQUFLLEdBQUc7WUFDbEIsQ0FBQyxDQUFDLGNBQWM7WUFDaEIsQ0FBQyxDQUFDLEdBQUcsVUFBVSxVQUFVLEVBQzdCO1FBQ0UsZUFBZSxFQUFFLE9BQU8sQ0FBQyxZQUFZO1FBQ3JDLEdBQUcsT0FBTyxDQUFDLEtBQUs7UUFDaEIscUJBQXFCLEVBQUUsVUFBVTtRQUNqQyxVQUFVLEVBQUUsR0FBRztRQUNmLFFBQVEsRUFBRSxJQUFBLGVBQU0sRUFBQyxXQUFXLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUMxQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FDckM7UUFDRCxHQUFHLEVBQUUsSUFBSTtLQUNWLEVBQ0QsRUFBRSxTQUFTLEVBQUUsQ0FDZCxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBM0JXLFFBQUEsVUFBVSxjQTJCckI7QUFRSyxNQUFNLG9CQUFvQixHQUFHLENBQUMsRUFDbkMsSUFBSSxFQUNKLEtBQUssRUFDTCxRQUFRLEVBQ1IsTUFBTSxFQUNOLG1CQUFtQixHQUFHLEtBQUssRUFDM0IsR0FBRyxNQUFNLEVBQ2EsRUFBRSxFQUFFO0lBQzFCLE9BQU8sSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLGtCQUFrQixDQUMxQyxHQUFHLElBQUksT0FBTyxFQUNkO1FBQ0UsR0FBRyxLQUFLO1FBQ1IsUUFBUSxFQUFFLFFBQVE7UUFDbEIsZUFBZSxFQUFFLFFBQVE7UUFDekIsbUJBQW1CO1FBQ25CLGNBQWMsRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUU7S0FDL0IsRUFDRCxNQUFNLENBQ1AsQ0FBQztBQUNKLENBQUMsQ0FBQztBQW5CVyxRQUFBLG9CQUFvQix3QkFtQi9CO0FBWUYsb0ZBQW9GO0FBQ3BGLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxHQUFHLE1BQU0sQ0FBQyxTQUFTLEVBQ3hCLE9BQU8sRUFDUCxPQUFPLEVBQ1AsU0FBUyxHQUNILEVBRU4sRUFBRTtJQUNGLE1BQU0sSUFBSSxHQUFHLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQ3pDLElBQUksRUFDSjtRQUNFLGVBQWUsRUFBRSxJQUFJO1FBQ3JCLEdBQUcsS0FBSztRQUNSLFFBQVEsRUFBRSxRQUFRO0tBQ25CLEVBQ0QsRUFBRSxTQUFTLEVBQUUsQ0FDZCxDQUFDO0lBRUYsTUFBTSxTQUFTLEdBQUcsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUVyRSxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQ1osT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQ2pCLElBQUEsNEJBQW9CLEVBQUM7WUFDbkIsSUFBSTtZQUNKLE1BQU0sRUFBRSxFQUFFO1lBQ1YsUUFBUSxFQUFFLElBQUk7WUFDZCxLQUFLO1lBQ0wsbUJBQW1CLEVBQUUsS0FBSztZQUMxQixTQUFTLEVBQUUsSUFBSTtTQUNoQixDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7SUFFRCxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQ1osSUFBSSxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDckIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUN6QixJQUFBLGtCQUFVLEVBQUMsRUFBRSxHQUFHLENBQUMsRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQzVELENBQUM7UUFDSixDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU87UUFDTCxJQUFJO1FBQ0osUUFBUSxFQUFFLElBQUk7UUFDZCxTQUFTO0tBQ1YsQ0FBQztBQUNKLENBQUMsQ0FBQztBQUVLLE1BQU0sY0FBYyxHQUFHLENBQUMsRUFDN0IsSUFBSSxFQUNKLEtBQUssR0FBRyxNQUFNLENBQUMsU0FBUyxHQUNELEVBQUUsRUFBRSxDQUMzQixNQUFNLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQztJQUM1QixlQUFlLEVBQUUsSUFBSTtJQUNyQixpQkFBaUIsRUFBRSxLQUFLLENBQUMsaUJBQWlCO0NBQzNDLENBQUMsQ0FBQztBQVBRLFFBQUEsY0FBYyxrQkFPdEIifQ==
|
package/VNet/PrivateEndpoint.js
CHANGED
|
@@ -26,7 +26,7 @@ exports.default = ({ name, group, resourceId, subnetIds, privateDnsZoneName, lin
|
|
|
26
26
|
const resourceInfo = (0, AzureEnv_1.parseResourceInfoFromId)(id);
|
|
27
27
|
//Create Zone
|
|
28
28
|
const zone = (0, PrivateDns_1.default)({
|
|
29
|
-
name: `${resourceInfo
|
|
29
|
+
name: `${resourceInfo.name}.${privateDnsZoneName}`,
|
|
30
30
|
group,
|
|
31
31
|
});
|
|
32
32
|
//Add Root Record
|
|
@@ -41,7 +41,7 @@ exports.default = ({ name, group, resourceId, subnetIds, privateDnsZoneName, lin
|
|
|
41
41
|
const vnetId = (0, Helper_1.getVnetIdFromSubnetId)(id);
|
|
42
42
|
(0, PrivateDns_1.linkVnetToPrivateDns)({
|
|
43
43
|
name: `${name}-${index}`,
|
|
44
|
-
zoneName:
|
|
44
|
+
zoneName: zone.name,
|
|
45
45
|
vnetId,
|
|
46
46
|
group,
|
|
47
47
|
dependsOn: zone.resource,
|
|
@@ -51,4 +51,4 @@ exports.default = ({ name, group, resourceId, subnetIds, privateDnsZoneName, lin
|
|
|
51
51
|
});
|
|
52
52
|
return endpoints;
|
|
53
53
|
};
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUVuZHBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvUHJpdmF0ZUVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsd0RBQXdEO0FBQ3hELDJDQUErQztBQUUvQyxxQ0FBaUQ7QUFDakQsNkNBQTZFO0FBQzdFLGlEQUE2RDtBQUM3RCw2Q0FBMEQ7QUFRMUQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsVUFBVSxFQUNWLFNBQVMsRUFDVCxrQkFBa0IsRUFDbEIsbUJBQW1CLEdBQ2IsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLElBQUEsK0JBQXNCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFcEMsTUFBTSxTQUFTLEdBQUcsU0FBUyxDQUFDLEdBQUcsQ0FDN0IsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FDWCxJQUFJLE9BQU8sQ0FBQyxlQUFlLENBQUMsR0FBRyxJQUFJLElBQUksS0FBSyxFQUFFLEVBQUU7UUFDOUMsbUJBQW1CLEVBQUUsR0FBRyxJQUFJLElBQUksS0FBSyxFQUFFO1FBQ3ZDLEdBQUcsS0FBSztRQUVSLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQUU7UUFDakIsNkJBQTZCLEVBQUU7WUFDN0I7Z0JBQ0UsUUFBUSxFQUFFLG1CQUFtQjtnQkFDN0IsSUFBSSxFQUFFLEdBQUcsSUFBSSxPQUFPO2dCQUNwQixvQkFBb0IsRUFBRSxVQUFVO2FBQ2pDO1NBQ0Y7S0FDRixDQUFDLENBQ0wsQ0FBQztJQUVGLGtCQUFrQjtJQUNsQixNQUFNLFdBQVcsR0FBRyxJQUFBLGVBQU0sRUFDeEIsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ2xCLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFZLENBQUMsQ0FBQyxDQUNuRSxDQUNGLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRXBDLElBQUEsZUFBTSxFQUFDLFVBQVUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFO1FBQzlCLE1BQU0sWUFBWSxHQUFHLElBQUEsa0NBQXVCLEVBQUMsRUFBRSxDQUFDLENBQUM7UUFFakQsYUFBYTtRQUNiLE1BQU0sSUFBSSxHQUFHLElBQUEsb0JBQVcsRUFBQztZQUN2QixJQUFJLEVBQUUsR0FBRyxZQUFhLENBQUMsSUFBSSxJQUFJLGtCQUFrQixFQUFFO1lBQ25ELEtBQUs7U0FDTixDQUFDLENBQUM7UUFFSCxpQkFBaUI7UUFDakIsSUFBQSx1QkFBVSxFQUFDO1lBQ1QsV0FBVztZQUNYLFVBQVUsRUFBRSxHQUFHO1lBQ2YsT0FBTyxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUU7WUFDekIsU0FBUyxFQUFFLElBQUksQ0FBQyxRQUFRO1NBQ3pCLENBQUMsQ0FBQztRQUVILGNBQWM7UUFDZCxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxFQUFFLENBQ3pCLElBQUEsZUFBTSxFQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFO1lBQ3JCLE1BQU0sTUFBTSxHQUFHLElBQUEsOEJBQXFCLEVBQUMsRUFBRSxDQUFDLENBQUM7WUFDekMsSUFBQSxpQ0FBb0IsRUFBQztnQkFDbkIsSUFBSSxFQUFFLEdBQUcsSUFBSSxJQUFJLEtBQUssRUFBRTtnQkFDeEIsUUFBUSxFQUFFLElBQUksQ0FBQyxJQUFJO2dCQUNuQixNQUFNO2dCQUNOLEtBQUs7Z0JBQ0wsU0FBUyxFQUFFLElBQUksQ0FBQyxRQUFRO2FBQ3pCLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUNILENBQUM7UUFDRixHQUFHO0lBQ0wsQ0FBQyxDQUFDLENBQUM7SUFFSCxPQUFPLFNBQVMsQ0FBQztBQUNuQixDQUFDLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@drunk-pulumi/azure",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.41",
|
|
4
4
|
"author": "drunkcoding@outlook.com",
|
|
5
5
|
"description": "The custom helpers pulumi-azure",
|
|
6
6
|
"license": "MIT",
|
|
@@ -17,10 +17,10 @@
|
|
|
17
17
|
"url": "https://github.com/baoduy/drunk-pulumi-azure.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@drunk-pulumi/azure-providers": "^0.0.
|
|
20
|
+
"@drunk-pulumi/azure-providers": "^0.0.21",
|
|
21
21
|
"@pulumi/azure-native": "^2.46.0",
|
|
22
22
|
"@pulumi/azuread": "5.52.0",
|
|
23
|
-
"@pulumi/pulumi": "^3.
|
|
23
|
+
"@pulumi/pulumi": "^3.121.0",
|
|
24
24
|
"@pulumi/random": "^4.16.2",
|
|
25
25
|
"@pulumi/tls": "^5.0.3",
|
|
26
26
|
"axios": "^1.7.2",
|