mirror of
https://github.com/fluxcd/flux2.git
synced 2025-10-29 07:19:07 +08:00
9af6175302
The output of `kubectl version` has changed with newer kubectl version
from
```
{
"serverVersion": ...,
"clientVersion": ...
}
```
to
```
{
"serverVersion": ...,
"clientVersion": ...,
"kustomizeVersion": ...
}
```
So the `kustomizeVersion` field is new which causes the JSON
unmarshaling to fail.
We now just unmarshal it to `map[string]interface{}` and peel the
server git version out of that map manually w/o unmarshalling the JSON
into a custom type.
Signed-off-by: Max Jonas Werner <mail@makk.es>
51 lines
1.4 KiB
Go
51 lines
1.4 KiB
Go
//go:build e2e
|
|
// +build e2e
|
|
|
|
/*
|
|
Copyright 2021 The Flux authors
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"testing"
|
|
|
|
"github.com/fluxcd/flux2/internal/utils"
|
|
)
|
|
|
|
func TestCheckPre(t *testing.T) {
|
|
jsonOutput, err := utils.ExecKubectlCommand(context.TODO(), utils.ModeCapture, *kubeconfigArgs.KubeConfig, *kubeconfigArgs.Context, "version", "--output", "json")
|
|
if err != nil {
|
|
t.Fatalf("Error running utils.ExecKubectlCommand: %v", err.Error())
|
|
}
|
|
|
|
var versions map[string]interface{}
|
|
if err := json.Unmarshal([]byte(jsonOutput), &versions); err != nil {
|
|
t.Fatalf("Error unmarshalling '%s': %v", jsonOutput, err.Error())
|
|
}
|
|
|
|
serverGitVersion := versions["serverVersion"].(map[string]interface{})["gitVersion"].(string)
|
|
|
|
cmd := cmdTestCase{
|
|
args: "check --pre",
|
|
assert: assertGoldenTemplateFile("testdata/check/check_pre.golden", map[string]string{
|
|
"serverVersion": serverGitVersion,
|
|
}),
|
|
}
|
|
cmd.runTestCmd(t)
|
|
}
|