mgr/dashboard: put some default values on rgw encryption config form

Fixes: https://tracker.ceph.com/issues/61246
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 024ba4ee38212138d9c5aa85bd3e12be68e5a40c)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html
index dbf93f4de3f971daf9a781cbd6b4be29abbd6c23..a8ed17838347630500ea72fa2a9f22c2332220cf 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html
@@ -69,9 +69,6 @@
                     name="auth_method"
                     class="form-select"
                     formControlName="auth_method">
-              <option i18n
-                      *ngIf="authMethods !== null"
-                      [ngValue]="null">-- Select a method --</option>
               <option *ngFor="let auth_method of authMethods"
                       [value]="auth_method">{{ auth_method }}</option>
             </select>
@@ -92,9 +89,6 @@
                     name="secret_engine"
                     class="form-select"
                     formControlName="secret_engine">
-              <option i18n
-                      *ngIf="secretEngines !== null"
-                      [ngValue]="null">-- Select a method --</option>
               <option *ngFor="let secret_engine of secretEngines"
                       [value]="secret_engine">{{ secret_engine }}</option>
             </select>
@@ -150,7 +144,8 @@
             <input id="address"
                    name="address"
                    class="form-control"
-                   formControlName="address">
+                   formControlName="address"
+                   placeholder="http://127.0.0.1:8000">
             <span class="invalid-feedback"
                   *ngIf="configForm.showError('address', frm, 'required')"
                   i18n>This field is required.</span>
@@ -163,6 +158,9 @@
         <label class="cd-col-form-label required"
                for="token">
         <span i18n>Token</span>
+        <cd-helper i18n>
+          The token authentication method expects a Vault token to be present in a plaintext file.
+        </cd-helper>
         </label>
         <div class="cd-col-form-input">
           <input type="file"

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.ts
index de1541a680fe0fd36f6ef50a56e712f74346a880..f2a0959109fbb72d609accbf1e0055f40b75f6e0 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.ts
@@ -65,8 +65,8 @@ export class RgwConfigModalComponent implements OnInit {
       ],
       kms_provider: ['vault', Validators.required],
       encryptionType: ['aws:kms', Validators.required],
-      auth_method: [null, Validators.required],
-      secret_engine: [null, Validators.required],
+      auth_method: ['token', Validators.required],
+      secret_engine: ['kv', Validators.required],
       secret_path: ['/'],
       namespace: [null],
       token: [