@firestartr/cli 2.11.0-snapshot-gh-pages-public-https-2 → 2.11.0-snapshot-orgsettings-binding-1

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

@@ -137,7 +137,29 @@ declare const _default: {
                         type: string;
                     };
                     pages: {
-                        $ref: string;
+                        type: string;
+                        properties: {
+                            cname: {
+                                type: string;
+                            };
+                            buildType: {
+                                type: string;
+                                enum: string[];
+                            };
+                            source: {
+                                type: string;
+                                properties: {
+                                    branch: {
+                                        type: string;
+                                    };
+                                    path: {
+                                        type: string;
+                                    };
+                                };
+                                additionalProperties: boolean;
+                            };
+                        };
+                        additionalProperties: boolean;
                     };
                     additionalRules: {
                         type: string;

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

@@ -264,7 +264,29 @@ export declare const GithubSchemas: ({
                         type: string;
                     };
                     pages: {
-                        $ref: string;
+                        type: string;
+                        properties: {
+                            cname: {
+                                type: string;
+                            };
+                            buildType: {
+                                type: string;
+                                enum: string[];
+                            };
+                            source: {
+                                type: string;
+                                properties: {
+                                    branch: {
+                                        type: string;
+                                    };
+                                    path: {
+                                        type: string;
+                                    };
+                                };
+                                additionalProperties: boolean;
+                            };
+                        };
+                        additionalProperties: boolean;
                     };
                     additionalRules: {
                         type: string;
@@ -529,6 +551,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[];
@@ -652,50 +698,65 @@ export declare const GithubSchemas: ({
     $schema: string;
     $id: string;
     definitions: {
-        GithubPages: {
+        GithubOrgClaimSecrets: {
             $id: string;
             type: string;
             description: string;
             properties: {
-                cname: {
+                actions: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+                codespaces: {
                     type: string;
+                    items: {
+                        $ref: string;
+                    };
                 };
-                public: {
+                dependabot: {
                     type: string;
+                    items: {
+                        $ref: string;
+                    };
                 };
-                https_enforced: {
+            };
+            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;
                 };
-                buildType: {
+                visibility: {
                     type: string;
                     enum: string[];
+                    description: string;
                 };
-                source: {
+                selected_repositories: {
                     type: string;
-                    properties: {
-                        branch: {
-                            type: string;
-                        };
-                        path: {
-                            type: string;
-                            enum: string[];
-                        };
+                    items: {
+                        type: string;
                     };
-                    additionalProperties: boolean;
+                    description: string;
                 };
             };
+            required: string[];
             additionalProperties: boolean;
-            if: {
-                required: string[];
-                properties: {
-                    https_enforced: {
-                        const: boolean;
-                    };
-                };
-            };
-            then: {
-                required: string[];
-            };
         };
     };
 })[];

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/claims/github/repository.d.ts

@@ -1,8 +1,7 @@
 import { BranchStrategy } from 'catalog_common';
-import { FirestartrGithubRepositorySpecRepoVisibility } from '../../../imports/firestartr.dev';
+import { FirestartrGithubRepositorySpecPagesBuildType, FirestartrGithubRepositorySpecRepoVisibility } from '../../../imports/firestartr.dev';
 import { IClaimInstalledFeature } from '../base';
 import { IComponentClaim } from '../base/component';
-import { IRepositoryPage } from './pages';
 export interface IGithubRepositoryClaim extends IComponentClaim {
     providers: {
         github: {
@@ -50,6 +49,14 @@ interface IComponentClaimActions {
         includeClaimKeys: string[];
     };
 }
+interface IRepositoryPage {
+    cname?: string;
+    source?: {
+        branch: string;
+        path: string;
+    };
+    buildType?: FirestartrGithubRepositorySpecPagesBuildType;
+}
 interface IComponentClaimLabel {
     name: string;
     color: 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[]): Promise<IRenderClaimResult>;
+export declare function renderClaim(catalogScope: Construct, firestartrScope: Construct, claim: any, patches: ICustomResourcePatch[], previousCR?: any | null, claimPath?: string, variableSectionPreviousCR?: any | false, variableSectionPatches?: ICustomResourcePatch[], 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/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/gh_provisioner/src/entities/ghrepo/index.d.ts

@@ -2,7 +2,12 @@ import { Entity } from '../base';
 export declare class EntityGHRepo extends Entity {
     private escapeTerraformBranchName;
     constructor(artifact: any);
-    private validatePages;
+    /**
+     * Validation logic for GitHub Pages branch settings:
+     * - On create: If pages branch is set, it must equal the default branch.
+     * - On update: If pages branch is set and is not the default, it must exist in remote.
+     */
+    private validatePagesBranch;
     loadResources(tfOp: string): Promise<void>;
     postProvision(tfOp: string): Promise<void>;
     loadAddressesToImport(): 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';
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "2.11.0-snapshot-gh-pages-public-https-2",
+  "version": "2.11.0-snapshot-orgsettings-binding-1",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",

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

@@ -1,11 +0,0 @@
-import { FirestartrGithubRepositorySpecPagesBuildType, FirestartrGithubRepositorySpecPagesSourcePath } from '../../../imports/firestartr.dev';
-export interface IRepositoryPage {
-    cname?: string;
-    public?: boolean;
-    https_enforced?: boolean;
-    source?: {
-        branch: string;
-        path: FirestartrGithubRepositorySpecPagesSourcePath;
-    };
-    buildType?: FirestartrGithubRepositorySpecPagesBuildType;
-}

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

@@ -1,52 +0,0 @@
-declare const _default: {
-    $schema: string;
-    $id: string;
-    definitions: {
-        GithubPages: {
-            $id: string;
-            type: string;
-            description: string;
-            properties: {
-                cname: {
-                    type: string;
-                };
-                public: {
-                    type: string;
-                };
-                https_enforced: {
-                    type: string;
-                };
-                buildType: {
-                    type: string;
-                    enum: string[];
-                };
-                source: {
-                    type: string;
-                    properties: {
-                        branch: {
-                            type: string;
-                        };
-                        path: {
-                            type: string;
-                            enum: string[];
-                        };
-                    };
-                    additionalProperties: boolean;
-                };
-            };
-            additionalProperties: boolean;
-            if: {
-                required: string[];
-                properties: {
-                    https_enforced: {
-                        const: boolean;
-                    };
-                };
-            };
-            then: {
-                required: string[];
-            };
-        };
-    };
-};
-export default _default;