@fjall/components-infrastructure 0.86.0 → 0.87.3
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/README.md +3 -3
- package/dist/lib/app.d.ts +166 -6
- package/dist/lib/app.js +212 -20
- package/dist/lib/aspects/resourceInventory.d.ts +4 -4
- package/dist/lib/aspects/resourceInventory.js +3 -3
- package/dist/lib/config/aws/backupGlobalSettings.js +1 -2
- package/dist/lib/config/aws/identityCenter.js +1 -5
- package/dist/lib/config/aws/organisation.js +1 -4
- package/dist/lib/index.d.ts +1 -0
- package/dist/lib/index.js +7 -1
- package/dist/lib/patterns/aws/buildkite.js +3 -2
- package/dist/lib/patterns/aws/cdn.d.ts +164 -0
- package/dist/lib/patterns/aws/cdn.js +264 -0
- package/dist/lib/patterns/aws/compute.d.ts +278 -59
- package/dist/lib/patterns/aws/compute.js +384 -188
- package/dist/lib/patterns/aws/connections.d.ts +46 -0
- package/dist/lib/patterns/aws/connections.js +159 -0
- package/dist/lib/patterns/aws/database.d.ts +124 -11
- package/dist/lib/patterns/aws/database.js +188 -66
- package/dist/lib/patterns/aws/hostedZone.js +1 -1
- package/dist/lib/patterns/aws/index.d.ts +3 -0
- package/dist/lib/patterns/aws/index.js +4 -1
- package/dist/lib/patterns/aws/interfaces/compute.d.ts +121 -0
- package/dist/lib/patterns/aws/interfaces/compute.js +48 -0
- package/dist/lib/patterns/aws/interfaces/connector.d.ts +183 -0
- package/dist/lib/patterns/aws/interfaces/connector.js +117 -0
- package/dist/lib/patterns/aws/interfaces/database.d.ts +136 -0
- package/dist/lib/patterns/aws/interfaces/database.js +65 -0
- package/dist/lib/patterns/aws/interfaces/index.d.ts +12 -0
- package/dist/lib/patterns/aws/interfaces/index.js +49 -0
- package/dist/lib/patterns/aws/interfaces/messaging.d.ts +146 -0
- package/dist/lib/patterns/aws/interfaces/messaging.js +56 -0
- package/dist/lib/patterns/aws/interfaces/pattern.d.ts +403 -0
- package/dist/lib/patterns/aws/interfaces/pattern.js +36 -0
- package/dist/lib/patterns/aws/interfaces/storage.d.ts +136 -0
- package/dist/lib/patterns/aws/interfaces/storage.js +48 -0
- package/dist/lib/patterns/aws/messaging.d.ts +183 -0
- package/dist/lib/patterns/aws/messaging.js +239 -0
- package/dist/lib/patterns/aws/network.js +4 -4
- package/dist/lib/patterns/aws/pattern.d.ts +67 -0
- package/dist/lib/patterns/aws/pattern.js +69 -0
- package/dist/lib/patterns/aws/payload.d.ts +87 -0
- package/dist/lib/patterns/aws/payload.js +526 -0
- package/dist/lib/patterns/aws/storage.d.ts +127 -15
- package/dist/lib/patterns/aws/storage.js +234 -38
- package/dist/lib/resources/aws/backup/backupPlan.js +1 -6
- package/dist/lib/resources/aws/backup/backupVault.js +1 -2
- package/dist/lib/resources/aws/base/awsStack.d.ts +0 -2
- package/dist/lib/resources/aws/base/awsStack.js +1 -7
- package/dist/lib/resources/aws/cdn/cloudFront.d.ts +71 -0
- package/dist/lib/resources/aws/cdn/cloudFront.js +176 -0
- package/dist/lib/resources/aws/cdn/index.d.ts +1 -0
- package/dist/lib/resources/aws/cdn/index.js +18 -0
- package/dist/lib/resources/aws/compute/ec2.d.ts +5 -0
- package/dist/lib/resources/aws/compute/ec2.js +33 -6
- package/dist/lib/resources/aws/compute/ecs.d.ts +32 -25
- package/dist/lib/resources/aws/compute/ecs.js +31 -115
- package/dist/lib/resources/aws/compute/lambda.d.ts +94 -5
- package/dist/lib/resources/aws/compute/lambda.js +209 -32
- package/dist/lib/resources/aws/database/database.js +1 -1
- package/dist/lib/resources/aws/database/dynamodb.d.ts +70 -0
- package/dist/lib/resources/aws/database/dynamodb.js +181 -0
- package/dist/lib/resources/aws/database/index.d.ts +1 -0
- package/dist/lib/resources/aws/database/index.js +2 -1
- package/dist/lib/resources/aws/database/migrationLambda.d.ts +80 -0
- package/dist/lib/resources/aws/database/migrationLambda.js +119 -0
- package/dist/lib/resources/aws/database/rdsAurora.d.ts +15 -0
- package/dist/lib/resources/aws/database/rdsAurora.js +41 -18
- package/dist/lib/resources/aws/database/rdsAuroraGlobal.js +12 -8
- package/dist/lib/resources/aws/database/rdsInstance.js +2 -2
- package/dist/lib/resources/aws/index.d.ts +2 -0
- package/dist/lib/resources/aws/index.js +3 -1
- package/dist/lib/resources/aws/messaging/eventbridge.d.ts +28 -0
- package/dist/lib/resources/aws/messaging/eventbridge.js +53 -0
- package/dist/lib/resources/aws/messaging/index.d.ts +3 -0
- package/dist/lib/resources/aws/messaging/index.js +20 -0
- package/dist/lib/resources/aws/messaging/sns.d.ts +35 -0
- package/dist/lib/resources/aws/messaging/sns.js +70 -0
- package/dist/lib/resources/aws/messaging/sqs.d.ts +105 -0
- package/dist/lib/resources/aws/messaging/sqs.js +231 -0
- package/dist/lib/resources/aws/messaging/utils.d.ts +3 -0
- package/dist/lib/resources/aws/messaging/utils.js +7 -0
- package/dist/lib/resources/aws/networking/ipam.js +1 -2
- package/dist/lib/resources/aws/networking/ipamPool.js +3 -2
- package/dist/lib/resources/aws/networking/vpc.js +1 -2
- package/dist/lib/resources/aws/storage/ecr.js +8 -5
- package/dist/lib/resources/aws/storage/s3.js +1 -2
- package/dist/lib/resources/aws/utilities/awsCustomResource.js +1 -1
- package/dist/lib/resources/aws/utilities/customResource.js +1 -1
- package/dist/lib/utils/getConfig.js +3 -2
- package/dist/lib/utils/index.d.ts +1 -0
- package/dist/lib/utils/index.js +2 -1
- package/dist/lib/utils/manifestWriter.d.ts +174 -0
- package/dist/lib/utils/manifestWriter.js +233 -0
- package/dist/lib/utils/standardTagsAspect.js +1 -8
- package/dist/lib/utils/validationLogger.d.ts +34 -0
- package/dist/lib/utils/validationLogger.js +83 -0
- package/package.json +3 -3
- package/dist/lib/__tests__/setup.d.ts +0 -48
- package/dist/lib/__tests__/setup.js +0 -1
- package/dist/lib/patterns/aws/cicdRole.d.ts +0 -67
- package/dist/lib/patterns/aws/cicdRole.js +0 -68
- package/dist/lib/resources/aws/cicd/cicdRole.d.ts +0 -65
- package/dist/lib/resources/aws/cicd/cicdRole.js +0 -191
- package/dist/lib/resources/aws/compute/ecsFreeTier.d.ts +0 -75
- package/dist/lib/resources/aws/compute/ecsFreeTier.js +0 -1
- package/dist/lib/resources/aws/compute/ecsSpot.d.ts +0 -75
- package/dist/lib/resources/aws/compute/ecsSpot.js +0 -1
- package/dist/lib/resources/aws/compute/utilities/capacityProviderDrainWaiter.d.ts +0 -20
- package/dist/lib/resources/aws/compute/utilities/capacityProviderDrainWaiter.js +0 -1
- package/dist/lib/resources/aws/utilities/cfnOutput.d.ts +0 -5
- package/dist/lib/resources/aws/utilities/cfnOutput.js +0 -1
|
@@ -0,0 +1,233 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Fjall Manifest Writer.
|
|
4
|
+
*
|
|
5
|
+
* Writes a manifest file during CDK synthesis that contains resolved service
|
|
6
|
+
* configuration, pattern details, and template hashes. This replaces fragile
|
|
7
|
+
* AST parsing of infrastructure.ts in the CLI.
|
|
8
|
+
*
|
|
9
|
+
* The manifest is written to cdk.out/fjall-manifest.json after synthesis.
|
|
10
|
+
*
|
|
11
|
+
* NOTE: This file uses synchronous file operations (writeFileSync, readFileSync, etc.)
|
|
12
|
+
* because CDK synthesis is inherently synchronous. The synth() method blocks until
|
|
13
|
+
* complete, so async operations would provide no benefit and add complexity.
|
|
14
|
+
*
|
|
15
|
+
* TYPE DUPLICATION NOTE: The interfaces below (ManifestService, ManifestPattern, etc.)
|
|
16
|
+
* are mirrored by Zod schemas in cli/src/types/FjallManifest.ts. The CLI schemas are
|
|
17
|
+
* the authoritative source for validation. If you modify these interfaces, update
|
|
18
|
+
* the Zod schemas to match. Future work: extract to shared @fjall/types package.
|
|
19
|
+
*/
|
|
20
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
|
+
exports.ManifestCollector = void 0;
|
|
22
|
+
exports.writeManifest = writeManifest;
|
|
23
|
+
exports.readExistingManifest = readExistingManifest;
|
|
24
|
+
exports.getManifestCollector = getManifestCollector;
|
|
25
|
+
exports.getCurrentCollector = getCurrentCollector;
|
|
26
|
+
exports.resetManifestCollector = resetManifestCollector;
|
|
27
|
+
const fs_1 = require("fs");
|
|
28
|
+
const path_1 = require("path");
|
|
29
|
+
const crypto_1 = require("crypto");
|
|
30
|
+
const validationLogger_js_1 = require("./validationLogger.js");
|
|
31
|
+
/** Current manifest schema version. Must match MANIFEST_SCHEMA_VERSION in CLI's FjallManifest.ts */
|
|
32
|
+
const MANIFEST_SCHEMA_VERSION = 1;
|
|
33
|
+
/** Manifest file name */
|
|
34
|
+
const MANIFEST_FILE_NAME = "fjall-manifest.json";
|
|
35
|
+
/**
|
|
36
|
+
* Collected manifest data during synthesis.
|
|
37
|
+
* Stores all data that will be written to the manifest file.
|
|
38
|
+
*/
|
|
39
|
+
class ManifestCollector {
|
|
40
|
+
constructor(appName) {
|
|
41
|
+
this.services = [];
|
|
42
|
+
this.lambdas = [];
|
|
43
|
+
this.appName = appName;
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Add a service configuration.
|
|
47
|
+
*/
|
|
48
|
+
addService(service) {
|
|
49
|
+
if (!this.services.some((s) => s.name === service.name)) {
|
|
50
|
+
this.services.push(service);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Add a Lambda function configuration.
|
|
55
|
+
*/
|
|
56
|
+
addLambda(lambda) {
|
|
57
|
+
if (!this.lambdas.some((l) => l.name === lambda.name)) {
|
|
58
|
+
this.lambdas.push(lambda);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* Set the pattern configuration.
|
|
63
|
+
*/
|
|
64
|
+
setPattern(pattern) {
|
|
65
|
+
this.pattern = pattern;
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Set the ECR repository configuration.
|
|
69
|
+
*/
|
|
70
|
+
setEcr(ecr) {
|
|
71
|
+
this.ecr = ecr;
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Get collected services.
|
|
75
|
+
*/
|
|
76
|
+
getServices() {
|
|
77
|
+
return this.services;
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Get collected Lambda functions.
|
|
81
|
+
*/
|
|
82
|
+
getLambdas() {
|
|
83
|
+
return this.lambdas;
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* Get pattern configuration.
|
|
87
|
+
*/
|
|
88
|
+
getPattern() {
|
|
89
|
+
return this.pattern;
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* Get ECR configuration.
|
|
93
|
+
*/
|
|
94
|
+
getEcr() {
|
|
95
|
+
return this.ecr;
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* Get the application name.
|
|
99
|
+
*/
|
|
100
|
+
getAppName() {
|
|
101
|
+
return this.appName;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
exports.ManifestCollector = ManifestCollector;
|
|
105
|
+
/**
|
|
106
|
+
* Compute SHA-256 hash of a CloudFormation template file.
|
|
107
|
+
* Normalises JSON to ensure consistent hashes.
|
|
108
|
+
*/
|
|
109
|
+
function computeTemplateHash(templatePath) {
|
|
110
|
+
try {
|
|
111
|
+
const content = (0, fs_1.readFileSync)(templatePath, "utf-8");
|
|
112
|
+
const normalised = JSON.stringify(JSON.parse(content));
|
|
113
|
+
return (0, crypto_1.createHash)("sha256").update(normalised).digest("hex");
|
|
114
|
+
}
|
|
115
|
+
catch (error) {
|
|
116
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
117
|
+
validationLogger_js_1.FjallLogger.warn(`Failed to compute hash for ${templatePath}: ${errorMessage}`);
|
|
118
|
+
return null;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
* Find all template files in cdk.out and compute their hashes.
|
|
123
|
+
*/
|
|
124
|
+
function computeStackHashes(cdkOutPath) {
|
|
125
|
+
const stacks = {};
|
|
126
|
+
const synthTimestamp = new Date().toISOString();
|
|
127
|
+
try {
|
|
128
|
+
const files = (0, fs_1.readdirSync)(cdkOutPath);
|
|
129
|
+
const templateFiles = files.filter((f) => f.endsWith(".template.json"));
|
|
130
|
+
for (const templateFile of templateFiles) {
|
|
131
|
+
const templatePath = (0, path_1.join)(cdkOutPath, templateFile);
|
|
132
|
+
const stackName = (0, path_1.basename)(templateFile, ".template.json");
|
|
133
|
+
const hash = computeTemplateHash(templatePath);
|
|
134
|
+
if (hash) {
|
|
135
|
+
stacks[stackName] = {
|
|
136
|
+
templateHash: hash,
|
|
137
|
+
synthTimestamp
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
catch (error) {
|
|
143
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
144
|
+
validationLogger_js_1.FjallLogger.warn(`Failed to read cdk.out for hash computation: ${errorMessage}`);
|
|
145
|
+
}
|
|
146
|
+
return stacks;
|
|
147
|
+
}
|
|
148
|
+
/**
|
|
149
|
+
* Write the manifest file to cdk.out.
|
|
150
|
+
*
|
|
151
|
+
* @param assembly - The CloudAssembly from synth
|
|
152
|
+
* @param collector - The manifest collector with service data
|
|
153
|
+
*/
|
|
154
|
+
function writeManifest(assembly, collector) {
|
|
155
|
+
const cdkOutPath = assembly.directory;
|
|
156
|
+
const manifestPath = (0, path_1.join)(cdkOutPath, MANIFEST_FILE_NAME);
|
|
157
|
+
const stacks = computeStackHashes(cdkOutPath);
|
|
158
|
+
const manifest = {
|
|
159
|
+
version: MANIFEST_SCHEMA_VERSION,
|
|
160
|
+
generatedAt: new Date().toISOString(),
|
|
161
|
+
appName: collector.getAppName(),
|
|
162
|
+
services: collector.getServices(),
|
|
163
|
+
lambdas: collector.getLambdas(),
|
|
164
|
+
stacks
|
|
165
|
+
};
|
|
166
|
+
const pattern = collector.getPattern();
|
|
167
|
+
if (pattern) {
|
|
168
|
+
manifest.pattern = pattern;
|
|
169
|
+
}
|
|
170
|
+
const ecr = collector.getEcr();
|
|
171
|
+
if (ecr) {
|
|
172
|
+
manifest.ecr = ecr;
|
|
173
|
+
}
|
|
174
|
+
try {
|
|
175
|
+
(0, fs_1.writeFileSync)(manifestPath, JSON.stringify(manifest, null, 2), "utf-8");
|
|
176
|
+
validationLogger_js_1.FjallLogger.info(`Fjall manifest written to ${manifestPath}`);
|
|
177
|
+
}
|
|
178
|
+
catch (error) {
|
|
179
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
180
|
+
validationLogger_js_1.FjallLogger.warn(`Failed to write Fjall manifest: ${errorMessage}`);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
/**
|
|
184
|
+
* Read an existing manifest file (for preserving deployment history).
|
|
185
|
+
*/
|
|
186
|
+
function readExistingManifest(cdkOutPath) {
|
|
187
|
+
const manifestPath = (0, path_1.join)(cdkOutPath, MANIFEST_FILE_NAME);
|
|
188
|
+
if (!(0, fs_1.existsSync)(manifestPath)) {
|
|
189
|
+
return null;
|
|
190
|
+
}
|
|
191
|
+
try {
|
|
192
|
+
const content = (0, fs_1.readFileSync)(manifestPath, "utf-8");
|
|
193
|
+
return JSON.parse(content);
|
|
194
|
+
}
|
|
195
|
+
catch (error) {
|
|
196
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
197
|
+
validationLogger_js_1.FjallLogger.warn(`Failed to parse existing manifest: ${message}`);
|
|
198
|
+
return null;
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
/**
|
|
202
|
+
* Global manifest collector instance.
|
|
203
|
+
*
|
|
204
|
+
* CDK's architecture guarantees one App per process, so a global singleton is safe here.
|
|
205
|
+
* The collector is created when App is constructed and used throughout synthesis.
|
|
206
|
+
* resetManifestCollector() is provided for testing scenarios where multiple Apps
|
|
207
|
+
* may be created in the same process.
|
|
208
|
+
*/
|
|
209
|
+
let globalCollector = null;
|
|
210
|
+
/**
|
|
211
|
+
* Get or create the global manifest collector.
|
|
212
|
+
* Called by App during construction to initialise the collector.
|
|
213
|
+
*/
|
|
214
|
+
function getManifestCollector(appName) {
|
|
215
|
+
if (!globalCollector || globalCollector.getAppName() !== appName) {
|
|
216
|
+
globalCollector = new ManifestCollector(appName);
|
|
217
|
+
}
|
|
218
|
+
return globalCollector;
|
|
219
|
+
}
|
|
220
|
+
/**
|
|
221
|
+
* Get the current global manifest collector.
|
|
222
|
+
* Returns null if not initialised.
|
|
223
|
+
*/
|
|
224
|
+
function getCurrentCollector() {
|
|
225
|
+
return globalCollector;
|
|
226
|
+
}
|
|
227
|
+
/**
|
|
228
|
+
* Reset the global collector (for testing).
|
|
229
|
+
*/
|
|
230
|
+
function resetManifestCollector() {
|
|
231
|
+
globalCollector = null;
|
|
232
|
+
}
|
|
233
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"manifestWriter.js","sourceRoot":"","sources":["../../../lib/utils/manifestWriter.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Fjall Manifest Writer.\n *\n * Writes a manifest file during CDK synthesis that contains resolved service\n * configuration, pattern details, and template hashes. This replaces fragile\n * AST parsing of infrastructure.ts in the CLI.\n *\n * The manifest is written to cdk.out/fjall-manifest.json after synthesis.\n *\n * NOTE: This file uses synchronous file operations (writeFileSync, readFileSync, etc.)\n * because CDK synthesis is inherently synchronous. The synth() method blocks until\n * complete, so async operations would provide no benefit and add complexity.\n *\n * TYPE DUPLICATION NOTE: The interfaces below (ManifestService, ManifestPattern, etc.)\n * are mirrored by Zod schemas in cli/src/types/FjallManifest.ts. The CLI schemas are\n * the authoritative source for validation. If you modify these interfaces, update\n * the Zod schemas to match. Future work: extract to shared @fjall/types package.\n */\n\nimport { writeFileSync, readFileSync, existsSync, readdirSync } from \"fs\";\nimport { join, basename } from \"path\";\nimport { createHash } from \"crypto\";\nimport type { CloudAssembly } from \"aws-cdk-lib/cx-api\";\n\nimport { FjallLogger } from \"./validationLogger.js\";\n\n/** Current manifest schema version. Must match MANIFEST_SCHEMA_VERSION in CLI's FjallManifest.ts */\nconst MANIFEST_SCHEMA_VERSION = 1 as const;\n\n/**\n * Service configuration extracted from ECS services.\n */\nexport interface ManifestService {\n  /** Service name (must match ECS service name) */\n  name: string;\n  /** Cluster name this service belongs to */\n  clusterName?: string;\n  /** Path to Dockerfile relative to app root */\n  dockerfilePath?: string;\n  /** Docker build target for multi-stage builds */\n  dockerTarget?: string;\n  /** Container port */\n  containerPort?: number;\n  /** SSM secrets configured for this service (aggregated from all containers) */\n  secrets?: string[];\n  /** SSM secrets path (derived or explicit) */\n  ssmSecretsPath?: string;\n}\n\n/**\n * Pattern configuration extracted from PatternFactory.\n */\nexport interface ManifestPattern {\n  /** Pattern type */\n  type: \"payload\";\n  /** Pattern name (CMS name) */\n  name: string;\n  /** Source directory containing build output */\n  source: string;\n}\n\n/**\n * ECR configuration.\n */\nexport interface ManifestEcr {\n  /** ECR repository name */\n  repositoryName: string;\n}\n\n/**\n * Lambda function configuration extracted from Lambda compute.\n * Enables CLI discovery of Lambda functions for secrets management.\n */\nexport interface ManifestLambda {\n  /** Lambda function name (construct ID) */\n  name: string;\n  /** SSM secrets configured for this Lambda */\n  secrets?: string[];\n  /** SSM secrets path (derived or explicit) */\n  ssmSecretsPath?: string;\n}\n\n/**\n * Stack hash entry computed from synthesised template.\n */\nexport interface ManifestStackHash {\n  /** SHA-256 hash of the synthesised template */\n  templateHash: string;\n  /** ISO timestamp when synth completed */\n  synthTimestamp: string;\n}\n\n/**\n * Fjall manifest - generated during CDK synth.\n */\nexport interface FjallManifest {\n  /** Schema version for future compatibility */\n  version: typeof MANIFEST_SCHEMA_VERSION;\n  /** ISO timestamp when manifest was generated */\n  generatedAt: string;\n  /** Application name */\n  appName: string;\n  /** Resolved service configurations */\n  services: ManifestService[];\n  /** Lambda function configurations */\n  lambdas: ManifestLambda[];\n  /** Pattern configuration (if using PatternFactory) */\n  pattern?: ManifestPattern;\n  /** ECR configuration */\n  ecr?: ManifestEcr;\n  /** Template hashes by stack name */\n  stacks: Record<string, ManifestStackHash>;\n}\n\n/** Manifest file name */\nconst MANIFEST_FILE_NAME = \"fjall-manifest.json\";\n\n/**\n * Collected manifest data during synthesis.\n * Stores all data that will be written to the manifest file.\n */\nexport class ManifestCollector {\n  private services: ManifestService[] = [];\n  private lambdas: ManifestLambda[] = [];\n  private pattern?: ManifestPattern;\n  private ecr?: ManifestEcr;\n  private appName: string;\n\n  constructor(appName: string) {\n    this.appName = appName;\n  }\n\n  /**\n   * Add a service configuration.\n   */\n  addService(service: ManifestService): void {\n    if (!this.services.some((s) => s.name === service.name)) {\n      this.services.push(service);\n    }\n  }\n\n  /**\n   * Add a Lambda function configuration.\n   */\n  addLambda(lambda: ManifestLambda): void {\n    if (!this.lambdas.some((l) => l.name === lambda.name)) {\n      this.lambdas.push(lambda);\n    }\n  }\n\n  /**\n   * Set the pattern configuration.\n   */\n  setPattern(pattern: ManifestPattern): void {\n    this.pattern = pattern;\n  }\n\n  /**\n   * Set the ECR repository configuration.\n   */\n  setEcr(ecr: ManifestEcr): void {\n    this.ecr = ecr;\n  }\n\n  /**\n   * Get collected services.\n   */\n  getServices(): ManifestService[] {\n    return this.services;\n  }\n\n  /**\n   * Get collected Lambda functions.\n   */\n  getLambdas(): ManifestLambda[] {\n    return this.lambdas;\n  }\n\n  /**\n   * Get pattern configuration.\n   */\n  getPattern(): ManifestPattern | undefined {\n    return this.pattern;\n  }\n\n  /**\n   * Get ECR configuration.\n   */\n  getEcr(): ManifestEcr | undefined {\n    return this.ecr;\n  }\n\n  /**\n   * Get the application name.\n   */\n  getAppName(): string {\n    return this.appName;\n  }\n}\n\n/**\n * Compute SHA-256 hash of a CloudFormation template file.\n * Normalises JSON to ensure consistent hashes.\n */\nfunction computeTemplateHash(templatePath: string): string | null {\n  try {\n    const content = readFileSync(templatePath, \"utf-8\");\n    const normalised = JSON.stringify(JSON.parse(content));\n    return createHash(\"sha256\").update(normalised).digest(\"hex\");\n  } catch (error) {\n    const errorMessage = error instanceof Error ? error.message : String(error);\n    FjallLogger.warn(\n      `Failed to compute hash for ${templatePath}: ${errorMessage}`\n    );\n    return null;\n  }\n}\n\n/**\n * Find all template files in cdk.out and compute their hashes.\n */\nfunction computeStackHashes(\n  cdkOutPath: string\n): Record<string, ManifestStackHash> {\n  const stacks: Record<string, ManifestStackHash> = {};\n  const synthTimestamp = new Date().toISOString();\n\n  try {\n    const files = readdirSync(cdkOutPath);\n    const templateFiles = files.filter((f) => f.endsWith(\".template.json\"));\n\n    for (const templateFile of templateFiles) {\n      const templatePath = join(cdkOutPath, templateFile);\n      const stackName = basename(templateFile, \".template.json\");\n      const hash = computeTemplateHash(templatePath);\n\n      if (hash) {\n        stacks[stackName] = {\n          templateHash: hash,\n          synthTimestamp\n        };\n      }\n    }\n  } catch (error) {\n    const errorMessage = error instanceof Error ? error.message : String(error);\n    FjallLogger.warn(\n      `Failed to read cdk.out for hash computation: ${errorMessage}`\n    );\n  }\n\n  return stacks;\n}\n\n/**\n * Write the manifest file to cdk.out.\n *\n * @param assembly - The CloudAssembly from synth\n * @param collector - The manifest collector with service data\n */\nexport function writeManifest(\n  assembly: CloudAssembly,\n  collector: ManifestCollector\n): void {\n  const cdkOutPath = assembly.directory;\n  const manifestPath = join(cdkOutPath, MANIFEST_FILE_NAME);\n\n  const stacks = computeStackHashes(cdkOutPath);\n\n  const manifest: FjallManifest = {\n    version: MANIFEST_SCHEMA_VERSION,\n    generatedAt: new Date().toISOString(),\n    appName: collector.getAppName(),\n    services: collector.getServices(),\n    lambdas: collector.getLambdas(),\n    stacks\n  };\n\n  const pattern = collector.getPattern();\n  if (pattern) {\n    manifest.pattern = pattern;\n  }\n\n  const ecr = collector.getEcr();\n  if (ecr) {\n    manifest.ecr = ecr;\n  }\n\n  try {\n    writeFileSync(manifestPath, JSON.stringify(manifest, null, 2), \"utf-8\");\n    FjallLogger.info(`Fjall manifest written to ${manifestPath}`);\n  } catch (error) {\n    const errorMessage = error instanceof Error ? error.message : String(error);\n    FjallLogger.warn(`Failed to write Fjall manifest: ${errorMessage}`);\n  }\n}\n\n/**\n * Read an existing manifest file (for preserving deployment history).\n */\nexport function readExistingManifest(cdkOutPath: string): FjallManifest | null {\n  const manifestPath = join(cdkOutPath, MANIFEST_FILE_NAME);\n\n  if (!existsSync(manifestPath)) {\n    return null;\n  }\n\n  try {\n    const content = readFileSync(manifestPath, \"utf-8\");\n    return JSON.parse(content) as FjallManifest;\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    FjallLogger.warn(`Failed to parse existing manifest: ${message}`);\n    return null;\n  }\n}\n\n/**\n * Global manifest collector instance.\n *\n * CDK's architecture guarantees one App per process, so a global singleton is safe here.\n * The collector is created when App is constructed and used throughout synthesis.\n * resetManifestCollector() is provided for testing scenarios where multiple Apps\n * may be created in the same process.\n */\nlet globalCollector: ManifestCollector | null = null;\n\n/**\n * Get or create the global manifest collector.\n * Called by App during construction to initialise the collector.\n */\nexport function getManifestCollector(appName: string): ManifestCollector {\n  if (!globalCollector || globalCollector.getAppName() !== appName) {\n    globalCollector = new ManifestCollector(appName);\n  }\n  return globalCollector;\n}\n\n/**\n * Get the current global manifest collector.\n * Returns null if not initialised.\n */\nexport function getCurrentCollector(): ManifestCollector | null {\n  return globalCollector;\n}\n\n/**\n * Reset the global collector (for testing).\n */\nexport function resetManifestCollector(): void {\n  globalCollector = null;\n}\n"]}
|
|
@@ -20,25 +20,20 @@ class StandardTagsAspect {
|
|
|
20
20
|
this.processedResources = new WeakSet();
|
|
21
21
|
}
|
|
22
22
|
visit(node) {
|
|
23
|
-
// Skip if already processed
|
|
24
23
|
if (this.processedResources.has(node)) {
|
|
25
24
|
return;
|
|
26
25
|
}
|
|
27
|
-
// Process L1 (CFN) resources only
|
|
28
26
|
if (!aws_cdk_lib_1.CfnResource.isCfnResource(node)) {
|
|
29
27
|
return;
|
|
30
28
|
}
|
|
31
29
|
const resource = node;
|
|
32
30
|
this.processedResources.add(node);
|
|
33
|
-
// Skip SecretRotation resources as they create nested stacks
|
|
34
31
|
if (resource.node.path.includes("SecretRotation")) {
|
|
35
32
|
return;
|
|
36
33
|
}
|
|
37
|
-
// Add IPAM pool tag for VPCs with IPAM configuration
|
|
38
34
|
if (resource.cfnResourceType === "AWS::EC2::VPC") {
|
|
39
35
|
this.addIpamPoolTag(resource);
|
|
40
36
|
}
|
|
41
|
-
// Add disaster recovery tier tag for S3 buckets with backupVaultTier
|
|
42
37
|
if (resource.cfnResourceType === "AWS::S3::Bucket") {
|
|
43
38
|
this.addBackupTierTag(resource);
|
|
44
39
|
}
|
|
@@ -71,10 +66,8 @@ class StandardTagsAspect {
|
|
|
71
66
|
* - enterprise -> "enterprise"
|
|
72
67
|
*/
|
|
73
68
|
addBackupTierTag(resource) {
|
|
74
|
-
// Walk up the construct tree to find the L2 S3Bucket construct
|
|
75
69
|
let construct = resource;
|
|
76
70
|
while (construct) {
|
|
77
|
-
// Check if this is our custom S3Bucket class with backupVaultTier property
|
|
78
71
|
const backupConstruct = construct;
|
|
79
72
|
if (backupConstruct.backupVaultTier) {
|
|
80
73
|
const tier = backupConstruct.backupVaultTier;
|
|
@@ -92,4 +85,4 @@ class StandardTagsAspect {
|
|
|
92
85
|
}
|
|
93
86
|
}
|
|
94
87
|
exports.StandardTagsAspect = StandardTagsAspect;
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRhcmRUYWdzQXNwZWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWxzL3N0YW5kYXJkVGFnc0FzcGVjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBcUU7QUFTckU7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0gsTUFBYSxrQkFBa0I7SUFBL0I7UUFDbUIsdUJBQWtCLEdBQUcsSUFBSSxPQUFPLEVBQWMsQ0FBQztJQStFbEUsQ0FBQztJQTdFQyxLQUFLLENBQUMsSUFBZ0I7UUFDcEIsSUFBSSxJQUFJLENBQUMsa0JBQWtCLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDdEMsT0FBTztRQUNULENBQUM7UUFFRCxJQUFJLENBQUMseUJBQVcsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUNyQyxPQUFPO1FBQ1QsQ0FBQztRQUVELE1BQU0sUUFBUSxHQUFHLElBQW1CLENBQUM7UUFDckMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVsQyxJQUFJLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUM7WUFDbEQsT0FBTztRQUNULENBQUM7UUFFRCxJQUFJLFFBQVEsQ0FBQyxlQUFlLEtBQUssZUFBZSxFQUFFLENBQUM7WUFDakQsSUFBSSxDQUFDLGNBQWMsQ0FBQyxRQUFrQixDQUFDLENBQUM7UUFDMUMsQ0FBQztRQUVELElBQUksUUFBUSxDQUFDLGVBQWUsS0FBSyxpQkFBaUIsRUFBRSxDQUFDO1lBQ25ELElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNsQyxDQUFDO0lBQ0gsQ0FBQztJQUVEOzs7T0FHRztJQUNLLGNBQWMsQ0FBQyxHQUFXO1FBQ2hDLE1BQU0sVUFBVSxHQUFHLEdBQUcsQ0FBQyxjQUFjLENBQUM7UUFFdEMsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ2hCLE9BQU87UUFDVCxDQUFDO1FBRUQsTUFBTSxLQUFLLEdBQUcsbUJBQUssQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDNUIsTUFBTSxTQUFTLEdBQ2IsS0FBSyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDO1lBQ3JDLEtBQUssQ0FBQyxPQUFPO1lBQ2IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxtQkFBbUIsQ0FBQztRQUNsQyxNQUFNLE1BQU0sR0FBRyxLQUFLLENBQUMsTUFBTSxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUM7UUFFOUQsSUFBSSxTQUFTLElBQUksTUFBTSxFQUFFLENBQUM7WUFDeEIsa0JBQUksQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLHVCQUF1QixFQUFFLEdBQUcsU0FBUyxJQUFJLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDdEUsQ0FBQztJQUNILENBQUM7SUFFRDs7Ozs7Ozs7T0FRRztJQUNLLGdCQUFnQixDQUFDLFFBQXFCO1FBQzVDLElBQUksU0FBUyxHQUEyQixRQUFRLENBQUM7UUFDakQsT0FBTyxTQUFTLEVBQUUsQ0FBQztZQUNqQixNQUFNLGVBQWUsR0FBRyxTQUFpQyxDQUFDO1lBQzFELElBQUksZUFBZSxDQUFDLGVBQWUsRUFBRSxDQUFDO2dCQUNwQyxNQUFNLElBQUksR0FBRyxlQUFlLENBQUMsZUFBZSxDQUFDO2dCQUU3QyxNQUFNLE9BQU8sR0FBMkI7b0JBQ3RDLFFBQVEsRUFBRSxTQUFTO29CQUNuQixTQUFTLEVBQUUsV0FBVztvQkFDdEIsVUFBVSxFQUFFLFlBQVk7aUJBQ3pCLENBQUM7Z0JBRUYsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLElBQUksQ0FBQztnQkFDdkMsa0JBQUksQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLENBQUMsR0FBRyxDQUFDLDZCQUE2QixFQUFFLFFBQVEsQ0FBQyxDQUFDO2dCQUMvRCxNQUFNO1lBQ1IsQ0FBQztZQUNELFNBQVMsR0FBRyxTQUFTLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQztRQUNuQyxDQUFDO0lBQ0gsQ0FBQztDQUNGO0FBaEZELGdEQWdGQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHR5cGUgSUFzcGVjdCwgQ2ZuUmVzb3VyY2UsIFN0YWNrLCBUYWdzIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyB0eXBlIENmblZQQyB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZWMyXCI7XG5pbXBvcnQgeyB0eXBlIElDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuXG4vKiogQ29uc3RydWN0IHdpdGggb3B0aW9uYWwgYmFja3VwVmF1bHRUaWVyIHByb3BlcnR5ICovXG5pbnRlcmZhY2UgSUJhY2t1cFRpZXJDb25zdHJ1Y3QgZXh0ZW5kcyBJQ29uc3RydWN0IHtcbiAgYmFja3VwVmF1bHRUaWVyPzogc3RyaW5nO1xufVxuXG4vKipcbiAqIEFzcGVjdCB0byBhcHBseSBzcGVjaWFsIEZqYWxsIHRhZ3MgdG8gc3BlY2lmaWMgcmVzb3VyY2UgdHlwZXMuXG4gKlxuICogVGhpcyBhc3BlY3QgaGFuZGxlcyB0YWdzIHRoYXQgZGVwZW5kIG9uIHJlc291cmNlLXNwZWNpZmljIHByb3BlcnRpZXM6XG4gKiAtIGZqYWxsOm9wZXJhdGlvbnM6cG9vbCBvbiBWUENzIHdpdGggSVBBTSBjb25maWd1cmF0aW9uXG4gKiAtIGZqYWxsOmRpc2FzdGVyUmVjb3Zlcnk6dGllciBvbiBTMyBidWNrZXRzIHdpdGggYmFja3VwIGNvbmZpZ3VyYXRpb25cbiAqXG4gKiBTdGFuZGFyZCBGamFsbCB0YWdzIChjb3N0QWxsb2NhdGlvbjplbnZpcm9ubWVudCwgY29zdEFsbG9jYXRpb246c2VydmljZSwgZXRjLilcbiAqIGFyZSBhcHBsaWVkIHZpYSBUYWdzLm9mKGFwcCkuYWRkKCkgaW4gdGhlIEFwcCBjbGFzcywgd2hpY2ggcHJvcGVybHkgbWVyZ2VzXG4gKiB3aXRoIGV4aXN0aW5nIHRhZ3MgZnJvbSBMMiBjb25zdHJ1Y3RzLlxuICpcbiAqIFRoaXMgYXNwZWN0IHVzZXMgVGFncy5vZihub2RlKS5hZGQoKSB0byBwcm9wZXJseSBtZXJnZSB3aXRoIGV4aXN0aW5nIHRhZ3NcbiAqL1xuZXhwb3J0IGNsYXNzIFN0YW5kYXJkVGFnc0FzcGVjdCBpbXBsZW1lbnRzIElBc3BlY3Qge1xuICBwcml2YXRlIHJlYWRvbmx5IHByb2Nlc3NlZFJlc291cmNlcyA9IG5ldyBXZWFrU2V0PElDb25zdHJ1Y3Q+KCk7XG5cbiAgdmlzaXQobm9kZTogSUNvbnN0cnVjdCk6IHZvaWQge1xuICAgIGlmICh0aGlzLnByb2Nlc3NlZFJlc291cmNlcy5oYXMobm9kZSkpIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICBpZiAoIUNmblJlc291cmNlLmlzQ2ZuUmVzb3VyY2Uobm9kZSkpIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICBjb25zdCByZXNvdXJjZSA9IG5vZGUgYXMgQ2ZuUmVzb3VyY2U7XG4gICAgdGhpcy5wcm9jZXNzZWRSZXNvdXJjZXMuYWRkKG5vZGUpO1xuXG4gICAgaWYgKHJlc291cmNlLm5vZGUucGF0aC5pbmNsdWRlcyhcIlNlY3JldFJvdGF0aW9uXCIpKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgaWYgKHJlc291cmNlLmNmblJlc291cmNlVHlwZSA9PT0gXCJBV1M6OkVDMjo6VlBDXCIpIHtcbiAgICAgIHRoaXMuYWRkSXBhbVBvb2xUYWcocmVzb3VyY2UgYXMgQ2ZuVlBDKTtcbiAgICB9XG5cbiAgICBpZiAocmVzb3VyY2UuY2ZuUmVzb3VyY2VUeXBlID09PSBcIkFXUzo6UzM6OkJ1Y2tldFwiKSB7XG4gICAgICB0aGlzLmFkZEJhY2t1cFRpZXJUYWcocmVzb3VyY2UpO1xuICAgIH1cbiAgfVxuXG4gIC8qKlxuICAgKiBBZGQgSVBBTSBwb29sIHRhZyB0byBWUENzIHRoYXQgdXNlIElQQU0gZm9yIElQIGFkZHJlc3MgYWxsb2NhdGlvbi5cbiAgICogVGFnIGZvcm1hdDogZmphbGw6b3BlcmF0aW9uczpwb29sID0gXCJ7YWNjb3VudElkfS17cmVnaW9ufVwiXG4gICAqL1xuICBwcml2YXRlIGFkZElwYW1Qb29sVGFnKHZwYzogQ2ZuVlBDKTogdm9pZCB7XG4gICAgY29uc3QgaXBhbVBvb2xJZCA9IHZwYy5pcHY0SXBhbVBvb2xJZDtcblxuICAgIGlmICghaXBhbVBvb2xJZCkge1xuICAgICAgcmV0dXJuO1xuICAgIH1cblxuICAgIGNvbnN0IHN0YWNrID0gU3RhY2sub2YodnBjKTtcbiAgICBjb25zdCBhY2NvdW50SWQgPVxuICAgICAgc3RhY2subm9kZS50cnlHZXRDb250ZXh0KFwiYWNjb3VudElkXCIpIHx8XG4gICAgICBzdGFjay5hY2NvdW50IHx8XG4gICAgICBwcm9jZXNzLmVudi5DREtfREVGQVVMVF9BQ0NPVU5UO1xuICAgIGNvbnN0IHJlZ2lvbiA9IHN0YWNrLnJlZ2lvbiB8fCBwcm9jZXNzLmVudi5DREtfREVGQVVMVF9SRUdJT047XG5cbiAgICBpZiAoYWNjb3VudElkICYmIHJlZ2lvbikge1xuICAgICAgVGFncy5vZih2cGMpLmFkZChcImZqYWxsOm9wZXJhdGlvbnM6cG9vbFwiLCBgJHthY2NvdW50SWR9LSR7cmVnaW9ufWApO1xuICAgIH1cbiAgfVxuXG4gIC8qKlxuICAgKiBBZGQgZGlzYXN0ZXIgcmVjb3ZlcnkgdGllciB0YWcgdG8gUzMgYnVja2V0cyB3aXRoIGJhY2t1cFZhdWx0VGllciBwcm9wZXJ0eS5cbiAgICogVGFnIGZvcm1hdDogZmphbGw6ZGlzYXN0ZXJSZWNvdmVyeTp0aWVyID0gXCJ7dGllcn1cIlxuICAgKlxuICAgKiBUaWVyIG1hcHBpbmc6XG4gICAqIC0gc3RhbmRhcmQgLT4gXCJkZWZhdWx0XCIgKG1hdGNoZXMgZXhpc3RpbmcgYmFja3VwIHBsYW5zKVxuICAgKiAtIHJlc2lsaWVudCAtPiBcInJlc2lsaWVudFwiXG4gICAqIC0gZW50ZXJwcmlzZSAtPiBcImVudGVycHJpc2VcIlxuICAgKi9cbiAgcHJpdmF0ZSBhZGRCYWNrdXBUaWVyVGFnKHJlc291cmNlOiBDZm5SZXNvdXJjZSk6IHZvaWQge1xuICAgIGxldCBjb25zdHJ1Y3Q6IElDb25zdHJ1Y3QgfCB1bmRlZmluZWQgPSByZXNvdXJjZTtcbiAgICB3aGlsZSAoY29uc3RydWN0KSB7XG4gICAgICBjb25zdCBiYWNrdXBDb25zdHJ1Y3QgPSBjb25zdHJ1Y3QgYXMgSUJhY2t1cFRpZXJDb25zdHJ1Y3Q7XG4gICAgICBpZiAoYmFja3VwQ29uc3RydWN0LmJhY2t1cFZhdWx0VGllcikge1xuICAgICAgICBjb25zdCB0aWVyID0gYmFja3VwQ29uc3RydWN0LmJhY2t1cFZhdWx0VGllcjtcblxuICAgICAgICBjb25zdCB0aWVyTWFwOiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+ID0ge1xuICAgICAgICAgIHN0YW5kYXJkOiBcImRlZmF1bHRcIixcbiAgICAgICAgICByZXNpbGllbnQ6IFwicmVzaWxpZW50XCIsXG4gICAgICAgICAgZW50ZXJwcmlzZTogXCJlbnRlcnByaXNlXCJcbiAgICAgICAgfTtcblxuICAgICAgICBjb25zdCB0YWdWYWx1ZSA9IHRpZXJNYXBbdGllcl0gfHwgdGllcjtcbiAgICAgICAgVGFncy5vZihyZXNvdXJjZSkuYWRkKFwiZmphbGw6ZGlzYXN0ZXJSZWNvdmVyeTp0aWVyXCIsIHRhZ1ZhbHVlKTtcbiAgICAgICAgYnJlYWs7XG4gICAgICB9XG4gICAgICBjb25zdHJ1Y3QgPSBjb25zdHJ1Y3Qubm9kZS5zY29wZTtcbiAgICB9XG4gIH1cbn1cbiJdfQ==
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Fjall validation logging utilities.
|
|
3
|
+
* Centralises warning and info messages for consistent formatting.
|
|
4
|
+
* Also writes to JSONL file for debugging and support.
|
|
5
|
+
*/
|
|
6
|
+
export declare const FjallLogger: {
|
|
7
|
+
/**
|
|
8
|
+
* Log a warning message with Fjall prefix.
|
|
9
|
+
*/
|
|
10
|
+
readonly warn: (message: string) => void;
|
|
11
|
+
/**
|
|
12
|
+
* Log an info message with Fjall prefix.
|
|
13
|
+
*/
|
|
14
|
+
readonly info: (message: string) => void;
|
|
15
|
+
};
|
|
16
|
+
/**
|
|
17
|
+
* Warn if a property is set but will be ignored for the given type.
|
|
18
|
+
* Used across factories to alert users about type-specific properties.
|
|
19
|
+
*
|
|
20
|
+
* @param props - The props object with a `type` discriminator
|
|
21
|
+
* @param property - The property name to check
|
|
22
|
+
* @param applicableType - The type(s) where this property is used
|
|
23
|
+
* @param typeName - Human-readable type name for the message
|
|
24
|
+
*/
|
|
25
|
+
export declare function warnIfPropertyIgnored<T extends {
|
|
26
|
+
type: string;
|
|
27
|
+
}>(props: T, property: string, applicableType: string | string[], typeName: string): void;
|
|
28
|
+
/**
|
|
29
|
+
* Warn if any of the specified properties are set but will be ignored.
|
|
30
|
+
* Convenience wrapper for checking multiple properties at once.
|
|
31
|
+
*/
|
|
32
|
+
export declare function warnIfPropertiesIgnored<T extends {
|
|
33
|
+
type: string;
|
|
34
|
+
}>(props: T, properties: string[], applicableType: string | string[], typeName: string): void;
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Fjall validation logging utilities.
|
|
4
|
+
* Centralises warning and info messages for consistent formatting.
|
|
5
|
+
* Also writes to JSONL file for debugging and support.
|
|
6
|
+
*/
|
|
7
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
+
exports.FjallLogger = void 0;
|
|
9
|
+
exports.warnIfPropertyIgnored = warnIfPropertyIgnored;
|
|
10
|
+
exports.warnIfPropertiesIgnored = warnIfPropertiesIgnored;
|
|
11
|
+
const fs_1 = require("fs");
|
|
12
|
+
const os_1 = require("os");
|
|
13
|
+
const path_1 = require("path");
|
|
14
|
+
const LOG_DIR = process.env.FJALL_LOG_DIR ?? (0, path_1.join)((0, os_1.homedir)(), ".fjall", "logs");
|
|
15
|
+
const LOG_FILE = (0, path_1.join)(LOG_DIR, "infrastructure.jsonl");
|
|
16
|
+
/**
|
|
17
|
+
* Write a log entry to the infrastructure JSONL file
|
|
18
|
+
*/
|
|
19
|
+
function writeToLog(level, message) {
|
|
20
|
+
try {
|
|
21
|
+
if (!(0, fs_1.existsSync)(LOG_DIR)) {
|
|
22
|
+
(0, fs_1.mkdirSync)(LOG_DIR, { recursive: true });
|
|
23
|
+
}
|
|
24
|
+
const entry = JSON.stringify({
|
|
25
|
+
timestamp: new Date().toISOString(),
|
|
26
|
+
level,
|
|
27
|
+
component: "Infrastructure",
|
|
28
|
+
message,
|
|
29
|
+
source: "cdk-subprocess"
|
|
30
|
+
});
|
|
31
|
+
(0, fs_1.appendFileSync)(LOG_FILE, entry + "\n");
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
// Never crash CDK on logging failure
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
exports.FjallLogger = {
|
|
38
|
+
/**
|
|
39
|
+
* Log a warning message with Fjall prefix.
|
|
40
|
+
*/
|
|
41
|
+
warn: (message) => {
|
|
42
|
+
console.warn(`[Fjall] Warning: ${message}`);
|
|
43
|
+
writeToLog("warn", message);
|
|
44
|
+
},
|
|
45
|
+
/**
|
|
46
|
+
* Log an info message with Fjall prefix.
|
|
47
|
+
*/
|
|
48
|
+
info: (message) => {
|
|
49
|
+
console.info(`[Fjall] Note: ${message}`);
|
|
50
|
+
writeToLog("info", message);
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
/**
|
|
54
|
+
* Warn if a property is set but will be ignored for the given type.
|
|
55
|
+
* Used across factories to alert users about type-specific properties.
|
|
56
|
+
*
|
|
57
|
+
* @param props - The props object with a `type` discriminator
|
|
58
|
+
* @param property - The property name to check
|
|
59
|
+
* @param applicableType - The type(s) where this property is used
|
|
60
|
+
* @param typeName - Human-readable type name for the message
|
|
61
|
+
*/
|
|
62
|
+
function warnIfPropertyIgnored(props, property, applicableType, typeName) {
|
|
63
|
+
const propsRecord = props;
|
|
64
|
+
const types = Array.isArray(applicableType)
|
|
65
|
+
? applicableType
|
|
66
|
+
: [applicableType];
|
|
67
|
+
if (!types.includes(props.type) &&
|
|
68
|
+
property in propsRecord &&
|
|
69
|
+
propsRecord[property] !== undefined) {
|
|
70
|
+
exports.FjallLogger.warn(`'${property}' is only used for ${typeName} type. ` +
|
|
71
|
+
`It will be ignored for type '${props.type}'.`);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Warn if any of the specified properties are set but will be ignored.
|
|
76
|
+
* Convenience wrapper for checking multiple properties at once.
|
|
77
|
+
*/
|
|
78
|
+
function warnIfPropertiesIgnored(props, properties, applicableType, typeName) {
|
|
79
|
+
for (const property of properties) {
|
|
80
|
+
warnIfPropertyIgnored(props, property, applicableType, typeName);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGlvbkxvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2xpYi91dGlscy92YWxpZGF0aW9uTG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7OztHQUlHOzs7QUF5REgsc0RBcUJDO0FBTUQsMERBU0M7QUEzRkQsMkJBQTJEO0FBQzNELDJCQUE2QjtBQUM3QiwrQkFBNEI7QUFFNUIsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLElBQUksSUFBQSxXQUFJLEVBQUMsSUFBQSxZQUFPLEdBQUUsRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7QUFDL0UsTUFBTSxRQUFRLEdBQUcsSUFBQSxXQUFJLEVBQUMsT0FBTyxFQUFFLHNCQUFzQixDQUFDLENBQUM7QUFFdkQ7O0dBRUc7QUFDSCxTQUFTLFVBQVUsQ0FBQyxLQUFhLEVBQUUsT0FBZTtJQUNoRCxJQUFJLENBQUM7UUFDSCxJQUFJLENBQUMsSUFBQSxlQUFVLEVBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUN6QixJQUFBLGNBQVMsRUFBQyxPQUFPLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUMxQyxDQUFDO1FBQ0QsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQztZQUMzQixTQUFTLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQyxXQUFXLEVBQUU7WUFDbkMsS0FBSztZQUNMLFNBQVMsRUFBRSxnQkFBZ0I7WUFDM0IsT0FBTztZQUNQLE1BQU0sRUFBRSxnQkFBZ0I7U0FDekIsQ0FBQyxDQUFDO1FBQ0gsSUFBQSxtQkFBYyxFQUFDLFFBQVEsRUFBRSxLQUFLLEdBQUcsSUFBSSxDQUFDLENBQUM7SUFDekMsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNQLHFDQUFxQztJQUN2QyxDQUFDO0FBQ0gsQ0FBQztBQUVZLFFBQUEsV0FBVyxHQUFHO0lBQ3pCOztPQUVHO0lBQ0gsSUFBSSxFQUFFLENBQUMsT0FBZSxFQUFRLEVBQUU7UUFDOUIsT0FBTyxDQUFDLElBQUksQ0FBQyxvQkFBb0IsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUM1QyxVQUFVLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzlCLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksRUFBRSxDQUFDLE9BQWUsRUFBUSxFQUFFO1FBQzlCLE9BQU8sQ0FBQyxJQUFJLENBQUMsaUJBQWlCLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFDekMsVUFBVSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztJQUM5QixDQUFDO0NBQ08sQ0FBQztBQUVYOzs7Ozs7OztHQVFHO0FBQ0gsU0FBZ0IscUJBQXFCLENBQ25DLEtBQVEsRUFDUixRQUFnQixFQUNoQixjQUFpQyxFQUNqQyxRQUFnQjtJQUVoQixNQUFNLFdBQVcsR0FBRyxLQUEyQyxDQUFDO0lBQ2hFLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDO1FBQ3pDLENBQUMsQ0FBQyxjQUFjO1FBQ2hCLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBRXJCLElBQ0UsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUM7UUFDM0IsUUFBUSxJQUFJLFdBQVc7UUFDdkIsV0FBVyxDQUFDLFFBQVEsQ0FBQyxLQUFLLFNBQVMsRUFDbkMsQ0FBQztRQUNELG1CQUFXLENBQUMsSUFBSSxDQUNkLElBQUksUUFBUSxzQkFBc0IsUUFBUSxTQUFTO1lBQ2pELGdDQUFnQyxLQUFLLENBQUMsSUFBSSxJQUFJLENBQ2pELENBQUM7SUFDSixDQUFDO0FBQ0gsQ0FBQztBQUVEOzs7R0FHRztBQUNILFNBQWdCLHVCQUF1QixDQUNyQyxLQUFRLEVBQ1IsVUFBb0IsRUFDcEIsY0FBaUMsRUFDakMsUUFBZ0I7SUFFaEIsS0FBSyxNQUFNLFFBQVEsSUFBSSxVQUFVLEVBQUUsQ0FBQztRQUNsQyxxQkFBcUIsQ0FBQyxLQUFLLEVBQUUsUUFBUSxFQUFFLGNBQWMsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUNuRSxDQUFDO0FBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogRmphbGwgdmFsaWRhdGlvbiBsb2dnaW5nIHV0aWxpdGllcy5cbiAqIENlbnRyYWxpc2VzIHdhcm5pbmcgYW5kIGluZm8gbWVzc2FnZXMgZm9yIGNvbnNpc3RlbnQgZm9ybWF0dGluZy5cbiAqIEFsc28gd3JpdGVzIHRvIEpTT05MIGZpbGUgZm9yIGRlYnVnZ2luZyBhbmQgc3VwcG9ydC5cbiAqL1xuXG5pbXBvcnQgeyBhcHBlbmRGaWxlU3luYywgZXhpc3RzU3luYywgbWtkaXJTeW5jIH0gZnJvbSBcImZzXCI7XG5pbXBvcnQgeyBob21lZGlyIH0gZnJvbSBcIm9zXCI7XG5pbXBvcnQgeyBqb2luIH0gZnJvbSBcInBhdGhcIjtcblxuY29uc3QgTE9HX0RJUiA9IHByb2Nlc3MuZW52LkZKQUxMX0xPR19ESVIgPz8gam9pbihob21lZGlyKCksIFwiLmZqYWxsXCIsIFwibG9nc1wiKTtcbmNvbnN0IExPR19GSUxFID0gam9pbihMT0dfRElSLCBcImluZnJhc3RydWN0dXJlLmpzb25sXCIpO1xuXG4vKipcbiAqIFdyaXRlIGEgbG9nIGVudHJ5IHRvIHRoZSBpbmZyYXN0cnVjdHVyZSBKU09OTCBmaWxlXG4gKi9cbmZ1bmN0aW9uIHdyaXRlVG9Mb2cobGV2ZWw6IHN0cmluZywgbWVzc2FnZTogc3RyaW5nKTogdm9pZCB7XG4gIHRyeSB7XG4gICAgaWYgKCFleGlzdHNTeW5jKExPR19ESVIpKSB7XG4gICAgICBta2RpclN5bmMoTE9HX0RJUiwgeyByZWN1cnNpdmU6IHRydWUgfSk7XG4gICAgfVxuICAgIGNvbnN0IGVudHJ5ID0gSlNPTi5zdHJpbmdpZnkoe1xuICAgICAgdGltZXN0YW1wOiBuZXcgRGF0ZSgpLnRvSVNPU3RyaW5nKCksXG4gICAgICBsZXZlbCxcbiAgICAgIGNvbXBvbmVudDogXCJJbmZyYXN0cnVjdHVyZVwiLFxuICAgICAgbWVzc2FnZSxcbiAgICAgIHNvdXJjZTogXCJjZGstc3VicHJvY2Vzc1wiXG4gICAgfSk7XG4gICAgYXBwZW5kRmlsZVN5bmMoTE9HX0ZJTEUsIGVudHJ5ICsgXCJcXG5cIik7XG4gIH0gY2F0Y2gge1xuICAgIC8vIE5ldmVyIGNyYXNoIENESyBvbiBsb2dnaW5nIGZhaWx1cmVcbiAgfVxufVxuXG5leHBvcnQgY29uc3QgRmphbGxMb2dnZXIgPSB7XG4gIC8qKlxuICAgKiBMb2cgYSB3YXJuaW5nIG1lc3NhZ2Ugd2l0aCBGamFsbCBwcmVmaXguXG4gICAqL1xuICB3YXJuOiAobWVzc2FnZTogc3RyaW5nKTogdm9pZCA9PiB7XG4gICAgY29uc29sZS53YXJuKGBbRmphbGxdIFdhcm5pbmc6ICR7bWVzc2FnZX1gKTtcbiAgICB3cml0ZVRvTG9nKFwid2FyblwiLCBtZXNzYWdlKTtcbiAgfSxcblxuICAvKipcbiAgICogTG9nIGFuIGluZm8gbWVzc2FnZSB3aXRoIEZqYWxsIHByZWZpeC5cbiAgICovXG4gIGluZm86IChtZXNzYWdlOiBzdHJpbmcpOiB2b2lkID0+IHtcbiAgICBjb25zb2xlLmluZm8oYFtGamFsbF0gTm90ZTogJHttZXNzYWdlfWApO1xuICAgIHdyaXRlVG9Mb2coXCJpbmZvXCIsIG1lc3NhZ2UpO1xuICB9XG59IGFzIGNvbnN0O1xuXG4vKipcbiAqIFdhcm4gaWYgYSBwcm9wZXJ0eSBpcyBzZXQgYnV0IHdpbGwgYmUgaWdub3JlZCBmb3IgdGhlIGdpdmVuIHR5cGUuXG4gKiBVc2VkIGFjcm9zcyBmYWN0b3JpZXMgdG8gYWxlcnQgdXNlcnMgYWJvdXQgdHlwZS1zcGVjaWZpYyBwcm9wZXJ0aWVzLlxuICpcbiAqIEBwYXJhbSBwcm9wcyAtIFRoZSBwcm9wcyBvYmplY3Qgd2l0aCBhIGB0eXBlYCBkaXNjcmltaW5hdG9yXG4gKiBAcGFyYW0gcHJvcGVydHkgLSBUaGUgcHJvcGVydHkgbmFtZSB0byBjaGVja1xuICogQHBhcmFtIGFwcGxpY2FibGVUeXBlIC0gVGhlIHR5cGUocykgd2hlcmUgdGhpcyBwcm9wZXJ0eSBpcyB1c2VkXG4gKiBAcGFyYW0gdHlwZU5hbWUgLSBIdW1hbi1yZWFkYWJsZSB0eXBlIG5hbWUgZm9yIHRoZSBtZXNzYWdlXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiB3YXJuSWZQcm9wZXJ0eUlnbm9yZWQ8VCBleHRlbmRzIHsgdHlwZTogc3RyaW5nIH0+KFxuICBwcm9wczogVCxcbiAgcHJvcGVydHk6IHN0cmluZyxcbiAgYXBwbGljYWJsZVR5cGU6IHN0cmluZyB8IHN0cmluZ1tdLFxuICB0eXBlTmFtZTogc3RyaW5nXG4pOiB2b2lkIHtcbiAgY29uc3QgcHJvcHNSZWNvcmQgPSBwcm9wcyBhcyB1bmtub3duIGFzIFJlY29yZDxzdHJpbmcsIHVua25vd24+O1xuICBjb25zdCB0eXBlcyA9IEFycmF5LmlzQXJyYXkoYXBwbGljYWJsZVR5cGUpXG4gICAgPyBhcHBsaWNhYmxlVHlwZVxuICAgIDogW2FwcGxpY2FibGVUeXBlXTtcblxuICBpZiAoXG4gICAgIXR5cGVzLmluY2x1ZGVzKHByb3BzLnR5cGUpICYmXG4gICAgcHJvcGVydHkgaW4gcHJvcHNSZWNvcmQgJiZcbiAgICBwcm9wc1JlY29yZFtwcm9wZXJ0eV0gIT09IHVuZGVmaW5lZFxuICApIHtcbiAgICBGamFsbExvZ2dlci53YXJuKFxuICAgICAgYCcke3Byb3BlcnR5fScgaXMgb25seSB1c2VkIGZvciAke3R5cGVOYW1lfSB0eXBlLiBgICtcbiAgICAgICAgYEl0IHdpbGwgYmUgaWdub3JlZCBmb3IgdHlwZSAnJHtwcm9wcy50eXBlfScuYFxuICAgICk7XG4gIH1cbn1cblxuLyoqXG4gKiBXYXJuIGlmIGFueSBvZiB0aGUgc3BlY2lmaWVkIHByb3BlcnRpZXMgYXJlIHNldCBidXQgd2lsbCBiZSBpZ25vcmVkLlxuICogQ29udmVuaWVuY2Ugd3JhcHBlciBmb3IgY2hlY2tpbmcgbXVsdGlwbGUgcHJvcGVydGllcyBhdCBvbmNlLlxuICovXG5leHBvcnQgZnVuY3Rpb24gd2FybklmUHJvcGVydGllc0lnbm9yZWQ8VCBleHRlbmRzIHsgdHlwZTogc3RyaW5nIH0+KFxuICBwcm9wczogVCxcbiAgcHJvcGVydGllczogc3RyaW5nW10sXG4gIGFwcGxpY2FibGVUeXBlOiBzdHJpbmcgfCBzdHJpbmdbXSxcbiAgdHlwZU5hbWU6IHN0cmluZ1xuKTogdm9pZCB7XG4gIGZvciAoY29uc3QgcHJvcGVydHkgb2YgcHJvcGVydGllcykge1xuICAgIHdhcm5JZlByb3BlcnR5SWdub3JlZChwcm9wcywgcHJvcGVydHksIGFwcGxpY2FibGVUeXBlLCB0eXBlTmFtZSk7XG4gIH1cbn1cbiJdfQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fjall/components-infrastructure",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.87.3",
|
|
4
4
|
"bin": {
|
|
5
5
|
"infrastructure": "bin/infrastructure.js"
|
|
6
6
|
},
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
38
|
"@aws-sdk/client-organizations": "^3.716.0",
|
|
39
|
-
"@fjall/util": "^0.
|
|
39
|
+
"@fjall/util": "^0.87.3",
|
|
40
40
|
"@pepperize/cdk-organizations": "^0.7.135",
|
|
41
41
|
"cdk-time-sleep": "^1.0.0",
|
|
42
42
|
"constructs": "^10.0.0",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"overrides": {
|
|
46
46
|
"@smithy/core": "2.5.5"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "be3b6f5bee0c9d1fe50e0be4816ffd87eb07e4c4",
|
|
49
49
|
"peerDependencies": {
|
|
50
50
|
"aws-cdk": "^2.206.0",
|
|
51
51
|
"aws-cdk-lib": "^2.206.0",
|
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
import { App } from "aws-cdk-lib";
|
|
2
|
-
import { Template } from "aws-cdk-lib/assertions";
|
|
3
|
-
import { Stack } from "aws-cdk-lib";
|
|
4
|
-
/**
|
|
5
|
-
* Test utilities for CDK infrastructure testing
|
|
6
|
-
*/
|
|
7
|
-
export declare class TestUtils {
|
|
8
|
-
/**
|
|
9
|
-
* Create a test app with proper environment settings
|
|
10
|
-
*/
|
|
11
|
-
static createTestApp(): App;
|
|
12
|
-
/**
|
|
13
|
-
* Create a test stack within a test app
|
|
14
|
-
*/
|
|
15
|
-
static createTestStack(app?: App): Stack;
|
|
16
|
-
/**
|
|
17
|
-
* Get CloudFormation template from a stack for assertions
|
|
18
|
-
*/
|
|
19
|
-
static getTemplate(stack: Stack): Template;
|
|
20
|
-
/**
|
|
21
|
-
* Generate consistent snapshot from CDK stack
|
|
22
|
-
*/
|
|
23
|
-
static getSnapshotTemplate(stack: Stack): any;
|
|
24
|
-
/**
|
|
25
|
-
* Clean up template for consistent snapshots by removing random IDs
|
|
26
|
-
*/
|
|
27
|
-
static sanitiseTemplate(template: any): any;
|
|
28
|
-
}
|
|
29
|
-
/**
|
|
30
|
-
* Common test data for infrastructure patterns
|
|
31
|
-
*/
|
|
32
|
-
export declare const TestData: {
|
|
33
|
-
defaultTags: {
|
|
34
|
-
"fjall:costAllocation:environment": string;
|
|
35
|
-
"fjall:costAllocation:owner": string;
|
|
36
|
-
};
|
|
37
|
-
defaultAccountId: string;
|
|
38
|
-
defaultRegion: string;
|
|
39
|
-
vpc: {
|
|
40
|
-
vpcId: string;
|
|
41
|
-
};
|
|
42
|
-
basicApp: {
|
|
43
|
-
serviceName: string;
|
|
44
|
-
environment: string;
|
|
45
|
-
containerPort: number;
|
|
46
|
-
owner: string;
|
|
47
|
-
};
|
|
48
|
-
};
|