From eec5055bdba8def014a50f5b4490299d7c776508 Mon Sep 17 00:00:00 2001
From: Olivier ORAND <olivier.orand@orange.com>
Date: Tue, 7 May 2024 16:00:59 +0000
Subject: [PATCH] chore(bosh-cli): download from github

As new version are not available on s3 anymore.
Last available version on s3:
```
<Key>bosh-cli-7.5.2-linux-arm64</Key>
<LastModified>2024-01-02T17:53:52.000Z</LastModified>
```
---
 bosh-cli-v2-cf-cli/bosh-cli-v2-cf-cli_spec.rb | 2 +-
 bosh-cli-v2/Dockerfile                        | 4 ++--
 bosh-cli-v2/bosh-cli-v2_spec.rb               | 2 +-
 k8s-tools/Dockerfile                          | 4 ++--
 k8s-tools/k8s-tools_spec.rb                   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bosh-cli-v2-cf-cli/bosh-cli-v2-cf-cli_spec.rb b/bosh-cli-v2-cf-cli/bosh-cli-v2-cf-cli_spec.rb
index fe4bca14..2f2f3bc9 100644
--- a/bosh-cli-v2-cf-cli/bosh-cli-v2-cf-cli_spec.rb
+++ b/bosh-cli-v2-cf-cli/bosh-cli-v2-cf-cli_spec.rb
@@ -31,7 +31,7 @@
   it "has the expected version of the Bosh CLI (#{BOSH_CLI_VERSION})" do
     expect(
       command("bosh -v").stdout.strip
-    ).to match("version #{BOSH_CLI_VERSION}-")
+    ).to match("version #{BOSH_CLI_VERSION}$")
   end
 
   it "has the expected version of the CF CLI (#{CF_CLI_VERSION})" do
diff --git a/bosh-cli-v2/Dockerfile b/bosh-cli-v2/Dockerfile
index 920d0e53..b45b877e 100644
--- a/bosh-cli-v2/Dockerfile
+++ b/bosh-cli-v2/Dockerfile
@@ -2,7 +2,7 @@ FROM ruby:3.1-slim-bullseye
 
 # renovate: datasource=github-releases depName=cloudfoundry/bosh-cli
 ENV BOSH_CLI_VERSION 7.5.6
-ENV BOSH_CLI_SUM 98705c704beedb08621db48ab2f4cad42704b85aba36cc99f3a9dc2738ebc226
+ENV BOSH_CLI_SUM 6fb9bb085c3afe7eff6e9a4e783731aeb4f03baf5ce1caf7ed229f29a97e60ac
 ENV BOSH_CLI_FILENAME bosh-cli-${BOSH_CLI_VERSION}-linux-amd64
 
 ENV DEBIAN_PACKAGES "ca-certificates wget git openssh-client file jq"
@@ -17,7 +17,7 @@ RUN apt-get update \
   && apt-get install -y --no-install-recommends ${BOSH_ENV_DEPS} \
   && rm -rf /var/lib/apt/lists/*
 
-RUN wget -nv https://s3.amazonaws.com/bosh-cli-artifacts/${BOSH_CLI_FILENAME} \
+RUN wget -nv https://github.com/cloudfoundry/bosh-cli/releases/download/v${BOSH_CLI_VERSION}/${BOSH_CLI_FILENAME} \
   && echo "${BOSH_CLI_SUM}  ${BOSH_CLI_FILENAME}" | sha256sum -c - \
   && chmod +x ${BOSH_CLI_FILENAME} \
   && mv ${BOSH_CLI_FILENAME} /usr/local/bin/bosh
diff --git a/bosh-cli-v2/bosh-cli-v2_spec.rb b/bosh-cli-v2/bosh-cli-v2_spec.rb
index feaa1f0d..187e7884 100644
--- a/bosh-cli-v2/bosh-cli-v2_spec.rb
+++ b/bosh-cli-v2/bosh-cli-v2_spec.rb
@@ -23,7 +23,7 @@
   it "has the expected version of the Bosh CLI (#{BOSH_CLI_VERSION})" do
     expect(
       command("bosh -v").stdout.strip
-    ).to match("version #{BOSH_CLI_VERSION}-")
+    ).to match("version #{BOSH_CLI_VERSION}$")
   end
 
   it "has `file` available" do
diff --git a/k8s-tools/Dockerfile b/k8s-tools/Dockerfile
index 5aee73b5..f70c106e 100644
--- a/k8s-tools/Dockerfile
+++ b/k8s-tools/Dockerfile
@@ -90,9 +90,9 @@ RUN echo "Computed ${YQ_FILENAME} sha256sum: $(sha256sum ${YQ_FILENAME})" \
 
 # renovate: datasource=github-releases depName=cloudfoundry/bosh-cli
 ENV BOSH_CLI_VERSION 7.5.6
-ENV BOSH_CLI_SUM 98705c704beedb08621db48ab2f4cad42704b85aba36cc99f3a9dc2738ebc226
+ENV BOSH_CLI_SUM 6fb9bb085c3afe7eff6e9a4e783731aeb4f03baf5ce1caf7ed229f29a97e60ac
 ENV BOSH_CLI_FILENAME bosh-cli-${BOSH_CLI_VERSION}-linux-amd64
-ADD https://s3.amazonaws.com/bosh-cli-artifacts/${BOSH_CLI_FILENAME} .
+ADD https://github.com/cloudfoundry/bosh-cli/releases/download/v${BOSH_CLI_VERSION}/${BOSH_CLI_FILENAME} .
 RUN echo "Computed ${BOSH_CLI_FILENAME} sha256sum: $(sha256sum ${BOSH_CLI_FILENAME})" \
       && echo "${BOSH_CLI_SUM}  ${BOSH_CLI_FILENAME}" | sha256sum -c - \
       && chmod +x ${BOSH_CLI_FILENAME} \
diff --git a/k8s-tools/k8s-tools_spec.rb b/k8s-tools/k8s-tools_spec.rb
index dc24e422..b129310f 100644
--- a/k8s-tools/k8s-tools_spec.rb
+++ b/k8s-tools/k8s-tools_spec.rb
@@ -129,6 +129,6 @@
   it "has the expected version of the Bosh CLI" do
     expect(
       command("bosh -v").stdout.strip
-    ).to match("version #{BOSH_CLI_VERSION}-")
+    ).to match("version #{BOSH_CLI_VERSION}$")
   end
 end