@friggframework/devtools 2.0.0-next.45 → 2.0.0-next.47
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/infrastructure/ARCHITECTURE.md +487 -0
- package/infrastructure/HEALTH.md +468 -0
- package/infrastructure/README.md +51 -0
- package/infrastructure/__tests__/postgres-config.test.js +914 -0
- package/infrastructure/__tests__/template-generation.test.js +687 -0
- package/infrastructure/create-frigg-infrastructure.js +1 -1
- package/infrastructure/docs/POSTGRES-CONFIGURATION.md +630 -0
- package/infrastructure/{DEPLOYMENT-INSTRUCTIONS.md → docs/deployment-instructions.md} +3 -3
- package/infrastructure/{IAM-POLICY-TEMPLATES.md → docs/iam-policy-templates.md} +9 -10
- package/infrastructure/domains/database/aurora-builder.js +809 -0
- package/infrastructure/domains/database/aurora-builder.test.js +950 -0
- package/infrastructure/domains/database/aurora-discovery.js +87 -0
- package/infrastructure/domains/database/aurora-discovery.test.js +188 -0
- package/infrastructure/domains/database/aurora-resolver.js +210 -0
- package/infrastructure/domains/database/aurora-resolver.test.js +347 -0
- package/infrastructure/domains/database/migration-builder.js +695 -0
- package/infrastructure/domains/database/migration-builder.test.js +294 -0
- package/infrastructure/domains/database/migration-resolver.js +163 -0
- package/infrastructure/domains/database/migration-resolver.test.js +337 -0
- package/infrastructure/domains/health/application/ports/IPropertyReconciler.js +164 -0
- package/infrastructure/domains/health/application/ports/IResourceDetector.js +129 -0
- package/infrastructure/domains/health/application/ports/IResourceImporter.js +142 -0
- package/infrastructure/domains/health/application/ports/IStackRepository.js +131 -0
- package/infrastructure/domains/health/application/ports/index.js +26 -0
- package/infrastructure/domains/health/application/use-cases/__tests__/execute-resource-import-use-case.test.js +679 -0
- package/infrastructure/domains/health/application/use-cases/__tests__/mismatch-analyzer-method-name.test.js +167 -0
- package/infrastructure/domains/health/application/use-cases/__tests__/repair-via-import-use-case.test.js +1130 -0
- package/infrastructure/domains/health/application/use-cases/execute-resource-import-use-case.js +221 -0
- package/infrastructure/domains/health/application/use-cases/reconcile-properties-use-case.js +152 -0
- package/infrastructure/domains/health/application/use-cases/reconcile-properties-use-case.test.js +343 -0
- package/infrastructure/domains/health/application/use-cases/repair-via-import-use-case.js +535 -0
- package/infrastructure/domains/health/application/use-cases/repair-via-import-use-case.test.js +376 -0
- package/infrastructure/domains/health/application/use-cases/run-health-check-use-case.js +213 -0
- package/infrastructure/domains/health/application/use-cases/run-health-check-use-case.test.js +441 -0
- package/infrastructure/domains/health/docs/ACME-DEV-DRIFT-ANALYSIS.md +267 -0
- package/infrastructure/domains/health/docs/BUILD-VS-DEPLOYED-TEMPLATE-ANALYSIS.md +324 -0
- package/infrastructure/domains/health/docs/ORPHAN-DETECTION-ANALYSIS.md +386 -0
- package/infrastructure/domains/health/docs/SPEC-CLEANUP-COMMAND.md +1419 -0
- package/infrastructure/domains/health/docs/TDD-IMPLEMENTATION-SUMMARY.md +391 -0
- package/infrastructure/domains/health/docs/TEMPLATE-COMPARISON-IMPLEMENTATION.md +551 -0
- package/infrastructure/domains/health/domain/entities/issue.js +299 -0
- package/infrastructure/domains/health/domain/entities/issue.test.js +528 -0
- package/infrastructure/domains/health/domain/entities/property-mismatch.js +108 -0
- package/infrastructure/domains/health/domain/entities/property-mismatch.test.js +275 -0
- package/infrastructure/domains/health/domain/entities/resource.js +159 -0
- package/infrastructure/domains/health/domain/entities/resource.test.js +432 -0
- package/infrastructure/domains/health/domain/entities/stack-health-report.js +306 -0
- package/infrastructure/domains/health/domain/entities/stack-health-report.test.js +601 -0
- package/infrastructure/domains/health/domain/services/__tests__/health-score-percentage-based.test.js +380 -0
- package/infrastructure/domains/health/domain/services/__tests__/import-progress-monitor.test.js +971 -0
- package/infrastructure/domains/health/domain/services/__tests__/import-template-generator.test.js +1150 -0
- package/infrastructure/domains/health/domain/services/__tests__/logical-id-mapper.test.js +672 -0
- package/infrastructure/domains/health/domain/services/__tests__/template-parser.test.js +496 -0
- package/infrastructure/domains/health/domain/services/__tests__/update-progress-monitor.test.js +419 -0
- package/infrastructure/domains/health/domain/services/health-score-calculator.js +248 -0
- package/infrastructure/domains/health/domain/services/health-score-calculator.test.js +504 -0
- package/infrastructure/domains/health/domain/services/import-progress-monitor.js +195 -0
- package/infrastructure/domains/health/domain/services/import-template-generator.js +435 -0
- package/infrastructure/domains/health/domain/services/logical-id-mapper.js +345 -0
- package/infrastructure/domains/health/domain/services/mismatch-analyzer.js +234 -0
- package/infrastructure/domains/health/domain/services/mismatch-analyzer.test.js +431 -0
- package/infrastructure/domains/health/domain/services/property-mutability-config.js +382 -0
- package/infrastructure/domains/health/domain/services/template-parser.js +245 -0
- package/infrastructure/domains/health/domain/services/update-progress-monitor.js +192 -0
- package/infrastructure/domains/health/domain/value-objects/health-score.js +138 -0
- package/infrastructure/domains/health/domain/value-objects/health-score.test.js +267 -0
- package/infrastructure/domains/health/domain/value-objects/property-mutability.js +161 -0
- package/infrastructure/domains/health/domain/value-objects/property-mutability.test.js +198 -0
- package/infrastructure/domains/health/domain/value-objects/resource-state.js +167 -0
- package/infrastructure/domains/health/domain/value-objects/resource-state.test.js +196 -0
- package/infrastructure/domains/health/domain/value-objects/stack-identifier.js +192 -0
- package/infrastructure/domains/health/domain/value-objects/stack-identifier.test.js +262 -0
- package/infrastructure/domains/health/infrastructure/adapters/__tests__/orphan-detection-cfn-tagged.test.js +312 -0
- package/infrastructure/domains/health/infrastructure/adapters/__tests__/orphan-detection-multi-stack.test.js +367 -0
- package/infrastructure/domains/health/infrastructure/adapters/__tests__/orphan-detection-relationship-analysis.test.js +432 -0
- package/infrastructure/domains/health/infrastructure/adapters/aws-property-reconciler.js +784 -0
- package/infrastructure/domains/health/infrastructure/adapters/aws-property-reconciler.test.js +1133 -0
- package/infrastructure/domains/health/infrastructure/adapters/aws-resource-detector.js +565 -0
- package/infrastructure/domains/health/infrastructure/adapters/aws-resource-detector.test.js +554 -0
- package/infrastructure/domains/health/infrastructure/adapters/aws-resource-importer.js +318 -0
- package/infrastructure/domains/health/infrastructure/adapters/aws-resource-importer.test.js +398 -0
- package/infrastructure/domains/health/infrastructure/adapters/aws-stack-repository.js +777 -0
- package/infrastructure/domains/health/infrastructure/adapters/aws-stack-repository.test.js +580 -0
- package/infrastructure/domains/integration/integration-builder.js +397 -0
- package/infrastructure/domains/integration/integration-builder.test.js +593 -0
- package/infrastructure/domains/integration/integration-resolver.js +170 -0
- package/infrastructure/domains/integration/integration-resolver.test.js +369 -0
- package/infrastructure/domains/integration/websocket-builder.js +69 -0
- package/infrastructure/domains/integration/websocket-builder.test.js +195 -0
- package/infrastructure/domains/networking/vpc-builder.js +1829 -0
- package/infrastructure/domains/networking/vpc-builder.test.js +1262 -0
- package/infrastructure/domains/networking/vpc-discovery.js +177 -0
- package/infrastructure/domains/networking/vpc-discovery.test.js +350 -0
- package/infrastructure/domains/networking/vpc-resolver.js +324 -0
- package/infrastructure/domains/networking/vpc-resolver.test.js +501 -0
- package/infrastructure/domains/parameters/ssm-builder.js +79 -0
- package/infrastructure/domains/parameters/ssm-builder.test.js +189 -0
- package/infrastructure/domains/parameters/ssm-discovery.js +84 -0
- package/infrastructure/domains/parameters/ssm-discovery.test.js +210 -0
- package/infrastructure/{iam-generator.js → domains/security/iam-generator.js} +2 -2
- package/infrastructure/domains/security/kms-builder.js +366 -0
- package/infrastructure/domains/security/kms-builder.test.js +374 -0
- package/infrastructure/domains/security/kms-discovery.js +80 -0
- package/infrastructure/domains/security/kms-discovery.test.js +177 -0
- package/infrastructure/domains/security/kms-resolver.js +96 -0
- package/infrastructure/domains/security/kms-resolver.test.js +216 -0
- package/infrastructure/domains/shared/base-builder.js +112 -0
- package/infrastructure/domains/shared/base-resolver.js +186 -0
- package/infrastructure/domains/shared/base-resolver.test.js +305 -0
- package/infrastructure/domains/shared/builder-orchestrator.js +212 -0
- package/infrastructure/domains/shared/builder-orchestrator.test.js +213 -0
- package/infrastructure/domains/shared/cloudformation-discovery-v2.js +334 -0
- package/infrastructure/domains/shared/cloudformation-discovery.js +375 -0
- package/infrastructure/domains/shared/cloudformation-discovery.test.js +590 -0
- package/infrastructure/domains/shared/environment-builder.js +119 -0
- package/infrastructure/domains/shared/environment-builder.test.js +247 -0
- package/infrastructure/domains/shared/providers/aws-provider-adapter.js +544 -0
- package/infrastructure/domains/shared/providers/aws-provider-adapter.test.js +377 -0
- package/infrastructure/domains/shared/providers/azure-provider-adapter.stub.js +93 -0
- package/infrastructure/domains/shared/providers/cloud-provider-adapter.js +136 -0
- package/infrastructure/domains/shared/providers/gcp-provider-adapter.stub.js +82 -0
- package/infrastructure/domains/shared/providers/provider-factory.js +108 -0
- package/infrastructure/domains/shared/providers/provider-factory.test.js +170 -0
- package/infrastructure/domains/shared/resource-discovery.js +192 -0
- package/infrastructure/domains/shared/resource-discovery.test.js +552 -0
- package/infrastructure/domains/shared/types/app-definition.js +205 -0
- package/infrastructure/domains/shared/types/discovery-result.js +106 -0
- package/infrastructure/domains/shared/types/discovery-result.test.js +258 -0
- package/infrastructure/domains/shared/types/index.js +46 -0
- package/infrastructure/domains/shared/types/resource-ownership.js +108 -0
- package/infrastructure/domains/shared/types/resource-ownership.test.js +101 -0
- package/infrastructure/domains/shared/utilities/base-definition-factory.js +380 -0
- package/infrastructure/domains/shared/utilities/base-definition-factory.js.bak +338 -0
- package/infrastructure/domains/shared/utilities/base-definition-factory.test.js +248 -0
- package/infrastructure/domains/shared/utilities/handler-path-resolver.js +134 -0
- package/infrastructure/domains/shared/utilities/handler-path-resolver.test.js +268 -0
- package/infrastructure/domains/shared/utilities/prisma-layer-manager.js +55 -0
- package/infrastructure/domains/shared/utilities/prisma-layer-manager.test.js +138 -0
- package/infrastructure/{env-validator.js → domains/shared/validation/env-validator.js} +2 -1
- package/infrastructure/domains/shared/validation/env-validator.test.js +173 -0
- package/infrastructure/esbuild.config.js +53 -0
- package/infrastructure/infrastructure-composer.js +87 -0
- package/infrastructure/{serverless-template.test.js → infrastructure-composer.test.js} +115 -24
- package/infrastructure/scripts/build-prisma-layer.js +553 -0
- package/infrastructure/scripts/build-prisma-layer.test.js +102 -0
- package/infrastructure/{build-time-discovery.js → scripts/build-time-discovery.js} +80 -48
- package/infrastructure/{build-time-discovery.test.js → scripts/build-time-discovery.test.js} +5 -4
- package/layers/prisma/nodejs/package.json +8 -0
- package/management-ui/server/utils/cliIntegration.js +1 -1
- package/management-ui/server/utils/environment/awsParameterStore.js +29 -18
- package/package.json +11 -11
- package/frigg-cli/.eslintrc.js +0 -141
- package/frigg-cli/__tests__/unit/commands/build.test.js +0 -251
- package/frigg-cli/__tests__/unit/commands/db-setup.test.js +0 -548
- package/frigg-cli/__tests__/unit/commands/install.test.js +0 -400
- package/frigg-cli/__tests__/unit/commands/ui.test.js +0 -346
- package/frigg-cli/__tests__/unit/utils/database-validator.test.js +0 -366
- package/frigg-cli/__tests__/unit/utils/error-messages.test.js +0 -304
- package/frigg-cli/__tests__/unit/utils/prisma-runner.test.js +0 -486
- package/frigg-cli/__tests__/utils/mock-factory.js +0 -270
- package/frigg-cli/__tests__/utils/prisma-mock.js +0 -194
- package/frigg-cli/__tests__/utils/test-fixtures.js +0 -463
- package/frigg-cli/__tests__/utils/test-setup.js +0 -287
- package/frigg-cli/build-command/index.js +0 -65
- package/frigg-cli/db-setup-command/index.js +0 -193
- package/frigg-cli/deploy-command/index.js +0 -175
- package/frigg-cli/generate-command/__tests__/generate-command.test.js +0 -301
- package/frigg-cli/generate-command/azure-generator.js +0 -43
- package/frigg-cli/generate-command/gcp-generator.js +0 -47
- package/frigg-cli/generate-command/index.js +0 -332
- package/frigg-cli/generate-command/terraform-generator.js +0 -555
- package/frigg-cli/generate-iam-command.js +0 -118
- package/frigg-cli/index.js +0 -75
- package/frigg-cli/index.test.js +0 -158
- package/frigg-cli/init-command/backend-first-handler.js +0 -756
- package/frigg-cli/init-command/index.js +0 -93
- package/frigg-cli/init-command/template-handler.js +0 -143
- package/frigg-cli/install-command/backend-js.js +0 -33
- package/frigg-cli/install-command/commit-changes.js +0 -16
- package/frigg-cli/install-command/environment-variables.js +0 -127
- package/frigg-cli/install-command/environment-variables.test.js +0 -136
- package/frigg-cli/install-command/index.js +0 -54
- package/frigg-cli/install-command/install-package.js +0 -13
- package/frigg-cli/install-command/integration-file.js +0 -30
- package/frigg-cli/install-command/logger.js +0 -12
- package/frigg-cli/install-command/template.js +0 -90
- package/frigg-cli/install-command/validate-package.js +0 -75
- package/frigg-cli/jest.config.js +0 -124
- package/frigg-cli/package.json +0 -54
- package/frigg-cli/start-command/index.js +0 -149
- package/frigg-cli/start-command/start-command.test.js +0 -297
- package/frigg-cli/test/init-command.test.js +0 -180
- package/frigg-cli/test/npm-registry.test.js +0 -319
- package/frigg-cli/ui-command/index.js +0 -154
- package/frigg-cli/utils/app-resolver.js +0 -319
- package/frigg-cli/utils/backend-path.js +0 -25
- package/frigg-cli/utils/database-validator.js +0 -161
- package/frigg-cli/utils/error-messages.js +0 -257
- package/frigg-cli/utils/npm-registry.js +0 -167
- package/frigg-cli/utils/prisma-runner.js +0 -280
- package/frigg-cli/utils/process-manager.js +0 -199
- package/frigg-cli/utils/repo-detection.js +0 -405
- package/infrastructure/aws-discovery.js +0 -1176
- package/infrastructure/aws-discovery.test.js +0 -1220
- package/infrastructure/serverless-template.js +0 -2094
- /package/infrastructure/{WEBSOCKET-CONFIGURATION.md → docs/WEBSOCKET-CONFIGURATION.md} +0 -0
- /package/infrastructure/{GENERATE-IAM-DOCS.md → docs/generate-iam-command.md} +0 -0
- /package/infrastructure/{iam-generator.test.js → domains/security/iam-generator.test.js} +0 -0
- /package/infrastructure/{frigg-deployment-iam-stack.yaml → domains/security/templates/frigg-deployment-iam-stack.yaml} +0 -0
- /package/infrastructure/{iam-policy-basic.json → domains/security/templates/iam-policy-basic.json} +0 -0
- /package/infrastructure/{iam-policy-full.json → domains/security/templates/iam-policy-full.json} +0 -0
- /package/infrastructure/{run-discovery.js → scripts/run-discovery.js} +0 -0
|
@@ -0,0 +1,345 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* LogicalIdMapper - Map orphaned resources to their logical IDs in templates
|
|
3
|
+
*
|
|
4
|
+
* Purpose: Analyze orphaned resources and match them to the correct logical IDs
|
|
5
|
+
* from CloudFormation templates using tags, containment analysis, and template comparison.
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
const {
|
|
9
|
+
EC2Client,
|
|
10
|
+
DescribeSubnetsCommand,
|
|
11
|
+
DescribeSecurityGroupsCommand,
|
|
12
|
+
} = require('@aws-sdk/client-ec2');
|
|
13
|
+
|
|
14
|
+
class LogicalIdMapper {
|
|
15
|
+
constructor({ region = 'us-east-1' } = {}) {
|
|
16
|
+
this.ec2Client = new EC2Client({ region });
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* Map orphaned resources to their logical IDs in template
|
|
21
|
+
* @param {object} params - Mapping parameters
|
|
22
|
+
* @param {Array} params.orphanedResources - Orphaned resources to map
|
|
23
|
+
* @param {object} params.buildTemplate - Build template with logical IDs
|
|
24
|
+
* @param {object} params.deployedTemplate - Deployed template with hardcoded IDs
|
|
25
|
+
* @returns {Promise<Array>} Mappings with logical IDs
|
|
26
|
+
*/
|
|
27
|
+
async mapOrphanedResourcesToLogicalIds({
|
|
28
|
+
orphanedResources,
|
|
29
|
+
buildTemplate,
|
|
30
|
+
deployedTemplate,
|
|
31
|
+
}) {
|
|
32
|
+
const mappings = [];
|
|
33
|
+
|
|
34
|
+
for (const orphan of orphanedResources) {
|
|
35
|
+
// Strategy 1: Check CloudFormation tags for logical ID
|
|
36
|
+
// Tags are stored in orphan.properties.tags (Resource entity structure)
|
|
37
|
+
const tags = orphan.properties?.tags || orphan.tags; // Support both formats
|
|
38
|
+
const logicalIdFromTag = this._getLogicalIdFromTags(tags);
|
|
39
|
+
|
|
40
|
+
if (logicalIdFromTag) {
|
|
41
|
+
mappings.push({
|
|
42
|
+
logicalId: logicalIdFromTag,
|
|
43
|
+
physicalId: orphan.physicalId,
|
|
44
|
+
resourceType: orphan.resourceType,
|
|
45
|
+
matchMethod: 'tag',
|
|
46
|
+
confidence: 'high',
|
|
47
|
+
});
|
|
48
|
+
continue;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
// Strategy 2: Match by template comparison
|
|
52
|
+
if (orphan.resourceType === 'AWS::EC2::VPC') {
|
|
53
|
+
const logicalId = await this._matchVpcByContainedResources(
|
|
54
|
+
orphan,
|
|
55
|
+
buildTemplate,
|
|
56
|
+
deployedTemplate
|
|
57
|
+
);
|
|
58
|
+
if (logicalId) {
|
|
59
|
+
mappings.push({
|
|
60
|
+
logicalId,
|
|
61
|
+
physicalId: orphan.physicalId,
|
|
62
|
+
resourceType: orphan.resourceType,
|
|
63
|
+
matchMethod: 'contained-resources',
|
|
64
|
+
confidence: 'high',
|
|
65
|
+
});
|
|
66
|
+
continue;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
if (orphan.resourceType === 'AWS::EC2::Subnet') {
|
|
71
|
+
const logicalId = await this._matchSubnetByVpcAndUsage(
|
|
72
|
+
orphan,
|
|
73
|
+
buildTemplate,
|
|
74
|
+
deployedTemplate
|
|
75
|
+
);
|
|
76
|
+
if (logicalId) {
|
|
77
|
+
mappings.push({
|
|
78
|
+
logicalId,
|
|
79
|
+
physicalId: orphan.physicalId,
|
|
80
|
+
resourceType: orphan.resourceType,
|
|
81
|
+
matchMethod: 'vpc-usage',
|
|
82
|
+
confidence: 'high',
|
|
83
|
+
});
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
if (orphan.resourceType === 'AWS::EC2::SecurityGroup') {
|
|
89
|
+
const logicalId = await this._matchSecurityGroupByUsage(
|
|
90
|
+
orphan,
|
|
91
|
+
buildTemplate,
|
|
92
|
+
deployedTemplate
|
|
93
|
+
);
|
|
94
|
+
if (logicalId) {
|
|
95
|
+
mappings.push({
|
|
96
|
+
logicalId,
|
|
97
|
+
physicalId: orphan.physicalId,
|
|
98
|
+
resourceType: orphan.resourceType,
|
|
99
|
+
matchMethod: 'usage',
|
|
100
|
+
confidence: 'medium',
|
|
101
|
+
});
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
// No match found - mark as unmapped
|
|
107
|
+
mappings.push({
|
|
108
|
+
logicalId: null,
|
|
109
|
+
physicalId: orphan.physicalId,
|
|
110
|
+
resourceType: orphan.resourceType,
|
|
111
|
+
matchMethod: 'none',
|
|
112
|
+
confidence: 'none',
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
return mappings;
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
/**
|
|
120
|
+
* Extract logical ID from CloudFormation tags
|
|
121
|
+
* Supports both formats:
|
|
122
|
+
* - AWS array format: [{Key: 'aws:cloudformation:logical-id', Value: 'FriggVPC'}]
|
|
123
|
+
* - Parsed object format: {'aws:cloudformation:logical-id': 'FriggVPC'}
|
|
124
|
+
* @private
|
|
125
|
+
*/
|
|
126
|
+
_getLogicalIdFromTags(tags) {
|
|
127
|
+
if (!tags) return null;
|
|
128
|
+
|
|
129
|
+
// Handle AWS array format [{Key, Value}]
|
|
130
|
+
if (Array.isArray(tags)) {
|
|
131
|
+
const logicalIdTag = tags.find(
|
|
132
|
+
(t) => t.Key === 'aws:cloudformation:logical-id'
|
|
133
|
+
);
|
|
134
|
+
return logicalIdTag ? logicalIdTag.Value : null;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
// Handle parsed object format {key: value}
|
|
138
|
+
if (typeof tags === 'object') {
|
|
139
|
+
return tags['aws:cloudformation:logical-id'] || null;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
return null;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
/**
|
|
146
|
+
* Match VPC by checking if it contains expected subnets from template
|
|
147
|
+
* @private
|
|
148
|
+
*/
|
|
149
|
+
async _matchVpcByContainedResources(
|
|
150
|
+
vpc,
|
|
151
|
+
buildTemplate,
|
|
152
|
+
deployedTemplate
|
|
153
|
+
) {
|
|
154
|
+
// Get expected subnet IDs from deployed template
|
|
155
|
+
const expectedSubnetIds = this._extractSubnetIdsFromTemplate(
|
|
156
|
+
deployedTemplate
|
|
157
|
+
);
|
|
158
|
+
|
|
159
|
+
if (expectedSubnetIds.length === 0) {
|
|
160
|
+
return null;
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
// Get actual subnets in this VPC
|
|
164
|
+
const actualSubnets = await this._getSubnetsInVpc(vpc.physicalId);
|
|
165
|
+
|
|
166
|
+
// Check if this VPC contains ALL expected subnets
|
|
167
|
+
const containsExpectedSubnets = expectedSubnetIds.every((expectedId) =>
|
|
168
|
+
actualSubnets.some((subnet) => subnet.SubnetId === expectedId)
|
|
169
|
+
);
|
|
170
|
+
|
|
171
|
+
if (containsExpectedSubnets) {
|
|
172
|
+
// Find VPC logical ID in build template
|
|
173
|
+
return this._findVpcLogicalIdInTemplate(buildTemplate);
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
return null;
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
/**
|
|
180
|
+
* Match subnet by VPC ownership and usage in Lambda functions
|
|
181
|
+
* @private
|
|
182
|
+
*/
|
|
183
|
+
async _matchSubnetByVpcAndUsage(subnet, buildTemplate, deployedTemplate) {
|
|
184
|
+
// Extract subnet IDs from deployed template Lambda VPC configs
|
|
185
|
+
const templateSubnetIds = this._extractSubnetIdsFromTemplate(
|
|
186
|
+
deployedTemplate
|
|
187
|
+
);
|
|
188
|
+
|
|
189
|
+
// Check if this subnet is referenced in deployed template
|
|
190
|
+
if (!templateSubnetIds.includes(subnet.physicalId)) {
|
|
191
|
+
return null;
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
// Find the position of this subnet in the template's subnet list
|
|
195
|
+
const subnetIndex = templateSubnetIds.indexOf(subnet.physicalId);
|
|
196
|
+
|
|
197
|
+
// Extract subnet Refs from build template
|
|
198
|
+
const subnetRefs = this._extractSubnetRefsFromTemplate(buildTemplate);
|
|
199
|
+
|
|
200
|
+
// Return the corresponding logical ID based on position
|
|
201
|
+
return subnetRefs[subnetIndex] || null;
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
/**
|
|
205
|
+
* Match security group by usage in Lambda functions
|
|
206
|
+
* @private
|
|
207
|
+
*/
|
|
208
|
+
async _matchSecurityGroupByUsage(sg, buildTemplate, deployedTemplate) {
|
|
209
|
+
// Extract security group IDs from deployed template
|
|
210
|
+
const templateSgIds = this._extractSecurityGroupIdsFromTemplate(
|
|
211
|
+
deployedTemplate
|
|
212
|
+
);
|
|
213
|
+
|
|
214
|
+
// Check if this SG is referenced in deployed template
|
|
215
|
+
if (!templateSgIds.includes(sg.physicalId)) {
|
|
216
|
+
return null;
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
// Find logical ID in build template
|
|
220
|
+
const sgRefs = this._extractSecurityGroupRefsFromTemplate(buildTemplate);
|
|
221
|
+
return sgRefs[0] || null; // Usually just one Lambda SG
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
/**
|
|
225
|
+
* Get subnets in a VPC from AWS
|
|
226
|
+
* @private
|
|
227
|
+
*/
|
|
228
|
+
async _getSubnetsInVpc(vpcId) {
|
|
229
|
+
const response = await this.ec2Client.send(
|
|
230
|
+
new DescribeSubnetsCommand({
|
|
231
|
+
Filters: [{ Name: 'vpc-id', Values: [vpcId] }],
|
|
232
|
+
})
|
|
233
|
+
);
|
|
234
|
+
return response.Subnets || [];
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
/**
|
|
238
|
+
* Extract subnet IDs from deployed template (hardcoded values)
|
|
239
|
+
* @private
|
|
240
|
+
*/
|
|
241
|
+
_extractSubnetIdsFromTemplate(template) {
|
|
242
|
+
const subnetIds = new Set();
|
|
243
|
+
|
|
244
|
+
// Traverse Lambda VpcConfig sections
|
|
245
|
+
Object.values(template.resources || {}).forEach((resource) => {
|
|
246
|
+
if (
|
|
247
|
+
resource.Type === 'AWS::Lambda::Function' &&
|
|
248
|
+
resource.Properties?.VpcConfig?.SubnetIds
|
|
249
|
+
) {
|
|
250
|
+
resource.Properties.VpcConfig.SubnetIds.forEach((id) => {
|
|
251
|
+
if (typeof id === 'string' && id.startsWith('subnet-')) {
|
|
252
|
+
subnetIds.add(id);
|
|
253
|
+
}
|
|
254
|
+
});
|
|
255
|
+
}
|
|
256
|
+
});
|
|
257
|
+
|
|
258
|
+
return Array.from(subnetIds);
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
/**
|
|
262
|
+
* Extract security group IDs from deployed template (hardcoded values)
|
|
263
|
+
* @private
|
|
264
|
+
*/
|
|
265
|
+
_extractSecurityGroupIdsFromTemplate(template) {
|
|
266
|
+
const sgIds = new Set();
|
|
267
|
+
|
|
268
|
+
Object.values(template.resources || {}).forEach((resource) => {
|
|
269
|
+
if (
|
|
270
|
+
resource.Type === 'AWS::Lambda::Function' &&
|
|
271
|
+
resource.Properties?.VpcConfig?.SecurityGroupIds
|
|
272
|
+
) {
|
|
273
|
+
resource.Properties.VpcConfig.SecurityGroupIds.forEach((id) => {
|
|
274
|
+
if (typeof id === 'string' && id.startsWith('sg-')) {
|
|
275
|
+
sgIds.add(id);
|
|
276
|
+
}
|
|
277
|
+
});
|
|
278
|
+
}
|
|
279
|
+
});
|
|
280
|
+
|
|
281
|
+
return Array.from(sgIds);
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
/**
|
|
285
|
+
* Extract subnet Refs from build template
|
|
286
|
+
* @private
|
|
287
|
+
*/
|
|
288
|
+
_extractSubnetRefsFromTemplate(template) {
|
|
289
|
+
const subnetRefs = [];
|
|
290
|
+
|
|
291
|
+
// Find Lambda functions and extract SubnetIds Refs
|
|
292
|
+
Object.values(template.resources || {}).forEach((resource) => {
|
|
293
|
+
if (
|
|
294
|
+
resource.Type === 'AWS::Lambda::Function' &&
|
|
295
|
+
resource.Properties?.VpcConfig?.SubnetIds
|
|
296
|
+
) {
|
|
297
|
+
resource.Properties.VpcConfig.SubnetIds.forEach((ref) => {
|
|
298
|
+
if (ref.Ref && ref.Ref.includes('Subnet')) {
|
|
299
|
+
subnetRefs.push(ref.Ref);
|
|
300
|
+
}
|
|
301
|
+
});
|
|
302
|
+
}
|
|
303
|
+
});
|
|
304
|
+
|
|
305
|
+
return subnetRefs;
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
/**
|
|
309
|
+
* Extract security group Refs from build template
|
|
310
|
+
* @private
|
|
311
|
+
*/
|
|
312
|
+
_extractSecurityGroupRefsFromTemplate(template) {
|
|
313
|
+
const sgRefs = [];
|
|
314
|
+
|
|
315
|
+
Object.values(template.resources || {}).forEach((resource) => {
|
|
316
|
+
if (
|
|
317
|
+
resource.Type === 'AWS::Lambda::Function' &&
|
|
318
|
+
resource.Properties?.VpcConfig?.SecurityGroupIds
|
|
319
|
+
) {
|
|
320
|
+
resource.Properties.VpcConfig.SecurityGroupIds.forEach((ref) => {
|
|
321
|
+
if (ref.Ref && ref.Ref.includes('SecurityGroup')) {
|
|
322
|
+
sgRefs.push(ref.Ref);
|
|
323
|
+
}
|
|
324
|
+
});
|
|
325
|
+
}
|
|
326
|
+
});
|
|
327
|
+
|
|
328
|
+
return sgRefs;
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
/**
|
|
332
|
+
* Find VPC logical ID in build template
|
|
333
|
+
* @private
|
|
334
|
+
*/
|
|
335
|
+
_findVpcLogicalIdInTemplate(template) {
|
|
336
|
+
const vpcResources = Object.entries(template.resources || {}).filter(
|
|
337
|
+
([_, resource]) => resource.Type === 'AWS::EC2::VPC'
|
|
338
|
+
);
|
|
339
|
+
|
|
340
|
+
// Return first VPC logical ID (usually only one)
|
|
341
|
+
return vpcResources.length > 0 ? vpcResources[0][0] : null;
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
|
|
345
|
+
module.exports = { LogicalIdMapper };
|
|
@@ -0,0 +1,234 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* MismatchAnalyzer Domain Service
|
|
3
|
+
*
|
|
4
|
+
* Analyzes differences between expected (CloudFormation template) and actual
|
|
5
|
+
* (cloud resource) property values to detect drift.
|
|
6
|
+
*
|
|
7
|
+
* Features:
|
|
8
|
+
* - Deep object comparison
|
|
9
|
+
* - Array comparison (order-sensitive)
|
|
10
|
+
* - Primitive value comparison
|
|
11
|
+
* - Type mismatch detection
|
|
12
|
+
* - Property mutability tracking
|
|
13
|
+
* - Ignore specific properties
|
|
14
|
+
* - Nested property path tracking
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
const PropertyMismatch = require('../entities/property-mismatch');
|
|
18
|
+
const PropertyMutability = require('../value-objects/property-mutability');
|
|
19
|
+
|
|
20
|
+
class MismatchAnalyzer {
|
|
21
|
+
/**
|
|
22
|
+
* Analyze differences between expected and actual property values
|
|
23
|
+
*
|
|
24
|
+
* @param {Object} params
|
|
25
|
+
* @param {Object} params.expected - Expected properties from CloudFormation template
|
|
26
|
+
* @param {Object} params.actual - Actual properties from cloud resource
|
|
27
|
+
* @param {Object} params.propertyMutability - Map of property paths to PropertyMutability instances
|
|
28
|
+
* @param {string[]} [params.ignoreProperties=[]] - Property paths to ignore
|
|
29
|
+
* @returns {PropertyMismatch[]} Array of detected mismatches
|
|
30
|
+
*/
|
|
31
|
+
analyze({ expected, actual, propertyMutability, ignoreProperties = [] }) {
|
|
32
|
+
const mismatches = [];
|
|
33
|
+
|
|
34
|
+
// Recursively compare objects
|
|
35
|
+
this._compareObjects({
|
|
36
|
+
expected,
|
|
37
|
+
actual,
|
|
38
|
+
propertyMutability,
|
|
39
|
+
ignoreProperties,
|
|
40
|
+
currentPath: '',
|
|
41
|
+
mismatches,
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
return mismatches;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* Recursively compare two objects
|
|
49
|
+
*
|
|
50
|
+
* @private
|
|
51
|
+
*/
|
|
52
|
+
_compareObjects({
|
|
53
|
+
expected,
|
|
54
|
+
actual,
|
|
55
|
+
propertyMutability,
|
|
56
|
+
ignoreProperties,
|
|
57
|
+
currentPath,
|
|
58
|
+
mismatches,
|
|
59
|
+
}) {
|
|
60
|
+
// Get all unique property keys from both objects
|
|
61
|
+
const allKeys = new Set([
|
|
62
|
+
...Object.keys(expected || {}),
|
|
63
|
+
...Object.keys(actual || {}),
|
|
64
|
+
]);
|
|
65
|
+
|
|
66
|
+
for (const key of allKeys) {
|
|
67
|
+
const propertyPath = currentPath ? `${currentPath}.${key}` : key;
|
|
68
|
+
|
|
69
|
+
// Skip ignored properties
|
|
70
|
+
if (ignoreProperties.includes(propertyPath)) {
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
const expectedValue = expected?.[key];
|
|
75
|
+
const actualValue = actual?.[key];
|
|
76
|
+
|
|
77
|
+
// Check if values are different
|
|
78
|
+
if (!this._areValuesEqual(expectedValue, actualValue)) {
|
|
79
|
+
// Check if both are objects (and not arrays or null)
|
|
80
|
+
if (
|
|
81
|
+
this._isPlainObject(expectedValue) &&
|
|
82
|
+
this._isPlainObject(actualValue)
|
|
83
|
+
) {
|
|
84
|
+
// Recursively compare nested objects
|
|
85
|
+
this._compareObjects({
|
|
86
|
+
expected: expectedValue,
|
|
87
|
+
actual: actualValue,
|
|
88
|
+
propertyMutability,
|
|
89
|
+
ignoreProperties,
|
|
90
|
+
currentPath: propertyPath,
|
|
91
|
+
mismatches,
|
|
92
|
+
});
|
|
93
|
+
} else {
|
|
94
|
+
// Create a mismatch for this property
|
|
95
|
+
const mutability =
|
|
96
|
+
propertyMutability[propertyPath] || PropertyMutability.MUTABLE;
|
|
97
|
+
|
|
98
|
+
const mismatch = new PropertyMismatch({
|
|
99
|
+
propertyPath,
|
|
100
|
+
expectedValue,
|
|
101
|
+
actualValue,
|
|
102
|
+
mutability,
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
mismatches.push(mismatch);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/**
|
|
112
|
+
* Check if two values are equal
|
|
113
|
+
*
|
|
114
|
+
* @private
|
|
115
|
+
* @param {*} value1
|
|
116
|
+
* @param {*} value2
|
|
117
|
+
* @returns {boolean}
|
|
118
|
+
*/
|
|
119
|
+
_areValuesEqual(value1, value2) {
|
|
120
|
+
// Handle null/undefined equivalence
|
|
121
|
+
if (this._isNullish(value1) && this._isNullish(value2)) {
|
|
122
|
+
return true;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
// Handle different types
|
|
126
|
+
if (typeof value1 !== typeof value2) {
|
|
127
|
+
return false;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
// Handle primitives
|
|
131
|
+
if (
|
|
132
|
+
typeof value1 === 'string' ||
|
|
133
|
+
typeof value1 === 'number' ||
|
|
134
|
+
typeof value1 === 'boolean'
|
|
135
|
+
) {
|
|
136
|
+
return value1 === value2;
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
// Handle arrays
|
|
140
|
+
if (Array.isArray(value1) && Array.isArray(value2)) {
|
|
141
|
+
return this._areArraysEqual(value1, value2);
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
// Handle plain objects
|
|
145
|
+
if (this._isPlainObject(value1) && this._isPlainObject(value2)) {
|
|
146
|
+
return this._areObjectsEqual(value1, value2);
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
// Handle dates
|
|
150
|
+
if (value1 instanceof Date && value2 instanceof Date) {
|
|
151
|
+
return value1.getTime() === value2.getTime();
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
// Fallback: strict equality
|
|
155
|
+
return value1 === value2;
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
/**
|
|
159
|
+
* Check if value is null or undefined
|
|
160
|
+
*
|
|
161
|
+
* @private
|
|
162
|
+
* @param {*} value
|
|
163
|
+
* @returns {boolean}
|
|
164
|
+
*/
|
|
165
|
+
_isNullish(value) {
|
|
166
|
+
return value === null || value === undefined;
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
/**
|
|
170
|
+
* Check if value is a plain object (not array, not null, not Date, etc.)
|
|
171
|
+
*
|
|
172
|
+
* @private
|
|
173
|
+
* @param {*} value
|
|
174
|
+
* @returns {boolean}
|
|
175
|
+
*/
|
|
176
|
+
_isPlainObject(value) {
|
|
177
|
+
return (
|
|
178
|
+
typeof value === 'object' &&
|
|
179
|
+
value !== null &&
|
|
180
|
+
!Array.isArray(value) &&
|
|
181
|
+
!(value instanceof Date) &&
|
|
182
|
+
Object.getPrototypeOf(value) === Object.prototype
|
|
183
|
+
);
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
/**
|
|
187
|
+
* Deep equality check for arrays (order-sensitive)
|
|
188
|
+
*
|
|
189
|
+
* @private
|
|
190
|
+
* @param {Array} arr1
|
|
191
|
+
* @param {Array} arr2
|
|
192
|
+
* @returns {boolean}
|
|
193
|
+
*/
|
|
194
|
+
_areArraysEqual(arr1, arr2) {
|
|
195
|
+
if (arr1.length !== arr2.length) {
|
|
196
|
+
return false;
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
for (let i = 0; i < arr1.length; i++) {
|
|
200
|
+
if (!this._areValuesEqual(arr1[i], arr2[i])) {
|
|
201
|
+
return false;
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
return true;
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
/**
|
|
209
|
+
* Deep equality check for plain objects
|
|
210
|
+
*
|
|
211
|
+
* @private
|
|
212
|
+
* @param {Object} obj1
|
|
213
|
+
* @param {Object} obj2
|
|
214
|
+
* @returns {boolean}
|
|
215
|
+
*/
|
|
216
|
+
_areObjectsEqual(obj1, obj2) {
|
|
217
|
+
const keys1 = Object.keys(obj1);
|
|
218
|
+
const keys2 = Object.keys(obj2);
|
|
219
|
+
|
|
220
|
+
if (keys1.length !== keys2.length) {
|
|
221
|
+
return false;
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
for (const key of keys1) {
|
|
225
|
+
if (!this._areValuesEqual(obj1[key], obj2[key])) {
|
|
226
|
+
return false;
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
return true;
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
module.exports = MismatchAnalyzer;
|