addressing comments

Author: GGabriele

cmd/ping.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 
@@ -20,43 +21,11 @@ can connect to Kong's Admin API.`,
 		Args: validateNoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
-			cmdStr := "ping"
-			var version string
-			var err error
 			mode := getMode(nil)
 			if mode == modeKonnect {
-				// get Konnect client
-				httpClient := utils.HTTPClient()
-				konnectClient, err := utils.GetKonnectClient(httpClient, konnectConfig)
-				if err != nil {
-					return err
-				}
-				u, _ := url.Parse(konnectConfig.Address)
-				// authenticate with konnect
-				res, err := authenticate(ctx, konnectClient, u.Host)
-				if err != nil {
-					return fmt.Errorf("authenticating with Konnect: %w", err)
-				}
-				fullName := res.FullName
-				if res.FullName == "" {
-					fullName = fmt.Sprintf("%s %s", res.FirstName, res.LastName)
-				}
-				fmt.Printf("Successfully Konnected as %s (%s)!\n",
-					fullName, res.Organization)
-				if konnectConfig.Debug {
-					fmt.Printf("Organization ID: %s\n", res.OrganizationID)
-				}
-			} else {
-				wsConfig := rootConfig.ForWorkspace(pingWorkspace)
-				version, err = fetchKongVersion(ctx, wsConfig)
-				if err != nil {
-					return fmt.Errorf("reading Kong version: %w", err)
-				}
-				fmt.Println("Successfully connected to Kong!")
-				fmt.Println("Kong version: ", version)
+				return pingKonnect(ctx)
 			}
-			_ = sendAnalytics(cmdStr, version, mode)
-			return nil
+			return pingKong(ctx)
 		},
 	}
 
@@ -66,3 +35,41 @@ can connect to Kong's Admin API.`,
 			"Useful when RBAC permissions are scoped to a Workspace.")
 	return pingCmd
 }
+
+func pingKonnect(ctx context.Context) error {
+	// get Konnect client
+	httpClient := utils.HTTPClient()
+	konnectClient, err := utils.GetKonnectClient(httpClient, konnectConfig)
+	if err != nil {
+		return err
+	}
+	u, _ := url.Parse(konnectConfig.Address)
+	// authenticate with konnect
+	res, err := authenticate(ctx, konnectClient, u.Host)
+	if err != nil {
+		return fmt.Errorf("authenticating with Konnect: %w", err)
+	}
+	fullName := res.FullName
+	if res.FullName == "" {
+		fullName = fmt.Sprintf("%s %s", res.FirstName, res.LastName)
+	}
+	fmt.Printf("Successfully Konnected as %s (%s)!\n",
+		fullName, res.Organization)
+	if konnectConfig.Debug {
+		fmt.Printf("Organization ID: %s\n", res.OrganizationID)
+	}
+	_ = sendAnalytics("ping", "", modeKonnect)
+	return nil
+}
+
+func pingKong(ctx context.Context) error {
+	wsConfig := rootConfig.ForWorkspace(pingWorkspace)
+	version, err := fetchKongVersion(ctx, wsConfig)
+	if err != nil {
+		return fmt.Errorf("reading Kong version: %w", err)
+	}
+	fmt.Println("Successfully connected to Kong!")
+	fmt.Println("Kong version: ", version)
+	_ = sendAnalytics("ping", version, modeKong)
+	return nil
+}

file/reader.go

@@ -78,6 +78,8 @@ func Get(ctx context.Context, fileContent *Content, opt RenderConfig, dumpConfig
 	builder.client = wsClient
 	builder.ctx = ctx
 	builder.skipCACerts = dumpConfig.SkipCACerts
+	// Konnect doesn't support the schema endpoint yet,
+	// therefore dynamic defaults injection must be disabled
 	if dumpConfig.KonnectRuntimeGroup != "" {
 		builder.disableDynamicDefaults = true
 	}

konnect/login_service.go

@@ -2,6 +2,7 @@ package konnect
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
@@ -61,12 +62,12 @@ func (s *AuthService) LoginV2(ctx context.Context, email,
 	}
 	req, err := s.client.NewRequest(http.MethodPost, authEndpointV2, nil, body)
 	if err != nil {
-		return AuthResponse{}, err
+		return AuthResponse{}, fmt.Errorf("build http request: %v", err)
 	}
 	var authResponse AuthResponse
 	resp, err := s.client.Do(ctx, req, &authResponse)
 	if err != nil {
-		return AuthResponse{}, err
+		return AuthResponse{}, fmt.Errorf("authenticate http request: %v", err)
 	}
 	url, _ := url.Parse(s.client.baseURL)
 	jar, err := cookiejar.New(nil)
@@ -79,7 +80,7 @@ func (s *AuthService) LoginV2(ctx context.Context, email,
 
 	info, err := s.UserInfo(ctx)
 	if err != nil {
-		return AuthResponse{}, err
+		return AuthResponse{}, fmt.Errorf("fetch user-info: %v", err)
 	}
 	authResponse.FullName = info.Profile.FullName
 	authResponse.Organization = info.Org.Name

utils/analytics.go

@@ -65,7 +65,7 @@ func collectStats(cmd, deckVersion, kongVersion, mode string) map[string]string
 	if mode == konnectMode {
 		result["mode"] = mode
 	}
-	if kongVersion != "" || mode != konnectMode {
+	if kongVersion != "" && mode != konnectMode {
 		result["kv"] = kongVersion
 	}
 	info, err := host.Info()