Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.7.3] Update to Go 1.15.13 and SDK version #11857

Merged
merged 8 commits into from
Jun 14, 2021
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
448 changes: 224 additions & 224 deletions .circleci/config.yml

Large diffs are not rendered by default.

436 changes: 218 additions & 218 deletions .circleci/config/@build-release.yml

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions .circleci/config/executors/@executors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go-machine:
environment:
GO111MODULE: "off"
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_VERSION: 1.15.11 # Pin Go to patch version (ex: 1.2.3)
GO_VERSION: 1.15.13 # Pin Go to patch version (ex: 1.2.3)
GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum to patch version (ex: 1.2.3)
GO_TAGS: ""
working_directory: /go/src/github.com/hashicorp/vault
Expand All @@ -20,13 +20,13 @@ python:
working_directory: /go/src/github.com/hashicorp/vault
alpine:
docker:
- image: docker.mirror.hashicorp.services/alpine:3.10.2
- image: docker.mirror.hashicorp.services/alpine:3.13
shell: /bin/sh
working_directory: /go/src/github.com/hashicorp/vault
docker-env-go-test-remote-docker:
resource_class: medium
docker:
- image: "docker.mirror.hashicorp.services/circleci/golang:1.15.11-buster"
- image: "docker.mirror.hashicorp.services/circleci/golang:1.15.13-buster"
environment:
GO111MODULE: "off"
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
Expand All @@ -35,7 +35,7 @@ docker-env-go-test-remote-docker:
docker-env-go-test:
resource_class: large
docker:
- image: "docker.mirror.hashicorp.services/circleci/golang:1.15.11-buster"
- image: "docker.mirror.hashicorp.services/circleci/golang:1.15.13-buster"
environment:
GO111MODULE: "off"
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
Expand All @@ -44,7 +44,7 @@ docker-env-go-test:
docker-env-go-test-race:
resource_class: xlarge
docker:
- image: "docker.mirror.hashicorp.services/circleci/golang:1.15.11-buster"
- image: "docker.mirror.hashicorp.services/circleci/golang:1.15.13-buster"
environment:
GO111MODULE: "off"
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ EXTERNAL_TOOLS=\
GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor)


GO_VERSION_MIN=1.15.11
GO_VERSION_MIN=1.15.13
GO_CMD?=go
CGO_ENABLED?=0
ifneq ($(FDB_ENABLED), )
Expand Down
3 changes: 3 additions & 0 deletions changelog/11857.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:change
go: Update go version to 1.15.13
```
2 changes: 1 addition & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uG
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/hashicorp/hcl v1.0.1-vault h1:UiJeEzCWAYdVaJr8Xo4lBkTozlW1+1yxVUnpbS1xVEk=
github.com/hashicorp/hcl v1.0.1-vault h1:/JhJsLUPC73zeqSbkZApgsofP4iB++zgDHS5t6ZL0Lc=
github.com/hashicorp/hcl v1.0.1-vault/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
Expand Down
664 changes: 332 additions & 332 deletions packages-oss.lock/layers/layers.mk

Large diffs are not rendered by default.

3,120 changes: 1,560 additions & 1,560 deletions packages-oss.lock/pkgs.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages-oss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ inputs:
PRODUCT_VERSION: 0.0.0-snapshot

# GO_VERSION is the version of the Go toolchain to use to compile this package.
GO_VERSION: 1.15.11
GO_VERSION: 1.15.13

# YARN_VERSION is the version of Yarn to install for the UI layer.
YARN_VERSION: 1.19.1-1
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Multi-stage builder to avoid polluting users environment with wrong
# architecture binaries. Since this binary is used in an alpine container,
# we're explicitly compiling for 'linux/amd64'
ARG VERSION=1.15.11
ARG VERSION=1.15.13

FROM golang:${VERSION} AS builder

Expand Down
2 changes: 1 addition & 1 deletion sdk/version/version_base.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var (
// Whether cgo is enabled or not; set at build time
CgoEnabled bool

Version = "1.7.2"
Version = "1.7.3"
VersionPrerelease = ""
VersionMetadata = ""
)
39 changes: 35 additions & 4 deletions vendor/github.com/hashicorp/hcl/decoder.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.