From 6d53dc22e8015a0b65536be6b62aeb5b425fc067 Mon Sep 17 00:00:00 2001
From: Philippe Perrin <philippe.perrin@sonarsource.com>
Date: Tue, 31 Aug 2021 14:40:23 +0200
Subject: [PATCH] SONAR-15322 Fix DevOps platform field's max length
 disprecancies

---
 .../js/apps/settings/components/almIntegration/AzureForm.tsx | 1 +
 .../components/almIntegration/BitbucketCloudForm.tsx         | 5 +++--
 .../components/almIntegration/BitbucketServerForm.tsx        | 2 +-
 .../apps/settings/components/almIntegration/GithubForm.tsx   | 1 +
 .../apps/settings/components/almIntegration/GitlabForm.tsx   | 1 +
 .../__tests__/__snapshots__/AzureForm-test.tsx.snap          | 2 ++
 .../__tests__/__snapshots__/BitbucketCloudForm-test.tsx.snap | 5 +++--
 .../__snapshots__/BitbucketServerForm-test.tsx.snap          | 2 +-
 .../__tests__/__snapshots__/GithubForm-test.tsx.snap         | 2 ++
 .../__tests__/__snapshots__/GitlabForm-test.tsx.snap         | 2 ++
 .../org/sonar/server/almsettings/ws/CreateGithubAction.java  | 4 ++--
 .../server/almsettings/ws/UpdateBitbucketCloudAction.java    | 5 +++--
 12 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AzureForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AzureForm.tsx
