PB-9235: moved smtp certificate fileds under common.proto

Signed-off-by: Kesavan Thiruvenkadasamy <[email protected]>
portworx · Jan 7, 2025 · 7ac5f5f · 7ac5f5f
1 parent bc2b46f
commit 7ac5f5f
Show file tree

Hide file tree

Showing 6 changed files with 1,339 additions and 984 deletions.
diff --git a/pkg/apis/v1/api.pb.go b/pkg/apis/v1/api.pb.go
diff --git a/pkg/apis/v1/api.proto b/pkg/apis/v1/api.proto
@@ -1580,21 +1580,8 @@ message EmailConfig {
     ];
     // Allow custom certificate for SMTP server client creation
     bool allow_custom_certificate = 9;
-    // Certificate file content
-    string cert_file = 10 [
-        (gogoproto.jsontag) = "certfile",
-        (gogoproto.moretags) = "secure:\"true\""
-    ];
-    // Key file content
-    string key_file = 11 [
-        (gogoproto.jsontag) = "keyfile",
-        (gogoproto.moretags) = "secure:\"true\""
-    ];
-    // CA certificate file content
-    string ca_cert_file = 12 [
-        (gogoproto.jsontag) = "cacertfile",
-        (gogoproto.moretags) = "secure:\"true\""
-    ];
+    // TLS configuration for SMTP server client creation
+    TlsConfig tlsConfig = 10;
 }
 
 message ReceiverInfo {

diff --git a/pkg/apis/v1/api.swagger.json b/pkg/apis/v1/api.swagger.json
@@ -4938,17 +4938,9 @@
           "format": "boolean",
           "title": "Allow custom certificate for SMTP server client creation"
         },
-        "cert_file": {
-          "type": "string",
-          "title": "Certificate file content"
-        },
-        "key_file": {
-          "type": "string",
-          "title": "Key file content"
-        },
-        "ca_cert_file": {
-          "type": "string",
-          "title": "CA certificate file content"
+        "tlsConfig": {
+          "$ref": "#/definitions/TlsConfig",
+          "title": "TLS configuration for SMTP server client creation"
         }
       }
     },
@@ -7014,6 +7006,23 @@
         }
       }
     },
+    "TlsConfig": {
+      "type": "object",
+      "properties": {
+        "cert_file": {
+          "type": "string",
+          "title": "Certificate file content"
+        },
+        "key_file": {
+          "type": "string",
+          "title": "Key file content"
+        },
+        "ca_cert_file": {
+          "type": "string",
+          "title": "CA certificate file content"
+        }
+      }
+    },
     "UnShareClusterRequest": {
       "type": "object",
       "properties": {