Skip to content

Commit 7377054

Browse files
committed
linting
Signed-off-by: yottta <[email protected]>
1 parent 0aced37 commit 7377054

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.github/scripts/submit-provider-key-check.sh

+8-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ function check_repo_release() {
2828
# download the GPG signature from the given provider release
2929
gh release download --repo "${owner}/${repo}" "${release}" -p "*SHA256*"
3030
# verify the signatures
31+
# shellcheck disable=SC2312
3132
sigfile=$(find . -name "*SHA256SUMS.sig" -print | head -1)
33+
# shellcheck disable=SC2312
3234
shafile=$(find . -name "*SHA256SUMS" -print | head -1)
3335
if gpg --verify "${sigfile}" "${shafile}" > /dev/null 2>&1
3436
then
@@ -44,6 +46,8 @@ function check_repo_release() {
4446
function check_repo_versions() {
4547
local owner="${1}"
4648
local repo="${2}"
49+
local releases
50+
releases="$(gh release list --exclude-drafts --exclude-pre-releases --repo "${owner}/${repo}" -L 3 -O desc --json name -q '.[].name')"
4751
# check recent releases of the owner's repo (3 releases checked)
4852
while IFS= read -r release; do
4953
if check_repo_release "${owner}" "${repo}" "${release}"
@@ -52,14 +56,15 @@ function check_repo_versions() {
5256
return 0
5357
fi
5458
# list the latest 100 releases of the repository and get only the release names
55-
done <<< "$(gh release list --exclude-drafts --exclude-pre-releases --repo "${owner}/${repo}" -L 3 -O desc --json name -q '.[].name')"
59+
done <<< "${releases}"
5660
# if no release is matching the signature, return error
5761
return 1
5862
}
5963

6064
function check_owner_repos() {
6165
local owner="${1}"
6266
# list first 100 repos of the owner and get all the terraform-provider-* repos to check their releases
67+
local repos
6368
repos="$(gh repo list "${owner}" --no-archived --source -L 100 --json name -q '.[].name | select(. | contains("terraform-provider-"))')"
6469
while IFS= read -r repo; do
6570
if check_repo_versions "${owner}" "${repo}" "${release}"
@@ -75,6 +80,7 @@ apt update && apt install -y gpg
7580
# import the submitted key
7681
gpg --import "${keyfile}" 2>/dev/null
7782
# trust the newly imported key
83+
# shellcheck disable=SC2312
7884
for fpr in $(gpg --list-keys --with-colons | grep "pub:" | awk -F: '{print $5}' | sort -u); do echo -e "5\ny\n" | gpg -q --command-fd 0 --expert --edit-key "${fpr}" trust; done
7985

8086
if [[ -n "${provider_name}" ]]; then
@@ -83,20 +89,19 @@ if [[ -n "${provider_name}" ]]; then
8389
if ! check_repo_versions "${owner}" "${repo}"
8490
then
8591
gh issue comment "${NUMBER}" -b "Key is matching no recent release of ${owner}/${repo}"
86-
echo "Key is matching no recent release of ${owner}/${repo}"
8792
exit 0
8893
fi
8994
else
9095
# if no provider name is given, will check the key against any terraform-provider-* repo of the owner
9196
if ! check_owner_repos "${owner}"
9297
then
9398
gh issue comment "${NUMBER}" -b "Key is matching no recent release from any 'terraform-provider-*' of ${owner}"
94-
echo "Key is matching no recent release from any 'terraform-provider-*' of ${owner}"
9599
exit 0
96100
fi
97101
fi
98102
gh issue comment "${NUMBER}" -b "Key provider signatures validation succeeded!"
99103

100104
# cleanup keys
105+
# shellcheck disable=SC2312
101106
for fpr in $(gpg --list-keys --with-colons -q | grep "pub:" | awk -F: '{print $5}' | sort -u); do echo -e "y\n" | gpg --command-fd 0 --expert --delete-keys "${fpr}"; done
102107

.github/scripts/submit-provider-key.sh

-6
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ if [[ -z "${providername}" ]]; then
6060
else
6161
keyfile="../keys/${namespace:0:1}/${namespace}/${providername}/provider-$(date +%s).asc"
6262
fi
63-
if [[ -d "$(dirname "${keyfile}")" ]]; then
64-
msg="Updated"
65-
#git rm $(dirname $keyfile)/*
66-
else
67-
msg="Created"
68-
fi
6963
mkdir -p "$(dirname "${keyfile}")"
7064
mv tmp.key "${keyfile}"
7165

0 commit comments

Comments
 (0)