@friggframework/devtools 2.0.0--canary.490.b93c127.0 → 2.0.0--canary.490.83d98eb.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.
|
@@ -220,16 +220,6 @@ class CloudFormationDiscovery {
|
|
|
220
220
|
discovered.existingLogicalIds = [];
|
|
221
221
|
}
|
|
222
222
|
|
|
223
|
-
// DEBUG: Log all VPC-related resources CloudFormation returns
|
|
224
|
-
console.log(' DEBUG: VPC-related resources from CloudFormation:');
|
|
225
|
-
resources.filter(r =>
|
|
226
|
-
r.LogicalResourceId.includes('VPCEndpoint') ||
|
|
227
|
-
r.LogicalResourceId.includes('Route') ||
|
|
228
|
-
r.LogicalResourceId.includes('RouteTable')
|
|
229
|
-
).forEach(r => {
|
|
230
|
-
console.log(` - ${r.LogicalResourceId} (${r.ResourceType}): ${r.PhysicalResourceId}`);
|
|
231
|
-
});
|
|
232
|
-
|
|
233
223
|
for (const resource of resources) {
|
|
234
224
|
const { LogicalResourceId, PhysicalResourceId, ResourceType } = resource;
|
|
235
225
|
|
|
@@ -239,9 +229,6 @@ class CloudFormationDiscovery {
|
|
|
239
229
|
LogicalResourceId.includes('Migration') ||
|
|
240
230
|
LogicalResourceId.startsWith('VPCEndpoint')) {
|
|
241
231
|
discovered.existingLogicalIds.push(LogicalResourceId);
|
|
242
|
-
if (LogicalResourceId.includes('Route') || LogicalResourceId.includes('VPCEndpoint')) {
|
|
243
|
-
console.log(` DEBUG: Added to existingLogicalIds: ${LogicalResourceId}`);
|
|
244
|
-
}
|
|
245
232
|
}
|
|
246
233
|
|
|
247
234
|
// Debug Aurora detection
|
|
@@ -375,14 +362,19 @@ class CloudFormationDiscovery {
|
|
|
375
362
|
|
|
376
363
|
// CRITICAL: Extract subnet ID from association physical ID by querying EC2
|
|
377
364
|
// Physical ID is the association ID (rtbassoc-xxx), need to query to get subnet
|
|
365
|
+
console.log(` DEBUG: Checking if this is subnet 1 association: LogicalResourceId="${LogicalResourceId}", matches=${LogicalResourceId === 'FriggSubnet1RouteAssociation' || LogicalResourceId === 'FriggPrivateSubnet1RouteTableAssociation'}`);
|
|
366
|
+
console.log(` DEBUG: this.provider=${!!this.provider}, getEC2Client=${!!(this.provider && this.provider.getEC2Client)}`);
|
|
367
|
+
|
|
378
368
|
if (this.provider && this.provider.getEC2Client &&
|
|
379
369
|
(LogicalResourceId === 'FriggSubnet1RouteAssociation' || LogicalResourceId === 'FriggPrivateSubnet1RouteTableAssociation')) {
|
|
380
370
|
// Store association ID to query later (after loop)
|
|
381
371
|
discovered._subnet1AssociationId = PhysicalResourceId;
|
|
372
|
+
console.log(` DEBUG: Set _subnet1AssociationId = ${PhysicalResourceId}`);
|
|
382
373
|
}
|
|
383
374
|
if (this.provider && this.provider.getEC2Client &&
|
|
384
375
|
(LogicalResourceId === 'FriggSubnet2RouteAssociation' || LogicalResourceId === 'FriggPrivateSubnet2RouteTableAssociation')) {
|
|
385
376
|
discovered._subnet2AssociationId = PhysicalResourceId;
|
|
377
|
+
console.log(` DEBUG: Set _subnet2AssociationId = ${PhysicalResourceId}`);
|
|
386
378
|
}
|
|
387
379
|
}
|
|
388
380
|
|
|
@@ -872,5 +872,14 @@ describe('CloudFormationDiscovery', () => {
|
|
|
872
872
|
expect(result.existingLogicalIds).not.toContain('VPCEndpointS3');
|
|
873
873
|
});
|
|
874
874
|
});
|
|
875
|
+
|
|
876
|
+
describe('Subnet extraction from route table associations', () => {
|
|
877
|
+
it.skip('should extract subnet IDs from route table associations when route table Associations array is empty', async () => {
|
|
878
|
+
// TODO: This test needs proper mock setup for EC2 client
|
|
879
|
+
// The code already exists (lines 563-608 in cloudformation-discovery.js)
|
|
880
|
+
// Skipping until we can properly mock the EC2 client chain
|
|
881
|
+
});
|
|
882
|
+
|
|
883
|
+
});
|
|
875
884
|
});
|
|
876
885
|
|
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.83d98eb.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.83d98eb.0",
|
|
20
|
+
"@friggframework/schemas": "2.0.0--canary.490.83d98eb.0",
|
|
21
|
+
"@friggframework/test": "2.0.0--canary.490.83d98eb.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.83d98eb.0",
|
|
50
|
+
"@friggframework/prettier-config": "2.0.0--canary.490.83d98eb.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": "83d98eb69c36a73f76db1a7289e6b282178b6b5b"
|
|
83
83
|
}
|