From: Afreen Misbah <afreen23.git@gmail.com>
Date: Wed, 18 Sep 2024 13:26:36 +0000 (+0530)
Subject: mgr/dashboard: Service form fixes for mTLS
X-Git-Tag: v20.0.0~1028^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bcbe50b01f37755c738c71c0725bc6fb6582000;p=ceph.git

mgr/dashboard: Service form fixes for mTLS

Due to conflicts with SSO PR, mTLS fields are not updated properly in code.
This is not happening only in main as noted: https://github.com/ceph/ceph/pull/59819#issuecomment-2356523491

The effect of this issue is mtls based fields not showing in service form

Fixes https://tracker.ceph.com/issues/68133

Signed-off-by: Afreen Misbah <afreen23.git@gmail.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
index 46d28f74e6b3..81df7582ce9e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
@@ -1292,7 +1292,7 @@
         </div>
 
         <!-- root_ca_cert -->
-        <div *ngIf="serviceForm.controls.enable_auth.value"
+        <div *ngIf="serviceForm.controls.enable_mtls.value"
              class="form-group row">
           <label class="cd-col-form-label required"
                  for="root_ca_cert">
@@ -1312,7 +1312,7 @@
         </div>
 
         <!-- client_cert -->
-        <div *ngIf="serviceForm.controls.enable_auth.value"
+        <div *ngIf="serviceForm.controls.enable_mtls.value"
              class="form-group row">
           <label class="cd-col-form-label required"
                  for="client_cert">
@@ -1332,7 +1332,7 @@
         </div>
 
         <!-- client_key -->
-        <div *ngIf="serviceForm.controls.enable_auth.value"
+        <div *ngIf="serviceForm.controls.enable_mtls.value"
              class="form-group row">
           <label class="cd-col-form-label required"
                  for="client_key">
@@ -1352,7 +1352,7 @@
         </div>
 
         <!-- server_cert -->
-        <div *ngIf="serviceForm.controls.enable_auth.value"
+        <div *ngIf="serviceForm.controls.enable_mtls.value"
              class="form-group row">
           <label class="cd-col-form-label required"
                  for="server_cert">
@@ -1372,7 +1372,7 @@
         </div>
 
         <!-- server_key -->
-        <div *ngIf="serviceForm.controls.enable_auth.value"
+        <div *ngIf="serviceForm.controls.enable_mtls.value"
              class="form-group row">
           <label class="cd-col-form-label required"
                  for="server_key">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts
index cbecc908e87d..bf1ac3ddf43c 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts
@@ -769,7 +769,7 @@ x4Ea7kGVgx9kWh5XjWz9wjZvY49UKIT5ppIAWPMbLl3UpfckiuNhTA==
         formHelper.setValue('pool', 'rbd');
         formHelper.setValue('group', 'default');
         // mTLS disabled
-        formHelper.setValue('enable_auth', false);
+        formHelper.setValue('enable_mtls', false);
         component.onSubmit();
         expect(cephServiceService.update).toHaveBeenCalledWith({
           service_type: 'nvmeof',
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts
index aa50aeab0b4a..889b7fe41979 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts
@@ -694,12 +694,12 @@ export class ServiceFormComponent extends CdForm implements OnInit {
             case 'nvmeof':
               this.serviceForm.get('pool').setValue(response[0].spec.pool);
               this.serviceForm.get('group').setValue(response[0].spec.group);
-              this.serviceForm.get('enable_auth').setValue(response[0].spec.enable_auth);
-              this.serviceForm.get('root_ca_cert').setValue(response[0].spec.root_ca_cert);
-              this.serviceForm.get('client_cert').setValue(response[0].spec.client_cert);
-              this.serviceForm.get('client_key').setValue(response[0].spec.client_key);
-              this.serviceForm.get('server_cert').setValue(response[0].spec.server_cert);
-              this.serviceForm.get('server_key').setValue(response[0].spec.server_key);
+              this.serviceForm.get('enable_mtls').setValue(response[0].spec?.enable_auth);
+              this.serviceForm.get('root_ca_cert').setValue(response[0].spec?.root_ca_cert);
+              this.serviceForm.get('client_cert').setValue(response[0].spec?.client_cert);
+              this.serviceForm.get('client_key').setValue(response[0].spec?.client_key);
+              this.serviceForm.get('server_cert').setValue(response[0].spec?.server_cert);
+              this.serviceForm.get('server_key').setValue(response[0].spec?.server_key);
               break;
             case 'rgw':
               this.serviceForm