@firestartr/cli 2.11.0-snapshot-patch-claims-3 → 2.11.0-snapshot-mco-3

package/build/packages/cdk8s_renderer/index.d.ts

@@ -9,6 +9,8 @@ export { InitializerDefault } from './src/defaults/initializer';
 export { InitializerClaimRef } from './src/initializers/claimRef';
 export { GithubRepositoryOverrider } from './src/overriders/githubRepositoryOverride';
 export { InitializerPatches as Initializer } from './src/initializers/base';
+export { resolveCodeownersRef } from './src/utils/repositoryClaimUtils';
+export { setRenderedClaim, emptyRenderedClaims } from './src/refresolver';
 import { runComparer } from './src/comparer';
 import { AllowedProviders, setDefaultBranch, setPath, setRepositoryUrl } from './src/config';
 import { render } from './src/renderer/renderer';

package/build/packages/cdk8s_renderer/src/claims/github/repositoryFeature.d.ts

@@ -16,6 +16,9 @@ export interface IGithubRepositoryFeatureClaim extends IClaim {
         version?: string;
         ref?: string;
         repo?: string;
+        sha?: string;
+        tags?: string[];
+        url?: string;
     };
     repositoryTarget: FirestartrGithubRepositoryFeatureSpecRepositoryTarget;
     files: Array<IGithubRepositoryFeatureFileClaim>;

package/build/packages/cdk8s_renderer/src/overriders/base.d.ts

@@ -1,7 +1,7 @@
 import { BasePatches } from '../patches/base';
 export declare abstract class OverriderPatches extends BasePatches {
     abstract __validate(): Promise<boolean>;
-    __patches(claim: any, _previousCR: any): Promise<ICustomResourcePatch[]>;
+    __patches(claim: any, _previousCR: any, _crs?: any): Promise<ICustomResourcePatch[]>;
     validate(): Promise<boolean>;
 }
 export declare class OverriderError extends Error {

package/build/packages/cdk8s_renderer/src/overriders/featureOverride.d.ts

@@ -12,7 +12,7 @@ export declare class FeaturesOverrider extends OverriderPatches {
     getFeatureConfig(cr: any): any;
     setUpAndRunRenderer(cr: any): any;
     __validate(): Promise<boolean>;
-    __patches(claim: any, _previousCR: any): Promise<{
+    __patches(claim: any, _previousCR: any): Promise<({
         validate(_cr: any): boolean;
         apply(cr: any): Promise<any>;
         identify(): string;
@@ -20,5 +20,14 @@ export declare class FeaturesOverrider extends OverriderPatches {
             applicableProviders: string[];
         };
         post(cr: any): Promise<import("../claims/github/repositoryFeature").IGithubRepositoryFeatureClaim>;
-    }[]>;
+        isPostPatch?: undefined;
+    } | {
+        isPostPatch: boolean;
+        validate(): boolean;
+        apply(cr: any): Promise<any>;
+        identify(): string;
+        applicable(): {
+            applicableProviders: string[];
+        };
+    })[]>;
 }

package/build/packages/cdk8s_renderer/src/overriders/githubRepositoryOverride.d.ts

@@ -2,7 +2,7 @@ import { ICustomResourcePatch, OverriderPatches } from './base';
 export declare class GithubRepositoryOverrider extends OverriderPatches {
     applicableProviders: string[];
     __validate(): Promise<boolean>;
-    __patches(claim: any, previousCR: any): Promise<ICustomResourcePatch[]>;
+    __patches(claim: any, previousCR: any, crs?: any): Promise<ICustomResourcePatch[]>;
     private additionalPermissions;
     private additionalCodeownersRules;
 }

package/build/packages/cdk8s_renderer/src/patches/base.d.ts

@@ -3,6 +3,6 @@ export declare abstract class BasePatches {
     constructor();
     abstract get applicableProviders(): string[];
     abstract __validate(data: any): Promise<boolean>;
-    abstract __patches(claim: any, previousCR: any): Promise<ICustomResourcePatch[]>;
-    patches(claim: any, previousCR: any): Promise<any[]>;
+    abstract __patches(claim: any, previousCR: any, crs?: any): Promise<ICustomResourcePatch[]>;
+    patches(claim: any, previousCR: any, crs?: any): Promise<any[]>;
 }

package/build/packages/cdk8s_renderer/src/renderer/claims-render.d.ts

@@ -8,5 +8,5 @@ export declare function renderClaims(catalogScope: Construct, firestartrScope: C
     crs: any;
     renames?: IRenameResult[];
 }): Promise<RenderedCrMap>;
