Merge pull request #154 from Drill4J/fix/remove-drill-prefix-for-api-…

…url-and-key-params

feat: remove drill_ prefix for api_url and api_key parameters

agent-runner-common/src/main/kotlin/com/epam/drill/test/agent/runner/Configuration.kt

@@ -18,8 +18,8 @@ package com.epam.drill.test.agent.runner
 import java.io.File
 
 abstract class Configuration {
-    var drillApiUrl: String? = null
-    var drillApiKey: String? = null
+    var apiUrl: String? = null
+    var apiKey: String? = null
     var groupId: String? = null
     var appId: String? = null
 
@@ -39,8 +39,8 @@ abstract class Configuration {
     fun toJvmArgs(): List<String> {
         val args = mutableMapOf<String, Any?>()
         args["drillInstallationDir"] = runtimePath
-        args[Configuration::drillApiUrl.name] = drillApiUrl
-        drillApiKey?.let { args[Configuration::drillApiKey.name] = it }
+        args[Configuration::apiUrl.name] = apiUrl
+        apiKey?.let { args[Configuration::apiKey.name] = it }
         args[Configuration::groupId.name] = groupId
         args[Configuration::appId.name] = appId
         args[Configuration::logLevel.name] = logLevel

agent-runner-common/src/main/kotlin/com/epam/drill/test/agent/runner/ConfigurationValidators.kt

@@ -27,10 +27,10 @@ val validateConfig = Validation<Configuration> {
         identifier()
         minLength(3)
     }
-    Configuration::drillApiUrl required {
+    Configuration::apiUrl required {
         validTransportUrl()
     }
-    Configuration::drillApiKey ifPresent {
+    Configuration::apiKey ifPresent {
         minLength(1)
     }
     Configuration::logLevel ifPresent {

autotest-agent/src/commonMain/kotlin/com/epam/drill/test/agent/configuration/ParameterDefinitions.kt

@@ -20,8 +20,8 @@ import com.epam.drill.plugins.test2code.api.Label
 
 object ParameterDefinitions {
     val GROUP_ID = AgentParameterDefinition.forString(name = "groupId")
-    val DRILL_API_URL = AgentParameterDefinition.forString(name = "drillApiUrl", parser = { if (!it.endsWith("/") ) "$it/" else it })
-    val DRILL_API_KEY = AgentParameterDefinition.forString(name = "drillApiKey")
+    val API_URL = AgentParameterDefinition.forString(name = "apiUrl", parser = { if (!it.endsWith("/") ) "$it/" else it })
+    val API_KEY = AgentParameterDefinition.forString(name = "apiKey")
     val MESSAGE_QUEUE_LIMIT = AgentParameterDefinition.forString(name = "coverageRetentionLimit", defaultValue = "512Mb")
     val SSL_TRUSTSTORE = AgentParameterDefinition.forString(name = "sslTruststore")
     val SSL_TRUSTSTORE_PASSWORD = AgentParameterDefinition.forString(name = "sslTruststorePassword")

autotest-agent/src/jvmMain/kotlin/com/epam/drill/test/agent/transport/AdminMessageSender.kt

@@ -43,8 +43,8 @@ object AdminMessageSender : AgentMessageSender<Action> {
 
     private fun messageSender(): QueuedAgentMessageSender<Action, ByteArray> {
         val transport = HttpAgentMessageTransport(
-            Configuration.parameters[ParameterDefinitions.DRILL_API_URL],
-            Configuration.parameters[ParameterDefinitions.DRILL_API_KEY],
+            Configuration.parameters[ParameterDefinitions.API_URL],
+            Configuration.parameters[ParameterDefinitions.API_KEY],
             Configuration.parameters[ParameterDefinitions.SSL_TRUSTSTORE].takeIf(String::isNotEmpty)?.let(::resolvePath) ?: "",
             Configuration.parameters[ParameterDefinitions.SSL_TRUSTSTORE_PASSWORD],
             gzipCompression = false

autotest-agent/src/nativeMain/kotlin/com/epam/drill/test/agent/configuration/ValidatedParametersProvider.kt

@@ -37,8 +37,8 @@ class ValidatedParametersProvider(
         val appId by provider
         val groupId by provider
         val drillInstallationDir by provider
-        val drillApiUrl by provider
-        val drillApiKey by provider
+        val apiUrl by provider
+        val apiKey by provider
         val devToolsProxyAddress by provider
         val browserProxyAddress by provider
         val logLevel by provider
@@ -51,7 +51,7 @@ class ValidatedParametersProvider(
         ValidatingParameters::drillInstallationDir required {
             minLength(1)
         }
-        ValidatingParameters::drillApiUrl required {
+        ValidatingParameters::apiUrl required {
             validTransportUrl()
         }
     }
@@ -65,7 +65,7 @@ class ValidatedParametersProvider(
             identifier()
             minLength(3)
         }
-        ValidatingParameters::drillApiKey ifPresent {
+        ValidatingParameters::apiKey ifPresent {
             minLength(3)
         }
         ValidatingParameters::logLevelAsList onEach {

tests-cucumber-v4/build.gradle.kts

@@ -53,7 +53,7 @@ drill {
     agentPath = nativeAgentDir.resolve(nativeAgentFile)
     appId = "test-pet-standalone"
     groupId = "drill-tests"
-    drillApiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
+    apiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
     logLevel = "TRACE"
     jvmArgs += "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5010"
     labels = mapOf("User" to "Test", "Team" to "Drill4j")

tests-cucumber-v5/build.gradle.kts

@@ -53,7 +53,7 @@ drill {
     agentPath = nativeAgentDir.resolve(nativeAgentFile)
     appId = "test-pet-standalone"
     groupId = "drill-tests"
-    drillApiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
+    apiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
     logLevel = "TRACE"
     jvmArgs += "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5011"
     labels = mapOf("User" to "Test", "Team" to "Drill4j")

tests-cucumber-v6.7/build.gradle.kts

@@ -53,7 +53,7 @@ drill {
     agentPath = nativeAgentDir.resolve(nativeAgentFile)
     appId = "test-pet-standalone"
     groupId = "drill-tests"
-    drillApiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
+    apiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
     logLevel = "TRACE"
     jvmArgs += "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5013"
     labels = mapOf("User" to "Test", "Team" to "Drill4j")

tests-cucumber-v6/build.gradle.kts

@@ -53,7 +53,7 @@ drill {
     agentPath = nativeAgentDir.resolve(nativeAgentFile)
     appId = "test-pet-standalone"
     groupId = "drill-tests"
-    drillApiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
+    apiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
     logLevel = "TRACE"
     jvmArgs += "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5012"
     labels = mapOf("User" to "Test", "Team" to "Drill4j")

tests-https-headers-ju4/build.gradle.kts

@@ -48,7 +48,7 @@ drill {
     agentPath = nativeAgentDir.resolve(nativeAgentFile)
     appId = "test-pet-standalone"
     groupId = "drill-tests"
-    drillApiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
+    apiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
     logLevel = "TRACE"
     jvmArgs += "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5014"
     labels = mapOf("User" to "Test", "Team" to "Drill4j")

tests-https-headers-ju5/build.gradle.kts

@@ -50,7 +50,7 @@ drill {
     agentPath = nativeAgentDir.resolve(nativeAgentFile)
     appId = "test-pet-standalone"
     groupId = "drill-tests"
-    drillApiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
+    apiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
     logLevel = "TRACE"
     jvmArgs += "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5016"
     labels = mapOf("User" to "Test", "Team" to "Drill4j")

tests-https-headers-testng-v6.1/build.gradle.kts

@@ -49,7 +49,7 @@ drill {
     agentPath = nativeAgentDir.resolve(nativeAgentFile)
     appId = "test-pet-standalone"
     groupId = "drill-tests"
-    drillApiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
+    apiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
     logLevel = "TRACE"
     jvmArgs += "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5017"
     labels = mapOf("User" to "Test", "Team" to "Drill4j")

tests-https-headers-testng-v7.4/build.gradle.kts

@@ -49,7 +49,7 @@ drill {
     agentPath = nativeAgentDir.resolve(nativeAgentFile)
     appId = "test-pet-standalone"
     groupId = "drill-tests"
-    drillApiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
+    apiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
     logLevel = "TRACE"
     jvmArgs += "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5018"
     labels = mapOf("User" to "Test", "Team" to "Drill4j")

tests-rest-assure-ju5/build.gradle.kts

@@ -42,7 +42,7 @@ drill {
     agentPath = nativeAgentDir.resolve(nativeAgentFile)
     appId = "test-pet-standalone"
     groupId = "drill-tests"
-    drillApiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
+    apiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
     logLevel = "TRACE"
     jvmArgs += "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5006"
     labels = mapOf("User" to "Test", "Team" to "Drill4j")

tests-selenium-v3-ju5/build.gradle.kts

@@ -49,7 +49,7 @@ drill {
     agentPath = nativeAgentDir.resolve(nativeAgentFile)
     appId = "test-pet-standalone"
     groupId = "drill-tests"
-    drillApiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
+    apiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
     logLevel = "TRACE"
     jvmArgs += "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5008"
     labels = mapOf("User" to "Test", "Team" to "Drill4j")

tests-selenium-v4-ju5/build.gradle.kts

@@ -50,7 +50,7 @@ drill {
     agentPath = nativeAgentDir.resolve(nativeAgentFile)
     appId = "test-pet-standalone"
     groupId = "drill-tests"
-    drillApiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
+    apiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
     logLevel = "TRACE"
     jvmArgs += "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5009"
     labels = mapOf("User" to "Test", "Team" to "Drill4j")

tests-spock/build.gradle.kts

@@ -52,7 +52,7 @@ drill {
     agentPath = nativeAgentDir.resolve(nativeAgentFile)
     appId = "test-pet-standalone"
     groupId = "drill-tests"
-    drillApiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
+    apiUrl = "http://" + rootProject.extra["testsAdminStubServerHost"] as String + ":" + rootProject.extra["testsAdminStubServerPort"] as Int
     logLevel = "TRACE"
     jvmArgs += "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5007"
     labels = mapOf("User" to "Test", "Team" to "Drill4j")