@firestartr/cli 1.52.0-snapshot-8 → 1.52.1-snapshot-10

package/build/index.js

@@ -357975,6 +357975,9 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                                     type: 'boolean',
                                     description: 'If the webhook is active',
                                 },
+                                secretRef: {
+                                    $ref: 'firestartr.dev://github/GithubComponentClaimSecretRef',
+                                },
                                 events: {
                                     type: 'array',
                                     description: 'List of events that trigger the webhook (e.g., push, pull_request, issues)',
@@ -357983,7 +357986,7 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                                     },
                                 },
                             },
-                            required: ['url', 'contentType', 'events'],
+                            required: ['url', 'contentType', 'events', 'secretRef'],
                         },
                     },
                     required: ['orgName', 'webhook'],
@@ -361732,6 +361735,7 @@ function toJson_FirestartrGithubOrgWebhookSpecWebhookSecretRef(obj) {
         return undefined;
     }
     const result = {
+        'kind': obj.kind,
         'name': obj.name,
         'key': obj.key,
     };
@@ -361780,6 +361784,17 @@ function toJson_FirestartrGithubOrgWebhookSpecWriteConnectionSecretToRefOutputs(
     // filter undefined values
     return Object.entries(result).reduce((r, i) => (i[1] === undefined) ? r : ({ ...r, [i[0]]: i[1] }), {});
 }
+/* eslint-enable max-len, @stylistic/max-len, quote-props, @stylistic/quote-props */
+/**
+ * The type of Kubernetes resource to reference.
+ *
+ * @schema FirestartrGithubOrgWebhookSpecWebhookSecretRefKind
+ */
+var FirestartrGithubOrgWebhookSpecWebhookSecretRefKind;
+(function (FirestartrGithubOrgWebhookSpecWebhookSecretRefKind) {
+    /** Secret */
+    FirestartrGithubOrgWebhookSpecWebhookSecretRefKind["SECRET"] = "Secret";
+})(FirestartrGithubOrgWebhookSpecWebhookSecretRefKind || (FirestartrGithubOrgWebhookSpecWebhookSecretRefKind = {}));
 /**
  * Converts an object of type 'FirestartrGithubOrgWebhookSpecContextBackendRef' to JSON representation.
  */
@@ -364233,10 +364248,7 @@ class GithubOrgWebhookChart extends BaseGithubChart {
                 webhook: {
                     url: claim.providers.github.webhook.url,
                     contentType: claim.providers.github.webhook.contentType,
-                    secretRef: {
-                        name: claim.providers.github.webhook.secretRef.name,
-                        key: claim.providers.github.webhook.secretRef.key,
-                    },
+                    secretRef: this.renderSecret(claim.providers.github.webhook.secretRef),
                     active: claim.providers.github.webhook.active,
                     events: claim.providers.github.webhook.events,
                 },
@@ -364247,6 +364259,17 @@ class GithubOrgWebhookChart extends BaseGithubChart {
             },
         };
     }
+    renderSecret(secret) {
+        const parts = secret.split(':');
+        if (parts.length < 4) {
+            throw `GithubOrgWebhookChart: invalid secretRef: ${secret}. Expected format: <provider>:<namespace>:<name>:<key>`;
+        }
+        return {
+            kind: 'Secret',
+            name: parts[2],
+            key: parts[3],
+        };
+    }
     gvk() {
         return FirestartrGithubOrgWebhook.GVK;
     }
