Delete unused mocks, rename variables and fix imports

They were not needed anymore and the linter was complaining.

auth/tokencache/cache.go

@@ -3,10 +3,11 @@ package tokencache
 import (
 	"encoding/json"
 	"fmt"
-	"golang.org/x/oauth2"
 	"os"
 	"path"
 	"time"
+
+	"golang.org/x/oauth2"
 )
 
 // cache is used to (un-)marshal the cached tokens from/to JSON.
@@ -32,13 +33,13 @@ func readCache(cacheFile string) (*cache, error) {
 	}
 
 	// Read the cache information from the file, if it exists
-	cacheJson, err := os.ReadFile(cacheFile)
+	cacheJSON, err := os.ReadFile(cacheFile)
 	if err != nil {
 		return cachedTokens, fmt.Errorf("failed to read credentials cache from %q: %w", cacheFile, err)
 	}
 
 	// Unmarshal the cached credentials
-	if err = json.Unmarshal(cacheJson, cachedTokens); err != nil {
+	if err = json.Unmarshal(cacheJSON, cachedTokens); err != nil {
 		return cachedTokens, fmt.Errorf("failed to unmarshal cached credentials: %w", err)
 	}
 
@@ -51,7 +52,7 @@ func readCache(cacheFile string) (*cache, error) {
 // future (e.g. by -re-reading the content before writing, locking the file or writing cache information to multiple files).
 func (c *cache) write(cacheFile string) error {
 	// Marshal the new tokens
-	cacheJson, err := json.Marshal(c)
+	cacheJSON, err := json.Marshal(c)
 	if err != nil {
 		return fmt.Errorf("failed to marshal cached tokens: %w", err)
 	}
@@ -63,7 +64,7 @@ func (c *cache) write(cacheFile string) error {
 	}
 
 	// Write the file
-	err = os.WriteFile(cacheFile, cacheJson, os.FileMode(0600))
+	err = os.WriteFile(cacheFile, cacheJSON, os.FileMode(0600))
 	if err != nil {
 		return fmt.Errorf("failed to write cached credentials to file: %w", err)
 	}

auth/tokencache/cache_test.go

@@ -1,9 +1,10 @@
 package tokencache
 
 import (
-	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestCache_ExpiredTokenRemoval(t *testing.T) {

auth/tokencache/login.go

@@ -2,8 +2,9 @@ package tokencache
 
 import (
 	"fmt"
-	"golang.org/x/oauth2"
 	"log"
+
+	"golang.org/x/oauth2"
 )
 
 // NewLoginTokenSource will create a token source that caches login tokens. Only one login token will be cached at a

auth/tokencache/oauth2config.go

@@ -2,6 +2,7 @@ package tokencache
 
 import (
 	"context"
+
 	"golang.org/x/oauth2"
 )
 

auth/tokencache/serviceprincipal.go

@@ -2,8 +2,9 @@ package tokencache
 
 import (
 	"fmt"
-	"golang.org/x/oauth2"
 	"log"
+
+	"golang.org/x/oauth2"
 )
 
 const sourceTypeServicePrincipal = sourceType("service-principal")

auth/tokencache/tokensource.go

@@ -3,9 +3,10 @@ package tokencache
 import (
 	"context"
 	"fmt"
-	"golang.org/x/oauth2"
 	"log"
 	"time"
+
+	"golang.org/x/oauth2"
 )
 
 // sourceType identities the type of token source.

auth/tokencache/tokensource_test.go

@@ -3,12 +3,13 @@ package tokencache
 import (
 	"context"
 	"fmt"
-	requirepkg "github.com/stretchr/testify/require"
-	"golang.org/x/oauth2"
 	"os"
 	"path"
 	"testing"
 	"time"
+
+	requirepkg "github.com/stretchr/testify/require"
+	"golang.org/x/oauth2"
 )
 
 type testTokenSource struct {

auth/tokencache/workload.go

@@ -2,8 +2,9 @@ package tokencache
 
 import (
 	"fmt"
-	"golang.org/x/oauth2"
 	"log"
+
+	"golang.org/x/oauth2"
 )
 
 const sourceTypeWorkload = sourceType("workload")

config/hcp.go

@@ -6,9 +6,10 @@ package config
 import (
 	"crypto/tls"
 	"fmt"
-	"github.com/hashicorp/hcp-sdk-go/auth/workload"
 	"net/url"
 
+	"github.com/hashicorp/hcp-sdk-go/auth/workload"
+
 	"github.com/hashicorp/hcp-sdk-go/auth"
 	"github.com/hashicorp/hcp-sdk-go/profile"
 	"golang.org/x/oauth2"

config/new.go

@@ -6,11 +6,12 @@ package config
 import (
 	"crypto/tls"
 	"fmt"
-	"github.com/hashicorp/hcp-sdk-go/profile"
-	"golang.org/x/oauth2"
 	"io"
 	"log"
 	"net/url"
+
+	"github.com/hashicorp/hcp-sdk-go/profile"
+	"golang.org/x/oauth2"
 )
 
 const (

config/tokensource.go

@@ -3,16 +3,17 @@ package config
 import (
 	"context"
 	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+	"path"
+
 	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/hcp-sdk-go/auth"
 	"github.com/hashicorp/hcp-sdk-go/auth/tokencache"
 	"github.com/hashicorp/hcp-sdk-go/auth/workload"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/clientcredentials"
-	"net/http"
-	"net/url"
-	"os"
-	"path"
 )
 
 type sourceType = string

config/tokensource_test.go

@@ -1,11 +1,12 @@
 package config
 
 import (
+	"io/ioutil"
+	"testing"
+
 	"github.com/hashicorp/hcp-sdk-go/auth"
 	"github.com/hashicorp/hcp-sdk-go/auth/workload"
 	requirepkg "github.com/stretchr/testify/require"
-	"io/ioutil"
-	"testing"
 )
 
 func TestTokenSource_GetTokenSource_WithClientCredentials(t *testing.T) {