From b0fe0c9d422541365b9385991ead2fd0b6f6d79f Mon Sep 17 00:00:00 2001
From: Florent CHAMFROY <florent.chamfroy@graviteesource.com>
Date: Tue, 14 Jan 2025 16:42:15 +0100
Subject: [PATCH] feat: improve http-proxy schema-form

add "(supports EL and Secrets)" on fields that supports the new secrets feature

(cherry picked from commit 957f1e44c93890484f6fee4cc4af47f46d367eca)
---
 .../main/resources/schemas/schema-form.json   |  2 +-
 .../sharedConfiguration/schema-form.json      | 26 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/src/main/resources/schemas/schema-form.json b/gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/src/main/resources/schemas/schema-form.json
index 73c100f0767..349b2b87f10 100644
--- a/gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/src/main/resources/schemas/schema-form.json
+++ b/gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/src/main/resources/schemas/schema-form.json
@@ -4,7 +4,7 @@
     "definitions":{
         "target":{
             "title":"Target url",
-            "description":"The target url to use to contact the backend",
+            "description":"The target url to use to contact the backend (supports EL and Secrets)",
             "type":"string",
             "pattern": "^\\S+$"
         }
diff --git a/gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/src/main/resources/schemas/sharedConfiguration/schema-form.json b/gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/src/main/resources/schemas/sharedConfiguration/schema-form.json
index 9d415abaa99..25ab648dfe5 100644
--- a/gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/src/main/resources/schemas/sharedConfiguration/schema-form.json
+++ b/gravitee-apim-plugin/gravitee-apim-plugin-endpoint/gravitee-apim-plugin-endpoint-http-proxy/src/main/resources/schemas/sharedConfiguration/schema-form.json
@@ -303,12 +303,12 @@
                         "username":{
                             "type":"string",
                             "title":"Proxy username",
-                            "description":"Optional proxy username"
+                            "description":"Optional proxy username (supports EL and Secrets)"
                         },
                         "password":{
                             "type":"string",
                             "title":"Proxy password",
-                            "description":"Optional proxy password",
+                            "description":"Optional proxy password (supports EL and Secrets)",
                             "format":"password"
                         }
                     },
@@ -335,7 +335,7 @@
         "sslTrustStorePassword":{
             "type":"string",
             "title":"Password",
-            "description":"Truststore password",
+            "description":"Truststore password (supports EL and Secrets)",
             "format":"password",
             "gioConfig":{
                 "banner":{
@@ -347,60 +347,62 @@
         "sslTrustStorePath":{
             "type":"string",
             "title":"Path to truststore",
-            "description":"Path to the truststore file"
+            "description":"Path to the truststore file (supports EL and Secrets)"
         },
         "sslTrustStoreContent":{
             "type":"string",
             "title":"Content",
-            "description":"Binary content as Base64",
+            "description":"Binary content as Base64 (supports EL and Secrets)",
             "format":"text"
         },
         "sslKeyStorePassword":{
             "type":"string",
             "title":"Password",
-            "description":"Password to use to open the key store",
+            "description":"Password to use to open the key store (supports EL and Secrets)",
             "format":"password"
         },
         "sslKeyStoreAlias":{
             "type":"string",
             "title":"Alias for the key",
-            "description":"Alias of the key to use in case the key store contains more than one key"
+            "description":"Alias of the key to use in case the key store contains more than one key (supports EL and Secrets)"
         },
         "sslKeyStoreKeyPassword":{
             "type":"string",
             "title":"Key Password",
-            "description":"Password to use to access the key when protected by password",
+            "description":"Password to use to access the key when protected by password (supports EL and Secrets)",
             "format":"password"
         },
         "sslKeyStorePath":{
             "type":"string",
             "title":"Path to key store",
-            "description":"Path to the key store file"
+            "description":"Path to the key store file (supports EL and Secrets)"
         },
         "sslKeyStoreContent":{
             "type":"string",
             "title":"Content",
-            "description":"Binary content as Base64",
+            "description":"Binary content as Base64 (supports EL and Secrets)",
             "format":"text"
         },
         "sslKeyStoreCertPath":{
             "type":"string",
             "title":"Path to cert file",
-            "description":"Path to cert file (.PEM)"
+            "description":"Path to cert file (.PEM) (supports EL and Secrets)"
         },
         "sslKeyStoreCertContent":{
             "type":"string",
             "title":"Certificate",
+            "description": "(supports EL and Secrets)",
             "format":"text"
         },
         "sslKeyStoreKeyPath":{
             "type":"string",
             "title":"Path to private key file",
-            "description":"Path to private key file (.PEM)"
+            "description":"Path to private key file (.PEM) (supports EL and Secrets)"
         },
         "sslKeyStoreKeyContent":{
             "type":"string",
             "title":"Private key",
+            "description": "(supports EL and Secrets)",
             "format":"text"
         },
         "ssl":{