浏览代码

Bump to go1.17 (#553)

Nate Brown 3 年之前
父节点
当前提交
32cd9a93f1

+ 7 - 7
.github/workflows/gofmt.yml

@@ -14,21 +14,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.16
-      uses: actions/setup-go@v1
+    - name: Set up Go 1.17
+      uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
       id: go
 
     - 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:
         path: ~/go/pkg/mod
-        key: ${{ runner.os }}-gofmt1.16-${{ hashFiles('**/go.sum') }}
+        key: ${{ runner.os }}-gofmt1.17-${{ hashFiles('**/go.sum') }}
         restore-keys: |
-          ${{ runner.os }}-gofmt1.16-
+          ${{ runner.os }}-gofmt1.17-
 
     - name: Install goimports
       run: |

+ 9 - 9
.github/workflows/release.yml

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

+ 7 - 7
.github/workflows/smoke.yml

@@ -18,21 +18,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.16
-      uses: actions/setup-go@v1
+    - name: Set up Go 1.17
+      uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
       id: go
 
     - 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:
         path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go1.16-${{ hashFiles('**/go.sum') }}
+        key: ${{ runner.os }}-go1.17-${{ hashFiles('**/go.sum') }}
         restore-keys: |
-          ${{ runner.os }}-go1.16-
+          ${{ runner.os }}-go1.17-
 
     - name: build
       run: make bin-docker

+ 14 - 14
.github/workflows/test.yml

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

+ 4 - 0
CHANGELOG.md

@@ -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
   removal of root trust). Default is `false`. Note, this will not currently recognize if a remote has changed
   certificates since the last handshake. (#370)
+  
+### Changed
+
+- Build against go 1.17. (#553)
 
 ### Deprecated
 

+ 1 - 1
Makefile

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

+ 1 - 0
cmd/nebula-cert/ca_test.go

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

+ 1 - 0
cmd/nebula-cert/sign_test.go

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

+ 1 - 0
cmd/nebula-service/logs_generic.go

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

+ 1 - 0
control_tester.go

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

+ 1 - 0
e2e/handshakes_test.go

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

+ 1 - 0
e2e/helpers_test.go

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

+ 1 - 0
e2e/router/router.go

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

+ 11 - 1
go.mod

@@ -1,6 +1,6 @@
 module github.com/slackhq/nebula
 
-go 1.16
+go 1.17
 
 require (
 	github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239
@@ -33,3 +33,13 @@ require (
 	google.golang.org/protobuf v1.26.0
 	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
+)

+ 1 - 0
tun_android.go

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

+ 2 - 2
tun_darwin.go

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

+ 1 - 0
tun_freebsd.go

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

+ 2 - 2
tun_ios.go

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

+ 2 - 2
tun_linux.go

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

+ 1 - 0
tun_linux_test.go

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

+ 1 - 0
tun_tester.go

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

+ 1 - 0
tun_windows.go

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

+ 1 - 0
udp_android.go

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

+ 1 - 0
udp_darwin.go

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

+ 1 - 0
udp_freebsd.go

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

+ 1 - 0
udp_generic.go

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

+ 2 - 2
udp_linux.go

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

+ 1 - 0
udp_linux_32.go

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

+ 1 - 0
udp_linux_64.go

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

+ 1 - 0
udp_tester.go

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

+ 1 - 0
udp_windows.go

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