fix: support 1.17 & 1.16.7 Go versions (influxdata#9642)

normandoleonardo · Aug 23, 2021 · 3a7d9b6 · 3a7d9b6
1 parent 34565a3
commit 3a7d9b6
Show file tree

Hide file tree

Showing 176 changed files with 2,167 additions and 1,494 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,16 +4,16 @@ orbs:
   aws-cli: circleci/aws-cli@1.4.0
 
 executors:
-  go-1_15:
+  go-1_16:
     working_directory: '/go/src/github.com/influxdata/telegraf'
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.15.8'
+      - image: 'quay.io/influxdb/telegraf-ci:1.16.7'
     environment:
       GOFLAGS: -p=8
-  go-1_16:
+  go-1_17:
     working_directory: '/go/src/github.com/influxdata/telegraf'
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.16.6'
+      - image: 'quay.io/influxdb/telegraf-ci:1.17.0'
     environment:
       GOFLAGS: -p=8
   mac:
@@ -88,7 +88,7 @@ commands:
             - 'dist'
 jobs:
   deps:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - checkout
       - restore_cache:
@@ -105,21 +105,21 @@ jobs:
           root: '/go'
           paths:
             - '*'
-  test-go-1_15:
-    executor: go-1_15
+  test-go-1_16:
+    executor: go-1_16
     steps:
       - test-go
-  test-go-1_15-386:
-    executor: go-1_15
+  test-go-1_16-386:
+    executor: go-1_16
     steps:
       - test-go:
           goarch: "386"
-  test-go-1_16:
-    executor: go-1_16
+  test-go-1_17:
+    executor: go-1_17
     steps:
       - test-go
-  test-go-1_16-386:
-    executor: go-1_16
+  test-go-1_17-386:
+    executor: go-1_17
     steps:
       - test-go:
           goarch: "386"
@@ -150,79 +150,79 @@ jobs:
     steps:
       - checkout
       - check-changed-files-or-halt-windows
-      - run: choco upgrade golang --version=1.16.6
+      - run: choco upgrade golang --version=1.17.0
       - run: choco install make
       - run: git config --system core.longpaths true
       - run: make test-windows
 
   windows-package:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           type: windows
   darwin-package:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           type: darwin
   i386-package:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           type: i386
   ppc641e-package:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           type: ppc641e
   s390x-package:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           type: s390x
   armel-package:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           type: armel
   amd64-package:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           type: amd64
   arm64-package:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           type: arm64
   mipsel-package:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           type: mipsel
   mips-package:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           type: mips
   static-package:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           type: static
   armhf-package:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           type: armhf
 
   release:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           release: true
   nightly:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - package-build:
           nightly: true
@@ -277,7 +277,7 @@ jobs:
           path: './dist'
           destination: 'build/dist'
   test-awaiter:
-    executor: go-1_16
+    executor: go-1_17
     steps:
       - run:
           command: |
@@ -299,25 +299,25 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - 'test-go-1_15':
+      - 'test-go-1_16':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-1_15-386':
+      - 'test-go-1_16-386':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-1_16':
+      - 'test-go-1_17':
           requires:
             - 'deps'
           filters:
             tags:
               only: /.*/
-      - 'test-go-1_16-386':
+      - 'test-go-1_17-386':
           requires:
             - 'deps'
           filters:
@@ -333,10 +333,10 @@ workflows:
               only: /.*/
       - 'test-awaiter': 
           requires:
-            - 'test-go-1_15'
-            - 'test-go-1_15-386'
             - 'test-go-1_16'
             - 'test-go-1_16-386'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
       - 'windows-package':
           requires: 
             - 'test-go-windows'
@@ -395,10 +395,10 @@ workflows:
           requires:
             - 'test-go-windows'
             - 'test-go-mac'
-            - 'test-go-1_15'
-            - 'test-go-1_15-386'
             - 'test-go-1_16'
             - 'test-go-1_16-386'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
           filters:
             tags:
               only: /.*/
@@ -420,16 +420,16 @@ workflows:
   nightly:
     jobs:
       - 'deps'
-      - 'test-go-1_15':
+      - 'test-go-1_16':
           requires:
             - 'deps'
-      - 'test-go-1_15-386':
+      - 'test-go-1_16-386':
           requires:
             - 'deps'
-      - 'test-go-1_16':
+      - 'test-go-1_17':
           requires:
             - 'deps'
-      - 'test-go-1_16-386':
+      - 'test-go-1_17-386':
           requires:
             - 'deps'
       - 'test-go-mac'
@@ -438,10 +438,10 @@ workflows:
           requires:
             - 'test-go-windows'
             - 'test-go-mac'
-            - 'test-go-1_15'
-            - 'test-go-1_15-386'
             - 'test-go-1_16'
             - 'test-go-1_16-386'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
     triggers:
       - schedule:
           cron: "0 7 * * *"

diff --git a/Makefile b/Makefile
@@ -194,15 +194,15 @@ plugin-%:
 	@echo "Starting dev environment for $${$(@)} input plugin..."
 	@docker-compose -f plugins/inputs/$${$(@)}/dev/docker-compose.yml up
 
-.PHONY: ci-1.15
-ci-1.15:
-	docker build -t quay.io/influxdb/telegraf-ci:1.15.8 - < scripts/ci-1.15.docker
-	docker push quay.io/influxdb/telegraf-ci:1.15.8
-
 .PHONY: ci-1.16
 ci-1.16:
-	docker build -t quay.io/influxdb/telegraf-ci:1.16.6 - < scripts/ci-1.16.docker
-	docker push quay.io/influxdb/telegraf-ci:1.16.6
+	docker build -t quay.io/influxdb/telegraf-ci:1.16.7 - < scripts/ci-1.16.docker
+	docker push quay.io/influxdb/telegraf-ci:1.16.7
+
+.PHONY: ci-1.17
+ci-1.17:
+	docker build -t quay.io/influxdb/telegraf-ci:1.17.0 - < scripts/ci-1.17.docker
+	docker push quay.io/influxdb/telegraf-ci:1.17.0
 
 .PHONY: install
 install: $(buildbin)

diff --git a/agent/agent_posix.go b/agent/agent_posix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package agent

diff --git a/agent/agent_windows.go b/agent/agent_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package agent

diff --git a/cmd/telegraf/telegraf_posix.go b/cmd/telegraf/telegraf_posix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main

diff --git a/cmd/telegraf/telegraf_windows.go b/cmd/telegraf/telegraf_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package main

diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md
@@ -38,7 +38,6 @@ following works:
 - github.com/aws/aws-sdk-go-v2/credentials [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/credentials/LICENSE.txt)
 - github.com/aws/aws-sdk-go-v2/feature/ec2/imds [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/feature/ec2/imds/LICENSE.txt)
 - github.com/aws/aws-sdk-go-v2/feature/s3/manager [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/LICENSE.txt)
-- github.com/aws/aws-sdk-go-v2/internal/ini [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/config/LICENSE.txt)
 - github.com/aws/aws-sdk-go-v2/service/ec2 [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/service/ec2/LICENSE.txt)
 - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/service/internal/accept-encoding/LICENSE.txt)
 - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url [Apache License 2.0](https://github.com/aws/aws-sdk-go-v2/blob/main/service/internal/presigned-url/LICENSE.txt)