GCP KMS many fixes

- Operator-UI didnt correctly append gcp kms configuration

Author: Alevsk

portal-ui/src/screens/Console/Tenants/ListTenants/AddTenant.tsx

@@ -17,7 +17,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import debounce from "lodash/debounce";
 import get from "lodash/get";
-import ModalWrapper from "../../Common/ModalWrapper/ModalWrapper";
 import Grid from "@material-ui/core/Grid";
 import InputBoxWrapper from "../../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
 import { Button, LinearProgress, Paper, Typography } from "@material-ui/core";
@@ -27,10 +26,7 @@ import TableCell from "@material-ui/core/TableCell";
 import TableRow from "@material-ui/core/TableRow";
 import api from "../../../../common/api";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import {
-  containerForHeader,
-  modalBasic,
-} from "../../Common/FormComponents/common/styleLibrary";
+import { modalBasic } from "../../Common/FormComponents/common/styleLibrary";
 import FormSwitchWrapper from "../../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
 import SelectWrapper from "../../Common/FormComponents/SelectWrapper/SelectWrapper";
 import {
@@ -268,6 +264,7 @@ const AddTenant = ({ classes }: IAddTenantProps) => {
     vaultCert: "",
     vaultCA: "",
     gemaltoCA: "",
+    gcpPrivateKey: "",
   });
 
   // Files States
@@ -299,6 +296,7 @@ const AddTenant = ({ classes }: IAddTenantProps) => {
   const [vaultCertVal, setVaultCertVal] = useState<string>("");
   const [vaultCAVal, setVaultCAVal] = useState<string>("");
   const [gemaltoCAVal, setGemaltoCAVal] = useState<string>("");
+  const [gcpPrivateKeyVal, setGcpPrivateKeyVal] = useState<string>("");
 
   // Flow
 
@@ -853,17 +851,6 @@ const AddTenant = ({ classes }: IAddTenantProps) => {
         ];
       }
 
-      if (encryptionType === "gcp") {
-        encryptionValidation = [
-          ...encryptionValidation,
-          {
-            fieldKey: "gcp_project_id",
-            required: true,
-            value: gcpProjectID,
-          },
-        ];
-      }
-
       if (encryptionType === "aws") {
         encryptionValidation = [
           ...encryptionValidation,
@@ -1100,7 +1087,13 @@ const AddTenant = ({ classes }: IAddTenantProps) => {
               },
             };
             break;
-          case "GCP":
+          case "gcp":
+            // let gcpPrivateKey = {};
+            // if (filesBase64.gcpPrivateKey !== "") {
+            //   gcpPrivateKey = {
+            //     private_key: filesBase64.gcpPrivateKey,
+            //   };
+            // }
             insertEncrypt = {
               gcp: {
                 secretmanager: {
@@ -1111,6 +1104,7 @@ const AddTenant = ({ classes }: IAddTenantProps) => {
                     client_id: gcpClientID,
                     private_key_id: gcpPrivateKeyID,
                     private_key: gcpPrivateKey,
+                    // ...gcpPrivateKey,
                   },
                 },
               },
@@ -2311,12 +2305,9 @@ const AddTenant = ({ classes }: IAddTenantProps) => {
                       name="gcp_project_id"
                       onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                         setGcpProjectID(e.target.value);
-                        clearValidationError("gcp_project_id");
                       }}
                       label="Project ID"
                       value={gcpProjectID}
-                      error={validationErrors["gcp_project_id"] || ""}
-                      required
                     />
                   </Grid>
                   <Grid item xs={12}>
@@ -2375,6 +2366,20 @@ const AddTenant = ({ classes }: IAddTenantProps) => {
                       value={gcpPrivateKey}
                     />
                   </Grid>
+                  {/*<Grid item xs={12}>*/}
+                  {/*  <FileSelector*/}
+                  {/*    onChange={(encodedValue, fileName) => {*/}
+                  {/*      storeCertInObject("gcpPrivateKey", encodedValue);*/}
+                  {/*      setGcpPrivateKeyVal(fileName);*/}
+                  {/*      clearValidationError("gcp_private_key");*/}
+                  {/*    }}*/}
+                  {/*    accept=".key,.pem"*/}
+                  {/*    id="gcp_private_key"*/}
+                  {/*    name="gcp_private_key"*/}
+                  {/*    label="Private Key"*/}
+                  {/*    value={gcpPrivateKeyVal}*/}
+                  {/*  />*/}
+                  {/*</Grid>*/}
                 </React.Fragment>
               )}
               {encryptionType === "aws" && (

restapi/consts.go

@@ -62,7 +62,7 @@ const (
 
 // Image versions
 const (
-	KESImageVersion            = "minio/kes:v0.13.1"
+	KESImageVersion            = "minio/kes:v0.13.4"
 	ConsoleImageDefaultVersion = "minio/console:v0.5.2"
 )