Adds service_account telemetry

Author: cveticm

internal/telemetry/event.go

@@ -207,18 +207,19 @@ func withOS() EventOpt {
 }
 
 type Authenticator interface {
-	PublicAPIKey() string
-	PrivateAPIKey() string
-	AccessToken() string
+	AuthType() config.AuthMechanism
 }
 
 func withAuthMethod(c Authenticator) EventOpt {
 	return func(event Event) {
-		if c.PublicAPIKey() != "" && c.PrivateAPIKey() != "" {
+		switch c.AuthType() {
+		case config.APIKeys:
 			event.Properties["auth_method"] = "api_key"
 			return
-		} else if c.AccessToken() != "" {
+		case config.UserAccount:
 			event.Properties["auth_method"] = "oauth"
+		case config.ServiceAccount:
+			event.Properties["auth_method"] = "service_account"
 		}
 	}
 }

internal/telemetry/event_test.go

@@ -135,20 +135,39 @@ func TestWithUserAgent(t *testing.T) {
 }
 
 func TestWithAuthMethod(t *testing.T) {
-	t.Run("api key", func(t *testing.T) {
-		c := &configMock{
-			publicKey:  "test-public",
-			privateKey: "test-private",
-		}
-		e := newEvent(withAuthMethod(c))
-		assert.Equal(t, "api_key", e.Properties["auth_method"])
-	})
-	t.Run("Oauth", func(t *testing.T) {
-		e := newEvent(withAuthMethod(&configMock{
-			accessToken: "test",
-		}))
-		assert.Equal(t, "oauth", e.Properties["auth_method"])
-	})
+	tests := []struct {
+		name     string
+		cfg      *configMock
+		expected string
+	}{
+		{
+			name: "api key",
+			cfg: &configMock{
+				authType: config.APIKeys,
+			},
+			expected: "api_key",
+		},
+		{
+			name: "user account",
+			cfg: &configMock{
+				authType: config.UserAccount,
+			},
+			expected: "oauth",
+		},
+		{
+			name: "service account",
+			cfg: &configMock{
+				authType: config.ServiceAccount,
+			},
+			expected: "service_account",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			e := newEvent(withAuthMethod(tt.cfg))
+			assert.Equal(t, tt.expected, e.Properties["auth_method"])
+		})
+	}
 }
 
 func TestWithService(t *testing.T) {
@@ -446,15 +465,13 @@ func Test_withOutput(t *testing.T) {
 }
 
 type configMock struct {
-	name        string
-	publicKey   string
-	privateKey  string
-	accessToken string
-	service     string
-	url         string
-	project     string
-	org         string
-	out         string
+	name     string
+	authType config.AuthMechanism
+	service  string
+	url      string
+	project  string
+	org      string
+	out      string
 }
 
 var _ Authenticator = configMock{}
@@ -479,16 +496,8 @@ func (c configMock) OpsManagerURL() string {
 	return c.url
 }
 
-func (c configMock) PublicAPIKey() string {
-	return c.publicKey
-}
-
-func (c configMock) PrivateAPIKey() string {
-	return c.privateKey
-}
-
-func (c configMock) AccessToken() string {
-	return c.accessToken
+func (c configMock) AuthType() config.AuthMechanism {
+	return c.authType
 }
 
 func (c configMock) Output() string {