From 6768b9146b949c9fdde324c2e2f2182fe74c213c Mon Sep 17 00:00:00 2001
From: Michael Fero <6863207+mikefero@users.noreply.github.com>
Date: Tue, 12 Dec 2023 18:37:00 -0500
Subject: [PATCH] apply updates based on changes in decK and Koko

---
 cmd/common.go         |  5 +----
 cmd/common_konnect.go | 26 +++++++-------------------
 cmd/ping.go           |  4 ++--
 go.mod                |  2 +-
 4 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/cmd/common.go b/cmd/common.go
index cd843f6a0..9bdb09e23 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -143,10 +143,7 @@ func syncMain(ctx context.Context, filenames []string, dry bool, parallelism,
 	var kongVersion string
 	var parsedKongVersion semver.Version
 	if mode == modeKonnect {
-		kongVersion, err = fetchKonnectKongVersion(ctx, kongClient)
-		if err != nil {
-			return fmt.Errorf("reading Konnect Kong version: %w", err)
-		}
+		kongVersion = fetchKonnectKongVersion()
 	} else {
 		kongVersion, err = fetchKongVersion(ctx, wsConfig)
 		if err != nil {
diff --git a/cmd/common_konnect.go b/cmd/common_konnect.go
index 685da587c..0bcd87d60 100644
--- a/cmd/common_konnect.go
+++ b/cmd/common_konnect.go
@@ -3,7 +3,6 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"net/url"
 	"os"
 	"strings"
@@ -172,10 +171,6 @@ func dumpKonnectV2(ctx context.Context) error {
 	if dumpConfig.KonnectRuntimeGroup == "" {
 		dumpConfig.KonnectRuntimeGroup = defaultRuntimeGroupName
 	}
-	kongVersion, err := fetchKonnectKongVersion(ctx, client)
-	if err != nil {
-		return fmt.Errorf("reading Konnect Kong version: %w", err)
-	}
 	rawState, err := dump.Get(ctx, client, dumpConfig)
 	if err != nil {
 		return fmt.Errorf("reading configuration from Kong: %w", err)
@@ -190,7 +185,7 @@ func dumpKonnectV2(ctx context.Context) error {
 		FileFormat:       file.Format(strings.ToUpper(konnectDumpCmdStateFormat)),
 		WithID:           dumpWithID,
 		RuntimeGroupName: konnectRuntimeGroup,
-		KongVersion:      kongVersion,
+		KongVersion:      fetchKonnectKongVersion(),
 	})
 }
 
@@ -386,17 +381,10 @@ func getKonnectState(ctx context.Context,
 	return ks, nil
 }
 
-func fetchKonnectKongVersion(ctx context.Context, client *kong.Client) (string, error) {
-	req, err := http.NewRequest("GET",
-		utils.CleanAddress(client.BaseRootURL())+"/v1", nil)
-	if err != nil {
-		return "", err
-	}
-
-	var resp map[string]interface{}
-	_, err = client.Do(ctx, req, &resp)
-	if err != nil {
-		return "", err
-	}
-	return resp["version"].(string), nil
+func fetchKonnectKongVersion() string {
+	// Returning an hardcoded version for now. decK only needs the version
+	// to determine the format_version expected in the state file. Since
+	// Konnect is always on the latest version, we can safely return the
+	// latest version here and avoid making an extra and unnecessary request.
+	return "3.5.0.0"
 }
diff --git a/cmd/ping.go b/cmd/ping.go
index 9ca622e0d..4f74f8168 100644
--- a/cmd/ping.go
+++ b/cmd/ping.go
@@ -39,7 +39,7 @@ can connect to Kong's Admin API.`,
 func pingKonnect(ctx context.Context) error {
 	// get Konnect client
 	httpClient := utils.HTTPClient()
-	kongClient, err := GetKongClientForKonnectMode(ctx, &konnectConfig)
+	_, err := GetKongClientForKonnectMode(ctx, &konnectConfig)
 	if err != nil {
 		return err
 	}
@@ -49,7 +49,7 @@ func pingKonnect(ctx context.Context) error {
 	}
 	u, _ := url.Parse(konnectConfig.Address)
 	if konnectConfig.Dev {
-		version, err := fetchKonnectKongVersion(ctx, kongClient)
+		version := fetchKonnectKongVersion()
 		if err != nil {
 			return fmt.Errorf("reading Konnect Kong version: %w", err)
 		}
diff --git a/go.mod b/go.mod
index a216525cb..b9eac2d45 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/kong/deck
 go 1.18
 
 replace github.com/yudai/gojsondiff v1.0.0 => github.com/Kong/gojsondiff v1.3.0
-replace github.com/kong/go-kong v0.34.1-0.20221222170410-6c81ce561662 => /home/aboudreault/dev/kong/go-kong
+replace github.com/kong/go-kong v0.34.1-0.20221222170410-6c81ce561662 => ./go-kong
 
 require (
 	github.com/Kong/gojsondiff v1.3.2