Clean up

Author: ofek

.gitlab/.pre/deps_fetch/deps_fetch.yml

@@ -4,7 +4,6 @@
 # to reuse them in further jobs that need them.
 
 # Keep GOPROXY entries usable from the current environment; drop the rest.
-# See tools/ci/sanitize-goproxy.sh.
 .sanitize_goproxy:
   - . tools/ci/sanitize-goproxy.sh
 

.gitlab/build/source_test/kmt_tasks.yml

@@ -40,6 +40,8 @@ test_kmt_local_setup_macos:
   before_script:
     - !reference [.vault_login]
     - !reference [.aws_retry_config]
+    # Drop GOPROXY entries not usable from macOS runners, before any go command.
+    - !reference [.sanitize_goproxy]
     - !reference [.setup_github_token_read]
     # Selecting the current Go version
     - |

tools/ci/sanitize-goproxy.ps1

@@ -1,30 +1,24 @@
-# Normalize $env:GOPROXY on Windows: drop the entry that isn't usable here,
-# keeping the rest. Mirrors tools/ci/sanitize-goproxy.sh.
+# Normalize $env:GOPROXY on Windows: drop the entry that isn't usable here
+# (hosts ending in .fabric.dog), keeping the rest. Mirrors tools/ci/sanitize-goproxy.sh.
 #
 # Dot-source before `docker run ... -e GOPROXY` so the container inherits the
 # cleaned value:  . ./tools/ci/sanitize-goproxy.ps1
 
-$sgpHost     = 'depot-read-api-go.rapid-dependency-management-depot.all-clusters.local-dc.fabric.dog'
-$sgpProbeUrl = "https://${sgpHost}:8443/magicmirror/magicmirror/@current/sumdb/sum.golang.org/supported"
+$sgpProbeUrl = 'https://depot-read-api-go.rapid-dependency-management-depot.all-clusters.local-dc.fabric.dog:8443/magicmirror/magicmirror/@current/sumdb/sum.golang.org/supported'
 
 function Test-SgpUsable {
-    param([string]$Url)
     try {
         # -SkipHttpErrorCheck (PS7+) so a non-2xx still counts as completed; any
         # failure throws and is caught below.
-        Invoke-WebRequest -Uri $Url -Method Head -TimeoutSec 5 -SkipHttpErrorCheck -UseBasicParsing | Out-Null
+        Invoke-WebRequest -Uri $sgpProbeUrl -Method Head -TimeoutSec 5 -SkipHttpErrorCheck -UseBasicParsing | Out-Null
         return $true
     } catch {
         return $false
     }
 }
 
-if ($env:GOPROXY -and $env:GOPROXY.Contains('.fabric.dog')) {
-    if (Test-SgpUsable -Url $sgpProbeUrl) {
-        Write-Host "sanitize-goproxy: endpoint usable here; keeping it in GOPROXY"
-    } else {
-        $env:GOPROXY = (($env:GOPROXY -split '\|') |
-            Where-Object { $_ -notmatch '^https?://[^/]*\.fabric\.dog(:\d+)?(/|$)' }) -join '|'
-        Write-Host "sanitize-goproxy: endpoint unusable here; stripped it from GOPROXY"
-    }
+if ($env:GOPROXY -and $env:GOPROXY.Contains('.fabric.dog') -and -not (Test-SgpUsable)) {
+    $env:GOPROXY = (($env:GOPROXY -split '\|') |
+        Where-Object { $_ -notmatch '^https?://[^/]*\.fabric\.dog(:\d+)?(/|$)' }) -join '|'
+    Write-Host "sanitize-goproxy: endpoint unusable here; stripped it from GOPROXY"
 }

tools/ci/sanitize-goproxy.sh

@@ -1,38 +1,27 @@
 # shellcheck shell=bash
-# Drop GOPROXY entries that aren't usable from the current environment, keeping
-# the rest. Probes the endpoint the way Go would (an HTTPS request with cert
-# verification) and strips it if that fails.
+# Drop the GOPROXY entry that isn't usable from the current environment (hosts
+# ending in .fabric.dog), keeping the rest. Probes the endpoint the way Go would
+# (an HTTPS request with cert verification) and strips it only if that fails;
+# missing curl counts as unusable.
 #
 # Source this file (don't execute) so the change is visible to the caller:
 #   . tools/ci/sanitize-goproxy.sh
 # Safe to source repeatedly; never empties GOPROXY.
 
-__sgp_host='depot-read-api-go.rapid-dependency-management-depot.all-clusters.local-dc.fabric.dog'
-__sgp_probe_url="https://${__sgp_host}:8443/magicmirror/magicmirror/@current/sumdb/sum.golang.org/supported"
+__sgp_probe_url="https://depot-read-api-go.rapid-dependency-management-depot.all-clusters.local-dc.fabric.dog:8443/magicmirror/magicmirror/@current/sumdb/sum.golang.org/supported"
 
 # Returns 0 if the endpoint completes a request over verified TLS. No --fail: we
-# only care that the request completes, not its HTTP status. Missing curl counts
-# as not usable.
+# only care that the request completes, not its HTTP status.
 __sgp_usable() {
-    command -v curl >/dev/null 2>&1 || return 1
-    curl --silent --output /dev/null --connect-timeout 3 --max-time 5 "$__sgp_probe_url"
-}
-
-# Drop entries whose host ends in .fabric.dog, keeping the '|' separators and
-# every other entry.
-__sgp_strip() {
-    printf '%s' "${1-}" \
-        | tr '|' '\n' \
-        | grep -vE '^https?://[^/]*\.fabric\.dog(:[0-9]+)?(/|$)' \
-        | paste -sd '|' -
+    command -v curl >/dev/null 2>&1 \
+        && curl --silent --output /dev/null --connect-timeout 3 --max-time 5 "$__sgp_probe_url"
 }
 
 case "${GOPROXY-}" in
     *.fabric.dog*)
-        if __sgp_usable; then
-            echo "sanitize-goproxy: endpoint usable here; keeping it in GOPROXY" >&2
-        else
-            GOPROXY="$(__sgp_strip "${GOPROXY-}")"
+        if ! __sgp_usable; then
+            GOPROXY="$(printf '%s' "$GOPROXY" | tr '|' '\n' \
+                | grep -vE '^https?://[^/]*\.fabric\.dog(:[0-9]+)?(/|$)' | paste -sd '|' -)"
             export GOPROXY
             echo "sanitize-goproxy: endpoint unusable here; stripped it from GOPROXY" >&2
         fi