-export declare function renderClaim(catalogScope: Construct, firestartrScope: Construct, claim: any, patches: ICustomResourcePatch[], previousCR?: any | null, claimPath?: string, variableSectionPreviousCR?: any | false, variableSectionPatches?: ICustomResourcePatch[]): Promise<IRenderClaimResult>;
+export declare function renderClaim(catalogScope: Construct, firestartrScope: Construct, claim: any, patches: ICustomResourcePatch[], previousCR?: any | null, claimPath?: string, variableSectionPreviousCR?: any | false, variableSectionPatches?: ICustomResourcePatch[], crs?: any): Promise<IRenderClaimResult>;
 export declare function renameVariantCrFiles(outputDir: string, renderedMap: RenderedCrMap): void;

package/build/packages/cdk8s_renderer/src/renderer/patches-extractor.d.ts

@@ -1,3 +1,3 @@
 import { ICustomResourcePatch } from '../patches';
 import { RenderClaimData } from './types';
-export declare function extractPatches(claimToRenderData: RenderClaimData, previousCR: any): Promise<ICustomResourcePatch[]>;
+export declare function extractPatches(claimToRenderData: RenderClaimData, previousCR: any, crs?: any): Promise<ICustomResourcePatch[]>;

package/build/packages/cdk8s_renderer/src/utils/repositoryClaimUtils.d.ts

@@ -7,7 +7,7 @@
  *
  * @returns Permission
  */
-export declare function createPermissionFor(claimRef: `group:${string}` | `user:${string}` | `collaborator:${string}`, permission: 'admin' | 'push' | 'pull' | 'maintain'): Permission | CollaboratorPermission;
+export declare function createPermissionFor(claimRef: `group:${string}` | `user:${string}` | `collaborator:${string}`, permission: 'admin' | 'push' | 'pull' | 'maintain', crs?: any): Permission | CollaboratorPermission;
 /**
  * @description This method creates a list of permissions for a given claimRefs and permission
  *
@@ -17,7 +17,7 @@ export declare function createPermissionFor(claimRef: `group:${string}` | `user:
  *
  * @returns Permission[]
  */
