mirror of
https://github.com/docker/compose.git
synced 2025-07-28 16:14:06 +02:00
Refactoring of redundant condition checks
Signed-off-by: keitosuwahara <keitosuwahara0816@gmail.com>
This commit is contained in:
parent
1946de598d
commit
cab2c2a44e
@ -17,8 +17,6 @@
|
|||||||
package api
|
package api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/hashicorp/go-version"
|
"github.com/hashicorp/go-version"
|
||||||
|
|
||||||
"github.com/docker/compose/v2/internal"
|
"github.com/docker/compose/v2/internal"
|
||||||
@ -65,9 +63,7 @@ var ComposeVersion string
|
|||||||
func init() {
|
func init() {
|
||||||
v, err := version.NewVersion(internal.Version)
|
v, err := version.NewVersion(internal.Version)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
segments := v.Segments()
|
// We are only interested in the core version (e.g., "1.2.3") from the version string.
|
||||||
if len(segments) > 2 {
|
ComposeVersion = v.Core().String()
|
||||||
ComposeVersion = fmt.Sprintf("%d.%d.%d", segments[0], segments[1], segments[2])
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
35
pkg/api/labels_test.go
Normal file
35
pkg/api/labels_test.go
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2020 Docker Compose CLI 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 api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/docker/compose/v2/internal"
|
||||||
|
"github.com/hashicorp/go-version"
|
||||||
|
"gotest.tools/v3/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestComposeVersionInitialization(t *testing.T) {
|
||||||
|
v, err := version.NewVersion(internal.Version)
|
||||||
|
if err != nil {
|
||||||
|
assert.Equal(t, "", ComposeVersion, "ComposeVersion should be empty for a non-semver internal version (e.g. 'devel')")
|
||||||
|
} else {
|
||||||
|
expected := v.Core().String()
|
||||||
|
assert.Equal(t, expected, ComposeVersion, "ComposeVersion should be the core of internal.Version")
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user