Skip to content

Commit d327535

Browse files
authored
Merge pull request #5 from solidnerd/add-circleci-shellcheck
Add shellcheck for tests
2 parents 67a3d19 + c1956ca commit d327535

File tree

5 files changed

+25
-14
lines changed

5 files changed

+25
-14
lines changed

.circleci/config.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
version: 2
22

33
jobs:
4+
shellcheck:
5+
docker:
6+
- image: nlknguyen/alpine-shellcheck:v0.4.6
7+
steps:
8+
- checkout
9+
- run:
10+
name: Check Scripts
11+
command: |
12+
find . -type f -name '*.sh' | wc -l
13+
find . -type f -name '*.sh' | xargs shellcheck --external-sources
414
validate_terraform:
515
docker:
6-
- image: hashicorp/terraform
16+
- image: hashicorp/terraform:0.11.7
717
steps:
818
- checkout
919
- run:
@@ -14,4 +24,5 @@ workflows:
1424
version: 2
1525
validate:
1626
jobs:
27+
- shellcheck
1728
- validate_terraform

install-plugin.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ OS=${OS:-darwin}
44
HCLOUD_VERSION=${HCLOUD_VERSION:-1.1.0}
55
HCLOUD_TERRAFORM_URL=${HCLOUD_TERRAFORM_URL:-"https://github.com/hetznercloud/terraform-provider-hcloud/releases/download/v${HCLOUD_VERSION}/terraform-provider-hcloud_v${HCLOUD_VERSION}_${OS}_amd64.zip"}
66
echo "Install Terraform plugin from:"
7-
echo "$HCLOUD_TERRAFORM_URL"
8-
curl -sSL $HCLOUD_TERRAFORM_URL -o terraform-provider-hcloud_v${HCLOUD_VERSION}_${OS}_amd64.zip
7+
echo "${HCLOUD_TERRAFORM_URL}"
8+
curl -sSL "${HCLOUD_TERRAFORM_URL}" -o terraform-provider-hcloud_v"${HCLOUD_VERSION}"_"${OS}"_amd64.zip
99

10-
unzip -d /tmp/terraform-provider-hcloud_v${HCLOUD_VERSION}_${OS}_amd64 terraform-provider-hcloud_v${HCLOUD_VERSION}_${OS}_amd64.zip
10+
unzip -d /tmp/terraform-provider-hcloud_v"${HCLOUD_VERSION}"_"${OS}"_amd64 terraform-provider-hcloud_v"${HCLOUD_VERSION}"_"${OS}"_amd64.zip
1111

1212
mkdir -p ~/.terraform.d/plugins/
1313

14-
mv -v /tmp/terraform-provider-hcloud_v${HCLOUD_VERSION}_${OS}_amd64/terraform-provider-hcloud ~/.terraform.d/plugins/terraform-provider-hcloud
14+
mv -v /tmp/terraform-provider-hcloud_v"${HCLOUD_VERSION}"_"${OS}"_amd64/terraform-provider-hcloud ~/.terraform.d/plugins/terraform-provider-hcloud

scripts/copy-kubeadm-token.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ SSH_HOST=${SSH_HOST:-}
66

77
TARGET=${TARGET:-}
88

9-
mkdir -p ${TARGET}
9+
mkdir -p "${TARGET}"
1010

1111
scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
12-
-i ${SSH_PRIVATE_KEY} \
13-
${SSH_USERNAME}@${SSH_HOST}:"/tmp/kubeadm_join" \
14-
${TARGET}
12+
-i "${SSH_PRIVATE_KEY}" \
13+
"${SSH_USERNAME}@${SSH_HOST}:/tmp/kubeadm_join" \
14+
"${TARGET}"
1515

1616
scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
17-
-i ${SSH_PRIVATE_KEY} \
18-
${SSH_USERNAME}@${SSH_HOST}:"/etc/kubernetes/admin.conf" \
19-
${TARGET}
17+
-i "${SSH_PRIVATE_KEY}" \
18+
"${SSH_USERNAME}@${SSH_HOST}:/etc/kubernetes/admin.conf" \
19+
"${TARGET}"

scripts/master.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Pin-Priority: 1000
1313
apt-get install -qq -y kubectl
1414

1515
# Initialize Cluster
16-
kubeadm init --feature-gates CoreDNS=$CORE_DNS
16+
kubeadm init --feature-gates CoreDNS="$CORE_DNS"
1717

1818
systemctl enable docker kubelet
1919

scripts/node.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/bash
22
set -eu
33

4-
eval $(cat /tmp/kubeadm_join)
4+
eval "$(cat /tmp/kubeadm_join)"
55
systemctl enable docker kubelet

0 commit comments

Comments
 (0)