@friggframework/devtools 2.0.0--canary.490.1f4f770.0 → 2.0.0--canary.490.1b7bbcb.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.
|
@@ -1756,8 +1756,13 @@ class VpcBuilder extends InfrastructureBuilder {
|
|
|
1756
1756
|
|
|
1757
1757
|
/**
|
|
1758
1758
|
* Create route table and associations for NAT Gateway
|
|
1759
|
+
* Always adds to template - CloudFormation handles idempotency
|
|
1759
1760
|
*/
|
|
1760
1761
|
createNatGatewayRouting(appDefinition, discoveredResources, result, natGatewayId) {
|
|
1762
|
+
// Note: We always add routing resources to the template.
|
|
1763
|
+
// CloudFormation's idempotency ensures existing resources are updated, not recreated.
|
|
1764
|
+
// Removing resources from the template causes CloudFormation to try CREATE on next deploy → AlreadyExists error
|
|
1765
|
+
|
|
1761
1766
|
// Private route table with NAT Gateway route
|
|
1762
1767
|
if (!result.resources.FriggLambdaRouteTable) {
|
|
1763
1768
|
result.resources.FriggLambdaRouteTable = {
|
|
@@ -78,8 +78,20 @@ class KmsBuilder extends InfrastructureBuilder {
|
|
|
78
78
|
const resolver = new KmsResourceResolver();
|
|
79
79
|
const decisions = resolver.resolveAll(appDefinition, discovery);
|
|
80
80
|
|
|
81
|
+
// Check if external key exists (for accurate logging)
|
|
82
|
+
const externalKmsKey = discoveredResources?.defaultKmsKeyId ||
|
|
83
|
+
discoveredResources?.kmsKeyArn ||
|
|
84
|
+
discoveredResources?.kmsKeyId;
|
|
85
|
+
const willUseExternal = decisions.key.ownership === ResourceOwnership.STACK &&
|
|
86
|
+
!decisions.key.physicalId &&
|
|
87
|
+
externalKmsKey;
|
|
88
|
+
|
|
81
89
|
console.log('\n 📋 Resource Ownership Decisions:');
|
|
82
|
-
|
|
90
|
+
if (willUseExternal) {
|
|
91
|
+
console.log(` Key: external - Found external KMS key (not in stack)`);
|
|
92
|
+
} else {
|
|
93
|
+
console.log(` Key: ${decisions.key.ownership} - ${decisions.key.reason}`);
|
|
94
|
+
}
|
|
83
95
|
|
|
84
96
|
// Build resources based on ownership decisions
|
|
85
97
|
await this.buildFromDecisions(decisions, appDefinition, discoveredResources, result);
|
|
@@ -247,7 +259,6 @@ class KmsBuilder extends InfrastructureBuilder {
|
|
|
247
259
|
} else if (decisions.key.ownership === ResourceOwnership.STACK && !decisions.key.physicalId && externalKmsKey) {
|
|
248
260
|
// ORPHANED KEY FIX: Key exists externally but not in stack
|
|
249
261
|
// Use it as external instead of trying to create (would fail with "already exists")
|
|
250
|
-
console.log(' ⚠️ KMS key exists externally but not in stack - using as external resource');
|
|
251
262
|
console.log(` → Using external KMS key: ${externalKmsKey}`);
|
|
252
263
|
|
|
253
264
|
// Format as ARN if it's just a key ID
|
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.490.
|
|
4
|
+
"version": "2.0.0--canary.490.1b7bbcb.0",
|
|
5
5
|
"bin": {
|
|
6
6
|
"frigg": "./frigg-cli/index.js"
|
|
7
7
|
},
|
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
"@babel/eslint-parser": "^7.18.9",
|
|
17
17
|
"@babel/parser": "^7.25.3",
|
|
18
18
|
"@babel/traverse": "^7.25.3",
|
|
19
|
-
"@friggframework/core": "2.0.0--canary.490.
|
|
20
|
-
"@friggframework/schemas": "2.0.0--canary.490.
|
|
21
|
-
"@friggframework/test": "2.0.0--canary.490.
|
|
19
|
+
"@friggframework/core": "2.0.0--canary.490.1b7bbcb.0",
|
|
20
|
+
"@friggframework/schemas": "2.0.0--canary.490.1b7bbcb.0",
|
|
21
|
+
"@friggframework/test": "2.0.0--canary.490.1b7bbcb.0",
|
|
22
22
|
"@hapi/boom": "^10.0.1",
|
|
23
23
|
"@inquirer/prompts": "^5.3.8",
|
|
24
24
|
"axios": "^1.7.2",
|
|
@@ -46,8 +46,8 @@
|
|
|
46
46
|
"validate-npm-package-name": "^5.0.0"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
|
-
"@friggframework/eslint-config": "2.0.0--canary.490.
|
|
50
|
-
"@friggframework/prettier-config": "2.0.0--canary.490.
|
|
49
|
+
"@friggframework/eslint-config": "2.0.0--canary.490.1b7bbcb.0",
|
|
50
|
+
"@friggframework/prettier-config": "2.0.0--canary.490.1b7bbcb.0",
|
|
51
51
|
"aws-sdk-client-mock": "^4.1.0",
|
|
52
52
|
"aws-sdk-client-mock-jest": "^4.1.0",
|
|
53
53
|
"jest": "^30.1.3",
|
|
@@ -79,5 +79,5 @@
|
|
|
79
79
|
"publishConfig": {
|
|
80
80
|
"access": "public"
|
|
81
81
|
},
|
|
82
|
-
"gitHead": "
|
|
82
|
+
"gitHead": "1b7bbcb96b98d3a5a6cb2fb0fcfa06fb5235433e"
|
|
83
83
|
}
|