npm - @firestartr/cli - Versions diffs - 1.49.0-snapshot-9 → 1.49.0-snapshot-11 - Mend

@firestartr/cli 1.49.0-snapshot-9 → 1.49.0-snapshot-11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/build/index.js CHANGED Viewed

@@ -301959,6 +301959,7 @@ const ArgoCDSchemas = [argocd_schema];
                                         type: 'object',
                                         properties: {
                                             secretName: { type: 'string' },
+                                            remoteRef: { type: 'string' },
                                         },
                                         required: ['secretName'],
                                     },
@@ -301966,7 +301967,7 @@ const ArgoCDSchemas = [argocd_schema];
                             },
                         },
                     },
-                    required: ['secretStore'],
+                    required: ['secretStore', 'externalSecrets', 'pushSecrets'],
                 },
             ],
         },
@@ -302667,20 +302668,15 @@ function validatePermissionsUniqueness(crs) {
             const permissions = cr.spec.permissions;
             cdk8s_renderer_src_logger.debug(`Validating Permissions Uniqueness of ${crkey}`);
             if (permissions) {
-                const rolesByIdentifier = new Map();
+                const seen = new Set();
                 for (const perm of permissions) {
                     const identifier = perm.collaborator
                         ? perm.collaborator
                         : `ref:${perm.ref.kind}:${perm.ref.name}`;
-                    const role = perm.role;
-                    if (rolesByIdentifier.has(identifier)) {
-                        const prevRole = rolesByIdentifier.get(identifier);
-                        if (prevRole !== role) {
-                            throw new Error(`Conflicting permission role in FirestartrGithubRepository ${crkey}: ${identifier} has roles "${prevRole}" and "${role}".\nFull CR: ${JSON.stringify(cr, null, 2)}`);
-                        }
-                        continue;
+                    if (seen.has(identifier)) {
+                        throw new Error(`Duplicate permission reference found in FirestartrGithubRepository ${crkey}: ${identifier}\nFull CR: ${JSON.stringify(cr, null, 2)}`);
                     }
-                    rolesByIdentifier.set(identifier, role);
+                    seen.add(identifier);
                 }
             }
         }
@@ -308058,12 +308054,12 @@ class SecretsChart extends BaseSecretsChart {
             refsData.push({
                 secretKey: secret.secretName,
                 remoteRef: {
-                    key: secret.secretName,
+                    key: secret.remoteRef ? secret.remoteRef : secret.secretName,
                 },
             });
         }
         const k8sResource = {
-            apiVersion: 'external-secrets.io/v1alpha1',
+            apiVersion: 'external-secrets.io/v1',
             kind: 'ExternalSecret',
             metadata: {
                 name: catalog_common.generic.normalizeName(claim.name),
@@ -308110,7 +308106,7 @@ class SecretsChart extends BaseSecretsChart {
         }
         for (const pushSecret of pushSecretsFromClaim) {
             const k8sResource = {
-                apiVersion: 'external-secrets.io/v1alpha1',
+                apiVersion: 'external-secrets.io/v1',
                 kind: 'PushSecret',
                 metadata: {
                     name: catalog_common.generic.normalizeName(`${pushSecret.secretName}-${claim.name}`),

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

@@ -932,6 +932,9 @@ declare const schemas: {
                                             secretName: {
                                                 type: string;
                                             };
+                                            remoteRef: {
+                                                type: string;
+                                            };
                                         };
                                         required: string[];
                                     };

package/build/packages/cdk8s_renderer/src/claims/external-secrets/external-secrets.schema.d.ts CHANGED Viewed

@@ -85,6 +85,9 @@ declare const _default: {
                                         secretName: {
                                             type: string;
                                         };
+                                        remoteRef: {
+                                            type: string;
+                                        };
                                     };
                                     required: string[];
                                 };

package/build/packages/cdk8s_renderer/src/claims/external-secrets/index.d.ts CHANGED Viewed

@@ -85,6 +85,9 @@ export declare const SecretsSchemas: {
                                         secretName: {
                                             type: string;
                                         };
+                                        remoteRef: {
+                                            type: string;
+                                        };
                                     };
                                     required: string[];
                                 };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "1.49.0-snapshot-9",
+  "version": "1.49.0-snapshot-11",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",