Skip to content

Commit

Permalink
core: make rook version more readable
Browse files Browse the repository at this point in the history
during pre-validation check, rook version was
printed in multiple lines with golang version
which was making it difficult to read. Now, it
prints in one single like with the golang version.
Also, adding unit test for the  regular expression.

Signed-off-by: subhamkrai <[email protected]>
  • Loading branch information
subhamkrai committed Jun 14, 2023
1 parent c558309 commit 8c63fee
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 1 deletion.
13 changes: 12 additions & 1 deletion cmd/commands/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package command
import (
"context"
"fmt"
"regexp"
"strings"

"github.com/rook/kubectl-rook-ceph/pkg/exec"
Expand Down Expand Up @@ -105,8 +106,18 @@ func PreValidationCheck(ctx context.Context, k8sclientset *k8sutil.Clientsets, o
logging.Error(fmt.Errorf("CephCluster namespace '%s' does not exist. %v", cephClusterNamespace, err))
}

rookVersion := exec.RunCommandInOperatorPod(ctx, k8sclientset, "rook", []string{"version"}, operatorNamespace, cephClusterNamespace, true, false)
rookVersionOutput := exec.RunCommandInOperatorPod(ctx, k8sclientset, "rook", []string{"version"}, operatorNamespace, cephClusterNamespace, true, false)
rookVersion := trimGoVersionFromRookVersion(rookVersionOutput)
if strings.Contains(rookVersion, "alpha") || strings.Contains(rookVersion, "beta") {
logging.Warning("rook version '%s' is running a pre-release version of Rook.", rookVersion)
fmt.Println()
}
}

func trimGoVersionFromRookVersion(rookVersion string) string {
re := regexp.MustCompile("(?m)[\r\n]+^.*go: go.*$") // remove the go version from the output
rookVersion = re.ReplaceAllString(rookVersion, "")
rookVersion = strings.TrimSpace(rookVersion) // remove any trailing newlines

return rookVersion
}
45 changes: 45 additions & 0 deletions cmd/commands/root_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
Copyright 2023 The Rook Authors. All rights reserved.
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 command

import "testing"

func Test_trimGoVersionFromRookVersion(t *testing.T) {
type args struct {
rookVersion string
}

sampleRookVersion := `rook: v1.11.0-alpha.0.420.gd9a17691c
go: go1.19.10s`
tests := []struct {
name string
args args
want string
}{
{
name: "trim go version from rook version",
args: args{rookVersion: sampleRookVersion},
want: "rook: v1.11.0-alpha.0.420.gd9a17691c",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := trimGoVersionFromRookVersion(tt.args.rookVersion); got != tt.want {
t.Errorf("trimGoVersionFromRookVersion() = %v, want %v", got, tt.want)
}
})
}
}

0 comments on commit 8c63fee

Please sign in to comment.