index 128f260f341..cedafcad2dd 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AzureForm.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AzureForm.tsx
@@ -42,6 +42,7 @@ export default function AzureForm(props: AzureFormProps) {
         onFieldChange={onFieldChange}
         propKey="key"
         value={formData.key}
+        maxLength={200}
       />
       <AlmBindingDefinitionFormField
         help={
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketCloudForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketCloudForm.tsx
index f6d08382860..70bd049cae4 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketCloudForm.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketCloudForm.tsx
@@ -41,7 +41,7 @@ export default function BitbucketCloudForm(props: BitbucketCloudFormProps) {
         autoFocus={true}
         help={translate('settings.almintegration.form.name.bitbucketcloud.help')}
         id="name.bitbucket"
-        maxLength={100}
+        maxLength={200}
         onFieldChange={props.onFieldChange}
         propKey="key"
         value={formData.key || ''}
@@ -63,7 +63,7 @@ export default function BitbucketCloudForm(props: BitbucketCloudFormProps) {
           />
         }
         id="workspace.bitbucketcloud"
-        maxLength={2000}
+        maxLength={80}
         onFieldChange={props.onFieldChange}
         propKey="workspace"
         value={formData.workspace || ''}
@@ -96,6 +96,7 @@ export default function BitbucketCloudForm(props: BitbucketCloudFormProps) {
         onFieldChange={props.onFieldChange}
         propKey="clientId"
         value={formData.clientId || ''}
+        maxLength={80}
       />
       <AlmBindingDefinitionFormField
         id="client_secret.bitbucketcloud"
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx
index 9779db9e329..eee252e45e0 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx
@@ -40,7 +40,7 @@ export default function BitbucketServerForm(props: BitbucketServerFormProps) {
         autoFocus={true}
         help={translate('settings.almintegration.form.name.bitbucket.help')}
         id="name.bitbucket"
-        maxLength={100}
+        maxLength={200}
         onFieldChange={props.onFieldChange}
         propKey="key"
         value={formData.key || ''}
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx
index a94593e57aa..a5cf1cd36ef 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx
@@ -43,6 +43,7 @@ export default function GithubForm(props: GithubFormProps) {
         onFieldChange={onFieldChange}
         propKey="key"
         value={formData.key}
+        maxLength={200}
       />
       <AlmBindingDefinitionFormField
         help={
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GitlabForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GitlabForm.tsx
index 015fbc581aa..f519e9edb8b 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GitlabForm.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GitlabForm.tsx
@@ -42,6 +42,7 @@ export default function GitlabForm(props: GitlabFormProps) {
         onFieldChange={onFieldChange}
         propKey="key"
         value={formData.key}
+        maxLength={200}
       />
       <AlmBindingDefinitionFormField
         help={
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AzureForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AzureForm-test.tsx.snap
index d03d8b8f90a..a13b6b6ead1 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AzureForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/AzureForm-test.tsx.snap
@@ -6,6 +6,7 @@ exports[`should render correctly: create 1`] = `
     autoFocus={true}
     help="settings.almintegration.form.name.azure.help"
     id="name.azure"
+    maxLength={200}
     onFieldChange={[MockFunction]}
     propKey="key"
     value=""
@@ -80,6 +81,7 @@ exports[`should render correctly: edit 1`] = `
     autoFocus={true}
     help="settings.almintegration.form.name.azure.help"
     id="name.azure"
+    maxLength={200}
     onFieldChange={[MockFunction]}
     propKey="key"
     value="key"
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketCloudForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketCloudForm-test.tsx.snap
index 4fd3e07e4fa..2bf6f6b5244 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketCloudForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketCloudForm-test.tsx.snap
@@ -6,7 +6,7 @@ exports[`should render correctly 1`] = `
     autoFocus={true}
     help="settings.almintegration.form.name.bitbucketcloud.help"
     id="name.bitbucket"
-    maxLength={100}
+    maxLength={200}
     onFieldChange={[MockFunction]}
     propKey="key"
     value="key"
@@ -30,7 +30,7 @@ exports[`should render correctly 1`] = `
       />
     }
     id="workspace.bitbucketcloud"
-    maxLength={2000}
+    maxLength={80}
     onFieldChange={[MockFunction]}
     propKey="workspace"
     value="workspace"
@@ -69,6 +69,7 @@ exports[`should render correctly 1`] = `
   <AlmBindingDefinitionFormField
     help="settings.almintegration.form.oauth_key.bitbucketcloud.help"
     id="client_id.bitbucketcloud"
+    maxLength={80}
     onFieldChange={[MockFunction]}
     propKey="clientId"
     value="client1"
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap
index 168036c2123..f8bf5e2ce02 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/BitbucketServerForm-test.tsx.snap
@@ -6,7 +6,7 @@ exports[`should render correctly 1`] = `
     autoFocus={true}
     help="settings.almintegration.form.name.bitbucket.help"
     id="name.bitbucket"
-    maxLength={100}
+    maxLength={200}
     onFieldChange={[MockFunction]}
     propKey="key"
     value="key"
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap
index 2eaa2b19995..e921eb46af9 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap
@@ -6,6 +6,7 @@ exports[`should render correctly 1`] = `
     autoFocus={true}
     help="settings.almintegration.form.name.github.help"
     id="name.github"
+    maxLength={200}
     onFieldChange={[MockFunction]}
     propKey="key"
     value=""
@@ -100,6 +101,7 @@ exports[`should render correctly 2`] = `
     autoFocus={true}
     help="settings.almintegration.form.name.github.help"
     id="name.github"
+    maxLength={200}
     onFieldChange={[MockFunction]}
     propKey="key"
     value="key"
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GitlabForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GitlabForm-test.tsx.snap
index 33452300e00..335a2f039bc 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GitlabForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GitlabForm-test.tsx.snap
@@ -6,6 +6,7 @@ exports[`should render correctly 1`] = `
     autoFocus={true}
     help="settings.almintegration.form.name.gitlab.help"
     id="name.gitlab"
+    maxLength={200}
     onFieldChange={[MockFunction]}
     propKey="key"
     value=""
@@ -76,6 +77,7 @@ exports[`should render correctly 2`] = `
     autoFocus={true}
     help="settings.almintegration.form.name.gitlab.help"
     id="name.gitlab"
+    maxLength={200}
     onFieldChange={[MockFunction]}
     propKey="key"
     value="foo"
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/almsettings/ws/CreateGithubAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/almsettings/ws/CreateGithubAction.java
index f1b6c1b295c..4a0a86c16ea 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/almsettings/ws/CreateGithubAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/almsettings/ws/CreateGithubAction.java
@@ -72,7 +72,7 @@ public class CreateGithubAction implements AlmSettingsWsAction {
       .setDescription("GitHub App ID");
     action.createParam(PARAM_PRIVATE_KEY)
       .setRequired(true)
-      .setMaximumLength(2000)
+      .setMaximumLength(2500)
       .setDescription("GitHub App private key");
     action.createParam(PARAM_CLIENT_ID)
       .setRequired(true)
@@ -80,7 +80,7 @@ public class CreateGithubAction implements AlmSettingsWsAction {
       .setDescription("GitHub App Client ID");
     action.createParam(PARAM_CLIENT_SECRET)
       .setRequired(true)
-      .setMaximumLength(80)
+      .setMaximumLength(160)
       .setDescription("GitHub App Client Secret");
   }
 
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/almsettings/ws/UpdateBitbucketCloudAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/almsettings/ws/UpdateBitbucketCloudAction.java
index 1141bc58b2a..f62d7515207 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/almsettings/ws/UpdateBitbucketCloudAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/almsettings/ws/UpdateBitbucketCloudAction.java
@@ -66,14 +66,15 @@ public class UpdateBitbucketCloudAction implements AlmSettingsWsAction {
       .setDescription("Optional new value for an unique key of the Bitbucket Cloud setting");
     action.createParam(PARAM_WORKSPACE)
       .setRequired(true)
+      .setMaximumLength(80)
       .setDescription("Bitbucket Cloud workspace ID");
     action.createParam(PARAM_CLIENT_ID)
       .setRequired(true)
-      .setMaximumLength(2000)
+      .setMaximumLength(80)
       .setDescription("Bitbucket Cloud Client ID");
     action.createParam(PARAM_CLIENT_SECRET)
       .setRequired(false)
-      .setMaximumLength(2000)
+      .setMaximumLength(160)
       .setDescription("Optional new value for the Bitbucket Cloud client secret");
   }
 
-- 
2.39.5