Skip to content

Commit 54d5a4a

Browse files
committed
update path
1 parent 05221ac commit 54d5a4a

File tree

3 files changed

+14
-203
lines changed

3 files changed

+14
-203
lines changed

modules/kube-audit/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ resource "null_resource" "install_required_binaries" {
55
build_number = timestamp()
66
}
77
provisioner "local-exec" {
8-
command = "${path.module}/scripts/install-binaries.sh"
8+
command = "${path.root}/scripts/install-binaries.sh"
99
interpreter = ["/bin/bash", "-c"]
1010
environment = {
1111
DISABLE_EXTERNAL_DOWNLOADS = var.disable_external_binary_download

modules/kube-audit/scripts/install-binaries.sh

Lines changed: 0 additions & 163 deletions
This file was deleted.

scripts/install-binaries.sh

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@ set -o pipefail
66
ARG=""
77
DIRECTORY="/tmp"
88

9-
#######################################
10-
# Feature flags
11-
#######################################
12-
13-
# Optional custom URL prefix for all binaries
14-
KUBECTL_DOWNLOAD_URL="${KUBECTL_DOWNLOAD_URL:-}"
15-
JQ_DOWNLOAD_URL="${JQ_DOWNLOAD_URL:-}"
16-
179
#######################################
1810
# OS / ARCH Detection
1911
#######################################
@@ -38,19 +30,13 @@ fi
3830

3931
function download {
4032
local binary=$1
41-
local version=$2
42-
local url=$3
43-
local file=$4
44-
local tmp_dir=$5
45-
local custom_url=$6
46-
47-
if [ "$custom_url" = "true" ]; then
48-
echo "Downloading ${binary}..."
49-
curl --retry 3 -fLsS "${url}" --output "${tmp_dir}/${file}"
50-
else
51-
echo "Downloading ${binary} ${version}..."
52-
curl --retry 3 -fLsS "${url}/${file}" --output "${tmp_dir}/${file}"
53-
fi
33+
local url=$2
34+
local file=$3
35+
local tmp_dir=$4
36+
37+
echo "Downloading ${binary}..."
38+
curl --retry 3 -fLsS "${url}" --output "${tmp_dir}/${file}"
39+
5440
}
5541

5642
#######################################
@@ -101,22 +87,16 @@ KUBECTL_VERSION=v1.34.1
10187
BINARY=kubectl
10288

10389
if ! command -v kubectl >/dev/null 2>&1; then
104-
echo "kubectl not found. Installing latest stable version locally..."
90+
echo "kubectl not found. Installing version ${KUBECTL_VERSION} locally..."
10591
TMP_DIR=$(mktemp -d /tmp/${BINARY}-XXXXX)
10692

10793
echo
10894
echo "-- Installing ${BINARY} ${KUBECTL_VERSION}..."
10995

110-
BASE_URL="${KUBECTL_DOWNLOAD_URL:-https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/${OS}/${ARCH}}"
111-
11296
FILE_NAME="kubectl"
97+
BASE_URL="${KUBECTL_DOWNLOAD_URL:-https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/${OS}/${ARCH}/${FILE_NAME}}"
11398

114-
if [ -n "$KUBECTL_DOWNLOAD_URL" ]; then
115-
download "$BINARY" "$KUBECTL_VERSION" "$BASE_URL" "$FILE_NAME" "$TMP_DIR" "true"
116-
else
117-
download "$BINARY" "$KUBECTL_VERSION" "$BASE_URL" "$FILE_NAME" "$TMP_DIR"
118-
fi
119-
99+
download "$BINARY" "$BASE_URL" "$FILE_NAME" "$TMP_DIR"
120100
copy_replace_binary "$BINARY" "$TMP_DIR"
121101
clean "$TMP_DIR"
122102

@@ -138,22 +118,16 @@ JQ_VERSION=1.7.1
138118
BINARY=jq
139119

140120
if ! command -v jq >/dev/null 2>&1; then
141-
echo "jq not found. Installing latest stable version locally..."
121+
echo "jq not found. Installing version ${JQ_VERSION} locally..."
142122
TMP_DIR=$(mktemp -d /tmp/${BINARY}-XXXXX)
143123

144124
echo
145125
echo "-- Installing ${BINARY} ${JQ_VERSION}..."
146126

147-
BASE_URL="${JQ_DOWNLOAD_URL:-https://github.com/jqlang/jq/releases/download/jq-${JQ_VERSION}}"
148-
149127
FILE_NAME="jq-${JQ_OS}-${ARCH}"
128+
BASE_URL="${JQ_DOWNLOAD_URL:-https://github.com/jqlang/jq/releases/download/jq-${JQ_VERSION}/${FILE_NAME}}"
150129

151-
if [ -n "$JQ_DOWNLOAD_URL" ]; then
152-
download "$BINARY" "$JQ_VERSION" "$BASE_URL" "$FILE_NAME" "$TMP_DIR" "true"
153-
else
154-
download "$BINARY" "$JQ_VERSION" "$BASE_URL" "$FILE_NAME" "$TMP_DIR"
155-
fi
156-
130+
download "$BINARY" "$BASE_URL" "$FILE_NAME" "$TMP_DIR"
157131
mv "${TMP_DIR}/${FILE_NAME}" "${TMP_DIR}/${BINARY}"
158132
copy_replace_binary "$BINARY" "$TMP_DIR"
159133
clean "$TMP_DIR"

0 commit comments

Comments
 (0)