Skip to content

Commit 40a08a0

Browse files
paulpalamarchukpaulpalamarchuk
committed
Updated dev tools docker image tag to 0.4.6
 * Fixed lint tests * Updated Makefile * Fixed check_generate test function
1 parent 6912022 commit 40a08a0

File tree

11 files changed

+27
-32
lines changed

11 files changed

+27
-32
lines changed

‎Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Make will use bash instead of sh
1919
SHELL := /usr/bin/env bash
2020

21-
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.4.5
21+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.4.6
2222
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424

@@ -27,7 +27,7 @@ REGISTRY_URL := gcr.io/cloud-foundation-cicd
2727
docker_run:
2828
docker run --rm -it \
2929
-e SERVICE_ACCOUNT_JSON \
30-
-v $(CURDIR):/workspace \
30+
-v "$(CURDIR)":/workspace \
3131
$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
3232
/bin/bash
3333

@@ -39,7 +39,7 @@ docker_test_prepare:
3939
-e TF_VAR_org_id \
4040
-e TF_VAR_folder_id \
4141
-e TF_VAR_billing_account \
42-
-v $(CURDIR):/workspace \
42+
-v "$(CURDIR)":/workspace \
4343
$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
4444
/usr/local/bin/execute_with_credentials.sh prepare_environment
4545

@@ -51,7 +51,7 @@ docker_test_cleanup:
5151
-e TF_VAR_org_id \
5252
-e TF_VAR_folder_id \
5353
-e TF_VAR_billing_account \
54-
-v $(CURDIR):/workspace \
54+
-v "$(CURDIR)":/workspace \
5555
$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
5656
/usr/local/bin/execute_with_credentials.sh cleanup_environment
5757

@@ -60,31 +60,31 @@ docker_test_cleanup:
6060
docker_test_integration:
6161
docker run --rm -it \
6262
-e SERVICE_ACCOUNT_JSON \
63-
-v $(CURDIR):/workspace \
63+
-v "$(CURDIR)":/workspace \
6464
$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
6565
/usr/local/bin/test_integration.sh
6666

6767
# Execute lint tests within the docker container
6868
.PHONY: docker_test_lint
6969
docker_test_lint:
7070
docker run --rm -it \
71-
-v $(CURDIR):/workspace \
71+
-v "$(CURDIR)":/workspace \
7272
$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
7373
/usr/local/bin/test_lint.sh
7474

7575
# Generate documentation
7676
.PHONY: docker_generate_docs
7777
docker_generate_docs:
7878
docker run --rm -it \
79-
-v $(CURDIR):/workspace \
79+
-v "$(CURDIR)":/workspace \
8080
$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
8181
/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs'
8282

8383
# Generate files from autogen
8484
.PHONY: docker_generate
8585
docker_generate:
8686
docker run --rm -it \
87-
-v $(CURDIR):/workspace \
87+
-v "$(CURDIR)":/workspace \
8888
$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
8989
/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate'
9090

‎autogen/scripts/wait-for-cluster.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616
set -e
1717

18+
# shellcheck disable=SC2034
1819
if [ -n "${GOOGLE_APPLICATION_CREDENTIALS}" ]; then
19-
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${GOOGLE_APPLICATION_CREDENTIALS}
20+
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE="${GOOGLE_APPLICATION_CREDENTIALS}"
2021
fi
2122

2223
PROJECT=$1

‎build/int.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,4 +226,4 @@ tags:
226226
- 'integration'
227227
substitutions:
228228
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
229-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.4.5'
229+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.4.6'

‎build/lint.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ tags:
2424
- 'lint'
2525
substitutions:
2626
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
27-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.4.5'
27+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.4.6'

‎modules/beta-private-cluster-update-variant/scripts/wait-for-cluster.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616
set -e
1717

18+
# shellcheck disable=SC2034
1819
if [ -n "${GOOGLE_APPLICATION_CREDENTIALS}" ]; then
19-
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${GOOGLE_APPLICATION_CREDENTIALS}
20+
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE="${GOOGLE_APPLICATION_CREDENTIALS}"
2021
fi
2122

2223
PROJECT=$1

‎modules/beta-private-cluster/scripts/wait-for-cluster.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616
set -e
1717

18+
# shellcheck disable=SC2034
1819
if [ -n "${GOOGLE_APPLICATION_CREDENTIALS}" ]; then
19-
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${GOOGLE_APPLICATION_CREDENTIALS}
20+
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE="${GOOGLE_APPLICATION_CREDENTIALS}"
2021
fi
2122

2223
PROJECT=$1

‎modules/beta-public-cluster/scripts/wait-for-cluster.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616
set -e
1717

18+
# shellcheck disable=SC2034
1819
if [ -n "${GOOGLE_APPLICATION_CREDENTIALS}" ]; then
19-
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${GOOGLE_APPLICATION_CREDENTIALS}
20+
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE="${GOOGLE_APPLICATION_CREDENTIALS}"
2021
fi
2122

2223
PROJECT=$1

‎modules/private-cluster-update-variant/scripts/wait-for-cluster.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616
set -e
1717

18+
# shellcheck disable=SC2034
1819
if [ -n "${GOOGLE_APPLICATION_CREDENTIALS}" ]; then
19-
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${GOOGLE_APPLICATION_CREDENTIALS}
20+
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE="${GOOGLE_APPLICATION_CREDENTIALS}"
2021
fi
2122

2223
PROJECT=$1

‎modules/private-cluster/scripts/wait-for-cluster.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616
set -e
1717

18+
# shellcheck disable=SC2034
1819
if [ -n "${GOOGLE_APPLICATION_CREDENTIALS}" ]; then
19-
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${GOOGLE_APPLICATION_CREDENTIALS}
20+
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE="${GOOGLE_APPLICATION_CREDENTIALS}"
2021
fi
2122

2223
PROJECT=$1

‎scripts/wait-for-cluster.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright 2018 Google LLC
2+
# Copyright 2019 Google LLC
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -15,8 +15,9 @@
1515

1616
set -e
1717

18+
# shellcheck disable=SC2034
1819
if [ -n "${GOOGLE_APPLICATION_CREDENTIALS}" ]; then
19-
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${GOOGLE_APPLICATION_CREDENTIALS}
20+
export CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE="${GOOGLE_APPLICATION_CREDENTIALS}"
2021
fi
2122

2223
PROJECT=$1

‎test/task_helper_functions.sh

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ function check_generate() {
3232
--exclude '*/.kitchen' \
3333
--exclude '*/.git' \
3434
/workspace "${tempdir}" >/dev/null 2>/dev/null
35-
cd "${tempdir}" || exit 1
35+
cd "${tempdir}/workspace" || exit 1
3636
generate >/dev/null 2>/dev/null
37+
generate_docs >/dev/null 2>/dev/null
3738
diff -r \
3839
--exclude=".terraform" \
3940
--exclude=".kitchen" \
@@ -49,16 +50,3 @@ function check_generate() {
4950
rm -Rf "${tempdir}"
5051
return $((rval))
5152
}
52-
53-
find_files() {
54-
local pth="$1"
55-
shift
56-
find "${pth}" '(' \
57-
-path '*/.git' -o \
58-
-path '*/.terraform' -o \
59-
-path '*/.kitchen' -o \
60-
-path './autogen' -o \
61-
-path './test/fixtures/all_examples' -o \
62-
-path './test/fixtures/shared' ')' \
63-
-prune -o -type f "$@"
64-
}

0 commit comments

Comments
 (0)