@firestartr/cli 2.11.0-snapshot-org-secrets-00 → 2.11.0-snapshot-patch-claims-4

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

@@ -529,30 +529,6 @@ export declare const GithubSchemas: ({
                             }[];
                         };
                     };
-                    org_secrets: {
-                        type: string;
-                        properties: {
-                            actions: {
-                                type: string;
-                                items: {
-                                    $ref: string;
-                                };
-                            };
-                            codespaces: {
-                                type: string;
-                                items: {
-                                    $ref: string;
-                                };
-                            };
-                            dependabot: {
-                                type: string;
-                                items: {
-                                    $ref: string;
-                                };
-                            };
-                        };
-                        additionalProperties: boolean;
-                    };
                 };
                 additionalProperties: boolean;
                 required: string[];
@@ -723,69 +699,4 @@ export declare const GithubSchemas: ({
             };
         };
     };
-} | {
-    $schema: string;
-    $id: string;
-    definitions: {
-        GithubOrgClaimSecrets: {
-            $id: string;
-            type: string;
-            description: string;
-            properties: {
-                actions: {
-                    type: string;
-                    items: {
-                        $ref: string;
-                    };
-                };
-                codespaces: {
-                    type: string;
-                    items: {
-                        $ref: string;
-                    };
-                };
-                dependabot: {
-                    type: string;
-                    items: {
-                        $ref: string;
-                    };
-                };
-            };
-            additionalProperties: boolean;
-        };
-        GithubOrgClaimSecretRef: {
-            $id: string;
-            type: string;
-            description: string;
-            pattern: string;
-        };
-        GithubOrgClaimSecret: {
-            $id: string;
-            type: string;
-            description: string;
-            properties: {
-                name: {
-                    type: string;
-                    description: string;
-                };
-                value: {
-                    $ref: string;
-                };
-                visibility: {
-                    type: string;
-                    enum: string[];
-                    description: string;
-                };
-                selected_repositories: {
-                    type: string;
-                    items: {
-                        type: string;
-                    };
-                    description: string;
-                };
-            };
-            required: string[];
-            additionalProperties: boolean;
-        };
-    };
 })[];

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

@@ -35,26 +35,6 @@ export interface IGithubOrgSettingsClaim extends IOrgSettingsClaim {
                 visibility: 'all' | 'private' | 'selected';
                 selected_repositories?: string[];
             }[];
-            org_secrets?: {
-                actions?: {
-                    name: string;
-                    value: string;
-                    visibility?: 'all' | 'private' | 'selected';
-                    selected_repositories?: string[];
-                }[];
-                codespaces?: {
-                    name: string;
-                    value: string;
-                    visibility?: 'all' | 'private' | 'selected';
-                    selected_repositories?: string[];
-                }[];
-                dependabot?: {
-                    name: string;
-                    value: string;
-                    visibility?: 'all' | 'private' | 'selected';
-                    selected_repositories?: string[];
-                }[];
-            };
         };
     };
 }

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

@@ -146,30 +146,6 @@ declare const _default: {
                             }[];
                         };
                     };
-                    org_secrets: {
-                        type: string;
-                        properties: {
-                            actions: {
-                                type: string;
-                                items: {
-                                    $ref: string;
-                                };
-                            };
-                            codespaces: {
-                                type: string;
-                                items: {
-                                    $ref: string;
-                                };
-                            };
-                            dependabot: {
-                                type: string;
-                                items: {
-                                    $ref: string;
-                                };
-                            };
-                        };
-                        additionalProperties: boolean;
-                    };
                 };
                 additionalProperties: boolean;
                 required: 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' | '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

@@ -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,20 @@
+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 const STITCHED_CLAIM: unique symbol;
+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;
+}>;

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

@@ -0,0 +1 @@
+export declare function validateFeatureDescriptors(claim: unknown): void;

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/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[], crs?: any, secretSectionPreviousCR?: any | false, secretSectionPatches?: 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/features_preparer/index.d.ts

