Skip to content

Commit 40ea1fb

Browse files
rquadlingrquadling
committed
Merge commit 'b492808fcae33a0a62f575866ea86baa5573d5c2'
* commit 'b492808fcae33a0a62f575866ea86baa5573d5c2': Bump golang to 1.22.1 Bump golang from 1.21.5-alpine to 1.22.1-alpine
2 parents 1ff105d + b492808 commit 40ea1fb

File tree

15 files changed

+62
-2492
lines changed

15 files changed

+62
-2492
lines changed

‎.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
pull_request:
88

99
env:
10-
GO_VERSION: "1.21.5"
10+
GO_VERSION: "1.22.1"
1111
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
1212

1313
jobs:
@@ -73,7 +73,7 @@ jobs:
7373

7474
- name: Check License headers
7575
run: |
76-
GO111MODULE=off go get github.com/google/addlicense
76+
GO111MODULE=off go install github.com/google/addlicense
7777
7878
addlicense -check $(find . -type f -name "*.go")
7979
addlicense -check $(find . -type f -name "*.sh")

‎.github/workflows/codeql.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77

88
env:
9-
GO_VERSION: "1.21.5"
9+
GO_VERSION: "1.22.1"
1010

1111
jobs:
1212
analyze:

‎.github/workflows/prerelease.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- "v*.*.*-*"
77

88
env:
9-
GO_VERSION: "1.21.5"
9+
GO_VERSION: "1.22.1"
1010
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
1111

1212
jobs:

‎.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- "!v*.*.*-*"
88

99
env:
10-
GO_VERSION: "1.21.5"
10+
GO_VERSION: "1.22.1"
1111
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
1212

1313
jobs:

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ us on [Slack].
1010

1111
## Development Requirements
1212

13-
- [Go] 1.16+
13+
- [Go] 1.22+
1414
- [goimports]
1515
- [golangci-lint]
1616

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# You may obtain a copy of the License at the LICENSE file in
77
# the root directory of this source tree.
88

9-
FROM golang:1.21.5-alpine AS builder
9+
FROM golang:1.22.1-alpine AS builder
1010

1111
RUN apk add --update --no-cache make
1212

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ major: release ## Prepare Major release
141141
.PHONY: goimports
142142
goimports: ## Install goimports
143143
ifeq (, $(shell which goimports))
144-
GO111MODULE=off $(GO) get -u golang.org/x/tools/cmd/goimports
144+
$(GO) install golang.org/x/tools/cmd/goimports@latest
145145
endif
146146

147147
.PHONY: golangci

‎format/generator_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ the root directory of this source tree.
1111
package format
1212

1313
import (
14-
"io/ioutil"
14+
"os"
1515
"path/filepath"
1616
"testing"
1717

@@ -182,7 +182,7 @@ func TestGeneratorFuncModule(t *testing.T) {
182182
generator := newGenerator(config, true, withModule(module))
183183

184184
path := filepath.Join("..", "terraform", "testdata", "expected", "full-example-mainTf-Header.golden")
185-
data, err := ioutil.ReadFile(path)
185+
data, err := os.ReadFile(path)
186186

187187
assert.Nil(err)
188188

‎go.mod

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/terraform-docs/terraform-docs
22

3-
go 1.16
3+
go 1.22
44

55
require (
66
github.com/BurntSushi/toml v1.3.2
@@ -12,6 +12,7 @@ require (
1212
github.com/iancoleman/orderedmap v0.3.0
1313
github.com/imdario/mergo v0.3.16
1414
github.com/mitchellh/go-homedir v1.1.0
15+
github.com/rquadling/terraform-config-inspect v0.0.0-20240117094320-33c0c7fd6955
1516
github.com/spf13/cobra v1.8.0
1617
github.com/spf13/pflag v1.0.5
1718
github.com/spf13/viper v1.18.2
@@ -22,27 +23,52 @@ require (
2223
)
2324

2425
require (
26+
github.com/Masterminds/goutils v1.1.1 // indirect
2527
github.com/Masterminds/semver/v3 v3.2.1 // indirect
2628
github.com/agext/levenshtein v1.2.3 // indirect
29+
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
30+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2731
github.com/fatih/color v1.16.0 // indirect
32+
github.com/fsnotify/fsnotify v1.7.0 // indirect
33+
github.com/golang/protobuf v1.5.3 // indirect
34+
github.com/google/go-cmp v0.6.0 // indirect
2835
github.com/google/uuid v1.5.0 // indirect
29-
github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72
36+
github.com/hashicorp/hcl v1.0.0 // indirect
37+
github.com/hashicorp/yamux v0.1.1 // indirect
3038
github.com/huandu/xstrings v1.4.0 // indirect
39+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
40+
github.com/magiconair/properties v1.8.7 // indirect
41+
github.com/mattn/go-colorable v0.1.13 // indirect
42+
github.com/mattn/go-isatty v0.0.20 // indirect
3143
github.com/mitchellh/copystructure v1.2.0 // indirect
3244
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
3345
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
46+
github.com/mitchellh/mapstructure v1.5.0 // indirect
47+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
3448
github.com/oklog/run v1.1.0 // indirect
3549
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
50+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
51+
github.com/sagikazarmark/locafero v0.4.0 // indirect
52+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
3653
github.com/shopspring/decimal v1.3.1 // indirect
54+
github.com/sourcegraph/conc v0.3.0 // indirect
55+
github.com/spf13/afero v1.11.0 // indirect
56+
github.com/spf13/cast v1.6.0 // indirect
57+
github.com/subosito/gotenv v1.6.0 // indirect
3758
github.com/zclconf/go-cty v1.14.1 // indirect
3859
go.uber.org/multierr v1.11.0 // indirect
3960
golang.org/x/crypto v0.17.0 // indirect
4061
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
4162
golang.org/x/exp/typeparams v0.0.0-20231226003508-02704c960a9b // indirect
63+
golang.org/x/mod v0.14.0 // indirect
64+
golang.org/x/net v0.19.0 // indirect
65+
golang.org/x/sys v0.15.0 // indirect
66+
golang.org/x/text v0.14.0 // indirect
4267
golang.org/x/tools v0.16.1 // indirect
4368
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
4469
google.golang.org/grpc v1.60.1 // indirect
4570
google.golang.org/protobuf v1.32.0 // indirect
71+
gopkg.in/ini.v1 v1.67.0 // indirect
4672
)
4773

4874
replace github.com/hashicorp/terraform-config-inspect => github.com/rquadling/terraform-config-inspect v0.0.0-20231228173330-dceb5f6e1579

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy