Starting work on Jenkins plugin UI refactoring

PositiveTechnologies · Oct 14, 2021 · 7a172e9 · 7a172e9
1 parent cbf2c3a
commit 7a172e9
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 96 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/generic-client-lib/build.gradle b/generic-client-lib/build.gradle
@@ -36,6 +36,11 @@ dependencies {
     // https://mvnrepository.com/artifact/io.github.classgraph/classgraph
     implementation 'io.github.classgraph:classgraph:4.8.110'
 
+    // https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
+    // https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}"
+
     testFixturesApi("org.junit.jupiter:junit-jupiter-api:$junitVersion")
     testFixturesImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
 

diff --git a/generic-client-lib/docs/uml/tasks-and-jobs.puml b/generic-client-lib/docs/uml/tasks-and-jobs.puml
@@ -47,7 +47,7 @@ abstract class AbstractApiClient {
     # void unsafeInit()
 }
 
-AbstractApiClient -right-|> AbstractTool
+AbstractApiClient -right[hidden]-|> AbstractTool
 
 interface CheckServerTask {
     ServerCheckResult check()

diff --git a/generic-client-lib/src/testFixtures/resources/yaml/advanced.settings.1.yaml b/generic-client-lib/src/testFixtures/resources/yaml/advanced.settings.1.yaml
@@ -0,0 +1,7 @@
+logging:
+  http:
+    maximumResponseSize: 10240
+  external:
+    type: NONE
+    host: logstash.domain.org
+    port: 5000
diff --git a/generic-client-lib/src/testFixtures/resources/yaml/advanced.settings.2.yaml b/generic-client-lib/src/testFixtures/resources/yaml/advanced.settings.2.yaml
@@ -0,0 +1,5 @@
+logging:
+  external:
+    type: NONE
+    host: logstash.domain.org
+    # port: 5000
diff --git a/...ai/ee/utils/ci/integration/plugin/jenkins/serversettings/ServerSettings/config.properties b/...ai/ee/utils/ci/integration/plugin/jenkins/serversettings/ServerSettings/config.properties
@@ -3,4 +3,5 @@ serverUrl=PT AI server URL
 testServer=Test PT AI server connection
 serverCredentialsId=Credentials
 testServerProgress=Check in progress
-serverInsecure=Ignore SSL certificate check 
+serverInsecure=Ignore SSL certificate check
+advancedYamlSettings=Advanced settings
diff --git a/...ee/utils/ci/integration/plugin/jenkins/serversettings/ServerSettings/config_ru.properties b/...ee/utils/ci/integration/plugin/jenkins/serversettings/ServerSettings/config_ru.properties
@@ -4,3 +4,4 @@ testServer=\u041F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \u0441\u043E\u
 serverCredentialsId=\u0423\u0447\u0435\u0442\u043D\u0430\u044F \u0437\u0430\u043F\u0438\u0441\u044C
 testServerProgress=\u0412\u044B\u043F\u043E\u043B\u043D\u044F\u0435\u0442\u0441\u044F \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0430
 serverInsecure=\u0418\u0433\u043D\u043E\u0440\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043E\u0448\u0438\u0431\u043A\u0438 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 SSL-\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0432
+advancedYamlSettings=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438