@firestartr/cli 1.39.1 → 1.39.3-SNAPSHOT
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/build/index.js +290 -64
- package/build/packages/catalog_common/src/types/regex.d.ts +5 -0
- package/build/packages/cdk8s_renderer/index.d.ts +1 -1
- package/build/packages/cdk8s_renderer/src/loader/lazy_loader.d.ts +5 -0
- package/build/packages/cdk8s_renderer/src/loader/loader.d.ts +7 -1
- package/build/packages/cdk8s_renderer/src/refsSorter/refsExtractor.d.ts +1 -0
- package/build/packages/cdk8s_renderer/src/renderer/renderer.d.ts +1 -1
- package/build/packages/github/src/branches.d.ts +4 -4
- package/package.json +1 -1
package/build/index.js
CHANGED
|
@@ -276344,10 +276344,15 @@ var __webpack_exports__ = {};
|
|
|
276344
276344
|
var regex_namespaceObject = {};
|
|
276345
276345
|
__nccwpck_require__.r(regex_namespaceObject);
|
|
276346
276346
|
__nccwpck_require__.d(regex_namespaceObject, {
|
|
276347
|
+
"GenericRefRegex": () => (GenericRefRegex),
|
|
276347
276348
|
"GroupRefRegex": () => (GroupRefRegex),
|
|
276348
276349
|
"SecretRefRegex": () => (SecretRefRegex),
|
|
276349
276350
|
"TFWorkspaceRefCR": () => (TFWorkspaceRefCR),
|
|
276350
|
-
"TFWorkspaceRefRegex": () => (TFWorkspaceRefRegex)
|
|
276351
|
+
"TFWorkspaceRefRegex": () => (TFWorkspaceRefRegex),
|
|
276352
|
+
"YAMLHeaderRegex": () => (YAMLHeaderRegex),
|
|
276353
|
+
"YAMLInlineListRegex": () => (YAMLInlineListRegex),
|
|
276354
|
+
"YAMLListItemRegex": () => (YAMLListItemRegex),
|
|
276355
|
+
"YAMLMultilineRegex": () => (YAMLMultilineRegex)
|
|
276351
276356
|
});
|
|
276352
276357
|
|
|
276353
276358
|
// NAMESPACE OBJECT: ../catalog_common/src/features/tarballs.ts
|
|
@@ -277906,6 +277911,11 @@ const TFWorkspaceRefRegex = new RegExp(`\\$\\{\\{\\s*tfworkspace\\:(${regModuleN
|
|
|
277906
277911
|
const SecretRefRegex = new RegExp(`\\$\\{\\{\\s*secret\\:(${regModuleName.source})\\.(${regModuleName.source})\\s*\\}\\}`, 'ig');
|
|
277907
277912
|
const GroupRefRegex = new RegExp(`group\\:(${regModuleName.source})`, 'ig');
|
|
277908
277913
|
const TFWorkspaceRefCR = new RegExp(`\\$\\{\\{\\s*references\\.(${regModuleName.source})\\s*\\}\\}`, 'i');
|
|
277914
|
+
const GenericRefRegex = new RegExp(`user:${regModuleName.source}|group:${regModuleName.source}|system:${regModuleName.source}`, 'gm');
|
|
277915
|
+
const YAMLHeaderRegex = new RegExp(/^\s*(\w+:\s?)/);
|
|
277916
|
+
const YAMLListItemRegex = new RegExp(/^\s*(-\s)/);
|
|
277917
|
+
const YAMLInlineListRegex = new RegExp(/^\s*(\[.+\])/);
|
|
277918
|
+
const YAMLMultilineRegex = new RegExp(/^\s*([>|][-+]?)/);
|
|
277909
277919
|
|
|
277910
277920
|
;// CONCATENATED MODULE: ../catalog_common/src/types/catalog.ts
|
|
277911
277921
|
var KindTypes;
|
|
@@ -287089,6 +287099,244 @@ const NORMALIZERS = [
|
|
|
287089
287099
|
RevisionNormalizer,
|
|
287090
287100
|
];
|
|
287091
287101
|
|
|
287102
|
+
;// CONCATENATED MODULE: ../cdk8s_renderer/src/refsSorter/refsExtractor.ts
|
|
287103
|
+
|
|
287104
|
+
|
|
287105
|
+
|
|
287106
|
+
const refsExtractor_log = src_default()('firestartr:renderer:refsextractor');
|
|
287107
|
+
const kindMap = {
|
|
287108
|
+
user: 'UserClaim',
|
|
287109
|
+
group: 'GroupClaim',
|
|
287110
|
+
system: 'SystemClaim',
|
|
287111
|
+
};
|
|
287112
|
+
function extractRefs(renderClaims, kind) {
|
|
287113
|
+
const result = {};
|
|
287114
|
+
for (const key in renderClaims) {
|
|
287115
|
+
const claim = renderClaims[key].claim;
|
|
287116
|
+
let refs = [];
|
|
287117
|
+
switch (kind) {
|
|
287118
|
+
case 'TFWorkspaceClaim':
|
|
287119
|
+
refs = getTfWorkspacesRefs(claim.providers.terraform.values);
|
|
287120
|
+
break;
|
|
287121
|
+
case 'GroupClaim':
|
|
287122
|
+
/**
|
|
287123
|
+
* Groups can have refs to other groups in parent property
|
|
287124
|
+
**/
|
|
287125
|
+
refs = getGroupParentRef(claim.parent);
|
|
287126
|
+
break;
|
|
287127
|
+
default:
|
|
287128
|
+
throw new Error(`No refs for kind ${kind}`);
|
|
287129
|
+
}
|
|
287130
|
+
result[claim.name] = {
|
|
287131
|
+
name: `${claim.kind}-${claim.name}`,
|
|
287132
|
+
refs: refs,
|
|
287133
|
+
};
|
|
287134
|
+
}
|
|
287135
|
+
return result;
|
|
287136
|
+
}
|
|
287137
|
+
function extractAllRefs(claimData) {
|
|
287138
|
+
const refs = getClaimReferences(claimData);
|
|
287139
|
+
const parsedClaim = yaml_dist.parse(claimData);
|
|
287140
|
+
switch (parsedClaim.kind) {
|
|
287141
|
+
case 'TFWorkspaceClaim': {
|
|
287142
|
+
const tfWorkspaceRefs = getTfWorkspacesRefs(parsedClaim.providers.terraform.values);
|
|
287143
|
+
tfWorkspaceRefs.forEach((ref, idx, arr) => {
|
|
287144
|
+
arr[idx] = `TFWorkspaceClaim-${ref}`;
|
|
287145
|
+
});
|
|
287146
|
+
refs.push(...tfWorkspaceRefs);
|
|
287147
|
+
break;
|
|
287148
|
+
}
|
|
287149
|
+
case 'GroupClaim': {
|
|
287150
|
+
const groupRefs = getGroupParentRef(parsedClaim.parent);
|
|
287151
|
+
groupRefs.forEach((ref, idx, arr) => {
|
|
287152
|
+
arr[idx] = `GroupClaim-${ref}`;
|
|
287153
|
+
});
|
|
287154
|
+
refs.push(...groupRefs);
|
|
287155
|
+
break;
|
|
287156
|
+
}
|
|
287157
|
+
}
|
|
287158
|
+
return [...new Set(refs)];
|
|
287159
|
+
}
|
|
287160
|
+
function getGroupParentRef(parent, references = []) {
|
|
287161
|
+
if (!parent)
|
|
287162
|
+
return [];
|
|
287163
|
+
const regex = catalog_common.types.regex.GroupRefRegex;
|
|
287164
|
+
for (const match of parent.matchAll(regex)) {
|
|
287165
|
+
refsExtractor_log(match);
|
|
287166
|
+
const [_, claimName] = match;
|
|
287167
|
+
references.push(claimName);
|
|
287168
|
+
}
|
|
287169
|
+
return references;
|
|
287170
|
+
}
|
|
287171
|
+
function getTfWorkspacesRefs(values, references = []) {
|
|
287172
|
+
const regex = catalog_common.types.regex.TFWorkspaceRefRegex;
|
|
287173
|
+
for (const key in values) {
|
|
287174
|
+
switch (typeof values[key]) {
|
|
287175
|
+
case 'object':
|
|
287176
|
+
getTfWorkspacesRefs(values[key], references);
|
|
287177
|
+
break;
|
|
287178
|
+
case 'string':
|
|
287179
|
+
for (const match of values[key].matchAll(regex)) {
|
|
287180
|
+
const [_, claimName] = match;
|
|
287181
|
+
references.push(claimName);
|
|
287182
|
+
}
|
|
287183
|
+
break;
|
|
287184
|
+
}
|
|
287185
|
+
}
|
|
287186
|
+
return references;
|
|
287187
|
+
}
|
|
287188
|
+
function getClaimReferences(claim) {
|
|
287189
|
+
const headerRegex = catalog_common.types.regex.YAMLHeaderRegex;
|
|
287190
|
+
const multilineRegex = catalog_common.types.regex.YAMLMultilineRegex;
|
|
287191
|
+
const listItemRegex = catalog_common.types.regex.YAMLListItemRegex;
|
|
287192
|
+
const inlineListRegex = catalog_common.types.regex.YAMLInlineListRegex;
|
|
287193
|
+
const valueRegex = catalog_common.types.regex.GenericRefRegex;
|
|
287194
|
+
const refs = [];
|
|
287195
|
+
let multilineMargin = -1;
|
|
287196
|
+
for (const line of claim.split('\n')) {
|
|
287197
|
+
if (multilineMargin >= 0) {
|
|
287198
|
+
const currentLineMargin = line.length - line.trimStart().length;
|
|
287199
|
+
if (currentLineMargin > multilineMargin) {
|
|
287200
|
+
continue;
|
|
287201
|
+
}
|
|
287202
|
+
else {
|
|
287203
|
+
multilineMargin = -1;
|
|
287204
|
+
}
|
|
287205
|
+
}
|
|
287206
|
+
if (!line.match(headerRegex) && !line.match(listItemRegex))
|
|
287207
|
+
continue;
|
|
287208
|
+
let lineValue = line.match(headerRegex)
|
|
287209
|
+
? line.replace(headerRegex, '')
|
|
287210
|
+
: line.replace(listItemRegex, '');
|
|
287211
|
+
if (lineValue.match(valueRegex)) {
|
|
287212
|
+
lineValue = lineValue.replace(/"/g, '').replace(/'/g, '');
|
|
287213
|
+
let pendingRefs = [];
|
|
287214
|
+
if (lineValue.match(inlineListRegex)) {
|
|
287215
|
+
lineValue = lineValue
|
|
287216
|
+
.replace('[', '')
|
|
287217
|
+
.replace(']', '')
|
|
287218
|
+
.replace(/\s/g, '');
|
|
287219
|
+
pendingRefs = lineValue.split(',');
|
|
287220
|
+
}
|
|
287221
|
+
else {
|
|
287222
|
+
pendingRefs.push(lineValue);
|
|
287223
|
+
}
|
|
287224
|
+
for (const ref of pendingRefs) {
|
|
287225
|
+
refs.push(resolveFirestartrRef(ref));
|
|
287226
|
+
}
|
|
287227
|
+
}
|
|
287228
|
+
else if (lineValue.match(multilineRegex)) {
|
|
287229
|
+
multilineMargin = line.length - line.trimStart().length;
|
|
287230
|
+
}
|
|
287231
|
+
}
|
|
287232
|
+
return refs;
|
|
287233
|
+
}
|
|
287234
|
+
function resolveFirestartrRef(reference) {
|
|
287235
|
+
const splittedRef = reference.split(':');
|
|
287236
|
+
if (splittedRef.length === 2)
|
|
287237
|
+
return `${kindMap[splittedRef[0]]}-${splittedRef[1]}`;
|
|
287238
|
+
return '';
|
|
287239
|
+
}
|
|
287240
|
+
|
|
287241
|
+
;// CONCATENATED MODULE: external "node:child_process"
|
|
287242
|
+
const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:child_process");
|
|
287243
|
+
;// CONCATENATED MODULE: ../cdk8s_renderer/src/loader/lazy_loader.ts
|
|
287244
|
+
|
|
287245
|
+
|
|
287246
|
+
|
|
287247
|
+
|
|
287248
|
+
|
|
287249
|
+
|
|
287250
|
+
|
|
287251
|
+
const lazy_loader_log = src_default()('firestartr:renderer:lazy_loader');
|
|
287252
|
+
async function loadClaim(claimRef, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, existingRefs = {}) {
|
|
287253
|
+
let result = existingRefs;
|
|
287254
|
+
// cargas datos con grep
|
|
287255
|
+
const claimData = await lazyGetClaim(claimRef.split(/-/)[0], claimRef.replace(/^[^-]+-/, ''), cwd);
|
|
287256
|
+
const claim = patchClaim(catalog_common.io.fromYaml(claimData), defaults);
|
|
287257
|
+
result[claimRef] = {};
|
|
287258
|
+
result[claimRef]['claim'] = claim;
|
|
287259
|
+
result[claimRef]['claimPath'] = VisitedClaims[claimRef];
|
|
287260
|
+
result[claimRef]['initializers'] = await loadInitializers(claim);
|
|
287261
|
+
result[claimRef]['globals'] = await loadGlobals(claim);
|
|
287262
|
+
result[claimRef]['overrides'] = loadOverrides(claim);
|
|
287263
|
+
result[claimRef]['normalizers'] = await loadNormalizers(claim, result[claimRef]['claimPath']);
|
|
287264
|
+
const claimKind = claim.kind;
|
|
287265
|
+
const references = extractAllRefs(claimData);
|
|
287266
|
+
for (const ref of references) {
|
|
287267
|
+
if (!result[ref]) {
|
|
287268
|
+
const resolvedReferences = await loadClaim(ref, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, result);
|
|
287269
|
+
result = lodash_default().merge(result, resolvedReferences);
|
|
287270
|
+
}
|
|
287271
|
+
}
|
|
287272
|
+
return result;
|
|
287273
|
+
}
|
|
287274
|
+
const LoadedClaims = {};
|
|
287275
|
+
const VisitedClaims = {};
|
|
287276
|
+
async function lazyGetClaim(kind, name, cwd) {
|
|
287277
|
+
const indice = `${kind}-${name}`;
|
|
287278
|
+
if (indice in LoadedClaims)
|
|
287279
|
+
return LoadedClaims[indice];
|
|
287280
|
+
await getClaimsByName(name, cwd);
|
|
287281
|
+
if (indice in LoadedClaims) {
|
|
287282
|
+
return LoadedClaims[indice];
|
|
287283
|
+
}
|
|
287284
|
+
else {
|
|
287285
|
+
throw new Error(`Error: ${kind}-${name} not found`);
|
|
287286
|
+
}
|
|
287287
|
+
}
|
|
287288
|
+
async function getClaimsByName(name, cwd = '.') {
|
|
287289
|
+
return new Promise((ok, ko) => {
|
|
287290
|
+
const handler = (0,external_node_child_process_namespaceObject.spawn)('grep', ['-r', '-l', '--include=*', '-E', `name: "?${name}"?`, '.'], {
|
|
287291
|
+
cwd: cwd,
|
|
287292
|
+
});
|
|
287293
|
+
const entradas = [];
|
|
287294
|
+
handler.stdout.on('data', (data) => {
|
|
287295
|
+
const fileNameList = data
|
|
287296
|
+
.toString('utf-8')
|
|
287297
|
+
.split(/\n/)
|
|
287298
|
+
.filter((l) => l !== '');
|
|
287299
|
+
for (const fileName of fileNameList) {
|
|
287300
|
+
// only yaml files
|
|
287301
|
+
if (!fileName.match(/\.yml$|\.yaml$/)) {
|
|
287302
|
+
continue;
|
|
287303
|
+
}
|
|
287304
|
+
// only entries not already visited
|
|
287305
|
+
if (Object.values(VisitedClaims).includes(fileName)) {
|
|
287306
|
+
continue;
|
|
287307
|
+
}
|
|
287308
|
+
entradas.push(external_path_.join(cwd, fileName));
|
|
287309
|
+
}
|
|
287310
|
+
});
|
|
287311
|
+
handler.on('close', () => {
|
|
287312
|
+
Promise.all(entradas.map((entrada) => {
|
|
287313
|
+
return loadRawClaim(entrada);
|
|
287314
|
+
}))
|
|
287315
|
+
.then(() => {
|
|
287316
|
+
ok();
|
|
287317
|
+
})
|
|
287318
|
+
.catch(() => {
|
|
287319
|
+
ko();
|
|
287320
|
+
});
|
|
287321
|
+
});
|
|
287322
|
+
});
|
|
287323
|
+
}
|
|
287324
|
+
async function loadRawClaim(entry) {
|
|
287325
|
+
return new Promise((ok, ko) => {
|
|
287326
|
+
external_fs_.readFile(entry, 'utf-8', (error, data) => {
|
|
287327
|
+
if (error)
|
|
287328
|
+
return ko(`Reading ${entry}: ${error}`);
|
|
287329
|
+
const claim = catalog_common.io.fromYaml(data);
|
|
287330
|
+
if (!('kind' in claim && 'name' in claim)) {
|
|
287331
|
+
lazy_loader_log(`Invalid claim file ${entry}`);
|
|
287332
|
+
}
|
|
287333
|
+
LoadedClaims[`${claim.kind}-${claim.name}`] = data;
|
|
287334
|
+
VisitedClaims[`${claim.kind}-${claim.name}`] = entry;
|
|
287335
|
+
ok();
|
|
287336
|
+
});
|
|
287337
|
+
});
|
|
287338
|
+
}
|
|
287339
|
+
|
|
287092
287340
|
;// CONCATENATED MODULE: ../cdk8s_renderer/src/loader/loader.ts
|
|
287093
287341
|
|
|
287094
287342
|
|
|
@@ -287108,6 +287356,8 @@ const NORMALIZERS = [
|
|
|
287108
287356
|
|
|
287109
287357
|
|
|
287110
287358
|
|
|
287359
|
+
|
|
287360
|
+
|
|
287111
287361
|
|
|
287112
287362
|
const loader_log = src_default()('firestartr:renderer:loader');
|
|
287113
287363
|
const isYamlFile = new RegExp(/\.(yaml|yml)$/);
|
|
@@ -287334,7 +287584,7 @@ function patchClaim(claim, defaultsClaims) {
|
|
|
287334
287584
|
* - An object promise which contains each loaded CR
|
|
287335
287585
|
*
|
|
287336
287586
|
*/
|
|
287337
|
-
async function loadCRs(crsPath = config_getPath('crs'), excludedPaths = [config_getPath('globals'), config_getPath('initializers')]) {
|
|
287587
|
+
async function loadCRs(crsPath = config_getPath('crs'), excludedPaths = [config_getPath('globals'), config_getPath('initializers')], allowedClaimReferences = []) {
|
|
287338
287588
|
const result = {};
|
|
287339
287589
|
await crawlWithExclusions(crsPath, (entry) => {
|
|
287340
287590
|
return isYamlFile.test(entry);
|
|
@@ -287347,7 +287597,10 @@ async function loadCRs(crsPath = config_getPath('crs'), excludedPaths = [config_
|
|
|
287347
287597
|
if (result[`${yamlData.kind}-${yamlData.metadata.name}`]) {
|
|
287348
287598
|
loader_log(`Duplicate CR ${yamlData.kind}-${yamlData.metadata.name}`);
|
|
287349
287599
|
}
|
|
287350
|
-
|
|
287600
|
+
if (allowedClaimReferences.length === 0 ||
|
|
287601
|
+
allowedClaimReferences.includes(yamlData.metadata?.annotations?.[catalog_common.generic.getFirestartrAnnotation('claim-ref')])) {
|
|
287602
|
+
result[`${yamlData.kind}-${yamlData.metadata.name}`] = yamlData;
|
|
287603
|
+
}
|
|
287351
287604
|
}
|
|
287352
287605
|
}, excludedPaths.concat(getAdditionalPaths()));
|
|
287353
287606
|
return result;
|
|
@@ -287465,6 +287718,24 @@ async function loadAll() {
|
|
|
287465
287718
|
data['renames'] = await loadRenames(data['renderClaims'], data['crs']);
|
|
287466
287719
|
return data;
|
|
287467
287720
|
}
|
|
287721
|
+
async function loadClaimsList(claimRefList, claimsPath = config_getPath('claims')) {
|
|
287722
|
+
const data = {
|
|
287723
|
+
renderClaims: {},
|
|
287724
|
+
crs: {},
|
|
287725
|
+
};
|
|
287726
|
+
const defaults = loadClaimDefaults();
|
|
287727
|
+
for (const claimRef of claimRefList) {
|
|
287728
|
+
const renderedClaimData = await loadClaim(claimRef, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, claimsPath);
|
|
287729
|
+
data.renderClaims = lodash_default().merge(data.renderClaims, renderedClaimData);
|
|
287730
|
+
}
|
|
287731
|
+
const crClaimReferences = [];
|
|
287732
|
+
for (const ref of Object.keys(data.renderClaims)) {
|
|
287733
|
+
// Replaces only the first instance of '-'
|
|
287734
|
+
crClaimReferences.push(ref.replace('-', '/'));
|
|
287735
|
+
}
|
|
287736
|
+
data['crs'] = await loadCRs(config_getPath('crs'), [config_getPath('globals'), config_getPath('initializers')], crClaimReferences);
|
|
287737
|
+
return data;
|
|
287738
|
+
}
|
|
287468
287739
|
function getOrg() {
|
|
287469
287740
|
const groupOrg = catalog_common.environment.getFromEnvironmentWithDefault(catalog_common.types.envVars.org, '');
|
|
287470
287741
|
return groupOrg;
|
|
@@ -287674,62 +287945,6 @@ function isTerraformWorkspace(cr) {
|
|
|
287674
287945
|
return cr.kind === 'FirestartrTerraformWorkspace';
|
|
287675
287946
|
}
|
|
287676
287947
|
|
|
287677
|
-
;// CONCATENATED MODULE: ../cdk8s_renderer/src/refsSorter/refsExtractor.ts
|
|
287678
|
-
|
|
287679
|
-
function extractRefs(renderClaims, kind) {
|
|
287680
|
-
const result = {};
|
|
287681
|
-
for (const key in renderClaims) {
|
|
287682
|
-
const claim = renderClaims[key].claim;
|
|
287683
|
-
let refs = [];
|
|
287684
|
-
switch (kind) {
|
|
287685
|
-
case 'TFWorkspaceClaim':
|
|
287686
|
-
refs = getTfWorkspacesRefs(claim.providers.terraform.values);
|
|
287687
|
-
break;
|
|
287688
|
-
case 'GroupClaim':
|
|
287689
|
-
/**
|
|
287690
|
-
* Groups can have refs to other groups in parent property
|
|
287691
|
-
**/
|
|
287692
|
-
refs = getGroupParentRef(claim.parent);
|
|
287693
|
-
break;
|
|
287694
|
-
default:
|
|
287695
|
-
throw new Error(`No refs for kind ${kind}`);
|
|
287696
|
-
}
|
|
287697
|
-
result[claim.name] = {
|
|
287698
|
-
name: `${claim.kind}-${claim.name}`,
|
|
287699
|
-
refs: refs,
|
|
287700
|
-
};
|
|
287701
|
-
}
|
|
287702
|
-
return result;
|
|
287703
|
-
}
|
|
287704
|
-
function getGroupParentRef(parent, references = []) {
|
|
287705
|
-
if (!parent)
|
|
287706
|
-
return [];
|
|
287707
|
-
const regex = catalog_common.types.regex.GroupRefRegex;
|
|
287708
|
-
for (const match of parent.matchAll(regex)) {
|
|
287709
|
-
console.log(match);
|
|
287710
|
-
const [_, claimName] = match;
|
|
287711
|
-
references.push(claimName);
|
|
287712
|
-
}
|
|
287713
|
-
return references;
|
|
287714
|
-
}
|
|
287715
|
-
function getTfWorkspacesRefs(values, references = []) {
|
|
287716
|
-
const regex = catalog_common.types.regex.TFWorkspaceRefRegex;
|
|
287717
|
-
for (const key in values) {
|
|
287718
|
-
switch (typeof values[key]) {
|
|
287719
|
-
case 'object':
|
|
287720
|
-
getTfWorkspacesRefs(values[key], references);
|
|
287721
|
-
break;
|
|
287722
|
-
case 'string':
|
|
287723
|
-
for (const match of values[key].matchAll(regex)) {
|
|
287724
|
-
const [_, claimName] = match;
|
|
287725
|
-
references.push(claimName);
|
|
287726
|
-
}
|
|
287727
|
-
break;
|
|
287728
|
-
}
|
|
287729
|
-
}
|
|
287730
|
-
return references;
|
|
287731
|
-
}
|
|
287732
|
-
|
|
287733
287948
|
;// CONCATENATED MODULE: ../cdk8s_renderer/src/refsSorter/refsSorter.ts
|
|
287734
287949
|
|
|
287735
287950
|
/**
|
|
@@ -292623,8 +292838,14 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
|
|
|
292623
292838
|
* rendered firestartr-all group
|
|
292624
292839
|
*
|
|
292625
292840
|
*/
|
|
292626
|
-
async function renderer_render(catalogScope, firestartrScope, activateReferentialIntegrityValidation = true) {
|
|
292627
|
-
|
|
292841
|
+
async function renderer_render(catalogScope, firestartrScope, activateReferentialIntegrityValidation = true, claimList = []) {
|
|
292842
|
+
let data;
|
|
292843
|
+
if (claimList.length > 0) {
|
|
292844
|
+
data = await loadClaimsList(claimList);
|
|
292845
|
+
}
|
|
292846
|
+
else {
|
|
292847
|
+
data = await loadAll();
|
|
292848
|
+
}
|
|
292628
292849
|
const result = await renderClaims(catalogScope, firestartrScope, data);
|
|
292629
292850
|
if (activateReferentialIntegrityValidation) {
|
|
292630
292851
|
validateReferentialIntegrity(result);
|
|
@@ -292934,7 +293155,7 @@ async function addLastStateAndLastClaimAnnotations(filePath, lastStatePRLink, la
|
|
|
292934
293155
|
* This function returns nothing.
|
|
292935
293156
|
*
|
|
292936
293157
|
*/
|
|
292937
|
-
async function runRenderer(globalsPath, initializersPath, claimsPath, crsPath, claimsDefaults, outputCatalogDir, outputCrDir, renamesEnabled, provider, excludedPaths = [], validateReferentialIntegrity) {
|
|
293158
|
+
async function runRenderer(globalsPath, initializersPath, claimsPath, crsPath, claimsDefaults, outputCatalogDir, outputCrDir, renamesEnabled, provider, excludedPaths = [], validateReferentialIntegrity, claimRefs = '') {
|
|
292938
293159
|
configureProvider(provider);
|
|
292939
293160
|
setPath('initializers', initializersPath);
|
|
292940
293161
|
setPath('crs', crsPath);
|
|
@@ -292953,7 +293174,11 @@ async function runRenderer(globalsPath, initializersPath, claimsPath, crsPath, c
|
|
|
292953
293174
|
outputFileExtension: '.yaml',
|
|
292954
293175
|
yamlOutputType: lib.YamlOutputType.FILE_PER_RESOURCE,
|
|
292955
293176
|
});
|
|
292956
|
-
|
|
293177
|
+
let claimRefsList = [];
|
|
293178
|
+
if (claimRefs) {
|
|
293179
|
+
claimRefsList = claimRefs.replace(/\s/g, '').split(',');
|
|
293180
|
+
}
|
|
293181
|
+
await renderer_render(catalogApp, firestartrApp, validateReferentialIntegrity === 'enabled' ? true : false, claimRefsList);
|
|
292957
293182
|
catalogApp.synth();
|
|
292958
293183
|
firestartrApp.synth();
|
|
292959
293184
|
}
|
|
@@ -301086,6 +301311,7 @@ const cdk8s_rendererSubcommands = {
|
|
|
301086
301311
|
defaultValue: '/tmp/.resources',
|
|
301087
301312
|
},
|
|
301088
301313
|
{ name: 'disableRenames', type: Boolean, defaultValue: false },
|
|
301314
|
+
{ name: 'claimRefsList', type: String, defaultValue: '' },
|
|
301089
301315
|
/**
|
|
301090
301316
|
* Path where the claims defaults are located
|
|
301091
301317
|
*/
|
|
@@ -301114,7 +301340,7 @@ const cdk8s_rendererSubcommands = {
|
|
|
301114
301340
|
run: async (options) => {
|
|
301115
301341
|
if (options['render']) {
|
|
301116
301342
|
console.table(options);
|
|
301117
|
-
await runRenderer(options['globals'], options['initializers'], options['claims'], options['previousCRs'], options['claimsDefaults'], options['outputCatalogDir'], options['outputCrDir'], !options['disableRenames'], options['provider'], options['excludePath'], options['validateReferentialIntegrity']);
|
|
301343
|
+
await runRenderer(options['globals'], options['initializers'], options['claims'], options['previousCRs'], options['claimsDefaults'], options['outputCatalogDir'], options['outputCrDir'], !options['disableRenames'], options['provider'], options['excludePath'], options['validateReferentialIntegrity'], options['claimRefsList']);
|
|
301118
301344
|
}
|
|
301119
301345
|
else if (options['compare']) {
|
|
301120
301346
|
await cdk8s_renderer.runComparer(options['claimsFromMain'], options['claimsFromPr'], options['claimsDefaults'], options['wetReposConfig'], options['outputComparer']);
|
|
@@ -2,3 +2,8 @@ export declare const TFWorkspaceRefRegex: RegExp;
|
|
|
2
2
|
export declare const SecretRefRegex: RegExp;
|
|
3
3
|
export declare const GroupRefRegex: RegExp;
|
|
4
4
|
export declare const TFWorkspaceRefCR: RegExp;
|
|
5
|
+
export declare const GenericRefRegex: RegExp;
|
|
6
|
+
export declare const YAMLHeaderRegex: RegExp;
|
|
7
|
+
export declare const YAMLListItemRegex: RegExp;
|
|
8
|
+
export declare const YAMLInlineListRegex: RegExp;
|
|
9
|
+
export declare const YAMLMultilineRegex: RegExp;
|
|
@@ -37,4 +37,4 @@ declare const _default: {
|
|
|
37
37
|
addLastStateAndLastClaimAnnotations: typeof addLastStateAndLastClaimAnnotations;
|
|
38
38
|
};
|
|
39
39
|
export default _default;
|
|
40
|
-
export declare function runRenderer(globalsPath: string, initializersPath: string, claimsPath: string, crsPath: string, claimsDefaults: string, outputCatalogDir: string, outputCrDir: string, renamesEnabled: boolean, provider: AllowedProviders, excludedPaths: string[], validateReferentialIntegrity: string): Promise<void>;
|
|
40
|
+
export declare function runRenderer(globalsPath: string, initializersPath: string, claimsPath: string, crsPath: string, claimsDefaults: string, outputCatalogDir: string, outputCrDir: string, renamesEnabled: boolean, provider: AllowedProviders, excludedPaths: string[], validateReferentialIntegrity: string, claimRefs?: string): Promise<void>;
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { InitializerPatches } from '../initializers/base';
|
|
2
|
+
import { GlobalSection } from '../globals/base';
|
|
3
|
+
import { OverriderPatches } from '../overriders/base';
|
|
4
|
+
import { Normalizer } from '../normalizers/base';
|
|
5
|
+
export declare function loadClaim(claimRef: string, defaults: any, patchClaim: (claim: any, defaults: any) => any, loadInitializers: (claim: any) => Promise<InitializerPatches[]>, loadGlobals: (claim: any) => Promise<GlobalSection[]>, loadOverrides: (claim: any) => OverriderPatches[], loadNormalizers: (claim: any, path: string) => Promise<Normalizer[]>, cwd?: string, existingRefs?: any): Promise<any>;
|
|
@@ -3,6 +3,7 @@ import { GlobalSection } from '../globals/base';
|
|
|
3
3
|
import { OverriderPatches } from '../overriders/base';
|
|
4
4
|
import { Normalizer } from '../normalizers/base';
|
|
5
5
|
import { RenderClaims } from '../renderer/types';
|
|
6
|
+
export declare const isYamlFile: RegExp;
|
|
6
7
|
export declare function loadSystems(): Promise<any[]>;
|
|
7
8
|
export declare function loadDomains(): Promise<any[]>;
|
|
8
9
|
export declare function loadGlobals(claim: any): Promise<GlobalSection[]>;
|
|
@@ -17,7 +18,7 @@ export declare function loadInitializers(claim: any, initializersPath?: string):
|
|
|
17
18
|
export declare function loadClaims(claimsPath?: string): Promise<RenderClaims>;
|
|
18
19
|
export declare function loadClaimDefaults(): any;
|
|
19
20
|
export declare function patchClaim(claim: any, defaultsClaims: any): any;
|
|
20
|
-
export declare function loadCRs(crsPath?: string, excludedPaths?: string[]): Promise<any>;
|
|
21
|
+
export declare function loadCRs(crsPath?: string, excludedPaths?: string[], allowedClaimReferences?: string[]): Promise<any>;
|
|
21
22
|
export interface IRenameResult {
|
|
22
23
|
kind: string;
|
|
23
24
|
claimPath: string;
|
|
@@ -38,3 +39,8 @@ export declare function loadAll(): Promise<{
|
|
|
38
39
|
crs: any;
|
|
39
40
|
renames?: IRenameResult[];
|
|
40
41
|
}>;
|
|
42
|
+
export declare function loadClaimsList(claimRefList: string[], claimsPath?: string): Promise<{
|
|
43
|
+
renderClaims: RenderClaims;
|
|
44
|
+
crs: any;
|
|
45
|
+
renames?: IRenameResult[];
|
|
46
|
+
}>;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { RenderClaims } from '../renderer/types';
|
|
2
2
|
export declare function extractRefs(renderClaims: RenderClaims, kind: string): any;
|
|
3
|
+
export declare function extractAllRefs(claimData: string): any[];
|
|
3
4
|
export declare function getGroupParentRef(parent: string, references?: any[]): any[];
|
|
4
5
|
export declare function getTfWorkspacesRefs(values: any, references?: any[]): any[];
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Construct } from 'constructs';
|
|
2
2
|
import { RenderedCrMap } from './types';
|
|
3
|
-
export declare function render(catalogScope: Construct, firestartrScope: Construct, activateReferentialIntegrityValidation?: boolean): Promise<RenderedCrMap>;
|
|
3
|
+
export declare function render(catalogScope: Construct, firestartrScope: Construct, activateReferentialIntegrityValidation?: boolean, claimList?: string[]): Promise<RenderedCrMap>;
|
|
@@ -428,7 +428,7 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
|
|
|
428
428
|
verified_at: string;
|
|
429
429
|
};
|
|
430
430
|
};
|
|
431
|
-
author: {
|
|
431
|
+
author: Record<string, never> | {
|
|
432
432
|
name?: string;
|
|
433
433
|
email?: string;
|
|
434
434
|
login: string;
|
|
@@ -451,8 +451,8 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
|
|
|
451
451
|
site_admin: boolean;
|
|
452
452
|
starred_at?: string;
|
|
453
453
|
user_view_type?: string;
|
|
454
|
-
}
|
|
455
|
-
committer: {
|
|
454
|
+
};
|
|
455
|
+
committer: Record<string, never> | {
|
|
456
456
|
name?: string;
|
|
457
457
|
email?: string;
|
|
458
458
|
login: string;
|
|
@@ -475,7 +475,7 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
|
|
|
475
475
|
site_admin: boolean;
|
|
476
476
|
starred_at?: string;
|
|
477
477
|
user_view_type?: string;
|
|
478
|
-
}
|
|
478
|
+
};
|
|
479
479
|
parents: {
|
|
480
480
|
sha: string;
|
|
481
481
|
url: string;
|