Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify version detection #329

Closed
wants to merge 18 commits into from
Closed

Simplify version detection #329

Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e7e1dc9
Fixes #324
mmorel-35 Apr 16, 2021
5615f73
client NewRequest know the workspace not http
mmorel-35 Apr 17, 2021
9bfeb5d
introduce context as a parameter for kongVersion
mmorel-35 Apr 20, 2021
c70682c
apply gofmt
mmorel-35 Apr 20, 2021
3e998d0
Define context as parameter for workspaceExists, listWorkspaces and s…
mmorel-35 Apr 20, 2021
0b48815
use cmd.Context() instead of context.Background()
mmorel-35 Apr 21, 2021
3162f0b
Setup integration test for kongVersion on community edition
mmorel-35 Apr 24, 2021
c27373c
Variables declaration
mmorel-35 Apr 24, 2021
2a9894f
build only for integration test and compare only minor and major
mmorel-35 Apr 24, 2021
bc2a432
build tag is followed by a blank line
mmorel-35 Apr 24, 2021
5301d49
makefile name
mmorel-35 Apr 24, 2021
29d2968
Test with workspace
mmorel-35 Apr 24, 2021
17b9627
imports and new assertion
mmorel-35 Apr 24, 2021
f4347a6
Fix test
mmorel-35 Apr 24, 2021
aa4c66f
Workspace version
mmorel-35 Apr 24, 2021
2fabc8b
workspace only for enterprise
mmorel-35 Apr 24, 2021
72405b3
missing imports
mmorel-35 Apr 24, 2021
cc50af7
Integration tests for enterprise, deletion of unused env variables in…
mmorel-35 Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions cmd/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package cmd
import (
"context"
"fmt"
"net/http"
"os"

"github.com/blang/semver/v4"
Expand Down Expand Up @@ -177,33 +176,27 @@ func kongVersion(config utils.KongClientConfig) (semver.Version, error) {

var version string

workspace := config.Workspace

// remove workspace to be able to call top-level / endpoint
config.Workspace = ""
client, err := utils.GetKongClient(config)
if err != nil {
return semver.Version{}, err
}
root, err := client.Root(nil)
if err != nil {
if workspace == "" {
return semver.Version{}, err
}
// try with workspace path
req, err := http.NewRequest("GET",
utils.CleanAddress(config.Address)+"/"+workspace+"/kong",
nil)

if len(config.Workspace) > 0 {
req, err := client.NewRequest("GET", "/kong", nil, nil)
if err != nil {
return semver.Version{}, err
}
var resp map[string]interface{}
_, err = client.Do(nil, req, &resp)
_, err = client.Do(context.TODO(), req, &resp)
if err != nil {
return semver.Version{}, err
}
version = resp["version"].(string)
} else {
root, err := client.Root(context.TODO())
if err != nil {
return semver.Version{}, err
}
version = root["version"].(string)
}

Expand Down