Refactor apply*FromDatadogCIConfig

Make logic flow between the two functions the same
DataDog · Feb 1, 2024 · ef9dbec · ef9dbec
1 parent 35c58dd
commit ef9dbec
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/dd-sdk-android-gradle-plugin/src/main/kotlin/com/datadog/gradle/plugin/DdFileUploadTask.kt b/dd-sdk-android-gradle-plugin/src/main/kotlin/com/datadog/gradle/plugin/DdFileUploadTask.kt
@@ -229,7 +229,7 @@ abstract class DdFileUploadTask @Inject constructor(
             if (this.apiKeySource == ApiKeySource.GRADLE_PROPERTY) {
                 DdAndroidGradlePlugin.LOGGER.info(
                     "API key found in Datadog CI config file, but it will be ignored," +
-                        " because also an explicit one was provided as a gradle property."
+                            " because also an explicit one was provided as a gradle property."
                 )
             } else {
                 DdAndroidGradlePlugin.LOGGER.info("API key found in Datadog CI config file, using it.")
@@ -240,21 +240,21 @@ abstract class DdFileUploadTask @Inject constructor(
     }
 
     private fun applySiteFromDatadogCiConfig(config: JSONObject) {
-        if (this.site.isNotEmpty()) {
-            DdAndroidGradlePlugin.LOGGER.info(
-                "Site property found in Datadog CI config file, but it will be ignored," +
-                    " because also an explicit one was provided in extension."
-            )
-            return
-        }
         val siteAsDomain = config.optString(DATADOG_CI_SITE_PROPERTY, null)
         if (!siteAsDomain.isNullOrEmpty()) {
-            val site = DatadogSite.fromDomain(siteAsDomain)
-            if (site == null) {
-                DdAndroidGradlePlugin.LOGGER.warn("Unknown Datadog domain provided: $siteAsDomain, ignoring it.")
+            if (this.site.isNotEmpty()) {
+                DdAndroidGradlePlugin.LOGGER.info(
+                    "Site property found in Datadog CI config file, but it will be ignored," +
+                        " because also an explicit one was provided in extension."
+                )
             } else {
-                DdAndroidGradlePlugin.LOGGER.info("Site property found in Datadog CI config file, using it.")
-                this.site = site.name
+                val site = DatadogSite.fromDomain(siteAsDomain)
+                if (site == null) {
+                    DdAndroidGradlePlugin.LOGGER.warn("Unknown Datadog domain provided: $siteAsDomain, ignoring it.")
+                } else {
+                    DdAndroidGradlePlugin.LOGGER.info("Site property found in Datadog CI config file, using it.")
+                    this.site = site.name
+                }
             }
         }
     }