Support Go 1.18, phase out Go 1.16

axiomhq · Mar 16, 2022 · f54d0bd · f54d0bd
1 parent efc8339
commit f54d0bd
Show file tree

Hide file tree

Showing 26 changed files with 10 additions and 30 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -12,8 +12,8 @@ jobs:
     strategy:
       matrix:
         go:
-          - 1.16
           - 1.17
+          - 1.18
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
@@ -36,8 +36,8 @@ jobs:
     strategy:
       matrix:
         go:
-          - 1.16
           - 1.17
+          - 1.18
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
@@ -58,8 +58,8 @@ jobs:
           - azure-1-staging
           - cloud-dev
         go:
-          - 1.16
           - 1.17
+          - 1.18
         include:
           - deployment: azure-1-staging
             axiom_url: TESTING_AZURE_1_STAGING_DEPLOYMENT_URL

diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -12,8 +12,8 @@ jobs:
     strategy:
       matrix:
         go:
-          - 1.16
           - 1.17
+          - 1.18
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
@@ -36,8 +36,8 @@ jobs:
     strategy:
       matrix:
         go:
-          - 1.16
           - 1.17
+          - 1.18
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
@@ -57,8 +57,8 @@ jobs:
           - azure-1-staging
           - cloud-dev
         go:
-          - 1.16
           - 1.17
+          - 1.18
         include:
           - deployment: azure-1-staging
             axiom_url: TESTING_AZURE_1_STAGING_DEPLOYMENT_URL

diff --git a/.github/workflows/server_regression.yaml b/.github/workflows/server_regression.yaml
@@ -15,8 +15,8 @@ jobs:
           - azure-1-staging
           - cloud-dev
         go:
-          - 1.16
           - 1.17
+          - 1.18
         include:
           - deployment: azure-1-staging
             axiom_url: TESTING_AZURE_1_STAGING_DEPLOYMENT_URL

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@
 Axiom Go is a Go client library for accessing the [Axiom](https://www.axiom.co/)
 API.
 
-Currently, **Axiom Go requires Go 1.16 or greater**.
+Currently, **Axiom Go requires Go 1.17 or greater**.
 
 ## Installation
 

diff --git a/adapters/apex/apex_integration_test.go b/adapters/apex/apex_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package apex_test
 

diff --git a/adapters/logrus/logrus_integration_test.go b/adapters/logrus/logrus_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package logrus_test
 

diff --git a/adapters/testsuite.go b/adapters/testsuite.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package adapters
 

diff --git a/adapters/zap/zap_integration_test.go b/adapters/zap/zap_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package zap_test
 

diff --git a/axiom/axiom_integration_test.go b/axiom/axiom_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/axiom_test.go b/axiom/axiom_test.go
@@ -35,7 +35,7 @@ func TestIsValidToken(t *testing.T) {
 }
 
 func TestValidateEnvironment(t *testing.T) {
-	defer os.Clearenv()
+	t.Cleanup(os.Clearenv)
 
 	tests := []struct {
 		name        string

diff --git a/axiom/client_integration_test.go b/axiom/client_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/client_test.go b/axiom/client_test.go
@@ -40,7 +40,7 @@ func SetStrictDecoding(b bool) Option {
 }
 
 func TestNewClient(t *testing.T) {
-	defer os.Clearenv()
+	t.Cleanup(os.Clearenv)
 
 	tests := []struct {
 		name        string

diff --git a/axiom/dashboards_integration_test.go b/axiom/dashboards_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/datasets_integration_test.go b/axiom/datasets_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/error_integration_test.go b/axiom/error_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/monitors_integration_test.go b/axiom/monitors_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/notifiers_integration_test.go b/axiom/notifiers_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/orgs_integration_test.go b/axiom/orgs_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/shared_access_integration_test.go b/axiom/shared_access_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/starred_integration_test.go b/axiom/starred_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/teams_integration_test.go b/axiom/teams_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/tokens_integration_test.go b/axiom/tokens_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/users_integration_test.go b/axiom/users_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/version_integration_test.go b/axiom/version_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/axiom/vfields_integration_test.go b/axiom/vfields_integration_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package axiom_test
 

diff --git a/tools.go b/tools.go
@@ -1,5 +1,4 @@
 //go:build tools
-// +build tools
 
 package axiom