test: use modern Squid Proxy with Authentication container image

Signed-off-by: Marc Nuri <[email protected]>

src/it/maven.settings.https-auth-proxy/setup.groovy

@@ -1,2 +1,14 @@
-def dockerRun = 'docker run --rm -d --name test-auth-proxy -e SQUID_USERNAME=foo -e SQUID_PASSWORD=bar -p 0.0.0.0:3128:3128 robhaswell/squid-authenticated@sha256:6a99946c96d063981b329c22efc2b9ad1ac4e90d16ddcbb9d0b2d6773a7bea2b'.execute()
+def dockerRun = 'docker run --rm -d --name test-auth-proxy -e SQUID_USERNAME=foo -e SQUID_PASSWORD=bar -p 0.0.0.0:3128:3128 marcnuri/squid-simple-auth:latest'.execute()
 dockerRun.waitForOrKill(30_000)
+def count = 10
+def ready = false
+while(count-- > 0 && !ready) {
+  def logOut = new StringBuilder(), logErr = new StringBuilder()
+  def dockerLogs = 'docker logs test-auth-proxy'.execute()
+  dockerLogs.consumeProcessOutput(logOut, logErr)
+  dockerLogs.waitForOrKill(10_000)
+  if (logOut.contains('Accepting HTTP Socket connections')) {
+    ready = true
+  }
+  Thread.sleep(1000)
+}

src/it/maven.settings.https-auth-proxy/verify.groovy

@@ -1,9 +1,10 @@
 def logOut = new StringBuilder(), logErr = new StringBuilder()
-def dockerLogs = 'docker exec test-auth-proxy cat /var/log/squid3/access.log'.execute()
+def dockerLogs = 'docker exec test-auth-proxy cat /opt/squid/access.log'.execute()
 dockerLogs.consumeProcessOutput(logOut, logErr)
 dockerLogs.waitForOrKill(10_000)
 def dockerStop = 'docker stop test-auth-proxy'.execute()
 dockerStop.waitForOrKill(30_000)
+new FileWriter(new File(basedir, 'access.log')).withWriter { it << logOut }
 assert logOut.toString().contains('CONNECT services.gradle.org:443')
 def buildLog = new File(basedir, 'build.log').text
 assert buildLog.contains('Gradle 8.2.1 download complete')

src/it/system.properties.https-auth-proxy/setup.groovy

@@ -1,2 +1,14 @@
-def dockerRun = 'docker run --rm -d --name test-auth-proxy -e SQUID_USERNAME=foo -e SQUID_PASSWORD=bar -p 0.0.0.0:3128:3128 robhaswell/squid-authenticated@sha256:6a99946c96d063981b329c22efc2b9ad1ac4e90d16ddcbb9d0b2d6773a7bea2b'.execute()
+def dockerRun = 'docker run --rm -d --name test-auth-proxy -e SQUID_USERNAME=foo -e SQUID_PASSWORD=bar -p 0.0.0.0:3128:3128 marcnuri/squid-simple-auth:latest'.execute()
 dockerRun.waitForOrKill(30_000)
+def count = 10
+def ready = false
+while(count-- > 0 && !ready) {
+  def logOut = new StringBuilder(), logErr = new StringBuilder()
+  def dockerLogs = 'docker logs test-auth-proxy'.execute()
+  dockerLogs.consumeProcessOutput(logOut, logErr)
+  dockerLogs.waitForOrKill(10_000)
+  if (logOut.contains('Accepting HTTP Socket connections')) {
+    ready = true
+  }
+  Thread.sleep(1000)
+}

src/it/system.properties.https-auth-proxy/verify.groovy

@@ -1,9 +1,10 @@
 def logOut = new StringBuilder(), logErr = new StringBuilder()
-def dockerLogs = 'docker exec test-auth-proxy cat /var/log/squid3/access.log'.execute()
+def dockerLogs = 'docker exec test-auth-proxy cat /opt/squid/access.log'.execute()
 dockerLogs.consumeProcessOutput(logOut, logErr)
 dockerLogs.waitForOrKill(10_000)
 def dockerStop = 'docker stop test-auth-proxy'.execute()
 dockerStop.waitForOrKill(30_000)
+new FileWriter(new File(basedir, 'access.log')).withWriter { it << logOut }
 assert logOut.toString().contains('CONNECT services.gradle.org:443')
 def buildLog = new File(basedir, 'build.log').text
 assert buildLog.contains('Gradle 8.2.1 download complete')

src/it/system.properties.https-proxy/verify.groovy

@@ -4,6 +4,7 @@ dockerLogs.consumeProcessOutput(logOut, logErr)
 dockerLogs.waitForOrKill(10_000)
 def dockerStop = 'docker stop test-proxy'.execute()
 dockerStop.waitForOrKill(30_000)
+new FileWriter(new File(basedir, 'access.log')).withWriter { it << logOut }
 assert logOut.toString().contains('CONNECT services.gradle.org:443')
 def buildLog = new File(basedir, 'build.log').text
 assert buildLog.contains('Gradle 8.2.1 download complete')