Skip to content

Commit 2e75f8f

Browse files
Display line numbers for cft violations (#1671)
* Dispaly line numbers for cft violations * Updating version * Update go version and fix lint * Update go version to 1.21
1 parent 3bf466d commit 2e75f8f

File tree

8 files changed

+156
-69
lines changed

8 files changed

+156
-69
lines changed

.github/workflows/gobuild.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
GO111MODULE: on
1212
GOPATH: /home/runner/work/terrascan
1313
GOBIN: /home/runner/work/terrascan/bin
14-
GO_VERSION: 1.19
14+
GO_VERSION: 1.21
1515
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_TEST }}
1616
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_TEST }}
1717
AWS_REGION: ${{ secrets.AWS_REGION_TEST }}

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
env:
1212
GO111MODULE: on
13-
GO_VERSION: 1.19
13+
GO_VERSION: 1.21
1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@v3

go.mod

+34-23
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/tenable/terrascan
22

3-
go 1.19
3+
go 1.21
44

55
replace (
66
github.com/hashicorp/go-getter => github.com/hashicorp/go-getter v1.7.0
@@ -20,14 +20,14 @@ require (
2020
github.com/GoogleCloudPlatform/docker-credential-gcr v2.0.5+incompatible
2121
github.com/VerbalExpressions/GoVerbalExpressions v0.0.0-20200410162751-4d76a1099a6e
2222
github.com/aws/aws-sdk-go v1.44.193
23-
github.com/aws/aws-sdk-go-v2/config v1.5.0
24-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.3.2
25-
github.com/aws/aws-sdk-go-v2/service/s3 v1.11.1
26-
github.com/aws/smithy-go v1.6.0
23+
github.com/aws/aws-sdk-go-v2/config v1.27.3
24+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.5
25+
github.com/aws/aws-sdk-go-v2/service/s3 v1.51.0
26+
github.com/aws/smithy-go v1.20.1
2727
github.com/ghodss/yaml v1.0.0
2828
github.com/go-errors/errors v1.0.1
2929
github.com/google/go-containerregistry v0.5.1
30-
github.com/google/uuid v1.3.0
30+
github.com/google/uuid v1.6.0
3131
github.com/gorilla/handlers v1.5.1
3232
github.com/gorilla/mux v1.8.0
3333
github.com/hashicorp/go-cleanhttp v0.5.2
@@ -41,7 +41,7 @@ require (
4141
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734
4242
github.com/iancoleman/strcase v0.1.3
4343
github.com/itchyny/gojq v0.12.1
44-
github.com/mattn/go-isatty v0.0.12
44+
github.com/mattn/go-isatty v0.0.20
4545
github.com/mitchellh/go-homedir v1.1.0
4646
github.com/moby/buildkit v0.8.3
4747
github.com/onsi/ginkgo v1.16.4
@@ -51,11 +51,11 @@ require (
5151
github.com/pelletier/go-toml v1.9.3
5252
github.com/pkg/errors v0.9.1
5353
github.com/spf13/afero v1.6.0
54-
github.com/spf13/cobra v1.6.1
55-
github.com/stretchr/testify v1.8.1
54+
github.com/spf13/cobra v1.8.0
55+
github.com/stretchr/testify v1.8.4
5656
github.com/zclconf/go-cty v1.10.0
5757
go.uber.org/zap v1.17.0
58-
golang.org/x/sys v0.13.0
58+
golang.org/x/sys v0.17.0
5959
golang.org/x/tools v0.12.1-0.20230825192346-2191a27a6dc5 // indirect
6060
google.golang.org/api v0.114.0
6161
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
@@ -73,6 +73,7 @@ require (
7373
require (
7474
cloud.google.com/go/containeranalysis v0.9.0
7575
github.com/apparentlymart/go-versions v1.0.1
76+
github.com/aws-cloudformation/rain v1.7.6-0.20240222000459-86c95e121ae9
7677
github.com/awslabs/goformation/v7 v7.0.5
7778
)
7879

@@ -98,16 +99,23 @@ require (
9899
github.com/agext/levenshtein v1.2.2 // indirect
99100
github.com/agnivade/levenshtein v1.1.1 // indirect
100101
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
101-
github.com/aws/aws-sdk-go-v2 v1.7.1 // indirect
102-
github.com/aws/aws-sdk-go-v2/credentials v1.3.1 // indirect
103-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.3.0 // indirect
104-
github.com/aws/aws-sdk-go-v2/internal/ini v1.1.1 // indirect
105-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.2.1 // indirect
106-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.2.1 // indirect
107-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.5.1 // indirect
108-
github.com/aws/aws-sdk-go-v2/service/sso v1.3.1 // indirect
109-
github.com/aws/aws-sdk-go-v2/service/sts v1.6.0 // indirect
102+
github.com/aws/aws-sdk-go-v2 v1.25.1 // indirect
103+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1 // indirect
104+
github.com/aws/aws-sdk-go-v2/credentials v1.17.3 // indirect
105+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.1 // indirect
106+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.1 // indirect
107+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.1 // indirect
108+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
109+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.1 // indirect
110+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 // indirect
111+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.1 // indirect
112+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.1 // indirect
113+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.1 // indirect
114+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.0 // indirect
115+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.0 // indirect
116+
github.com/aws/aws-sdk-go-v2/service/sts v1.28.0 // indirect
110117
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
118+
github.com/chzyer/readline v1.5.1 // indirect
111119
github.com/containerd/typeurl v1.0.2 // indirect
112120
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
113121
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -121,7 +129,7 @@ require (
121129
github.com/docker/go-units v0.5.0 // indirect
122130
github.com/emirpasic/gods v1.12.0 // indirect
123131
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
124-
github.com/fatih/color v1.9.0 // indirect
132+
github.com/fatih/color v1.16.0 // indirect
125133
github.com/felixge/httpsnoop v1.0.3 // indirect
126134
github.com/fsnotify/fsnotify v1.6.0 // indirect
127135
github.com/go-logr/logr v1.2.3 // indirect
@@ -135,12 +143,13 @@ require (
135143
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
136144
github.com/golang/protobuf v1.5.3 // indirect
137145
github.com/google/flatbuffers v22.11.23+incompatible // indirect
138-
github.com/google/go-cmp v0.5.9 // indirect
146+
github.com/google/go-cmp v0.6.0 // indirect
139147
github.com/google/gofuzz v1.2.0 // indirect
140148
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
141149
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
142150
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
143151
github.com/googleapis/gnostic v0.5.5 // indirect
152+
github.com/gookit/color v1.5.4 // indirect
144153
github.com/hashicorp/errwrap v1.1.0 // indirect
145154
github.com/hashicorp/go-hclog v0.15.0 // indirect
146155
github.com/hashicorp/go-safetemp v1.0.0 // indirect
@@ -157,7 +166,7 @@ require (
157166
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
158167
github.com/klauspost/compress v1.15.13 // indirect
159168
github.com/mailru/easyjson v0.7.6 // indirect
160-
github.com/mattn/go-colorable v0.1.6 // indirect
169+
github.com/mattn/go-colorable v0.1.13 // indirect
161170
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
162171
github.com/mitchellh/copystructure v1.1.1 // indirect
163172
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
@@ -167,6 +176,7 @@ require (
167176
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
168177
github.com/modern-go/reflect2 v1.0.2 // indirect
169178
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
179+
github.com/nathan-fiscaletti/consolesize-go v0.0.0-20220204101620-317176b6684d // indirect
170180
github.com/nxadm/tail v1.4.8 // indirect
171181
github.com/opencontainers/go-digest v1.0.0 // indirect
172182
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
@@ -190,6 +200,7 @@ require (
190200
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
191201
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
192202
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
203+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
193204
github.com/yashtewari/glob-intersection v0.1.0 // indirect
194205
go.opencensus.io v0.24.0 // indirect
195206
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
@@ -200,7 +211,7 @@ require (
200211
golang.org/x/net v0.17.0 // indirect
201212
golang.org/x/oauth2 v0.7.0 // indirect
202213
golang.org/x/sync v0.3.0 // indirect
203-
golang.org/x/term v0.13.0 // indirect
214+
golang.org/x/term v0.17.0 // indirect
204215
golang.org/x/text v0.13.0 // indirect
205216
golang.org/x/time v0.3.0 // indirect
206217
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect

0 commit comments

Comments
 (0)