Bump to go1.17 (#553)

This commit is contained in:
Nate Brown 2021-10-21 16:24:11 -05:00 committed by GitHub
parent 97afe2ec48
commit 32cd9a93f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 81 additions and 47 deletions

View File

@ -14,21 +14,21 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Set up Go 1.16 - name: Set up Go 1.17
uses: actions/setup-go@v1 uses: actions/setup-go@v2
with: with:
go-version: 1.16 go-version: 1.17
id: go id: go
- name: Check out code into the Go module directory - name: Check out code into the Go module directory
uses: actions/checkout@v1 uses: actions/checkout@v2
- uses: actions/cache@v1 - uses: actions/cache@v2
with: with:
path: ~/go/pkg/mod path: ~/go/pkg/mod
key: ${{ runner.os }}-gofmt1.16-${{ hashFiles('**/go.sum') }} key: ${{ runner.os }}-gofmt1.17-${{ hashFiles('**/go.sum') }}
restore-keys: | restore-keys: |
${{ runner.os }}-gofmt1.16- ${{ runner.os }}-gofmt1.17-
- name: Install goimports - name: Install goimports
run: | run: |

View File

@ -10,10 +10,10 @@ jobs:
name: Build Linux All name: Build Linux All
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Set up Go 1.16 - name: Set up Go 1.17
uses: actions/setup-go@v1 uses: actions/setup-go@v2
with: with:
go-version: 1.16 go-version: 1.17
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -34,10 +34,10 @@ jobs:
name: Build Windows amd64 name: Build Windows amd64
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- name: Set up Go 1.16 - name: Set up Go 1.17
uses: actions/setup-go@v1 uses: actions/setup-go@v2
with: with:
go-version: 1.16 go-version: 1.17
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -58,10 +58,10 @@ jobs:
name: Build Darwin amd64 name: Build Darwin amd64
runs-on: macOS-latest runs-on: macOS-latest
steps: steps:
- name: Set up Go 1.16 - name: Set up Go 1.17
uses: actions/setup-go@v1 uses: actions/setup-go@v2
with: with:
go-version: 1.16 go-version: 1.17
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2

View File

@ -18,21 +18,21 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Set up Go 1.16 - name: Set up Go 1.17
uses: actions/setup-go@v1 uses: actions/setup-go@v2
with: with:
go-version: 1.16 go-version: 1.17
id: go id: go
- name: Check out code into the Go module directory - name: Check out code into the Go module directory
uses: actions/checkout@v1 uses: actions/checkout@v2
- uses: actions/cache@v1 - uses: actions/cache@v2
with: with:
path: ~/go/pkg/mod path: ~/go/pkg/mod
key: ${{ runner.os }}-go1.16-${{ hashFiles('**/go.sum') }} key: ${{ runner.os }}-go1.17-${{ hashFiles('**/go.sum') }}
restore-keys: | restore-keys: |
${{ runner.os }}-go1.16- ${{ runner.os }}-go1.17-
- name: build - name: build
run: make bin-docker run: make bin-docker

View File

@ -18,21 +18,21 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Set up Go 1.16 - name: Set up Go 1.17
uses: actions/setup-go@v1 uses: actions/setup-go@v2
with: with:
go-version: 1.16 go-version: 1.17
id: go id: go
- name: Check out code into the Go module directory - name: Check out code into the Go module directory
uses: actions/checkout@v1 uses: actions/checkout@v2
- uses: actions/cache@v1 - uses: actions/cache@v2
with: with:
path: ~/go/pkg/mod path: ~/go/pkg/mod
key: ${{ runner.os }}-go1.16-${{ hashFiles('**/go.sum') }} key: ${{ runner.os }}-go1.17-${{ hashFiles('**/go.sum') }}
restore-keys: | restore-keys: |
${{ runner.os }}-go1.16- ${{ runner.os }}-go1.17-
- name: Build - name: Build
run: make all run: make all
@ -51,21 +51,21 @@ jobs:
os: [windows-latest, macOS-latest] os: [windows-latest, macOS-latest]
steps: steps:
- name: Set up Go 1.16 - name: Set up Go 1.17
uses: actions/setup-go@v1 uses: actions/setup-go@v2
with: with:
go-version: 1.16 go-version: 1.17
id: go id: go
- name: Check out code into the Go module directory - name: Check out code into the Go module directory
uses: actions/checkout@v1 uses: actions/checkout@v2
- uses: actions/cache@v1 - uses: actions/cache@v2
with: with:
path: ~/go/pkg/mod path: ~/go/pkg/mod
key: ${{ runner.os }}-go1.16-${{ hashFiles('**/go.sum') }} key: ${{ runner.os }}-go1.17-${{ hashFiles('**/go.sum') }}
restore-keys: | restore-keys: |
${{ runner.os }}-go1.16- ${{ runner.os }}-go1.17-
- name: Build nebula - name: Build nebula
run: go build ./cmd/nebula run: go build ./cmd/nebula

View File

@ -18,6 +18,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- New config option `pki.disconnect_invalid` that will tear down tunnels when they become invalid (through expiry or - New config option `pki.disconnect_invalid` that will tear down tunnels when they become invalid (through expiry or
removal of root trust). Default is `false`. Note, this will not currently recognize if a remote has changed removal of root trust). Default is `false`. Note, this will not currently recognize if a remote has changed
certificates since the last handshake. (#370) certificates since the last handshake. (#370)
### Changed
- Build against go 1.17. (#553)
### Deprecated ### Deprecated

View File

@ -1,4 +1,4 @@
GOMINVERSION = 1.16 GOMINVERSION = 1.17
NEBULA_CMD_PATH = "./cmd/nebula" NEBULA_CMD_PATH = "./cmd/nebula"
GO111MODULE = on GO111MODULE = on
export GO111MODULE export GO111MODULE

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows // +build !windows
package main package main

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows // +build !windows
package main package main

View File

@ -1,3 +1,4 @@
//go:build !windows
// +build !windows // +build !windows
package main package main

View File

@ -1,3 +1,4 @@
//go:build e2e_testing
// +build e2e_testing // +build e2e_testing
package nebula package nebula

View File

@ -1,3 +1,4 @@
//go:build e2e_testing
// +build e2e_testing // +build e2e_testing
package e2e package e2e

View File

@ -1,3 +1,4 @@
//go:build e2e_testing
// +build e2e_testing // +build e2e_testing
package e2e package e2e

View File

@ -1,3 +1,4 @@
//go:build e2e_testing
// +build e2e_testing // +build e2e_testing
package router package router

12
go.mod
View File

@ -1,6 +1,6 @@
module github.com/slackhq/nebula module github.com/slackhq/nebula
go 1.16 go 1.17
require ( require (
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239
@ -33,3 +33,13 @@ require (
google.golang.org/protobuf v1.26.0 google.golang.org/protobuf v1.26.0
gopkg.in/yaml.v2 v2.2.7 gopkg.in/yaml.v2 v2.2.7
) )
require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/common v0.7.0 // indirect
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)

View File

@ -1,3 +1,4 @@
//go:build !e2e_testing
// +build !e2e_testing // +build !e2e_testing
package nebula package nebula

View File

@ -1,5 +1,5 @@
// +build !ios //go:build !ios && !e2e_testing
// +build !e2e_testing // +build !ios,!e2e_testing
package nebula package nebula

View File

@ -1,3 +1,4 @@
//go:build !e2e_testing
// +build !e2e_testing // +build !e2e_testing
package nebula package nebula

View File

@ -1,5 +1,5 @@
// +build ios //go:build ios && !e2e_testing
// +build !e2e_testing // +build ios,!e2e_testing
package nebula package nebula

View File

@ -1,5 +1,5 @@
// +build !android //go:build !android && !e2e_testing
// +build !e2e_testing // +build !android,!e2e_testing
package nebula package nebula

View File

@ -1,3 +1,4 @@
//go:build !e2e_testing
// +build !e2e_testing // +build !e2e_testing
package nebula package nebula

View File

@ -1,3 +1,4 @@
//go:build e2e_testing
// +build e2e_testing // +build e2e_testing
package nebula package nebula

View File

@ -1,3 +1,4 @@
//go:build !e2e_testing
// +build !e2e_testing // +build !e2e_testing
package nebula package nebula

View File

@ -1,3 +1,4 @@
//go:build !e2e_testing
// +build !e2e_testing // +build !e2e_testing
package nebula package nebula

View File

@ -1,3 +1,4 @@
//go:build !e2e_testing
// +build !e2e_testing // +build !e2e_testing
package nebula package nebula

View File

@ -1,3 +1,4 @@
//go:build !e2e_testing
// +build !e2e_testing // +build !e2e_testing
package nebula package nebula

View File

@ -1,3 +1,4 @@
//go:build (!linux || android) && !e2e_testing
// +build !linux android // +build !linux android
// +build !e2e_testing // +build !e2e_testing

View File

@ -1,5 +1,5 @@
// +build !android //go:build !android && !e2e_testing
// +build !e2e_testing // +build !android,!e2e_testing
package nebula package nebula

View File

@ -1,3 +1,4 @@
//go:build linux && (386 || amd64p32 || arm || mips || mipsle) && !android && !e2e_testing
// +build linux // +build linux
// +build 386 amd64p32 arm mips mipsle // +build 386 amd64p32 arm mips mipsle
// +build !android // +build !android

View File

@ -1,3 +1,4 @@
//go:build linux && (amd64 || arm64 || ppc64 || ppc64le || mips64 || mips64le || s390x || riscv64) && !android && !e2e_testing
// +build linux // +build linux
// +build amd64 arm64 ppc64 ppc64le mips64 mips64le s390x riscv64 // +build amd64 arm64 ppc64 ppc64le mips64 mips64le s390x riscv64
// +build !android // +build !android

View File

@ -1,3 +1,4 @@
//go:build e2e_testing
// +build e2e_testing // +build e2e_testing
package nebula package nebula

View File

@ -1,3 +1,4 @@
//go:build !e2e_testing
// +build !e2e_testing // +build !e2e_testing
package nebula package nebula