Skip to content

Commit

Permalink
Merge pull request #48 from GSA/bump-versions
Browse files Browse the repository at this point in the history
Bump versions
  • Loading branch information
bryanlalexander authored Jul 14, 2021
2 parents fa96b8a + e02141c commit 5c8f92f
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 73 deletions.
7 changes: 3 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
command: if [[ -n "$(terraform fmt -write=false)" ]]; then echo "Some terraform files need be formatted, run 'terraform fmt' to fix"; exit 1; fi
- run:
name: Install tflint
command: curl -L -o /tmp/tflint.zip https://github.com/terraform-linters/tflint/releases/download/v0.13.2/tflint_linux_amd64.zip && unzip /tmp/tflint.zip -d /usr/local/bin
command: curl -L -o /tmp/tflint.zip https://github.com/terraform-linters/tflint/releases/download/v0.29.1/tflint_linux_amd64.zip && unzip /tmp/tflint.zip -d /usr/local/bin
- run:
name: Check Terraform configurations with tflint
command: find . -name ".terraform" -prune -o -type f -name "*.tf" -exec dirname {} \;|sort -u | while read m; do (cd "$m" && tflint && echo "√ $m") || exit 1 ; done
Expand Down Expand Up @@ -67,14 +67,13 @@ jobs:
sudo python3.7 -m pip install --upgrade pip setuptools flask requests six distro
git clone https://github.com/brady-gsa/moto.git
cd moto
git pull origin fix_lambda_config
git checkout fix_lambda_config
cd ..
sudo python3.7 -m pip install -e moto --ignore-installed PyYAML
- run:
name: Install golang
command: |
curl -o go.tar.gz -sSL https://dl.google.com/go/go1.14.linux-amd64.tar.gz
curl -o go.tar.gz -sSL https://dl.google.com/go/go1.16.linux-amd64.tar.gz
sudo tar -xvf go.tar.gz
sudo rm -rf /usr/local/go
sudo mv -f go /usr/local
Expand Down Expand Up @@ -115,7 +114,7 @@ jobs:
- checkout
- run:
name: Install tfsec
command: env GO111MODULE=on go get -u github.com/tfsec/tfsec/cmd/tfsec
command: env GO111MODULE=on go install github.com/aquasecurity/tfsec/cmd/tfsec@latest
- run:
name: Terraform static code analysis with tfsec
command: tfsec
Expand Down
6 changes: 3 additions & 3 deletions handler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ endif
dependencies: precommit $(GOLANGCILINT) $(GOSEC) $(GHR)

$(GOLANGCILINT):
go get -u github.com/golangci/golangci-lint/cmd/golangci-lint@v1.22.2
go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest

$(GOSEC):
go get -u github.com/securego/gosec/cmd/gosec
go install github.com/securego/gosec/cmd/gosec@latest

$(GHR):
go get -u github.com/tcnksm/ghr
go install github.com/tcnksm/ghr@latest

precommit:
ifneq ($(strip $(hooksPath)),.github/hooks)
Expand Down
5 changes: 0 additions & 5 deletions handler/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,8 @@ require (
github.com/aws/aws-lambda-go v1.23.0
github.com/aws/aws-sdk-go v1.38.39
github.com/caarlos0/env/v6 v6.5.0
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.5
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/gruntwork-io/gruntwork-cli v0.5.1 // indirect
github.com/gruntwork-io/terratest v0.34.6
github.com/magiconair/properties v1.8.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/tealeg/xlsx v1.0.5
golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015 // indirect
Expand Down
Loading

0 comments on commit 5c8f92f

Please sign in to comment.