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

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

@@ -529,6 +529,30 @@ 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[];
@@ -699,4 +723,69 @@ 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/orgSecrets.schema.d.ts

@@ -0,0 +1,67 @@
+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/claims/github/orgSettings.d.ts

@@ -35,6 +35,26 @@ 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,6 +146,30 @@ 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/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/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): 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, secretSectionPreviousCR?: any | false, secretSectionPatches?: ICustomResourcePatch[]): Promise<IRenderClaimResult>;
 export declare function renameVariantCrFiles(outputDir: string, renderedMap: RenderedCrMap): void;

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

@@ -0,0 +1,4 @@
+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/features_preparer/index.d.ts

@@ -5,8 +5,5 @@ 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,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,8 +2,6 @@ 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,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;
@@ -31,13 +31,12 @@ export interface Traceability {
 }
 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 {
@@ -72,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>;
@@ -85,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/gh_provisioner/src/entities/ghorgsecretsection/index.d.ts

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

@@ -0,0 +1,16 @@
+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/index.d.ts

@@ -2,7 +2,9 @@ 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';
@@ -68,7 +70,7 @@ declare const _default: {
         getPrFiles: typeof import("./src/pull_request").getPrFiles;
         filterPrBy: (filter: {
             title: string;
-            state: "closed" | "all" | "open";
+            state: "all" | "closed" | "open";
             repo: string;
             owner: string;
             userType: "Bot" | "User";
@@ -80,7 +82,7 @@ declare const _default: {
         create: (owner: string, repo: string, title: string, body: string, labels?: string[], octokit?: any) => Promise<any>;
         update: (owner: string, repo: string, issue_number: number, title: string, body: string, labels?: string[], octokit?: any) => Promise<any>;
         close: (owner: string, repo: string, issue_number: number, octokit?: any) => Promise<any>;
-        filterBy: (owner: string, repo: string, title: string, labels: string, state?: "closed" | "all" | "open", creator?: string, assignee?: string, octokit?: any) => Promise<any>;
+        filterBy: (owner: string, repo: string, title: string, labels: string, state?: "all" | "closed" | "open", creator?: string, assignee?: string, octokit?: any) => Promise<any>;
         upsertByTitle: (owner: string, repo: string, title: string, body: string, labels?: string[], octokit?: any) => Promise<any>;
     };
     branches: {
@@ -103,10 +105,14 @@ 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 { RepoSecretsSection, createProfile };
+export { createProfile };
+export type { RepoSecretsSection, OrgSecretsSection };
 export type { WorkflowCompletionResult, WorkflowDispatchInputs, WorkflowRunConclusion, WorkflowRunStatus, WorkflowRunStatusFilter, WorkflowRunSummary, };

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

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

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

@@ -853,7 +853,7 @@ export declare function withProfile(profileName: string): {
         create: (owner: string, repo: string, title: string, body: string, labels?: string[]) => Promise<any>;
         update: (owner: string, repo: string, issue_number: number, title: string, body: string, labels?: string[]) => Promise<any>;
         close: (owner: string, repo: string, issue_number: number) => Promise<any>;
-        filterBy: (owner: string, repo: string, title: string, labels: string, state?: "closed" | "all" | "open", creator?: string, assignee?: string) => Promise<any>;
+        filterBy: (owner: string, repo: string, title: string, labels: string, state?: "all" | "closed" | "open", creator?: string, assignee?: string) => Promise<any>;
         upsertByTitle: (owner: string, repo: string, title: string, body: string, labels?: string[]) => Promise<any>;
     };
     workflow: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "2.11.0-snapshot-patch-claims-4",
+  "version": "2.11.0-snapshot-org-secrets-01",
   "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,20 +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 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

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