From dfe09966ceddbaa0c60a35ad3caadfff15a6da99 Mon Sep 17 00:00:00 2001
From: Caleb Doxsey <cdoxsey@pomerium.com>
Date: Tue, 11 Jun 2024 09:55:29 -0600
Subject: [PATCH] remove original get-envoy script

---
 .github/goreleaser.yaml |  7 +------
 Makefile                |  2 +-
 scripts/get-envoy.bash  | 37 -------------------------------------
 3 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100755 scripts/get-envoy.bash

diff --git a/.github/goreleaser.yaml b/.github/goreleaser.yaml
index f05ad7ffc..202c161ef 100644
--- a/.github/goreleaser.yaml
+++ b/.github/goreleaser.yaml
@@ -14,6 +14,7 @@ env:
 before:
   hooks:
     - go mod download
+    - make get-envoy
     - make build-deps
     - make yarn
     - make build-ui
@@ -37,12 +38,6 @@ builds:
       - -X github.com/pomerium/pomerium/internal/version.ProjectName=pomerium
       - -X github.com/pomerium/pomerium/internal/version.ProjectURL=https://wwww.pomerium.io
 
-    hooks:
-      pre:
-        - cmd: ./scripts/get-envoy.bash
-          env:
-            - TARGET={{ .Os }}-{{ .Arch }}
-
 archives:
   - name_template: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
     id: pomerium
diff --git a/Makefile b/Makefile
index 0d88e0e2b..ad75c537f 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ all: clean build-deps test lint build ## Runs a clean, build, fmt, lint, test, a
 .PHONY: get-envoy
 get-envoy: ## Fetch envoy binaries
 	@echo "==> $@"
-	@./scripts/get-envoy.bash
+	@cd pkg/envoy/files && go run ../get-envoy
 
 .PHONY: deps-build
 deps-build: get-envoy ## Install build dependencies
diff --git a/scripts/get-envoy.bash b/scripts/get-envoy.bash
deleted file mode 100755
index 3d1aac7b3..000000000
--- a/scripts/get-envoy.bash
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-PATH="$PATH:$(go env GOPATH)/bin"
-export PATH
-
-_project_root="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)/.."
-_envoy_version=1.30.1
-_dir="$_project_root/pkg/envoy/files"
-
-for _target in darwin-amd64 darwin-arm64 linux-amd64 linux-arm64; do
-  _url="https://github.com/pomerium/envoy-binaries/releases/download/v${_envoy_version}/envoy-${_target}"
-
-  curl \
-    --silent \
-    --fail \
-    --show-error \
-    --compressed \
-    --location \
-    --time-cond "$_dir/envoy-$_target" \
-    --output "$_dir/envoy-$_target" \
-    "$_url" &
-
-  curl \
-    --silent \
-    --fail \
-    --show-error \
-    --compressed \
-    --location \
-    --time-cond "$_dir/envoy-$_target.sha256" \
-    --output "$_dir/envoy-$_target.sha256" \
-    "$_url.sha256" &
-
-  echo "$_envoy_version" >"$_dir/envoy-$_target.version"
-done
-
-wait