Merge branch 'master' into bump-consul-in-tests (#375)

Author: mateusz.bartkowiak

.github/workflows/ci.yaml

@@ -48,7 +48,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Test with Gradle
+      - name: Test with Gradle (envoyVersion=${{ inputs.envoyVersion }})
         run: ./gradlew clean check -PenvoyVersion=${{ inputs.envoyVersion }}
 
       - name: Junit report

CHANGELOG.md

@@ -3,6 +3,11 @@
 Lists all changes with user impact.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [0.19.31]
+
+### Changed
+- move min & max envoy versions inside artifact to be accessible for dependant projects
+
 ## [0.19.30]
 
 ### Changed

envoy-control-tests/build.gradle

@@ -1,6 +1,3 @@
-def MIN_SUPPORTED_ENVOY_VERSION = "v1.22.7"
-def MAX_SUPPORTED_ENVOY_VERSION = "v1.24.0"
-
 dependencies {
     implementation project(':envoy-control-runner')
 
@@ -22,19 +19,6 @@ dependencies {
     implementation group: 'org.testcontainers', name: 'testcontainers', version: versions.testcontainers
 }
 
-String envoyVersion = { ->
-    String versionArg =  project.findProperty("envoyVersion") ?: "max"
-    if (versionArg == "max") {
-        return MAX_SUPPORTED_ENVOY_VERSION
-    } else if (versionArg == "min") {
-        return MIN_SUPPORTED_ENVOY_VERSION
-    } else {
-        return versionArg
-    }
-}()
-
-println("Using envoy version: $envoyVersion")
-
 test {
     useJUnitPlatform {
         excludeTags 'reliability'
@@ -57,6 +41,5 @@ task reliabilityTest(type: Test) {
 }
 
 tasks.withType(Test).configureEach {
-    systemProperty("pl.allegro.tech.servicemesh.envoyVersion", envoyVersion)
+    project.findProperty("envoyVersion")?.with { systemProperty("pl.allegro.tech.servicemesh.envoyVersion", it) }
 }
-

envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/config/envoy/EnvoyContainer.kt

@@ -38,9 +38,17 @@ class EnvoyContainer(
         const val INGRESS_LISTENER_CONTAINER_PORT = 5001
         private const val ADMIN_PORT = 10000
 
+        private const val MIN_SUPPORTED_ENVOY_VERSION = "v1.22.7"
+        private const val MAX_SUPPORTED_ENVOY_VERSION = "v1.24.0"
+
         val DEFAULT_IMAGE = run {
-            val key = "pl.allegro.tech.servicemesh.envoyVersion"
-            val version = System.getProperty(key) ?: throw IllegalStateException("Missing '$key' system property")
+            val version =
+                when (val versionArg = System.getProperty("pl.allegro.tech.servicemesh.envoyVersion").orEmpty()) {
+                    "max", "" -> MAX_SUPPORTED_ENVOY_VERSION
+                    "min" -> MIN_SUPPORTED_ENVOY_VERSION
+                    else -> versionArg
+                }
+            logger.info("Using envoy version: $version")
             "envoyproxy/envoy:$version"
         }
     }