@rancher/shell 3.0.5-rc.3 → 3.0.5-rc.5

package/edit/auth/oidc.vue

@@ -5,6 +5,7 @@ import AuthConfig from '@shell/mixins/auth-config';
 import CruResource from '@shell/components/CruResource';
 import AllowedPrincipals from '@shell/components/auth/AllowedPrincipals';
 import FileSelector from '@shell/components/form/FileSelector';
+import { Banner } from '@components/Banner';
 import AuthBanner from '@shell/components/auth/AuthBanner';
 import AuthProviderWarningBanners from '@shell/edit/auth/AuthProviderWarningBanners';
 import AdvancedSection from '@shell/components/AdvancedSection.vue';
@@ -13,9 +14,11 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import { RadioGroup } from '@components/Form/Radio';
 import { Checkbox } from '@components/Form/Checkbox';
 import { BASE_SCOPES } from '@shell/store/auth';
+import CopyToClipboardText from '@shell/components/CopyToClipboardText.vue';
 
 export default {
   components: {
+    Banner,
     Loading,
     CruResource,
     AllowedPrincipals,
@@ -27,6 +30,7 @@ export default {
     LabeledInput,
     RadioGroup,
     Checkbox,
+    CopyToClipboardText,
   },
 
   mixins: [CreateEditView, AuthConfig],
@@ -85,7 +89,11 @@ export default {
         return false;
       }
 
-      if ( !this.customEndpoint.value ) {
+      if (this.isAmazonCognito) {
+        const { issuer } = this.model;
+
+        return !!(clientId && clientSecret && issuer);
+      } else if ( !this.customEndpoint.value ) {
         const { url, realm } = this.oidcUrls;
 
         return !!(clientId && clientSecret && url && realm);
@@ -107,6 +115,20 @@ export default {
      */
     requiredScopes() {
       return this.model.id ? (BASE_SCOPES[this.model.id] || []) ? (BASE_SCOPES[this.model.id] || [])[0].split(' ') : [] : [];
+    },
+
+    requiresCert() {
+      // We assume all do, apart from the ones here, which do not
+      return !(['cognito'].includes(this.model.id));
+    },
+
+    supportsGroupSearch() {
+      // We assume all do, apart from the ones here, which do not
+      return !(['cognito'].includes(this.model.id));
+    },
+
+    isAmazonCognito() {
+      return this.model?.id === 'cognito';
     }
   },
 
@@ -205,7 +227,9 @@ export default {
             <tr><td>{{ t(`authConfig.oidc.rancherUrl`) }}: </td><td>{{ model.rancherUrl }}</td></tr>
             <tr><td>{{ t(`authConfig.oidc.clientId`) }}: </td><td>{{ model.clientId }}</td></tr>
             <tr><td>{{ t(`authConfig.oidc.issuer`) }}: </td><td>{{ model.issuer }}</td></tr>
-            <tr><td>{{ t(`authConfig.oidc.authEndpoint`) }}: </td><td>{{ model.authEndpoint }}</td></tr>
+            <tr v-if="model.authEndpoint">
+              <td>{{ t(`authConfig.oidc.authEndpoint`) }}: </td><td>{{ model.authEndpoint }}</td>
+            </tr>
           </template>
         </AuthBanner>
 
@@ -226,6 +250,25 @@ export default {
 
         <h3>{{ t(`authConfig.oidc.${NAME}`) }}</h3>
 
+        <Banner
+          v-if="!model.enabled && isAmazonCognito"
+          color="info"
+          class="mb-20 mt-0"
+          data-testid="oidc-cognito-banner"
+        >
+          <div>
+            <div
+              v-clean-html="t('authConfig.oidc.cognitoHelp', {}, true)"
+            />
+            <div class="mt-10">
+              <CopyToClipboardText
+                :plain="true"
+                :text="model.rancherUrl"
+              />
+            </div>
+          </div>
+        </Banner>
+
         <!-- Auth credentials -->
         <div class="row mb-20">
           <div class="col span-6">
@@ -249,7 +292,10 @@ export default {
         </div>
 
         <!-- Key/Certificate -->
-        <div class="row mb-20">
+        <div
+          v-if="requiresCert"
+          class="row mb-20"
+        >
           <div class="col span-6">
             <LabeledInput
               v-model:value="model.privateKey"
@@ -283,7 +329,10 @@ export default {
         </div>
 
         <!-- Allow group search -->
-        <div class="row mb-20">
+        <div
+          v-if="supportsGroupSearch"
+          class="row mb-20"
+        >
           <div class="col span-6">
             <Checkbox
               v-model:value="model.groupSearchEnabled"
@@ -309,102 +358,59 @@ export default {
           </div>
         </div>
 
-        <!-- Generated vs Specific Endpoints -->
-        <div class="row mb-20">
-          <div class="col span-6">
-            <RadioGroup
-              v-model:value="customEndpoint.value"
-              name="customEndpoint"
-              label-key="authConfig.oidc.customEndpoint.label"
-              :labels="customEndpoint.labels"
-              :options="customEndpoint.options"
-              data-testid="oidc-custom-endpoint"
-            >
-              <template #label>
-                <h4>{{ t('authConfig.oidc.customEndpoint.label') }}</h4>
-              </template>
-            </RadioGroup>
-          </div>
-        </div>
-
-        <!-- Generated endpoints -->
-        <div class="row mb-20">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="oidcUrls.url"
-              :label="t(`authConfig.oidc.url`)"
-              :mode="mode"
-              :required="!customEndpoint.value"
-              :disabled="customEndpoint.value"
-              data-testid="oidc-url"
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="oidcUrls.realm"
-              :label="t(`authConfig.oidc.realm`)"
-              :mode="mode"
-              :required="!customEndpoint.value"
-              :disabled="customEndpoint.value"
-              data-testid="oidc-realm"
-            />
-          </div>
-        </div>
-
-        <!-- Specific Endpoints -->
-        <div class="row mb-20">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="model.rancherUrl"
-              :label="t(`authConfig.oidc.rancherUrl`)"
-              :mode="mode"
-              required
-              :disabled="!customEndpoint.value"
-              data-testid="oidc-rancher-url"
-            />
-          </div>
-        </div>
-
-        <div class="row mb-20">
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="model.issuer"
-              :label="t(`authConfig.oidc.issuer`)"
-              :mode="mode"
-              required
-              :disabled="!customEndpoint.value"
-              data-testid="oidc-issuer"
-            />
-          </div>
-          <div class="col span-6">
-            <LabeledInput
-              v-model:value="model.authEndpoint"
-              :label="t(`authConfig.oidc.authEndpoint`)"
-              :mode="mode"
-              :disabled="!customEndpoint.value"
-              :required="requiresAuthEndpoint"
-              data-testid="oidc-auth-endpoint"
-            />
+        <template v-if="!isAmazonCognito">
+          <!-- Generated vs Specific Endpoints -->
+          <div class="row mb-20">
+            <div class="col span-6">
+              <RadioGroup
+                v-model:value="customEndpoint.value"
+                name="customEndpoint"
+                label-key="authConfig.oidc.customEndpoint.label"
+                :labels="customEndpoint.labels"
+                :options="customEndpoint.options"
+                data-testid="oidc-custom-endpoint"
+              >
+                <template #label>
+                  <h4>{{ t('authConfig.oidc.customEndpoint.label') }}</h4>
+                </template>
+              </RadioGroup>
+            </div>
           </div>
-        </div>
 
-        <!-- Advanced section -->
-        <AdvancedSection :mode="mode">
+          <!-- Generated endpoints -->
           <div class="row mb-20">
             <div class="col span-6">
               <LabeledInput
-                v-model:value="model.jwksUrl"
-                :label="t(`authConfig.oidc.jwksUrl`)"
+                v-model:value="oidcUrls.url"
+                :label="t(`authConfig.oidc.url`)"
                 :mode="mode"
-                :disabled="!customEndpoint.value"
+                :required="!customEndpoint.value"
+                :disabled="customEndpoint.value"
+                data-testid="oidc-url"
               />
             </div>
             <div class="col span-6">
               <LabeledInput
-                v-model:value="model.tokenEndpoint"
-                :label="t(`authConfig.oidc.tokenEndpoint`)"
+                v-model:value="oidcUrls.realm"
+                :label="t(`authConfig.oidc.realm`)"
                 :mode="mode"
+                :required="!customEndpoint.value"
+                :disabled="customEndpoint.value"
+                data-testid="oidc-realm"
+              />
+            </div>
+          </div>
+
+          <!-- Specific Endpoints -->
+          <div class="row mb-20">
+            <div class="col span-6">
+              <LabeledInput
+                v-model:value="model.rancherUrl"
+                :label="t(`authConfig.oidc.rancherUrl`)"
+                :mode="mode"
+                required
                 :disabled="!customEndpoint.value"
+                data-testid="oidc-rancher-url"
               />
             </div>
           </div>
@@ -412,22 +418,82 @@ export default {
           <div class="row mb-20">
             <div class="col span-6">
               <LabeledInput
-                v-model:value="model.userInfoEndpoint"
-                :label="t(`authConfig.oidc.userInfoEndpoint`)"
+                v-model:value="model.issuer"
+                :label="t(`authConfig.oidc.issuer`)"
                 :mode="mode"
+                required
                 :disabled="!customEndpoint.value"
+                data-testid="oidc-issuer"
               />
             </div>
             <div class="col span-6">
               <LabeledInput
-                v-model:value="model.acrValue"
-                :label="t(`authConfig.oidc.acrValue`)"
+                v-model:value="model.authEndpoint"
+                :label="t(`authConfig.oidc.authEndpoint`)"
                 :mode="mode"
                 :disabled="!customEndpoint.value"
+                :required="requiresAuthEndpoint"
+                data-testid="oidc-auth-endpoint"
+              />
+            </div>
+          </div>
+
+          <!-- Advanced section -->
+          <AdvancedSection :mode="mode">
+            <div class="row mb-20">
+              <div class="col span-6">
+                <LabeledInput
+                  v-model:value="model.jwksUrl"
+                  :label="t(`authConfig.oidc.jwksUrl`)"
+                  :mode="mode"
+                  :disabled="!customEndpoint.value"
+                />
+              </div>
+              <div class="col span-6">
+                <LabeledInput
+                  v-model:value="model.tokenEndpoint"
+                  :label="t(`authConfig.oidc.tokenEndpoint`)"
+                  :mode="mode"
+                  :disabled="!customEndpoint.value"
+                />
+              </div>
+            </div>
+
+            <div class="row mb-20">
+              <div class="col span-6">
+                <LabeledInput
+                  v-model:value="model.userInfoEndpoint"
+                  :label="t(`authConfig.oidc.userInfoEndpoint`)"
+                  :mode="mode"
+                  :disabled="!customEndpoint.value"
+                />
+              </div>
+              <div class="col span-6">
+                <LabeledInput
+                  v-model:value="model.acrValue"
+                  :label="t(`authConfig.oidc.acrValue`)"
+                  :mode="mode"
+                  :disabled="!customEndpoint.value"
+                />
+              </div>
+            </div>
+          </AdvancedSection>
+        </template>
+
+        <template v-if="isAmazonCognito">
+          <h3>{{ t(`authConfig.oidc.cognitoIssuer`) }}</h3>
+          <div class="row mb-20">
+            <div class="col span-6">
+              <LabeledInput
+                v-model:value="model.issuer"
+                :label="t(`authConfig.oidc.issuer`)"
+                :mode="mode"
+                required
+                data-testid="oidc-issuer"
               />
             </div>
           </div>
-        </AdvancedSection>
+        </template>
       </template>
     </CruResource>
   </div>

package/edit/fleet.cattle.io.gitrepo.vue

@@ -28,9 +28,8 @@ import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 import FormValidation from '@shell/mixins/form-validation';
 import UnitInput from '@shell/components/form/UnitInput';
 import { toSeconds } from '@shell/utils/duration';
-
-const MINIMUM_POLLING_INTERVAL = 15;
-const DEFAULT_POLLING_INTERVAL = 60;
+import FleetOCIStorageSecret from '@shell/components/fleet/FleetOCIStorageSecret.vue';
+import { DEFAULT_POLLING_INTERVAL, MINIMUM_POLLING_INTERVAL } from '@shell/models/fleet-application';
 
 const _VERIFY = 'verify';
 const _SKIP = 'skip';
@@ -48,6 +47,7 @@ export default {
     ArrayList,
     Banner,
     CruResource,
+    FleetOCIStorageSecret,
     InputWithSelect,
     Labels,
     LabeledInput,
@@ -130,7 +130,6 @@ export default {
     return {
       allClusters:             [],
       allClusterGroups:        [],
-      allWorkspaces:           [],
       tempCachedValues:        {},
       username:                null,
       password:                null,
@@ -153,7 +152,7 @@ export default {
         path:  'spec.repo',
         rules: [
           'required',
-          'gitRepository'
+          'urlRepository'
         ],
       }]
     };
@@ -215,14 +214,6 @@ export default {
       return !(this.value?.spec?.repo || '').startsWith('http://');
     },
 
-    isPollingEnabled() {
-      return !this.value.spec.disablePolling;
-    },
-
-    isWebhookConfigured() {
-      return !!this.value.status?.webhookCommit;
-    },
-
     targetOptions() {
       const out = [
         {
@@ -279,22 +270,6 @@ export default {
       return out;
     },
 
-    clusterNames() {
-      const out = this.allClusters
-        .filter((x) => x.metadata.namespace === this.value.metadata.namespace)
-        .map((x) => x.metadata.name);
-
-      return out;
-    },
-
-    clusterGroupNames() {
-      const out = this.allClusterGroups
-        .filter((x) => x.metadata.namespace === this.value.metadata.namespace)
-        .map((x) => x.metadata.name);
-
-      return out;
-    },
-
     tlsOptions() {
       return [
         { label: this.t('fleet.gitRepo.tls.verify'), value: _VERIFY },
@@ -304,7 +279,7 @@ export default {
     },
 
     showPollingIntervalWarning() {
-      return !this.isView && this.isPollingEnabled && this.pollingInterval < MINIMUM_POLLING_INTERVAL;
+      return !this.isView && this.value.isPollingEnabled && this.pollingInterval < MINIMUM_POLLING_INTERVAL;
     },
   },
 
@@ -328,6 +303,10 @@ export default {
     this.registerBeforeHook(this.cleanTLS, 'cleanTLS');
     this.registerBeforeHook(this.doCreateSecrets, `registerAuthSecrets${ new Date().getTime() }`, 99);
     this.registerBeforeHook(this.updateBeforeSave);
+
+    if (this.realMode === _EDIT && this.workspace !== this.value.namespace) {
+      this.$store.commit('updateWorkspace', { value: this.value.namespace, getters: this.$store.getters });
+    }
   },
 
   methods: {
@@ -750,6 +729,20 @@ export default {
         </div>
       </template>
       <div class="spacer" />
+
+      <h2 v-t="'fleet.gitRepo.ociStorageSecret.title'" />
+      <div class="row mt-20">
+        <div class="col span-6">
+          <FleetOCIStorageSecret
+            :secret="value.spec.ociRegistrySecret"
+            :workspace="workspace"
+            :mode="mode"
+            @update:value="value.spec.ociRegistrySecret=$event"
+          />
+        </div>
+      </div>
+      <div class="spacer" />
+
       <h2 v-t="'fleet.gitRepo.resources.label'" />
       <div class="resource-handling">
         <Checkbox
@@ -777,7 +770,7 @@ export default {
       <div class="row polling">
         <div class="col span-6">
           <Checkbox
-            v-model:value="isPollingEnabled"
+            :value="value.isPollingEnabled"
             data-testid="gitRepo-enablePolling-checkbox"
             class="check"
             type="checkbox"
@@ -786,7 +779,7 @@ export default {
             @update:value="enablePolling"
           />
         </div>
-        <template v-if="isPollingEnabled">
+        <template v-if="value.isPollingEnabled">
           <div class="col">
             <Banner
               v-if="showPollingIntervalWarning"
@@ -795,7 +788,7 @@ export default {
               data-testid="gitRepo-pollingInterval-minimumValueWarning"
             />
             <Banner
-              v-if="isWebhookConfigured"
+              v-if="value.isWebhookConfigured"
               color="warning"
               label-key="fleet.gitRepo.polling.pollingInterval.webhookWarning"
               data-testid="gitRepo-pollingInterval-webhookWarning"