Update packngo calls

Add default gitversion to version.go

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

Author: cprivitere

test/e2e/common_test.go

@@ -210,8 +210,9 @@ func (w *wrappedClusterProxy) Dispose(ctx context.Context) {
 	metalAuthToken := os.Getenv(AuthTokenEnvVar)
 	metalProjectID := os.Getenv(ProjectIDEnvVar)
 	if metalAuthToken != "" && metalProjectID != "" {
-		metal := packet.NewClientWithAuth(clientName, metalAuthToken)
-		metal.UserAgent = fmt.Sprintf("capp-e2e/%s %s", version.Version, metalClient.UserAgent)
+		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()
@@ -222,7 +223,7 @@ func (w *wrappedClusterProxy) Dispose(ctx context.Context) {
 
 				g.Eventually(func(g Gomega) {
 					var err error
-					ip, err = metal.GetIPByClusterIdentifier("", clusterName, metalProjectID)
+					ip, err = metalClient.GetIPByClusterIdentifier("", clusterName, metalProjectID)
 					g.Expect(err).To(SatisfyAny(Not(HaveOccurred()), MatchError(packet.ErrControlPlanEndpointNotFound)))
 				}, "5m", "10s").Should(Succeed())
 
@@ -231,7 +232,7 @@ func (w *wrappedClusterProxy) Dispose(ctx context.Context) {
 						logf("Deleting EIP with ID: %s, for cluster: %s", ip.ID, clusterName)
 
 						g.Eventually(func(g Gomega) {
-							_, err := metal.ProjectIPs.Remove(ip.ID)
+							_, err := metalClient.ProjectIPs.Remove(ip.ID)
 							Expect(err).NotTo(HaveOccurred())
 						}, "5m", "10s").Should(Succeed())
 

test/e2e/suite_test.go

@@ -180,7 +180,7 @@ var _ = SynchronizedAfterSuite(func() {
 		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.Version, metalClient.UserAgent)
+			metalClient.UserAgent = fmt.Sprintf("capp-e2e/%s %s", version.Get(), metalClient.UserAgent)
 			_, err := metalClient.SSHKeys.Delete(sshKeyID)
 			Expect(err).NotTo(HaveOccurred())
 		}
@@ -289,7 +289,7 @@ func generateSSHKey() (string, string) {
 	Expect(err).NotTo(HaveOccurred())
 
 	metalClient := packngo.NewClientWithAuth("capp-e2e", metalAuthToken, nil)
-	metalClient.UserAgent = fmt.Sprintf("capp-e2e/%s %s", version.Version, metalClient.UserAgent)
+	metalClient.UserAgent = fmt.Sprintf("capp-e2e/%s %s", version.Get(), metalClient.UserAgent)
 	res, _, err := metalClient.SSHKeys.Create(
 		&packngo.SSHKeyCreateRequest{
 			Label: fmt.Sprintf("capp-e2e-%s", util.RandomString(6)),

version/version.go

@@ -24,12 +24,12 @@ import (
 )
 
 var (
-	gitMajor     string // major version, always numeric
-	gitMinor     string // minor version, numeric possibly followed by "+"
-	gitVersion   string // semantic version, derived by build scripts
-	gitCommit    string // sha1 from git, output of $(git rev-parse HEAD)
-	gitTreeState string // state of git tree, either "clean" or "dirty"
-	buildDate    string // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
+	gitMajor     string  // major version, always numeric
+	gitMinor     string  // minor version, numeric possibly followed by "+"
+	gitVersion   = "dev" // semantic version, derived by build scripts
+	gitCommit    string  // sha1 from git, output of $(git rev-parse HEAD)
+	gitTreeState string  // state of git tree, either "clean" or "dirty"
+	buildDate    string  // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
 )
 
 // Info contains all version-related information.