Run go fix on the project (spiffe#4607)

* Run `go fix` on the project Signed-off-by: Ryan Turner <[email protected]> * Clean up imports Signed-off-by: Ryan Turner <[email protected]> --------- Signed-off-by: Ryan Turner <[email protected]> Co-authored-by: Marcos Yacob <[email protected]>
MarcosDY · Oct 27, 2023 · c942cc0 · c942cc0
1 parent 00f2825
commit c942cc0
Show file tree

Hide file tree

Showing 151 changed files with 28 additions and 165 deletions.
diff --git a/cmd/spire-agent/cli/api/api_posix_test.go b/cmd/spire-agent/cli/api/api_posix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package api
 

diff --git a/cmd/spire-agent/cli/api/api_windows_test.go b/cmd/spire-agent/cli/api/api_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package api
 

diff --git a/cmd/spire-agent/cli/common/config_posix.go b/cmd/spire-agent/cli/common/config_posix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package common
 

diff --git a/cmd/spire-agent/cli/common/config_windows.go b/cmd/spire-agent/cli/common/config_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package common
 

diff --git a/cmd/spire-agent/cli/common/defaults_posix.go b/cmd/spire-agent/cli/common/defaults_posix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package common
 

diff --git a/cmd/spire-agent/cli/common/defaults_windows.go b/cmd/spire-agent/cli/common/defaults_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package common
 

diff --git a/cmd/spire-agent/cli/healthcheck/healthcheck_posix.go b/cmd/spire-agent/cli/healthcheck/healthcheck_posix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package healthcheck
 

diff --git a/cmd/spire-agent/cli/healthcheck/healthcheck_posix_test.go b/cmd/spire-agent/cli/healthcheck/healthcheck_posix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package healthcheck
 

diff --git a/cmd/spire-agent/cli/healthcheck/healthcheck_windows.go b/cmd/spire-agent/cli/healthcheck/healthcheck_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package healthcheck
 

diff --git a/cmd/spire-agent/cli/healthcheck/healthcheck_windows_test.go b/cmd/spire-agent/cli/healthcheck/healthcheck_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package healthcheck
 

diff --git a/cmd/spire-agent/cli/run/run_posix.go b/cmd/spire-agent/cli/run/run_posix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package run
 

diff --git a/cmd/spire-agent/cli/run/run_posix_test.go b/cmd/spire-agent/cli/run/run_posix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package run
 

diff --git a/cmd/spire-agent/cli/run/run_windows.go b/cmd/spire-agent/cli/run/run_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package run
 

diff --git a/cmd/spire-agent/cli/run/run_windows_test.go b/cmd/spire-agent/cli/run/run_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package run
 

diff --git a/cmd/spire-server/cli/agent/agent_posix_test.go b/cmd/spire-server/cli/agent/agent_posix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package agent_test
 

diff --git a/cmd/spire-server/cli/agent/agent_windows_test.go b/cmd/spire-server/cli/agent/agent_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package agent_test
 

diff --git a/cmd/spire-server/cli/agent/count.go b/cmd/spire-server/cli/agent/count.go
@@ -1,6 +1,7 @@
 package agent
 
 import (
+	"context"
 	"errors"
 	"flag"
 	"fmt"
@@ -10,7 +11,6 @@ import (
 	"github.com/spiffe/spire/cmd/spire-server/util"
 	commoncli "github.com/spiffe/spire/pkg/common/cli"
 	"github.com/spiffe/spire/pkg/common/cliprinter"
-	"golang.org/x/net/context"
 )
 
 type countCommand struct {

diff --git a/cmd/spire-server/cli/agent/evict.go b/cmd/spire-server/cli/agent/evict.go
@@ -1,6 +1,7 @@
 package agent
 
 import (
+	"context"
 	"errors"
 	"flag"
 
@@ -11,7 +12,6 @@ import (
 	commoncli "github.com/spiffe/spire/pkg/common/cli"
 	"github.com/spiffe/spire/pkg/common/cliprinter"
 	"github.com/spiffe/spire/pkg/server/api"
-	"golang.org/x/net/context"
 )
 
 type evictCommand struct {

diff --git a/cmd/spire-server/cli/agent/list.go b/cmd/spire-server/cli/agent/list.go
@@ -1,6 +1,7 @@
 package agent
 
 import (
+	"context"
 	"errors"
 	"flag"
 	"fmt"
@@ -13,7 +14,6 @@ import (
 	commoncli "github.com/spiffe/spire/pkg/common/cli"
 	"github.com/spiffe/spire/pkg/common/cliprinter"
 	"github.com/spiffe/spire/pkg/common/idutil"
-	"golang.org/x/net/context"
 )
 
 type listCommand struct {

diff --git a/cmd/spire-server/cli/agent/purge.go b/cmd/spire-server/cli/agent/purge.go
@@ -1,6 +1,7 @@
 package agent
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"time"
@@ -13,7 +14,6 @@ import (
 	commoncli "github.com/spiffe/spire/pkg/common/cli"
 	"github.com/spiffe/spire/pkg/common/cliprinter"
 	"github.com/spiffe/spire/pkg/common/idutil"
-	"golang.org/x/net/context"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 

diff --git a/cmd/spire-server/cli/agent/show.go b/cmd/spire-server/cli/agent/show.go
@@ -1,6 +1,7 @@
 package agent
 
 import (
+	"context"
 	"errors"
 	"flag"
 
@@ -12,7 +13,6 @@ import (
 	commoncli "github.com/spiffe/spire/pkg/common/cli"
 	"github.com/spiffe/spire/pkg/common/cliprinter"
 	"github.com/spiffe/spire/pkg/server/api"
-	"golang.org/x/net/context"
 )
 
 type showCommand struct {

diff --git a/cmd/spire-server/cli/bundle/bundle_posix_test.go b/cmd/spire-server/cli/bundle/bundle_posix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package bundle
 

diff --git a/cmd/spire-server/cli/bundle/bundle_windows_test.go b/cmd/spire-server/cli/bundle/bundle_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package bundle
 

diff --git a/cmd/spire-server/cli/bundle/count.go b/cmd/spire-server/cli/bundle/count.go
@@ -1,6 +1,7 @@
 package bundle
 
 import (
+	"context"
 	"flag"
 	"fmt"
 
@@ -10,8 +11,6 @@ import (
 	bundlev1 "github.com/spiffe/spire-api-sdk/proto/spire/api/server/bundle/v1"
 	"github.com/spiffe/spire/cmd/spire-server/util"
 	commoncli "github.com/spiffe/spire/pkg/common/cli"
-
-	"golang.org/x/net/context"
 )
 
 type countCommand struct {

diff --git a/cmd/spire-server/cli/common/common_posix.go b/cmd/spire-server/cli/common/common_posix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package common
 

diff --git a/cmd/spire-server/cli/common/common_windows.go b/cmd/spire-server/cli/common/common_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package common
 

diff --git a/cmd/spire-server/cli/entry/count.go b/cmd/spire-server/cli/entry/count.go
@@ -1,17 +1,15 @@
 package entry
 
 import (
+	"context"
 	"flag"
 	"fmt"
 
 	"github.com/mitchellh/cli"
-	"github.com/spiffe/spire/pkg/common/cliprinter"
-
 	entryv1 "github.com/spiffe/spire-api-sdk/proto/spire/api/server/entry/v1"
 	"github.com/spiffe/spire/cmd/spire-server/util"
 	commoncli "github.com/spiffe/spire/pkg/common/cli"
-
-	"golang.org/x/net/context"
+	"github.com/spiffe/spire/pkg/common/cliprinter"
 )
 
 type countCommand struct {

diff --git a/cmd/spire-server/cli/entry/create.go b/cmd/spire-server/cli/entry/create.go
@@ -1,6 +1,7 @@
 package entry
 
 import (
+	"context"
 	"errors"
 	"flag"
 
@@ -12,8 +13,6 @@ import (
 	"github.com/spiffe/spire/pkg/common/cliprinter"
 	"github.com/spiffe/spire/pkg/common/idutil"
 	"google.golang.org/grpc/codes"
-
-	"golang.org/x/net/context"
 )
 
 // NewCreateCommand creates a new "create" subcommand for "entry" command.

diff --git a/cmd/spire-server/cli/entry/delete.go b/cmd/spire-server/cli/entry/delete.go
@@ -1,6 +1,7 @@
 package entry
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"flag"
@@ -13,8 +14,6 @@ import (
 	commoncli "github.com/spiffe/spire/pkg/common/cli"
 	"github.com/spiffe/spire/pkg/common/cliprinter"
 	"google.golang.org/grpc/codes"
-
-	"golang.org/x/net/context"
 )
 
 // NewDeleteCommand creates a new "delete" subcommand for "entry" command.

diff --git a/cmd/spire-server/cli/entry/show.go b/cmd/spire-server/cli/entry/show.go
@@ -1,6 +1,7 @@
 package entry
 
 import (
+	"context"
 	"errors"
 	"flag"
 	"fmt"
@@ -13,8 +14,6 @@ import (
 	"github.com/spiffe/spire/pkg/common/cliprinter"
 	commonutil "github.com/spiffe/spire/pkg/common/util"
 	"google.golang.org/protobuf/types/known/wrapperspb"
-
-	"golang.org/x/net/context"
 )
 
 const listEntriesRequestPageSize = 500

diff --git a/cmd/spire-server/cli/entry/update.go b/cmd/spire-server/cli/entry/update.go
@@ -1,6 +1,7 @@
 package entry
 
 import (
+	"context"
 	"errors"
 	"flag"
 
@@ -11,8 +12,6 @@ import (
 	commoncli "github.com/spiffe/spire/pkg/common/cli"
 	"github.com/spiffe/spire/pkg/common/cliprinter"
 	"google.golang.org/grpc/codes"
-
-	"golang.org/x/net/context"
 )
 
 // NewUpdateCommand creates a new "update" subcommand for "entry" command.

diff --git a/cmd/spire-server/cli/entry/util_posix_test.go b/cmd/spire-server/cli/entry/util_posix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package entry
 

diff --git a/cmd/spire-server/cli/entry/util_test.go b/cmd/spire-server/cli/entry/util_test.go
@@ -2,6 +2,7 @@ package entry
 
 import (
 	"bytes"
+	"context"
 	"os"
 	"path"
 	"testing"
@@ -15,7 +16,6 @@ import (
 	"github.com/spiffe/spire/test/util"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 

diff --git a/cmd/spire-server/cli/entry/util_windows_test.go b/cmd/spire-server/cli/entry/util_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package entry
 

diff --git a/cmd/spire-server/cli/federation/util_posix_test.go b/cmd/spire-server/cli/federation/util_posix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package federation
 

diff --git a/cmd/spire-server/cli/federation/util_windows_test.go b/cmd/spire-server/cli/federation/util_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package federation
 

diff --git a/cmd/spire-server/cli/healthcheck/healthcheck_posix_test.go b/cmd/spire-server/cli/healthcheck/healthcheck_posix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package healthcheck
 

diff --git a/cmd/spire-server/cli/healthcheck/healthcheck_windows_test.go b/cmd/spire-server/cli/healthcheck/healthcheck_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package healthcheck
 

diff --git a/cmd/spire-server/cli/run/run_posix.go b/cmd/spire-server/cli/run/run_posix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package run
 

diff --git a/cmd/spire-server/cli/run/run_posix_test.go b/cmd/spire-server/cli/run/run_posix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package run
 

diff --git a/cmd/spire-server/cli/run/run_windows.go b/cmd/spire-server/cli/run/run_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package run
 

diff --git a/cmd/spire-server/cli/run/run_windows_test.go b/cmd/spire-server/cli/run/run_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package run