MBS-9422 leftovers for TMS plugin (#571)

* MBS-9422 leftovers for TMS plugin - failfast at configuration time if no reportHost provided - rewrite log messages to clearly understand state * MBS-9422 fix test
avito-tech · Sep 14, 2020 · 500df38 · 500df38
1 parent 7283185
commit 500df38
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 27 deletions.
diff --git a/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/steps/MarkReportAsSourceForTMSStepTest.kt b/subprojects/gradle/cd/src/test/kotlin/com/avito/ci/steps/MarkReportAsSourceForTMSStepTest.kt
@@ -31,6 +31,10 @@ internal class MarkReportAsSourceForTMSStepTest {
                             }
                         }
                         
+                        tms {
+                            reportsHost = "stub"
+                        }
+                        
                         instrumentation {
                             sentryDsn = "stub"
                             slackToken = "stub"

diff --git a/subprojects/gradle/tms/src/main/kotlin/com/avito/plugin/MarkReportAsSourceAction.kt b/subprojects/gradle/tms/src/main/kotlin/com/avito/plugin/MarkReportAsSourceAction.kt
@@ -19,42 +19,46 @@ class MarkReportAsSourceAction(
     private val timeProvider: TimeProvider,
     private val logger: Logger
 ) {
+    private val tag = "TMS"
 
     fun mark(reportCoordinates: ReportCoordinates) {
         val testSuiteVersion = timeProvider.nowInMillis()
 
-        logger.debug("This is a new version [$testSuiteVersion] of full test suite for tms")
+        when (val result = reportsApi.getReport(reportCoordinates)) {
+            is GetReportResult.Found -> {
 
-        val reportId = tryGetId(reportCoordinates)
-
-        if (reportId != null) {
-            reportsApi.pushPreparedData(
-                reportId = reportId,
-                analyzerKey = "test_suite",
-                preparedData = jsonObject(
-                    "full" to true,
-                    "version" to testSuiteVersion
-                )
-            ).onFailure { error ->
-                logger.critical("Can't push prepared data: testSuite info", error)
-            }
-
-            reportsApi.setFinished(reportCoordinates).onFailure { error ->
-                logger.critical("Can't finish report for coordinates: $reportCoordinates", error)
+                reportsApi.pushPreparedData(
+                    reportId = result.report.id,
+                    analyzerKey = "test_suite",
+                    preparedData = jsonObject(
+                        "full" to true,
+                        "version" to testSuiteVersion
+                    )
+                ).fold(
+                    {
+                        reportsApi.setFinished(reportCoordinates).fold(
+                            {
+                                logger.info(
+                                    "[$tag] Test suite for tms version $testSuiteVersion, " +
+                                        "with id: ${result.report.id}, coordinates: $reportCoordinates marked as source of truth for tms"
+                                )
+                            },
+                            { error ->
+                                logger.critical("[$tag] Can't finish report for coordinates: $reportCoordinates", error)
+                            })
+                    },
+                    { error ->
+                        logger.critical("[$tag] Can't push prepared data: testSuite info", error)
+                    })
             }
-        }
-    }
-
-    private fun tryGetId(reportCoordinates: ReportCoordinates): String? {
-        return when (val result = reportsApi.getReport(reportCoordinates)) {
-            is GetReportResult.Found -> result.report.id
             GetReportResult.NotFound -> {
-                logger.warn("Can't find report for runId=${reportCoordinates.runId}")
-                null
+                logger.critical(
+                    "[$tag] Can't get reportId for coordinates: $reportCoordinates",
+                    IllegalStateException("stub")
+                )
             }
             is GetReportResult.Error -> {
-                logger.critical("Can't find report for runId=${reportCoordinates.runId}", result.exception)
-                null
+                logger.critical("[$tag] Can't find report for runId=${reportCoordinates.runId}", result.exception)
             }
         }
     }

diff --git a/subprojects/gradle/tms/src/main/kotlin/com/avito/plugin/TmsPlugin.kt b/subprojects/gradle/tms/src/main/kotlin/com/avito/plugin/TmsPlugin.kt
@@ -13,5 +13,9 @@ class TmsPlugin : Plugin<Project> {
         target.tasks.register<MarkReportAsSourceTask>(markReportAsSourceTaskName) {
             reportsHost.set(extension.reportsHost)
         }
+
+        target.afterEvaluate {
+            requireNotNull(extension.reportsHost.orNull) { "tms.reportsHost should be set" }
+        }
     }
 }