More fixes to useragent code

use packet.newclient in suite_test
use ldflags to get capp-e2e clientname instead of explicitly calling it

Signed-off-by: Chris Privitere <[email protected]>

Author: cprivitere

test/e2e/common_test.go

@@ -41,7 +41,6 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/clientcmd/api"
 	"sigs.k8s.io/cluster-api-provider-packet/pkg/cloud/packet"
-	"sigs.k8s.io/cluster-api-provider-packet/version"
 	clusterv1old "sigs.k8s.io/cluster-api/api/v1alpha3"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
@@ -211,8 +210,6 @@ func (w *wrappedClusterProxy) Dispose(ctx context.Context) {
 	metalProjectID := os.Getenv(ProjectIDEnvVar)
 	if metalAuthToken != "" && metalProjectID != "" {
 		metalClient := packet.NewClient(metalAuthToken)
-		metalClient.UserAgent = fmt.Sprintf("capp-e2e/%s %s", version.Get(), metalClient.UserAgent)
-		metalClient.ConsumerToken = "capp-e2e"
 
 		Eventually(func(g Gomega) {
 			clusterNames := w.clusterNames.UnsortedList()

test/e2e/suite_test.go

@@ -44,7 +44,7 @@ import (
 	"sigs.k8s.io/cluster-api/util"
 
 	"sigs.k8s.io/cluster-api-provider-packet/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-packet/version"
+	"sigs.k8s.io/cluster-api-provider-packet/pkg/cloud/packet"
 )
 
 const (
@@ -179,8 +179,7 @@ var _ = SynchronizedAfterSuite(func() {
 		metalAuthToken := os.Getenv(AuthTokenEnvVar)
 		if metalAuthToken != "" && sshKeyID != "" {
 			By("Cleaning up the generated SSH Key")
-			metalClient := packngo.NewClientWithAuth("capp-e2e", metalAuthToken, nil)
-			metalClient.UserAgent = fmt.Sprintf("capp-e2e/%s %s", version.Get(), metalClient.UserAgent)
+			metalClient := packet.NewClient(metalAuthToken)
 			_, err := metalClient.SSHKeys.Delete(sshKeyID)
 			Expect(err).NotTo(HaveOccurred())
 		}
@@ -288,8 +287,7 @@ func generateSSHKey() (string, string) {
 	pub, err := ssh.NewPublicKey(&privateKey.PublicKey)
 	Expect(err).NotTo(HaveOccurred())
 
-	metalClient := packngo.NewClientWithAuth("capp-e2e", metalAuthToken, nil)
-	metalClient.UserAgent = fmt.Sprintf("capp-e2e/%s %s", version.Get(), metalClient.UserAgent)
+	metalClient := packet.NewClient(metalAuthToken)
 	res, _, err := metalClient.SSHKeys.Create(
 		&packngo.SSHKeyCreateRequest{
 			Label: fmt.Sprintf("capp-e2e-%s", util.RandomString(6)),