@friggframework/devtools 2.0.0--canary.425.dd575ef.0 → 2.0.0--canary.425.06986ff.0
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.
|
@@ -974,6 +974,11 @@ const composeServerlessDefinition = async (AppDefinition) => {
|
|
|
974
974
|
definition.provider.environment.KMS_KEY_ARN = {
|
|
975
975
|
'Fn::GetAtt': ['FriggKMSKey', 'Arn'],
|
|
976
976
|
};
|
|
977
|
+
|
|
978
|
+
// Configure KMS grants to reference the created key
|
|
979
|
+
definition.custom.kmsGrants = {
|
|
980
|
+
kmsKeyId: { 'Fn::GetAtt': ['FriggKMSKey', 'Arn'] }
|
|
981
|
+
};
|
|
977
982
|
} else {
|
|
978
983
|
// No key found and createIfNoneFound is not enabled - error
|
|
979
984
|
throw new Error(
|
|
@@ -985,12 +990,14 @@ const composeServerlessDefinition = async (AppDefinition) => {
|
|
|
985
990
|
|
|
986
991
|
definition.plugins.push('serverless-kms-grants');
|
|
987
992
|
|
|
988
|
-
// Configure KMS grants
|
|
989
|
-
definition.custom.kmsGrants
|
|
990
|
-
|
|
991
|
-
|
|
992
|
-
|
|
993
|
-
|
|
993
|
+
// Configure KMS grants if not already set (when using existing key)
|
|
994
|
+
if (!definition.custom.kmsGrants) {
|
|
995
|
+
definition.custom.kmsGrants = {
|
|
996
|
+
kmsKeyId:
|
|
997
|
+
discoveredResources.defaultKmsKeyId ||
|
|
998
|
+
'${env:AWS_DISCOVERY_KMS_KEY_ID}',
|
|
999
|
+
};
|
|
1000
|
+
}
|
|
994
1001
|
}
|
|
995
1002
|
|
|
996
1003
|
// VPC Configuration based on App Definition
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@friggframework/devtools",
|
|
3
3
|
"prettier": "@friggframework/prettier-config",
|
|
4
|
-
"version": "2.0.0--canary.425.
|
|
4
|
+
"version": "2.0.0--canary.425.06986ff.0",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@aws-sdk/client-ec2": "^3.835.0",
|
|
7
7
|
"@aws-sdk/client-kms": "^3.835.0",
|
|
@@ -9,8 +9,8 @@
|
|
|
9
9
|
"@babel/eslint-parser": "^7.18.9",
|
|
10
10
|
"@babel/parser": "^7.25.3",
|
|
11
11
|
"@babel/traverse": "^7.25.3",
|
|
12
|
-
"@friggframework/schemas": "2.0.0--canary.425.
|
|
13
|
-
"@friggframework/test": "2.0.0--canary.425.
|
|
12
|
+
"@friggframework/schemas": "2.0.0--canary.425.06986ff.0",
|
|
13
|
+
"@friggframework/test": "2.0.0--canary.425.06986ff.0",
|
|
14
14
|
"@hapi/boom": "^10.0.1",
|
|
15
15
|
"@inquirer/prompts": "^5.3.8",
|
|
16
16
|
"axios": "^1.7.2",
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
"serverless-http": "^2.7.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@friggframework/eslint-config": "2.0.0--canary.425.
|
|
36
|
-
"@friggframework/prettier-config": "2.0.0--canary.425.
|
|
35
|
+
"@friggframework/eslint-config": "2.0.0--canary.425.06986ff.0",
|
|
36
|
+
"@friggframework/prettier-config": "2.0.0--canary.425.06986ff.0",
|
|
37
37
|
"jest": "^30.1.3",
|
|
38
38
|
"prettier": "^2.7.1",
|
|
39
39
|
"serverless": "3.39.0",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "06986fff8607c98e3157e5a219716c53276b065e"
|
|
70
70
|
}
|