@firestartr/cli 1.59.0-snapshot-3 → 1.59.0-snapshot-5
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 +154 -83
- package/build/packages/cdk8s_renderer/src/claims/base/schemas/common-meta.schema.d.ts +7 -3
- package/build/packages/cdk8s_renderer/src/claims/base/schemas/index.d.ts +11 -9
- package/build/packages/cdk8s_renderer/src/claims/github/component.schema.d.ts +1 -2
- package/build/packages/cdk8s_renderer/src/claims/github/group.schema.d.ts +1 -1
- package/build/packages/cdk8s_renderer/src/claims/github/index.d.ts +4 -6
- package/build/packages/cdk8s_renderer/src/claims/github/orgwebhook.schema.d.ts +1 -2
- package/build/packages/cdk8s_renderer/src/claims/github/user.schema.d.ts +1 -1
- package/build/packages/gh_provisioner/src/entities/ghmembership/index.d.ts +1 -1
- package/build/packages/importer/src/reimporter.d.ts +1 -0
- package/build/packages/operator/src/pr-annotation.d.ts +8 -0
- package/package.json +1 -1
package/build/index.js
CHANGED
|
@@ -356487,6 +356487,7 @@ function createExpanders(path) {
|
|
|
356487
356487
|
|
|
356488
356488
|
// EXTERNAL MODULE: external "node:fs/promises"
|
|
356489
356489
|
var promises_ = __nccwpck_require__(93977);
|
|
356490
|
+
var promises_default = /*#__PURE__*/__nccwpck_require__.n(promises_);
|
|
356490
356491
|
;// CONCATENATED MODULE: ../cdk8s_renderer/src/crawler.ts
|
|
356491
356492
|
|
|
356492
356493
|
|
|
@@ -357882,9 +357883,7 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
|
|
|
357882
357883
|
description: 'An envelope for a any kind of claim',
|
|
357883
357884
|
properties: {
|
|
357884
357885
|
name: {
|
|
357885
|
-
|
|
357886
|
-
pattern: '^[a-z0-9]([a-z0-9._-]*[a-z0-9])?$',
|
|
357887
|
-
maxLength: 63,
|
|
357886
|
+
$ref: 'firestartr.dev://common/ClaimName',
|
|
357888
357887
|
},
|
|
357889
357888
|
kind: {
|
|
357890
357889
|
type: 'string',
|
|
@@ -357943,6 +357942,12 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
|
|
|
357943
357942
|
},
|
|
357944
357943
|
additionalProperties: false,
|
|
357945
357944
|
},
|
|
357945
|
+
ClaimName: {
|
|
357946
|
+
$id: 'firestartr.dev://common/ClaimName',
|
|
357947
|
+
type: 'string',
|
|
357948
|
+
pattern: '^[a-z0-9]([a-z0-9._-]*[a-z0-9])?$',
|
|
357949
|
+
maxLength: 63,
|
|
357950
|
+
},
|
|
357946
357951
|
DomainReference: {
|
|
357947
357952
|
$id: 'firestartr.dev://common/FirestartrDomainRef',
|
|
357948
357953
|
type: 'string',
|
|
@@ -358330,7 +358335,7 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
|
|
|
358330
358335
|
type: 'string',
|
|
358331
358336
|
},
|
|
358332
358337
|
org: {
|
|
358333
|
-
|
|
358338
|
+
$ref: 'firestartr.dev://common/ClaimName',
|
|
358334
358339
|
},
|
|
358335
358340
|
},
|
|
358336
358341
|
required: ['org', 'privacy'],
|
|
@@ -358362,7 +358367,7 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
|
|
|
358362
358367
|
enum: ['admin', 'member'],
|
|
358363
358368
|
},
|
|
358364
358369
|
org: {
|
|
358365
|
-
|
|
358370
|
+
$ref: 'firestartr.dev://common/ClaimName',
|
|
358366
358371
|
},
|
|
358367
358372
|
},
|
|
358368
358373
|
required: ['org', 'role'],
|
|
@@ -358389,8 +358394,7 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
|
|
|
358389
358394
|
type: 'object',
|
|
358390
358395
|
properties: {
|
|
358391
358396
|
org: {
|
|
358392
|
-
|
|
358393
|
-
description: 'The github organization name',
|
|
358397
|
+
$ref: 'firestartr.dev://common/ClaimName',
|
|
358394
358398
|
},
|
|
358395
358399
|
name: {
|
|
358396
358400
|
type: 'string',
|
|
@@ -358456,8 +358460,7 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
|
|
|
358456
358460
|
type: 'object',
|
|
358457
358461
|
properties: {
|
|
358458
358462
|
orgName: {
|
|
358459
|
-
|
|
358460
|
-
description: 'Organization name on GitHub',
|
|
358463
|
+
$ref: 'firestartr.dev://common/ClaimName',
|
|
358461
358464
|
},
|
|
358462
358465
|
webhook: {
|
|
358463
358466
|
type: 'object',
|
|
@@ -367316,6 +367319,70 @@ function compileReg(value) {
|
|
|
367316
367319
|
return new RegExp(value);
|
|
367317
367320
|
}
|
|
367318
367321
|
|
|
367322
|
+
;// CONCATENATED MODULE: ../importer/src/reimporter.ts
|
|
367323
|
+
// we need to create a function that only performs the following steps:
|
|
367324
|
+
// 1. similar to importGithubGitopsRepository
|
|
367325
|
+
// 2. takes al the crs resulting
|
|
367326
|
+
// 3. performs two annotations import needs-re-import
|
|
367327
|
+
|
|
367328
|
+
|
|
367329
|
+
|
|
367330
|
+
|
|
367331
|
+
|
|
367332
|
+
// we create a special Collection that will use
|
|
367333
|
+
class ReimportCollection {
|
|
367334
|
+
isCrIncluded(cr, generatedFilters) {
|
|
367335
|
+
return this.filter('cr', generatedFilters, [cr]).then((result) => {
|
|
367336
|
+
return result.length > 0;
|
|
367337
|
+
});
|
|
367338
|
+
}
|
|
367339
|
+
}
|
|
367340
|
+
applyCollectionMixins(ReimportCollection);
|
|
367341
|
+
async function reimportGithubGitopsRepository(org, crsPath, configPath, generatedFilters) {
|
|
367342
|
+
const collection = new ReimportCollection();
|
|
367343
|
+
const importAnnotation = catalog_common.generic.getFirestartrAnnotation('import');
|
|
367344
|
+
const reImportAnnotation = catalog_common.generic.getFirestartrAnnotation('needs-re-import');
|
|
367345
|
+
// we need to perform a search in all the crsPath
|
|
367346
|
+
await searchCRs(crsPath, async (cr, filePath) => {
|
|
367347
|
+
// lets filter the cr with the generated filters, if it passes we annotate it with needs-re-import
|
|
367348
|
+
if (await collection.isCrIncluded(cr, generatedFilters)) {
|
|
367349
|
+
importer_src_logger.info(`Annotating ${cr.kind}/${cr.metadata.name} with ${reImportAnnotation} and ${importAnnotation}`);
|
|
367350
|
+
// we annotate the cr with needs-re-import
|
|
367351
|
+
if (!cr.metadata.annotations) {
|
|
367352
|
+
cr.metadata.annotations = {};
|
|
367353
|
+
}
|
|
367354
|
+
cr.metadata.annotations[reImportAnnotation] = 'true';
|
|
367355
|
+
cr.metadata.annotations[importAnnotation] = 'true';
|
|
367356
|
+
// we write the cr back to the file system
|
|
367357
|
+
const newContent = catalog_common.io.toYaml(cr);
|
|
367358
|
+
await promises_default().writeFile(filePath, newContent, 'utf-8');
|
|
367359
|
+
}
|
|
367360
|
+
});
|
|
367361
|
+
}
|
|
367362
|
+
async function searchCRs(dirname, functionToApply) {
|
|
367363
|
+
const files = await promises_default().readdir(dirname);
|
|
367364
|
+
for (const file of files) {
|
|
367365
|
+
if (file.endsWith('.yaml') || file.endsWith('.yml')) {
|
|
367366
|
+
const filePath = external_path_default().join(dirname, file);
|
|
367367
|
+
const content = await promises_default().readFile(filePath, 'utf-8');
|
|
367368
|
+
// let's use the catalog_common yaml loader
|
|
367369
|
+
const cr = catalog_common.io.fromYaml(content);
|
|
367370
|
+
await functionToApply(cr, filePath);
|
|
367371
|
+
}
|
|
367372
|
+
else if (await reimporter_isDirectory(external_path_default().join(dirname, file))) {
|
|
367373
|
+
await searchCRs(external_path_default().join(dirname, file), functionToApply);
|
|
367374
|
+
}
|
|
367375
|
+
}
|
|
367376
|
+
}
|
|
367377
|
+
async function reimporter_isDirectory(path) {
|
|
367378
|
+
try {
|
|
367379
|
+
return (await promises_default().stat(path)).isDirectory(); //
|
|
367380
|
+
}
|
|
367381
|
+
catch (err) {
|
|
367382
|
+
return false;
|
|
367383
|
+
}
|
|
367384
|
+
}
|
|
367385
|
+
|
|
367319
367386
|
;// CONCATENATED MODULE: ../importer/index.ts
|
|
367320
367387
|
|
|
367321
367388
|
|
|
@@ -367325,6 +367392,7 @@ function compileReg(value) {
|
|
|
367325
367392
|
});
|
|
367326
367393
|
|
|
367327
367394
|
|
|
367395
|
+
|
|
367328
367396
|
// const MAP_COLLECTION_KIND_CR_KIND: any = {
|
|
367329
367397
|
// gh-members: 'FirestartrGithubMembership',
|
|
367330
367398
|
// gh-group: 'FirestartrGithubGroup',
|
|
@@ -367336,7 +367404,12 @@ async function runImporter(force, skipPlan, claimsPath, crsPath, configPath, cla
|
|
|
367336
367404
|
//gh-repo,REGEXP=.*vite.*
|
|
367337
367405
|
cdk8s_renderer.setPath('claimsDefaults', claimsDefaultsPath);
|
|
367338
367406
|
generatedFilters = buildFilters(filters, force, crsPath, generatedFilters);
|
|
367339
|
-
|
|
367407
|
+
if (needsReimport) {
|
|
367408
|
+
await reimportGithubGitopsRepository(org, crsPath, configPath, generatedFilters);
|
|
367409
|
+
}
|
|
367410
|
+
else {
|
|
367411
|
+
await importGithubGitopsRepository(org, skipPlan, claimsPath, crsPath, configPath, generatedFilters, needsReimport, force);
|
|
367412
|
+
}
|
|
367340
367413
|
}
|
|
367341
367414
|
function buildFilters(filters, force, crsPath, generatedFilters) {
|
|
367342
367415
|
filters.push('all,FUNCTION=fCheckCRExistsOnDisk');
|
|
@@ -367345,7 +367418,6 @@ function buildFilters(filters, force, crsPath, generatedFilters) {
|
|
|
367345
367418
|
*/
|
|
367346
367419
|
generatedFilters = filtersBuilder(createSkipFilters(filters || []), {
|
|
367347
367420
|
fCheckCRExistsOnDisk: async function (collectionKind, name) {
|
|
367348
|
-
console.log(`Name ${name} && ${force}`);
|
|
367349
367421
|
if (force)
|
|
367350
367422
|
return true;
|
|
367351
367423
|
else {
|
|
@@ -367654,12 +367726,40 @@ function definitions_getPluralFromKind(kind) {
|
|
|
367654
367726
|
return plural;
|
|
367655
367727
|
}
|
|
367656
367728
|
|
|
367729
|
+
;// CONCATENATED MODULE: ../operator/src/pr-annotation.ts
|
|
367730
|
+
|
|
367731
|
+
|
|
367732
|
+
const LAST_STATE_PR_ANNOTATION = 'firestartr.dev/last-state-pr';
|
|
367733
|
+
function getPrInfoFromAnnotation(item, annotation = LAST_STATE_PR_ANNOTATION) {
|
|
367734
|
+
const itemId = `${item?.kind ?? 'UnknownKind'}/${item?.metadata?.name ?? 'unknown'}`;
|
|
367735
|
+
const annotationValue = item?.metadata?.annotations?.[annotation];
|
|
367736
|
+
if (typeof annotationValue !== 'string' ||
|
|
367737
|
+
annotationValue.trim().length === 0) {
|
|
367738
|
+
operator_src_logger.warn(`CR ${itemId} is missing annotation "${annotation}"; skipping GitHub feedback.`);
|
|
367739
|
+
return null;
|
|
367740
|
+
}
|
|
367741
|
+
try {
|
|
367742
|
+
const { owner, repo, prNumber } = catalog_common.generic.getOwnerRepoPrNumberFromAnnotationValue(annotationValue);
|
|
367743
|
+
return {
|
|
367744
|
+
annotationValue,
|
|
367745
|
+
owner,
|
|
367746
|
+
repo,
|
|
367747
|
+
prNumber,
|
|
367748
|
+
};
|
|
367749
|
+
}
|
|
367750
|
+
catch (e) {
|
|
367751
|
+
operator_src_logger.warn(`CR ${itemId} has invalid annotation "${annotation}" with value '${annotationValue}'; skipping GitHub feedback. Error: '${e?.message ?? String(e)}'.`);
|
|
367752
|
+
return null;
|
|
367753
|
+
}
|
|
367754
|
+
}
|
|
367755
|
+
|
|
367657
367756
|
;// CONCATENATED MODULE: ../operator/src/ctl.ts
|
|
367658
367757
|
|
|
367659
367758
|
|
|
367660
367759
|
|
|
367661
367760
|
|
|
367662
367761
|
|
|
367762
|
+
|
|
367663
367763
|
const MAX_CHARS_OUPUT_PLAN = 20000;
|
|
367664
367764
|
|
|
367665
367765
|
async function getItem(kind, namespace, item) {
|
|
@@ -368064,8 +368164,10 @@ async function addApplyCommitStatus(cr, state, targetURL = '', description = '',
|
|
|
368064
368164
|
}
|
|
368065
368165
|
async function addDestroyCommitStatus(cr, state, description = '', context = '') {
|
|
368066
368166
|
try {
|
|
368067
|
-
const
|
|
368068
|
-
|
|
368167
|
+
const prInfo = getPrInfoFromAnnotation(cr, LAST_STATE_PR_ANNOTATION);
|
|
368168
|
+
if (!prInfo)
|
|
368169
|
+
return;
|
|
368170
|
+
await addCommitStatusToPrMergeCommit(prInfo.annotationValue, state, '', description, context);
|
|
368069
368171
|
}
|
|
368070
368172
|
catch (e) {
|
|
368071
368173
|
operator_src_logger.error(`The ctl encountered an error while adding the destroy commit status for custom resource '${cr.metadata.name}' in namespace '${cr.metadata.namespace}'. State: '${state}'. Description: '${description}'. Error: '${e}'.`);
|
|
@@ -368113,33 +368215,6 @@ async function addCommitStatusToPrMergeCommit(prAnnotationValue, state, targetUR
|
|
|
368113
368215
|
operator_src_logger.info(`The ctl is adding a commit status for '${owner}/${repo}' on branch '${branchSha}'. State: '${state}'. Target URL: '${targetURL}'.`);
|
|
368114
368216
|
await github_0.repo.addCommitStatus(state, branchSha, repo, owner, targetURL, description, context);
|
|
368115
368217
|
}
|
|
368116
|
-
async function getLastStatePrInfo(cr) {
|
|
368117
|
-
try {
|
|
368118
|
-
const annKey = 'firestartr.dev/last-state-pr';
|
|
368119
|
-
const prInfo = cr?.metadata?.annotations?.[annKey];
|
|
368120
|
-
if (!prInfo || typeof prInfo !== 'string')
|
|
368121
|
-
return '';
|
|
368122
|
-
// Expect "owner/repo#<num>" or "owner/repo"
|
|
368123
|
-
const [orgRepo] = prInfo.split('#');
|
|
368124
|
-
const [owner, repo] = (orgRepo || '').split('/');
|
|
368125
|
-
if (!owner || !repo)
|
|
368126
|
-
return '';
|
|
368127
|
-
const prData = await github_0.pulls.filterPrBy({
|
|
368128
|
-
title: `hydrate: ${cr?.metadata?.name ?? ''}`,
|
|
368129
|
-
state: 'closed',
|
|
368130
|
-
repo,
|
|
368131
|
-
owner,
|
|
368132
|
-
userType: 'Bot',
|
|
368133
|
-
}, { maxRetries: 3 });
|
|
368134
|
-
const prNumber = prData?.number;
|
|
368135
|
-
if (typeof prNumber !== 'number')
|
|
368136
|
-
return '';
|
|
368137
|
-
return `${owner}/${repo}#${prNumber}`;
|
|
368138
|
-
}
|
|
368139
|
-
catch {
|
|
368140
|
-
return '';
|
|
368141
|
-
}
|
|
368142
|
-
}
|
|
368143
368218
|
async function createDryRun(manifest, namespace) {
|
|
368144
368219
|
const { kc } = await ctl_getConnection();
|
|
368145
368220
|
const k8sApi = kc.makeApiClient(client_node_dist.CustomObjectsApi);
|
|
@@ -371331,7 +371406,7 @@ async function execCommand(command, tfProject) {
|
|
|
371331
371406
|
;// CONCATENATED MODULE: ../operator/src/user-feedback-ops/user-feedback-ops.ts
|
|
371332
371407
|
|
|
371333
371408
|
|
|
371334
|
-
|
|
371409
|
+
|
|
371335
371410
|
async function tryPublishApply(item, planOutput, isSuccess = true, exitCode) {
|
|
371336
371411
|
const kind = item.kind;
|
|
371337
371412
|
const metadataName = item.metadata?.name ?? 'unknown';
|
|
@@ -371353,23 +371428,12 @@ async function tryPublishApply(item, planOutput, isSuccess = true, exitCode) {
|
|
|
371353
371428
|
}
|
|
371354
371429
|
async function tryPublishDestroy(item, destroyOutput, isSuccess = true) {
|
|
371355
371430
|
const kind = item.kind;
|
|
371356
|
-
let lastPr = null;
|
|
371357
371431
|
try {
|
|
371358
|
-
const
|
|
371359
|
-
|
|
371360
|
-
lastPr = await github_0.pulls.filterPrBy({
|
|
371361
|
-
title: `hydrate: ${item.metadata.name}`,
|
|
371362
|
-
state: 'closed',
|
|
371363
|
-
repo,
|
|
371364
|
-
owner: org,
|
|
371365
|
-
userType: 'Bot',
|
|
371366
|
-
}, {
|
|
371367
|
-
maxRetries: 3,
|
|
371368
|
-
});
|
|
371369
|
-
if (!lastPr) {
|
|
371370
|
-
operator_src_logger.debug(`The user feedback for the '${item.kind}/${item.metadata.name}' destroy operation could not be published because the last state was not found.`);
|
|
371432
|
+
const prInfo = getPrInfoFromAnnotation(item, LAST_STATE_PR_ANNOTATION);
|
|
371433
|
+
if (!prInfo)
|
|
371371
371434
|
return;
|
|
371372
|
-
}
|
|
371435
|
+
const { repo, owner: org, prNumber } = prInfo;
|
|
371436
|
+
operator_src_logger.debug(`The user feedback for the '${item.kind}/${item.metadata.name}' destroy operation is being published for repository '${repo}' in organization '${org}' on PR '${prNumber}'.`);
|
|
371373
371437
|
const dividedOutput = github_0.pulls.divideCommentIntoChunks(destroyOutput, 250);
|
|
371374
371438
|
const statusEmoji = isSuccess ? '✅' : '❌';
|
|
371375
371439
|
const statusText = isSuccess ? 'Succeeded' : 'Failed';
|
|
@@ -371389,17 +371453,17 @@ ${commentContent}
|
|
|
371389
371453
|
\`\`\`
|
|
371390
371454
|
</details>`;
|
|
371391
371455
|
});
|
|
371392
|
-
operator_src_logger.debug(`The user feedback for item '${item.kind}/${item.metadata.name}' is being published as a comment on pull request '${
|
|
371456
|
+
operator_src_logger.debug(`The user feedback for item '${item.kind}/${item.metadata.name}' is being published as a comment on pull request '${prNumber}' for repository '${repo}' in organization '${org}'.`);
|
|
371393
371457
|
// Get octokit instance for the org to use with upsertMultiPartStickyComments
|
|
371394
371458
|
const octokit = await github_0.auth.getOctokitForOrg(org);
|
|
371395
371459
|
await github_0.feedback.upsertMultiPartStickyComments(octokit, {
|
|
371396
371460
|
owner: org,
|
|
371397
371461
|
repo,
|
|
371398
|
-
pullNumber:
|
|
371462
|
+
pullNumber: prNumber,
|
|
371399
371463
|
baseKind: `${kind.toLowerCase()}:destroy`,
|
|
371400
371464
|
bodies: commentBodies,
|
|
371401
371465
|
});
|
|
371402
|
-
operator_src_logger.debug(`The user feedback for the '${item.kind}/${item.metadata.name}' destroy operation has been published as a comment on pull request '${
|
|
371466
|
+
operator_src_logger.debug(`The user feedback for the '${item.kind}/${item.metadata.name}' destroy operation has been published as a comment on pull request '${prNumber}'.`);
|
|
371403
371467
|
}
|
|
371404
371468
|
catch (e) {
|
|
371405
371469
|
operator_src_logger.error(`An error occurred while publishing user feedback for item '${item.kind}/${item.metadata.name}': '${e}'.`);
|
|
@@ -373447,11 +373511,11 @@ const MODULES = {
|
|
|
373447
373511
|
ref: 'feat/967-poc-gh-repo',
|
|
373448
373512
|
},
|
|
373449
373513
|
FirestartrGithubRepositoryFeature: {
|
|
373450
|
-
module: 'git::https://github.com/prefapp/tfm.git//modules/
|
|
373514
|
+
module: 'git::https://github.com/prefapp/tfm.git//modules/github-files-set',
|
|
373451
373515
|
ref: 'feat/969-poc-gh-files-set',
|
|
373452
373516
|
},
|
|
373453
373517
|
FirestartrGithubMembership: {
|
|
373454
|
-
module: 'git::https://github.com/prefapp/tfm.git//modules/
|
|
373518
|
+
module: 'git::https://github.com/prefapp/tfm.git//modules/github-membership',
|
|
373455
373519
|
ref: 'feat/975-poc-gh-membership',
|
|
373456
373520
|
},
|
|
373457
373521
|
FirestartrGithubOrgWebhook: {
|
|
@@ -373710,7 +373774,7 @@ class EntityGroup extends base_Entity {
|
|
|
373710
373774
|
path: '/imports/-',
|
|
373711
373775
|
value: {
|
|
373712
373776
|
to: `github_team_membership.members["${member.username}"]`,
|
|
373713
|
-
id: `${
|
|
373777
|
+
id: `${this.cr.id}:${member.username}`,
|
|
373714
373778
|
},
|
|
373715
373779
|
});
|
|
373716
373780
|
}
|
|
@@ -374141,7 +374205,7 @@ class EntityGHRepo extends base_Entity {
|
|
|
374141
374205
|
try {
|
|
374142
374206
|
if (tfOp === 'apply') {
|
|
374143
374207
|
gh_provisioner_src_logger.info(`[gh-provisioner] ${this.k8sId} provisioning additional branches`);
|
|
374144
|
-
|
|
374208
|
+
await this.runWithGithubProvider(async () => {
|
|
374145
374209
|
return await provisionAdditionalBranches(this);
|
|
374146
374210
|
});
|
|
374147
374211
|
}
|
|
@@ -374547,6 +374611,7 @@ class EntityGHFeature extends base_Entity {
|
|
|
374547
374611
|
;// CONCATENATED MODULE: ../gh_provisioner/src/entities/ghmembership/index.ts
|
|
374548
374612
|
|
|
374549
374613
|
|
|
374614
|
+
|
|
374550
374615
|
class EntityGHMembership extends base_Entity {
|
|
374551
374616
|
constructor(artifact) {
|
|
374552
374617
|
super(artifact, {
|
|
@@ -374566,7 +374631,7 @@ class EntityGHMembership extends base_Entity {
|
|
|
374566
374631
|
role: this.cr.spec.role,
|
|
374567
374632
|
},
|
|
374568
374633
|
});
|
|
374569
|
-
this.provisionAllGroupMembershipRelation();
|
|
374634
|
+
await this.provisionAllGroupMembershipRelation();
|
|
374570
374635
|
gh_provisioner_src_logger.debug(`[gh-provisioner] ${this.k8sId} loaded its data`);
|
|
374571
374636
|
}
|
|
374572
374637
|
catch (err) {
|
|
@@ -374581,7 +374646,7 @@ class EntityGHMembership extends base_Entity {
|
|
|
374581
374646
|
path: '/imports/-',
|
|
374582
374647
|
value: {
|
|
374583
374648
|
to: 'github_membership.this[0]',
|
|
374584
|
-
id: `${this.cr.spec.org}:${this.cr.
|
|
374649
|
+
id: `${this.cr.spec.org}:${this.cr.name}`,
|
|
374585
374650
|
},
|
|
374586
374651
|
});
|
|
374587
374652
|
for (const relationship of this.document.config.relationships) {
|
|
@@ -374595,13 +374660,19 @@ class EntityGHMembership extends base_Entity {
|
|
|
374595
374660
|
});
|
|
374596
374661
|
}
|
|
374597
374662
|
}
|
|
374598
|
-
provisionAllGroupMembershipRelation() {
|
|
374663
|
+
async provisionAllGroupMembershipRelation() {
|
|
374664
|
+
gh_provisioner_src_logger.debug('[gh-provisioner] provisioning all group membership relation');
|
|
374665
|
+
// we need to get the <org>-all group teamId
|
|
374666
|
+
const teamInfo = await this.runWithGithubProvider(async () => {
|
|
374667
|
+
return (await github_0.team.getTeamInfo(`${this.cr.spec.org}-all`, this.cr.spec.org));
|
|
374668
|
+
});
|
|
374669
|
+
gh_provisioner_src_logger.debug(`[gh-provisioner] got team info for org-all team: ${teamInfo.id}`);
|
|
374599
374670
|
this.patchData({
|
|
374600
374671
|
path: '/config/relationships/-',
|
|
374601
374672
|
op: PatchOperations.add,
|
|
374602
374673
|
value: {
|
|
374603
374674
|
username: this.cr.name,
|
|
374604
|
-
teamId:
|
|
374675
|
+
teamId: teamInfo.id,
|
|
374605
374676
|
role: 'member',
|
|
374606
374677
|
},
|
|
374607
374678
|
});
|
|
@@ -374941,9 +375012,9 @@ async function runGhProvisioner(data, opts) {
|
|
|
374941
375012
|
}
|
|
374942
375013
|
catch (err) {
|
|
374943
375014
|
gh_provisioner_src_logger.error(`[gh-provisioner] Error running runGhProvisioner: ${err}`);
|
|
374944
|
-
throw new Error(`[gh-provisioner] Error running runGhProvisioner: ${err}`);
|
|
374945
375015
|
if (!synthFinished)
|
|
374946
375016
|
entity.synthEnd(`${err}`);
|
|
375017
|
+
throw new Error(`[gh-provisioner] Error running runGhProvisioner: ${err}`);
|
|
374947
375018
|
}
|
|
374948
375019
|
finally {
|
|
374949
375020
|
if (entity && entity.inDebugMode) {
|
|
@@ -374960,21 +375031,21 @@ function inferTFOperation(cr, opts) {
|
|
|
374960
375031
|
? true
|
|
374961
375032
|
: false;
|
|
374962
375033
|
gh_provisioner_src_logger.debug('[gh-provisioner] inferTFOperation options keys:', Object.keys(opts || {}));
|
|
374963
|
-
const operation =
|
|
374964
|
-
? '
|
|
374965
|
-
: isImport
|
|
374966
|
-
? 'import
|
|
374967
|
-
:
|
|
374968
|
-
? '
|
|
374969
|
-
: opts.
|
|
375034
|
+
const operation = isImport && needsReimport
|
|
375035
|
+
? 'import-with-reimport'
|
|
375036
|
+
: isImport
|
|
375037
|
+
? 'import'
|
|
375038
|
+
: opts.create
|
|
375039
|
+
? 'apply'
|
|
375040
|
+
: opts.update
|
|
374970
375041
|
? 'apply'
|
|
374971
|
-
: opts.
|
|
374972
|
-
? '
|
|
374973
|
-
: opts.
|
|
374974
|
-
? '
|
|
374975
|
-
:
|
|
374976
|
-
|
|
374977
|
-
|
|
375042
|
+
: opts.delete
|
|
375043
|
+
? 'destroy'
|
|
375044
|
+
: opts.debug
|
|
375045
|
+
? 'debug'
|
|
375046
|
+
: 'nothing';
|
|
375047
|
+
//opts.import && opts.skipPlan && isImport
|
|
375048
|
+
// ? 'IMPORT_SKIP_PLAN'
|
|
374978
375049
|
return operation;
|
|
374979
375050
|
}
|
|
374980
375051
|
function sendWarnings() {
|
|
@@ -378393,7 +378464,7 @@ const crs_analyzerSubcommand = {
|
|
|
378393
378464
|
};
|
|
378394
378465
|
|
|
378395
378466
|
;// CONCATENATED MODULE: ./package.json
|
|
378396
|
-
const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-
|
|
378467
|
+
const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-5"}');
|
|
378397
378468
|
;// CONCATENATED MODULE: ../../package.json
|
|
378398
378469
|
const package_namespaceObject_1 = {"i8":"1.58.0"};
|
|
378399
378470
|
;// CONCATENATED MODULE: ./src/subcommands/index.ts
|
|
@@ -7,9 +7,7 @@ declare const _default: {
|
|
|
7
7
|
description: string;
|
|
8
8
|
properties: {
|
|
9
9
|
name: {
|
|
10
|
-
|
|
11
|
-
pattern: string;
|
|
12
|
-
maxLength: number;
|
|
10
|
+
$ref: string;
|
|
13
11
|
};
|
|
14
12
|
kind: {
|
|
15
13
|
type: string;
|
|
@@ -68,6 +66,12 @@ declare const _default: {
|
|
|
68
66
|
};
|
|
69
67
|
additionalProperties: boolean;
|
|
70
68
|
};
|
|
69
|
+
ClaimName: {
|
|
70
|
+
$id: string;
|
|
71
|
+
type: string;
|
|
72
|
+
pattern: string;
|
|
73
|
+
maxLength: number;
|
|
74
|
+
};
|
|
71
75
|
DomainReference: {
|
|
72
76
|
$id: string;
|
|
73
77
|
type: string;
|
|
@@ -11,9 +11,7 @@ declare const schemas: {
|
|
|
11
11
|
description: string;
|
|
12
12
|
properties: {
|
|
13
13
|
name: {
|
|
14
|
-
|
|
15
|
-
pattern: string;
|
|
16
|
-
maxLength: number;
|
|
14
|
+
$ref: string;
|
|
17
15
|
};
|
|
18
16
|
kind: {
|
|
19
17
|
type: string;
|
|
@@ -72,6 +70,12 @@ declare const schemas: {
|
|
|
72
70
|
};
|
|
73
71
|
additionalProperties: boolean;
|
|
74
72
|
};
|
|
73
|
+
ClaimName: {
|
|
74
|
+
$id: string;
|
|
75
|
+
type: string;
|
|
76
|
+
pattern: string;
|
|
77
|
+
maxLength: number;
|
|
78
|
+
};
|
|
75
79
|
DomainReference: {
|
|
76
80
|
$id: string;
|
|
77
81
|
type: string;
|
|
@@ -398,7 +402,7 @@ declare const schemas: {
|
|
|
398
402
|
type: string;
|
|
399
403
|
};
|
|
400
404
|
org: {
|
|
401
|
-
|
|
405
|
+
$ref: string;
|
|
402
406
|
};
|
|
403
407
|
};
|
|
404
408
|
required: string[];
|
|
@@ -427,7 +431,7 @@ declare const schemas: {
|
|
|
427
431
|
enum: string[];
|
|
428
432
|
};
|
|
429
433
|
org: {
|
|
430
|
-
|
|
434
|
+
$ref: string;
|
|
431
435
|
};
|
|
432
436
|
};
|
|
433
437
|
required: string[];
|
|
@@ -497,8 +501,7 @@ declare const schemas: {
|
|
|
497
501
|
type: string;
|
|
498
502
|
properties: {
|
|
499
503
|
org: {
|
|
500
|
-
|
|
501
|
-
description: string;
|
|
504
|
+
$ref: string;
|
|
502
505
|
};
|
|
503
506
|
name: {
|
|
504
507
|
type: string;
|
|
@@ -563,8 +566,7 @@ declare const schemas: {
|
|
|
563
566
|
type: string;
|
|
564
567
|
properties: {
|
|
565
568
|
orgName: {
|
|
566
|
-
|
|
567
|
-
description: string;
|
|
569
|
+
$ref: string;
|
|
568
570
|
};
|
|
569
571
|
webhook: {
|
|
570
572
|
type: string;
|
|
@@ -22,7 +22,7 @@ export declare const GithubSchemas: ({
|
|
|
22
22
|
type: string;
|
|
23
23
|
};
|
|
24
24
|
org: {
|
|
25
|
-
|
|
25
|
+
$ref: string;
|
|
26
26
|
};
|
|
27
27
|
};
|
|
28
28
|
required: string[];
|
|
@@ -51,7 +51,7 @@ export declare const GithubSchemas: ({
|
|
|
51
51
|
enum: string[];
|
|
52
52
|
};
|
|
53
53
|
org: {
|
|
54
|
-
|
|
54
|
+
$ref: string;
|
|
55
55
|
};
|
|
56
56
|
};
|
|
57
57
|
required: string[];
|
|
@@ -121,8 +121,7 @@ export declare const GithubSchemas: ({
|
|
|
121
121
|
type: string;
|
|
122
122
|
properties: {
|
|
123
123
|
org: {
|
|
124
|
-
|
|
125
|
-
description: string;
|
|
124
|
+
$ref: string;
|
|
126
125
|
};
|
|
127
126
|
name: {
|
|
128
127
|
type: string;
|
|
@@ -187,8 +186,7 @@ export declare const GithubSchemas: ({
|
|
|
187
186
|
type: string;
|
|
188
187
|
properties: {
|
|
189
188
|
orgName: {
|
|
190
|
-
|
|
191
|
-
description: string;
|
|
189
|
+
$ref: string;
|
|
192
190
|
};
|
|
193
191
|
webhook: {
|
|
194
192
|
type: string;
|
|
@@ -4,5 +4,5 @@ export declare class EntityGHMembership extends Entity {
|
|
|
4
4
|
loadResources(tfOp: string): Promise<void>;
|
|
5
5
|
postProvision(tfOp: string): Promise<void>;
|
|
6
6
|
loadAddressesToImport(): Promise<void>;
|
|
7
|
-
provisionAllGroupMembershipRelation(): void
|
|
7
|
+
provisionAllGroupMembershipRelation(): Promise<void>;
|
|
8
8
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function reimportGithubGitopsRepository(org: any, crsPath: any, configPath: any, generatedFilters: any): Promise<void>;
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export declare const LAST_STATE_PR_ANNOTATION = "firestartr.dev/last-state-pr";
|
|
2
|
+
export type PrAnnotationInfo = {
|
|
3
|
+
annotationValue: string;
|
|
4
|
+
owner: string;
|
|
5
|
+
repo: string;
|
|
6
|
+
prNumber: number;
|
|
7
|
+
};
|
|
8
|
+
export declare function getPrInfoFromAnnotation(item: any, annotation?: string): PrAnnotationInfo | null;
|