@firestartr/cli 2.11.0-snapshot-ghpages-01 → 2.11.0-snapshot-patch-claims

package/build/packages/cdk8s_renderer/src/charts/catalog/userChart.d.ts

@@ -6,9 +6,7 @@ export declare class CatalogUserChart extends BaseCatalogChart {
         kind: string;
         metadata: {
             name: string;
-            annotations: {
-                [key: string]: string;
-            };
+            annotations: Record<string, string>;
         };
         spec: {
             profile: import("../../claims/base/user").IUserClaimProfile;

package/build/packages/cdk8s_renderer/src/claims/base/schemas/index.d.ts

@@ -1141,6 +1141,7 @@ declare const schemas: {
                     };
                     source: {
                         type: string;
+                        required: string[];
                         properties: {
                             branch: {
                                 type: string;

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

@@ -672,6 +672,7 @@ export declare const GithubSchemas: ({
                 };
                 source: {
                     type: string;
+                    required: string[];
                     properties: {
                         branch: {
                             type: string;

package/build/packages/cdk8s_renderer/src/claims/github/pages.schema.d.ts

@@ -22,6 +22,7 @@ declare const _default: {
                 };
                 source: {
                     type: string;
+                    required: string[];
                     properties: {
                         branch: {
                             type: string;

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

@@ -0,0 +1,14 @@
+export type StitchingViolationReason = 'protected-path' | 'overwrite-protected' | 'duplicate-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

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,19 @@
+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[]): Promise<unknown>;
+export declare function extractClaimPatches(rendered: {
+    patches?: unknown;
+}): Array<{
+    op: string;
+    path: string;
+    value?: unknown;
+    name?: string;
+}>;

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,14 +20,5 @@ 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/validations/backstageAnnotations.d.ts

@@ -0,0 +1,2 @@
+import { RenderedCrMap } from '../renderer/types';
+export declare function validateNoBackstageAnnotationsInK8sCrs(crs: RenderedCrMap): void;

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

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

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

@@ -2,5 +2,7 @@ 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 getFeaturePatches(featureName: string, version: string, featureOwner: any, featureArgs?: any, repo?: string, owner?: string): Promise<any[]>;
+export declare function getFeaturePatchesFromRef(featureName: string, featureRef: string, featureOwner: any, featureArgs?: any, repo?: string, owner?: string): Promise<any[]>;
 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,2 +1,4 @@
 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 getFeaturePatches(featureName: string, version: string, owner: any, repo: any, featureOwner: any, featureArgs?: any): any[];
+export declare function getFeaturePatchesFromPath(extractPath: string, featureOwner: any, featureArgs?: any): any[];

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

@@ -1,7 +1,8 @@
 import validate from './src/validate';
-import render, { buildContext, renderContent, expandFiles } from './src/render';
+import render, { buildContext, renderContent, expandFiles, getPatches } from './src/render';
 import updateFileContent from './src/update_file';
 import { validateFeatureArgs } from './src/featureArgsValidation';
+export { getPatches, buildContext, renderContent, expandFiles };
 declare const _default: {
     validate: typeof validate;
     render: typeof render;
@@ -12,10 +13,12 @@ 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;
+    getPatches: typeof getPatches;
 };
 export default _default;

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

@@ -25,7 +25,8 @@ export interface ExpectedOutput {
 }
 export interface RenderTest {
     name: string;
-    cr: string;
+    cr?: string;
+    claim?: string;
     args?: Record<string, unknown>;
 }
 export interface RenderTestsFile {
@@ -60,6 +61,7 @@ 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>;
@@ -72,5 +74,6 @@ 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,5 +1,6 @@
 export default function render(featurePath: string, featureRenderPath: string, entity: any, firestartrConfig?: any, featureArgs?: any): any;
-export declare function buildContext(entity: any, args: any, firestartrConfig: any, featureArgs: any): any;
+export declare function getPatches(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 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

@@ -20,13 +20,8 @@ declare const _default: {
                 };
                 patches: {
                     type: string;
-                    patternProperties: {
-                        '^.+$': {
-                            type: string;
-                            items: {
-                                $ref: string;
-                            };
-                        };
+                    items: {
+                        $ref: string;
                     };
                 };
                 filesTemplates: {
@@ -129,7 +124,7 @@ declare const _default: {
                     type: string;
                 };
                 value: {
-                    type: string;
+                    type: string[];
                 };
             };
             required: string[];

package/package.json

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