From c4f07caef75c9beb65c36820687a40776b213af7 Mon Sep 17 00:00:00 2001
From: Nizamudeen A <nia@redhat.com>
Date: Thu, 18 May 2023 17:33:44 +0530
Subject: [PATCH] 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)
---
 .../rgw-config-modal/rgw-config-modal.component.html | 12 +++++-------
 .../rgw-config-modal/rgw-config-modal.component.ts   |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

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 dbf93f4de3f97..a8ed178383476 100644
--- 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 de1541a680fe0..f2a0959109fbb 100644
--- 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: [
-- 
2.39.5