@@ -5,5 +5,8 @@ declare const _default: {
     renderFeatureFromPath: typeof import("./src/renderer").renderFeatureFromPath;
     getFeatureConfig: typeof import("./src/installer").getFeatureConfig;
     getFeatureConfigFromRef: typeof import("./src/installer").getFeatureConfigFromRef;
+    getFeatureClaimPatches: typeof import("./src/installer").getFeatureClaimPatches;
+    getFeatureClaimPatchesFromRef: typeof import("./src/installer").getFeatureClaimPatchesFromRef;
+    getFeatureClaimPatchesFromPath: typeof import("./src/renderer").getFeatureClaimPatchesFromPath;
 };
 export default _default;

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, getFeatureClaimPatches, getFeatureClaimPatchesFromRef, prepareFeature } from './installer';
+import { renderFeature, renderFeatureFromPath, getFeatureClaimPatchesFromPath } 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,6 +2,8 @@ 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[];

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 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,7 +1,8 @@
 import validate from './src/validate';
-import render, { buildContext, renderContent, expandFiles } from './src/render';
+import render, { buildContext, renderContent, expandFiles, getClaimPatches } 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;
@@ -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;
+    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[];
-    patches?: unknown[];
+    claimPatches?: unknown[];
 }
 export interface ExpectedFile {
     localPath: string;
@@ -31,12 +31,13 @@ export interface Traceability {
 }
 export interface ExpectedOutput {
     files: ExpectedFile[];
-    patches: unknown[];
+    claimPatches: unknown[];
     traceability?: Traceability;
 }
 export interface RenderTest {
     name: string;
-    cr: string;
+    cr?: string;
+    claim?: string;
     args?: Record<string, unknown>;
 }
 export interface RenderTestsFile {
@@ -71,6 +72,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>;
@@ -83,5 +85,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 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 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,6 +18,12 @@ declare const _default: {
                         $ref: string;
                     };
                 };
+                claimPatches: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
                 patches: {
                     type: string;
                     patternProperties: {
@@ -129,7 +135,7 @@ declare const _default: {
                     type: string;
                 };
                 value: {
-                    type: string;
+                    type: string[];
                 };
             };
             required: string[];

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

@@ -2,9 +2,7 @@ import { createCheckRun } from './src/check_run';
 import { upsertMultiPartStickyComments } from './src/sticky_comment';
 import { getOctokitForOrg, getGithubAppToken, getOctokitFromPat } from './src/auth';
 import { encryptRepoSecret, getRepoPublicKey } from './src/encrypt';
-import { getOrgPublicKey, encryptOrgSecret, getOrgSecret } from './src/orgSecrets';
 import type { RepoSecretsSection } from './src/encrypt';
-import type { OrgSecretsSection } from './src/orgSecrets';
 import type { WorkflowCompletionResult, WorkflowDispatchInputs, WorkflowRunConclusion, WorkflowRunStatus, WorkflowRunStatusFilter, WorkflowRunSummary } from './src/workflow';
 import { withProfile } from './src/with_profile';
 import { createProfile } from './src/profile';
@@ -105,14 +103,10 @@ declare const _default: {
     encryption: {
         encryptRepoSecret: typeof encryptRepoSecret;
         getRepoPublicKey: typeof getRepoPublicKey;
-        getOrgPublicKey: typeof getOrgPublicKey;
-        encryptOrgSecret: typeof encryptOrgSecret;
-        getOrgSecret: typeof getOrgSecret;
     };
     withProfile: typeof withProfile;
     createProfile: typeof createProfile;
 };
 export default _default;
-export { createProfile };
-export type { RepoSecretsSection, OrgSecretsSection };
+export { RepoSecretsSection, createProfile };
 export type { WorkflowCompletionResult, WorkflowDispatchInputs, WorkflowRunConclusion, WorkflowRunStatus, WorkflowRunStatusFilter, WorkflowRunSummary, };

package/package.json

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

package/build/packages/cdk8s_renderer/src/charts/github/orgSecretSectionChart.d.ts

@@ -1,8 +0,0 @@
-import { FirestartrGithubOrganizationSecretSection, FirestartrGithubOrganizationSecretSectionProps } from '../../../imports/firestartr.dev';
-import { IUnitializedStateKey } from '../../claims/base';
-import { BaseGithubChart } from './base';
-export declare class GithubOrgSecretSectionChart extends BaseGithubChart {
-    template(): FirestartrGithubOrganizationSecretSectionProps | IUnitializedStateKey;
-    gvk(): import("cdk8s").GroupVersionKind;
-    instanceApiObject(template: any): FirestartrGithubOrganizationSecretSection;
-}

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

@@ -1,67 +0,0 @@
-declare const _default: {
-    $schema: string;
-    $id: string;
-    definitions: {
-        GithubOrgClaimSecrets: {
-            $id: string;
-            type: string;
-            description: string;
-            properties: {
-                actions: {
-                    type: string;
-                    items: {
-                        $ref: string;
-                    };
-                };
-                codespaces: {
-                    type: string;
-                    items: {
-                        $ref: string;
-                    };
-                };
-                dependabot: {
-                    type: string;
-                    items: {
-                        $ref: string;
-                    };
-                };
-            };
-            additionalProperties: boolean;
-        };
-        GithubOrgClaimSecretRef: {
-            $id: string;
-            type: string;
-            description: string;
-            pattern: string;
-        };
-        GithubOrgClaimSecret: {
-            $id: string;
-            type: string;
-            description: string;
-            properties: {
-                name: {
-                    type: string;
-                    description: string;
-                };
-                value: {
-                    $ref: string;
-                };
-                visibility: {
-                    type: string;
-                    enum: string[];
-                    description: string;
-                };
-                selected_repositories: {
-                    type: string;
-                    items: {
-                        type: string;
-                    };
-                    description: string;
-                };
-            };
-            required: string[];
-            additionalProperties: boolean;
-        };
-    };
-};
-export default _default;

package/build/packages/cdk8s_renderer/src/validations/githubOrgSecretSection.d.ts

@@ -1,4 +0,0 @@
-import { RenderClaims, RenderedCrMap } from '../renderer/types';
-export declare function validateGithubOrgSecretSectionSingleton(crs: RenderedCrMap): void;
-export declare function validateSecretNamesUniqueness(crs: RenderedCrMap): void;
-export declare function validateOrgSecretsCrossReferences(renderClaims: RenderClaims): void;

package/build/packages/gh_provisioner/src/entities/ghorgsecretsection/index.d.ts

@@ -1,7 +0,0 @@
-import { Entity } from '../base';
-export declare class EntityGHOrgSecretSection extends Entity {
-    constructor(artifact: any);
-    loadResources(tfOp: string): Promise<void>;
-    postProvision(_tfOp: string): Promise<void>;
-    loadAddressesToImport(): Promise<void>;
-}

package/build/packages/gh_provisioner/src/entities/ghorgsecretsection/secrets.d.ts

@@ -1,16 +0,0 @@
-import type { EntityGHOrgSecretSection } from '.';
-import { type OrgSecretsSection } from 'github';
-export type SecretEntry = {
-    name: string;
-    ref: {
-        kind: string;
-        name: string;
-        key: string;
-    };
-    visibility: string;
-    selectedRepositories?: string[];
-};
-declare const SECTIONS: OrgSecretsSection[];
-export { SECTIONS };
-export declare function provisionOrgSecrets(entity: EntityGHOrgSecretSection, secrets: Record<string, SecretEntry[]>): Promise<void>;
-export declare function adoptSecretsIfNeeded(entity: EntityGHOrgSecretSection, secrets: Record<string, SecretEntry[]>): Promise<void>;

package/build/packages/github/src/orgSecrets.d.ts

@@ -1,10 +0,0 @@
-export type OrgSecretsSection = 'actions' | 'dependabot' | 'codespaces';
-export declare function getOrgPublicKey(org: string, section: OrgSecretsSection, octokit?: any): Promise<any>;
-export declare function encryptOrgSecret(org: string, section: OrgSecretsSection, plaintextValue: string, preFetchedKey?: {
-    key_id: string;
-    key: string;
-}, octokit?: any): Promise<{
-    key_id: any;
-    encrypted_value: string;
-}>;
-export declare function getOrgSecret(org: string, section: OrgSecretsSection, name: string, octokit?: any): Promise<any>;