-export declare function createPermissionsListFor(claimRefs: (`group:${string}` | `user:${string}` | `collaborator:${string}`)[], permission: 'admin' | 'push' | 'pull' | 'maintain'): (Permission | CollaboratorPermission)[];
+export declare function createPermissionsListFor(claimRefs: (`group:${string}` | `user:${string}` | `collaborator:${string}`)[], permission: 'admin' | 'push' | 'pull' | 'maintain', crs?: any): (Permission | CollaboratorPermission)[];
 export declare function createCRrefFrom(claimRef: `group:${string}` | `user:${string}` | `collaborator:${string}`, needsSecret: boolean): {
     ref: {
         kind: string;
@@ -44,7 +44,8 @@ export interface CollaboratorPermission {
  *
  * @returns string
  */
-export declare function createCodeOwnersData(claim: any, additionalRules?: any[]): string;
+export declare function createCodeOwnersData(claim: any, additionalRules?: any[], crs?: any): string;
+export declare function resolveCodeownersRef(ref: string, org: string, crs?: any): string;
 /**
  * A reference to a secret, which can be an internal or external source.
  */

package/build/packages/features_preparer/src/index.d.ts

@@ -1,11 +1,8 @@
-import { getFeatureConfigFromRef, getFeatureConfig, getFeatureClaimPatches, getFeatureClaimPatchesFromRef, prepareFeature } from './installer';
-import { renderFeature, renderFeatureFromPath, getFeatureClaimPatchesFromPath } from './renderer';
+import { getFeatureConfigFromRef, getFeatureConfig, prepareFeature } from './installer';
+import { renderFeature, renderFeatureFromPath } from './renderer';
 declare const _default: {
     renderFeature: typeof renderFeature;
     renderFeatureFromPath: typeof renderFeatureFromPath;
-    getFeatureClaimPatches: typeof getFeatureClaimPatches;
-    getFeatureClaimPatchesFromRef: typeof getFeatureClaimPatchesFromRef;
-    getFeatureClaimPatchesFromPath: typeof getFeatureClaimPatchesFromPath;
     getFeatureConfigFromRef: typeof getFeatureConfigFromRef;
     getFeatureConfig: typeof getFeatureConfig;
     prepareFeature: typeof prepareFeature;

package/build/packages/features_preparer/src/installer.d.ts

@@ -2,7 +2,9 @@ export declare function getFeatureConfigFromRef(featureName: string, featureRef:
 featureArgs?: any, repo?: string, owner?: string): Promise<any>;
 export declare function getFeatureConfig(featureName: string, version: string, featureOwner: any, // -> cr
 featureArgs?: any, repo?: string, owner?: string): Promise<any>;
-export declare function getFeatureClaimPatches(featureName: string, version: string, featureOwner: any, featureArgs?: any, repo?: string, owner?: string): Promise<any[]>;
-export declare function getFeatureClaimPatchesFromRef(featureName: string, featureRef: string, featureOwner: any, featureArgs?: any, repo?: string, owner?: string): Promise<any[]>;
+export declare function resolveFeatureCommit(owner: string, repo: string, reference: string): Promise<{
+    sha: string;
+    tags: string[];
+}>;
 export declare function prepareFeature(featureName: string, version: string, repo?: string, owner?: string): Promise<void>;
 export declare function downloadFeatureZip(repo: string, featureName: string, reference: string, owner?: string): Promise<string>;

package/build/packages/features_preparer/src/renderer.d.ts

@@ -1,4 +1,2 @@
 export declare function renderFeature(featureName: string, version: string, owner: any, repo: any, featureOwner: any, renderPath?: string, featureArgs?: any): any;
 export declare function renderFeatureFromPath(extractPath: string, renderedPath: string, featureOwner: any, featureArgs?: any): any;
-export declare function getFeatureClaimPatches(featureName: string, version: string, owner: any, repo: any, featureOwner: any, featureArgs?: any): any[];
-export declare function getFeatureClaimPatchesFromPath(extractPath: string, featureOwner: any, featureArgs?: any): any[];

package/build/packages/features_renderer/index.d.ts

@@ -1,8 +1,7 @@
 import validate from './src/validate';
-import render, { buildContext, renderContent, expandFiles, getClaimPatches } from './src/render';
+import render, { buildContext, renderContent, expandFiles } from './src/render';
 import updateFileContent from './src/update_file';
 import { validateFeatureArgs } from './src/featureArgsValidation';
-export { getClaimPatches, buildContext, renderContent, expandFiles };
 declare const _default: {
     validate: typeof validate;
     render: typeof render;
@@ -13,12 +12,10 @@ declare const _default: {
         buildExpectedOutput: (config: import("./src/auxiliar").FeatureConfig, renderDir: string) => import("./src/auxiliar").ExpectedOutput;
         loadAndValidateRenderTests: (featurePath: string) => import("./src/auxiliar").RenderTestsFile;
         resolveCrPath: (featurePath: string, crRelPath: string) => string;
-        resolveClaimPath: (featurePath: string, claimRelPath: string) => string;
     };
     buildContext: typeof buildContext;
     renderContent: typeof renderContent;
     expandFiles: typeof expandFiles;
     validateFeatureArgs: typeof validateFeatureArgs;
-    getClaimPatches: typeof getClaimPatches;
 };
 export default _default;

package/build/packages/features_renderer/src/auxiliar.d.ts

@@ -11,7 +11,7 @@ export interface ConfigFile {
 }
 export interface FeatureConfig {
     files?: ConfigFile[];
-    claimPatches?: unknown[];
+    patches?: unknown[];
 }
 export interface ExpectedFile {
     localPath: string;
@@ -19,14 +19,24 @@ export interface ExpectedFile {
     targetBranch: string;
     userManaged: boolean;
 }
+export interface Traceability {
+    owner?: string;
+    repo?: string;
+    name?: string;
+    version?: string;
+    ref?: string;
+    url?: string;
+    sha?: string;
+    tags?: string[];
+}
 export interface ExpectedOutput {
     files: ExpectedFile[];
-    claimPatches: unknown[];
+    patches: unknown[];
+    traceability?: Traceability;
 }
 export interface RenderTest {
     name: string;
-    cr?: string;
-    claim?: string;
+    cr: string;
     args?: Record<string, unknown>;
 }
 export interface RenderTestsFile {
@@ -61,7 +71,6 @@ export interface RenderContext {
 export declare function formatAjvErrors(errors: ErrorObject[] | null | undefined): string;
 declare function loadAndValidateRenderTests(featurePath: string): RenderTestsFile;
 declare function resolveCrPath(featurePath: string, crRelPath: string): string;
-declare function resolveClaimPath(featurePath: string, claimRelPath: string): string;
 export declare function listYamlFiles(dir: string): string[];
 declare function loadYaml<T = unknown>(file: string): T;
 declare function mkNamedTmp(...names: string[]): Promise<string>;
@@ -74,6 +83,5 @@ declare const _default: {
     buildExpectedOutput: typeof buildExpectedOutput;
     loadAndValidateRenderTests: typeof loadAndValidateRenderTests;
     resolveCrPath: typeof resolveCrPath;
-    resolveClaimPath: typeof resolveClaimPath;
 };
 export default _default;

package/build/packages/features_renderer/src/render.d.ts

@@ -1,6 +1,5 @@
 export default function render(featurePath: string, featureRenderPath: string, entity: any, firestartrConfig?: any, featureArgs?: any): any;
-export declare function getClaimPatches(featurePath: string, entity: any, firestartrConfig?: any, featureArgs?: any): any[];
-export declare function buildContext(stitchedClaim: any, args: any, firestartrConfig: any, featureArgs: any): any;
+export declare function buildContext(entity: any, args: any, firestartrConfig: any, featureArgs: any): any;
 export declare function expandFiles(featurePath: string, configData: any, context: any): void;
 export declare function renderContent(template: string, ctx: any): any;
 export declare function assertNonEmptyString(value: unknown, what: string): asserts value is string;

package/build/packages/features_renderer/src/schema.d.ts

@@ -18,12 +18,6 @@ declare const _default: {
                         $ref: string;
                     };
                 };
-                claimPatches: {
-                    type: string;
-                    items: {
-                        $ref: string;
-                    };
-                };
                 patches: {
                     type: string;
                     patternProperties: {
@@ -135,7 +129,7 @@ declare const _default: {
                     type: string;
                 };
                 value: {
-                    type: string[];
+                    type: string;
                 };
             };
             required: string[];

package/build/packages/importer/src/decanter/config.d.ts

@@ -4,6 +4,36 @@ export declare function setResourcesPath(path: string): void;
 export declare function getResourcesPath(): string;
 export declare function setConfigPath(path: string): void;
 export declare function getConfigPath(): string;
+export declare function setClaimsDefaultsPath(path: string): void;
+export declare function getClaimsDefaultsPath(): string;
+/**
+ * Loads claims_defaults.yaml once and caches the default owner claim reference.
+ * Must be called after setClaimsDefaultsPath() and before any decanter runs.
+ */
+export declare function loadClaimsDefaultsOnce(): void;
+/**
+ * Returns the cached default owner claim reference (e.g., "group:group_a" or "user:user_a").
+ * Returns null if not loaded or not set in claims_defaults.yaml.
+ */
+export declare function getDefaultOwnerClaimRef(): string | null;
+/**
+ * Resolves the default owner claim reference to CODEOWNERS handle(s) using the
+ * same claim-to-external-name mapping used by CODEOWNERS generation.
+ * Must be called after the referenced claims have been seeded into the renderer
+ * (i.e., after setPreviousCRs) so resolveCodeownersRef can resolve them.
+ */
+export declare function resolveDefaultOwnerHandles(org: string, crs?: any): void;
+/**
+ * Returns the resolved default owner CODEOWNERS handles, if any.
+ */
+export declare function getDefaultOwnerHandles(): {
+    team: string | null;
+    user: string | null;
+};
+/**
+ * Resets the cached default owner claim ref and handles (useful for testing).
+ */
+export declare function resetClaimsDefaultsCache(): void;
 declare const _default: {
     setClaimsPath: typeof setClaimsPath;
     getClaimsPath: typeof getClaimsPath;
@@ -11,5 +41,12 @@ declare const _default: {
     getResourcesPath: typeof getResourcesPath;
     setConfigPath: typeof setConfigPath;
     getConfigPath: typeof getConfigPath;
+    setClaimsDefaultsPath: typeof setClaimsDefaultsPath;
+    getClaimsDefaultsPath: typeof getClaimsDefaultsPath;
+    loadClaimsDefaultsOnce: typeof loadClaimsDefaultsOnce;
+    getDefaultOwnerClaimRef: typeof getDefaultOwnerClaimRef;
+    resolveDefaultOwnerHandles: typeof resolveDefaultOwnerHandles;
+    getDefaultOwnerHandles: typeof getDefaultOwnerHandles;
+    resetClaimsDefaultsCache: typeof resetClaimsDefaultsCache;
 };
 export default _default;

package/build/packages/importer/src/decanter/index.d.ts

@@ -11,7 +11,7 @@ export declare const collections: {
     RepoCollectionGithubDecanter: typeof RepoCollectionGithubDecanter;
 };
 export declare function isInPreviousCRs(kind: string, name: string): boolean;
-export declare function setPreviousCRs(resourcesPath: string): Promise<void>;
+export declare function setPreviousCRs(resourcesPath: string, org?: string): Promise<void>;
 export declare function importGithubGitopsRepository(org: string, skipPlan: boolean, claimsPath: string, resourcesPath: string, configPath: string, filters: CollectionFilter[], needsReImport: boolean, force: boolean): Promise<void>;
 export declare function getPreviousCrs(crsPath: string): Promise<void>;
 declare const _default: {

package/build/packages/operator/src/crdMonitor.d.ts

@@ -0,0 +1,12 @@
+export interface CrdMonitorOpts {
+    enabled?: boolean;
+    intervalSeconds?: number;
+    apiGroup?: string;
+    namespace?: string;
+}
+export declare function createCrdMonitor(plural: string, opts?: CrdMonitorOpts): {
+    start: () => void;
+    stop: () => void;
+    isStarted: () => boolean;
+};
+export default createCrdMonitor;

package/build/packages/operator/src/status.d.ts

@@ -7,6 +7,7 @@ export declare function needsProvisioningOnCreateOrUpdate(cr: any): Promise<Need
 export declare function shouldForceReconcileByAnnotation(cr: any): boolean;
 export declare function updateSyncTransition(itemPath: string, reason: string, lastSyncTime: string, nextSyncTime: string, message: string, status: string): Promise<void>;
 export declare function updateRetryStatusInCR(pluralKind: string, namespace: string, name: string, retryCount: number, nextRetryTime?: string): Promise<void>;
+export declare function isKubernetesNotFoundError(error: unknown): boolean;
 export declare function writePrioritizedStatus(kind: string, namespace: string, item: any): Promise<void>;
 export declare function updateTransition(itemPath: string, reason: string, type: string, statusValue: string, message?: string, updateStatusOnly?: boolean): Promise<void>;
 export declare function getConditionByType(conditionList: Array<any>, type: string): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "2.11.0-snapshot-patch-claims-3",
+  "version": "2.11.0-snapshot-mco-3",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",

package/build/packages/cdk8s_renderer/src/claims/stitching/errors.d.ts

@@ -1,14 +0,0 @@
-export type StitchingViolationReason = 'protected-path' | 'overwrite-protected' | 'duplicate-path' | 'user-declared-path';
-export interface StitchingViolation {
-    feature: string;
-    op: string;
-    path: string;
-    reason: StitchingViolationReason;
-    conflictingFeature?: string;
-    message: string;
-}
-export declare class StitchingError extends Error {
-    violations: StitchingViolation[];
-    constructor(violations: StitchingViolation[]);
-}
-export declare function formatStitchingError(error: StitchingError): string;

package/build/packages/cdk8s_renderer/src/claims/stitching/protectedPaths.d.ts

@@ -1,3 +0,0 @@
-export declare const PROTECTED_CLAIM_PATHS: string[];
-export declare function isProtectedPath(patchPath: string): boolean;
-export declare function normalizePointer(pointer: string): string;

package/build/packages/cdk8s_renderer/src/claims/stitching/stitching.d.ts

@@ -1,19 +0,0 @@
-export interface FeaturePatchEnvelope {
-    feature: string;
-    patches: Array<{
-        op: string;
-        path: string;
-        value?: unknown;
-        name?: string;
-    }>;
-}
-export declare function MOCK_STITCHING_FEATURES(mock?: (claim: unknown) => Promise<FeaturePatchEnvelope[]>): void;
-export declare function stitchClaim(claimAfterDefaults: unknown, preCollectedEnvelopes?: FeaturePatchEnvelope[], originalClaim?: unknown): Promise<unknown>;
-export declare function extractClaimPatches(rendered: {
-    claimPatches?: unknown;
-}): Array<{
-    op: string;
-    path: string;
-    value?: unknown;
-    name?: string;
-}>;