From 74b84a137757c9bc3da5b95ce52007cab681d025 Mon Sep 17 00:00:00 2001 From: Qasim Sarfraz Date: Fri, 18 Mar 2022 14:11:14 +0000 Subject: [PATCH] update all +build statements (#5271) * update all +build statements Signed-off-by: MQasimSarfraz * remove old +build style Signed-off-by: MQasimSarfraz --- directives_generate.go | 2 +- owners_generate.go | 2 +- plugin/cache/fuzz.go | 2 +- plugin/chaos/fuzz.go | 2 +- plugin/etcd/cname_test.go | 2 +- plugin/etcd/group_test.go | 2 +- plugin/etcd/lookup_test.go | 2 +- plugin/etcd/multi_test.go | 2 +- plugin/etcd/other_test.go | 2 +- plugin/etcd/setup_test.go | 2 +- plugin/file/fuzz.go | 2 +- plugin/forward/fuzz.go | 2 +- plugin/pkg/reuseport/listen_no_reuseport.go | 2 +- plugin/pkg/reuseport/listen_reuseport.go | 3 +-- plugin/rewrite/fuzz.go | 2 +- plugin/whoami/fuzz.go | 2 +- test/etcd_cache_test.go | 2 +- test/etcd_credentials_test.go | 2 +- test/etcd_test.go | 2 +- test/fuzz_corefile.go | 2 +- 20 files changed, 20 insertions(+), 21 deletions(-) diff --git a/directives_generate.go b/directives_generate.go index 618d683c9..ccfd43e43 100644 --- a/directives_generate.go +++ b/directives_generate.go @@ -1,4 +1,4 @@ -//+build ignore +//go:build ignore package main diff --git a/owners_generate.go b/owners_generate.go index b38656752..ebae01038 100644 --- a/owners_generate.go +++ b/owners_generate.go @@ -1,4 +1,4 @@ -//+build ignore +//go:build ignore // generates plugin/chaos/zowners.go. diff --git a/plugin/cache/fuzz.go b/plugin/cache/fuzz.go index 18e98fa9f..43f4d2604 100644 --- a/plugin/cache/fuzz.go +++ b/plugin/cache/fuzz.go @@ -1,4 +1,4 @@ -// +build gofuzz +//go:build gofuzz package cache diff --git a/plugin/chaos/fuzz.go b/plugin/chaos/fuzz.go index 53667f2cd..001cf1dee 100644 --- a/plugin/chaos/fuzz.go +++ b/plugin/chaos/fuzz.go @@ -1,4 +1,4 @@ -// +build gofuzz +//go:build gofuzz package chaos diff --git a/plugin/etcd/cname_test.go b/plugin/etcd/cname_test.go index a7d45d510..045a775f8 100644 --- a/plugin/etcd/cname_test.go +++ b/plugin/etcd/cname_test.go @@ -1,4 +1,4 @@ -// +build etcd +//go:build etcd package etcd diff --git a/plugin/etcd/group_test.go b/plugin/etcd/group_test.go index d5c846238..831bdc2d5 100644 --- a/plugin/etcd/group_test.go +++ b/plugin/etcd/group_test.go @@ -1,4 +1,4 @@ -// +build etcd +//go:build etcd package etcd diff --git a/plugin/etcd/lookup_test.go b/plugin/etcd/lookup_test.go index 10008ae6a..ef26d182d 100644 --- a/plugin/etcd/lookup_test.go +++ b/plugin/etcd/lookup_test.go @@ -1,4 +1,4 @@ -// +build etcd +//go:build etcd package etcd diff --git a/plugin/etcd/multi_test.go b/plugin/etcd/multi_test.go index 1efce1861..7993a25db 100644 --- a/plugin/etcd/multi_test.go +++ b/plugin/etcd/multi_test.go @@ -1,4 +1,4 @@ -// +build etcd +//go:build etcd package etcd diff --git a/plugin/etcd/other_test.go b/plugin/etcd/other_test.go index 1a69bd617..a71260ff4 100644 --- a/plugin/etcd/other_test.go +++ b/plugin/etcd/other_test.go @@ -1,4 +1,4 @@ -// +build etcd +//go:build etcd // tests mx and txt records diff --git a/plugin/etcd/setup_test.go b/plugin/etcd/setup_test.go index 219563664..4922641bb 100644 --- a/plugin/etcd/setup_test.go +++ b/plugin/etcd/setup_test.go @@ -1,4 +1,4 @@ -// +build etcd +//go:build etcd package etcd diff --git a/plugin/file/fuzz.go b/plugin/file/fuzz.go index e693f58bf..9c59ab8da 100644 --- a/plugin/file/fuzz.go +++ b/plugin/file/fuzz.go @@ -1,4 +1,4 @@ -// +build gofuzz +//go:build gofuzz package file diff --git a/plugin/forward/fuzz.go b/plugin/forward/fuzz.go index d07b1345b..bec573e47 100644 --- a/plugin/forward/fuzz.go +++ b/plugin/forward/fuzz.go @@ -1,4 +1,4 @@ -// +build gofuzz +//go:build gofuzz package forward diff --git a/plugin/pkg/reuseport/listen_no_reuseport.go b/plugin/pkg/reuseport/listen_no_reuseport.go index e3bdfb906..1018a9b10 100644 --- a/plugin/pkg/reuseport/listen_no_reuseport.go +++ b/plugin/pkg/reuseport/listen_no_reuseport.go @@ -1,4 +1,4 @@ -// +build !go1.11 !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd +//go:build !go1.11 || (!aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd) package reuseport diff --git a/plugin/pkg/reuseport/listen_reuseport.go b/plugin/pkg/reuseport/listen_reuseport.go index fa6f365d6..71fac3e76 100644 --- a/plugin/pkg/reuseport/listen_reuseport.go +++ b/plugin/pkg/reuseport/listen_reuseport.go @@ -1,5 +1,4 @@ -// +build go1.11 -// +build aix darwin dragonfly freebsd linux netbsd openbsd +//go:build go1.11 && (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd) package reuseport diff --git a/plugin/rewrite/fuzz.go b/plugin/rewrite/fuzz.go index 8149d1c09..8e44ebb59 100644 --- a/plugin/rewrite/fuzz.go +++ b/plugin/rewrite/fuzz.go @@ -1,4 +1,4 @@ -// +build gofuzz +//go:build gofuzz package rewrite diff --git a/plugin/whoami/fuzz.go b/plugin/whoami/fuzz.go index 70f2bd602..0525398d9 100644 --- a/plugin/whoami/fuzz.go +++ b/plugin/whoami/fuzz.go @@ -1,4 +1,4 @@ -// +build gofuzz +//go:build gofuzz package whoami diff --git a/test/etcd_cache_test.go b/test/etcd_cache_test.go index 4f5cd8472..a6e9cb5bc 100644 --- a/test/etcd_cache_test.go +++ b/test/etcd_cache_test.go @@ -1,4 +1,4 @@ -// +build etcd +//go:build etcd package test diff --git a/test/etcd_credentials_test.go b/test/etcd_credentials_test.go index 6fe124dce..a51e44e9e 100644 --- a/test/etcd_credentials_test.go +++ b/test/etcd_credentials_test.go @@ -1,4 +1,4 @@ -// +build etcd +//go:build etcd package test diff --git a/test/etcd_test.go b/test/etcd_test.go index 405a4ce83..e54a2bd1d 100644 --- a/test/etcd_test.go +++ b/test/etcd_test.go @@ -1,4 +1,4 @@ -// +build etcd +//go:build etcd package test diff --git a/test/fuzz_corefile.go b/test/fuzz_corefile.go index a1a7e6a36..88d0df396 100644 --- a/test/fuzz_corefile.go +++ b/test/fuzz_corefile.go @@ -1,4 +1,4 @@ -// +build gofuzz +//go:build gofuzz package test