Repository maintenance

.circleci/config.yml

@@ -5,16 +5,27 @@ version: 2.1
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
+ shellcheck:
+ docker:
+ - image: public.ecr.aws/debian/debian:11
+ steps:
+ - run:
+ name: "Install dependencies"
+ command: "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install shellcheck git ssh-client"
+ - checkout
+ - run:
+ name: "shellcheck"
+ command: "shellcheck -s bash -S warning ec2-metadata ec2nvme-nsid ec2udev-vbd ec2udev-vcpu"
  code-checks-al2:
  docker:
  - image: public.ecr.aws/amazonlinux/amazonlinux:2
  steps:
- - checkout
  - run:
  name: "Install dependencies"
  command: |
  yum -y install python-pip git
  pip install flake8
+ - checkout
  - run:
  name: "flake8"
  command: "git grep -l '^#!/usr/bin/env python' | xargs flake8 ebsnvme-id"
@@ -23,11 +34,11 @@ jobs:
  docker:
  - image: public.ecr.aws/amazonlinux/amazonlinux:2
  steps:
- - checkout
  - run:
  name: "Install dependencies"
  command: |
- yum -y install rpm-build python
+ yum -y install rpm-build python git
+ - checkout
  - run:
  name: "rpmbuild"
  command: "rpmbuild --define \"_sourcedir $PWD\" -bb amazon-ec2-utils.spec"
@@ -37,5 +48,6 @@ jobs:
 workflows:
  ci-workflow:
  jobs:
+ - shellcheck
  - code-checks-al2
  - build-al2-rpm

ec2-metadata

@@ -58,7 +58,8 @@ function set_imds_token()
 # param1 = query
 function get_meta()
 {
- local imds_out=$(curl -s -q -H "X-aws-ec2-metadata-token:${IMDS_TOKEN}" -f ${METADATA_BASEURL}/latest/${1})
+ local imds_out
+ imds_out=$(curl -s -q -H "X-aws-ec2-metadata-token:${IMDS_TOKEN}" -f ${METADATA_BASEURL}/latest/${1})
  echo -n "${imds_out}"
 }
 
@@ -81,7 +82,7 @@ function print_block-device-mapping()
  x=$(get_meta meta-data/block-device-mapping/)
  if [ -n "${x}" ]; then
  for i in $x; do
-  echo -e '\t' $i: $(get_meta meta-data/block-device-mapping/$i)
+  echo -e '\t' $i: "$(get_meta meta-data/block-device-mapping/$i)"
  done
  else
  echo not available
@@ -102,7 +103,7 @@ function print_public-keys()
  format=$(get_meta meta-data/public-keys/$index/)
  echo format:$format
  echo 'key:(begins from next line)'
- echo $(get_meta meta-data/public-keys/$index/$format)
+ echo "$(get_meta meta-data/public-keys/$index/$format)"
  done
  else
  echo not available
@@ -116,7 +117,7 @@ function print_tags()
  x=$(get_meta meta-data/tags/instance/)
  if [ -n "${x}" ]; then
  for i in $x; do
- echo -e '\t' $i: $(get_meta meta-data/tags/instance/$i)
+ echo -e '\t' $i: "$(get_meta meta-data/tags/instance/$i)"
  done
  else
  echo not available
@@ -198,7 +199,7 @@ while [ "$1" != "" ]; do
  ;;
  -g | --tags ) print_tags
  ;;
- -h | --help ) print_help
+   --help ) print_help
  exit
  ;;
  --all ) print_all