@@ -364793,7 +364816,7 @@ class SecretsChart extends BaseSecretsChart {
     gvk() {
         return {
             kind: 'ExternalSecret/PushSecret',
-            apiVersion: 'external-secrets.io/v1',
+            apiVersion: 'external-secrets.io/v1alpha1',
         };
     }
     extraCharts() {
@@ -364801,7 +364824,8 @@ class SecretsChart extends BaseSecretsChart {
         const pushSecrets = this.get('pushSecrets');
         const kind = this.get('claim').kind;
         const name = this.get('claim').name;
-        const concatenated = externalSecrets
+        const concatenated = []
+            .concat(externalSecrets)
             .concat(pushSecrets)
             .filter((el) => el !== undefined);
         return concatenated.map((chart) => {
@@ -364876,7 +364900,7 @@ class SecretsChart extends BaseSecretsChart {
         }
         for (const pushSecret of pushSecretsFromClaim) {
             const k8sResource = {
-                apiVersion: 'external-secrets.io/v1',
+                apiVersion: 'external-secrets.io/v1alpha1',
                 kind: 'PushSecret',
                 metadata: {
                     name: catalog_common.generic.normalizeName(`${pushSecret.secretName}-${claim.name}`),

package/build/packages/cdk8s_renderer/imports/firestartr.dev.d.ts

@@ -711,6 +711,12 @@ export declare enum FirestartrGithubOrgWebhookSpecWebhookContentType {
  * @schema FirestartrGithubOrgWebhookSpecWebhookSecretRef
  */
 export interface FirestartrGithubOrgWebhookSpecWebhookSecretRef {
+    /**
+     * The type of Kubernetes resource to reference.
+     *
+     * @schema FirestartrGithubOrgWebhookSpecWebhookSecretRef#kind
+     */
+    readonly kind: FirestartrGithubOrgWebhookSpecWebhookSecretRefKind;
     /**
      * Secret name
      *
@@ -767,6 +773,15 @@ export interface FirestartrGithubOrgWebhookSpecWriteConnectionSecretToRefOutputs
  * Converts an object of type 'FirestartrGithubOrgWebhookSpecWriteConnectionSecretToRefOutputs' to JSON representation.
  */
 export declare function toJson_FirestartrGithubOrgWebhookSpecWriteConnectionSecretToRefOutputs(obj: FirestartrGithubOrgWebhookSpecWriteConnectionSecretToRefOutputs | undefined): Record<string, any> | undefined;
+/**
+ * The type of Kubernetes resource to reference.
+ *
+ * @schema FirestartrGithubOrgWebhookSpecWebhookSecretRefKind
+ */
+export declare enum FirestartrGithubOrgWebhookSpecWebhookSecretRefKind {
+    /** Secret */
+    SECRET = "Secret"
+}
 /**
  * @schema FirestartrGithubOrgWebhookSpecContextBackendRef
  */

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

@@ -1,8 +1,9 @@
-import { FirestartrGithubOrgWebhook, FirestartrGithubOrgWebhookProps } from '../../../imports/firestartr.dev';
+import { FirestartrGithubOrgWebhook, FirestartrGithubOrgWebhookProps, FirestartrGithubOrgWebhookSpecWebhookSecretRef } from '../../../imports/firestartr.dev';
 import { IUnitializedStateKey } from '../../claims/base';
 import { BaseGithubChart } from './base';
 export declare class GithubOrgWebhookChart extends BaseGithubChart {
     template(): FirestartrGithubOrgWebhookProps | IUnitializedStateKey;
+    renderSecret(secret: string): FirestartrGithubOrgWebhookSpecWebhookSecretRef;
     gvk(): import("cdk8s").GroupVersionKind;
     instanceApiObject(template: any): FirestartrGithubOrgWebhook;
 }

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

@@ -545,6 +545,9 @@ declare const schemas: {
                                     type: string;
                                     description: string;
                                 };
+                                secretRef: {
+                                    $ref: string;
+                                };
                                 events: {
                                     type: string;
                                     description: string;

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

@@ -182,6 +182,9 @@ export declare const GithubSchemas: ({
                                 type: string;
                                 description: string;
                             };
+                            secretRef: {
+                                $ref: string;
+                            };
                             events: {
                                 type: string;
                                 description: string;

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

@@ -8,10 +8,7 @@ export interface IGithubOrgWebhookClaim extends IOrgWebhookClaim {
             webhook: {
                 url: string;
                 contentType: FirestartrGithubOrgWebhookSpecWebhookContentType;
-                secretRef: {
-                    name: string;
-                    key: string;
-                };
+                secretRef: string;
                 active?: boolean;
                 events: string[];
             };

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

@@ -34,6 +34,9 @@ declare const _default: {
                                 type: string;
                                 description: string;
                             };
+                            secretRef: {
+                                $ref: string;
+                            };
                             events: {
                                 type: string;
                                 description: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "1.52.0-snapshot-8",
+  "version": "1.52.1-snapshot-10",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",