Skip to content

Commit

Permalink
Merge pull request #755 from terraform-docs/dependabot/docker/golang-…
Browse files Browse the repository at this point in the history
…1.22.1-alpine

Bump golang from 1.21.5-alpine to 1.22.1-alpine
  • Loading branch information
khos2ow committed Mar 22, 2024
2 parents 4552a93 + a321c28 commit 9e81dc2
Show file tree
Hide file tree
Showing 15 changed files with 61 additions and 2,424 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

env:
GO_VERSION: "1.21.5"
GO_VERSION: "1.22.1"
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}

jobs:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:

- name: Check License headers
run: |
GO111MODULE=off go get github.com/google/addlicense
go install github.com/google/addlicense@latest
addlicense -check $(find . -type f -name "*.go")
addlicense -check $(find . -type f -name "*.sh")
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master

env:
GO_VERSION: "1.21.5"
GO_VERSION: "1.22.1"

jobs:
analyze:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prerelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- "v*.*.*-*"

env:
GO_VERSION: "1.21.5"
GO_VERSION: "1.22.1"
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- "!v*.*.*-*"

env:
GO_VERSION: "1.21.5"
GO_VERSION: "1.22.1"
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}

jobs:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ us on [Slack].

## Development Requirements

- [Go] 1.16+
- [Go] 1.22+
- [goimports]
- [golangci-lint]

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# You may obtain a copy of the License at the LICENSE file in
# the root directory of this source tree.

FROM golang:1.21.5-alpine AS builder
FROM golang:1.22.1-alpine AS builder

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

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ major: release ## Prepare Major release
.PHONY: goimports
goimports: ## Install goimports
ifeq (, $(shell which goimports))
GO111MODULE=off $(GO) get -u golang.org/x/tools/cmd/goimports
$(GO) install golang.org/x/tools/cmd/goimports@latest
endif

.PHONY: golangci
Expand Down
4 changes: 2 additions & 2 deletions format/generator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ the root directory of this source tree.
package format

import (
"io/ioutil"
"os"
"path/filepath"
"testing"

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

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

assert.Nil(err)

Expand Down
33 changes: 32 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/terraform-docs/terraform-docs

go 1.16
go 1.22

require (
github.com/BurntSushi/toml v1.3.2
Expand All @@ -23,19 +23,50 @@ require (
)

require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/zclconf/go-cty v1.14.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
golang.org/x/exp/typeparams v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.16.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
)
Loading

0 comments on commit 9e81dc2

Please sign in to comment.