opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 08:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor version handling in cmd tree

Browse Source 
* Move from simple string to semver objects
* Change client API Version from '1' to 2.0.0

Signed-off-by: Jhon Honce <jhonce@redhat.com>
This commit is contained in:
Jhon Honce
2020-09-18 14:10:14 -07:00
parent 5b7509c562
commit c4b49afad3
11 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/root.go
View File

@ -63,7 +63,7 @@ var (
PersistentPreRunE: persistentPreRunE,
RunE: validate.SubCommandExists,
PersistentPostRunE: persistentPostRunE,
Version: version.Version,
Version: version.Version.String(),
}
logLevels = []string{"debug", "info", "warn", "error", "fatal", "panic"}

2
cmd/podman/system/version.go
View File

@ -83,7 +83,7 @@ func version(cmd *cobra.Command, args []string) error {
func formatVersion(writer io.Writer, version *define.Version) {
fmt.Fprintf(writer, "Version:\t%s\n", version.Version)
fmt.Fprintf(writer, "API Version:\t%d\n", version.APIVersion)
fmt.Fprintf(writer, "API Version:\t%s\n", version.APIVersion)
fmt.Fprintf(writer, "Go Version:\t%s\n", version.GoVersion)
if version.GitCommit != "" {
fmt.Fprintf(writer, "Git Commit:\t%s\n", version.GitCommit)

2
hack/release.sh
View File

@ -27,7 +27,7 @@ LAST_TAG=$(git describe --tags --abbrev=0)
write_go_version()
{
LOCAL_VERSION="$1"
sed -i "s/^\(const Version = \"\).*/\1${LOCAL_VERSION}\"/" version/version.go
sed -i "s/^\(var Version = semver.MustParse\( \"\).*/\1${LOCAL_VERSION}\"\)/" version/version.go
}
write_spec_version()

10
libpod/define/version.go
View File

@ -18,9 +18,9 @@ var (
buildInfo string
)
// Version is an output struct for varlink
// Version is an output struct for API
type Version struct {
APIVersion int64
APIVersion string
Version string
GoVersion string
GitCommit string
@ -29,7 +29,7 @@ type Version struct {
OsArch string
}
// GetVersion returns a VersionOutput struct for varlink and podman
// GetVersion returns a VersionOutput struct for API and podman
func GetVersion() (Version, error) {
var err error
var buildTime int64
@ -42,8 +42,8 @@ func GetVersion() (Version, error) {
}
}
return Version{
APIVersion: podmanVersion.APIVersion,
Version: podmanVersion.Version,
APIVersion: podmanVersion.APIVersion.String(),
Version: podmanVersion.Version.String(),
GoVersion: runtime.Version(),
GitCommit: gitCommit,
BuiltTime: time.Unix(buildTime, 0).Format(time.ANSIC),

2
pkg/bindings/bindings.go
View File

@ -22,5 +22,5 @@ var (
PFalse = &pFalse
// APIVersion - podman will fail to run if this value is wrong
APIVersion = semver.MustParse("1.0.0")
APIVersion = semver.MustParse("2.0.0")
)

10
pkg/bindings/system/system.go
View File

@ -118,10 +118,10 @@ func Version(ctx context.Context) (*entities.SystemVersionReport, error) {
if err = response.Process(&component); err != nil {
return nil, err
}
f, _ := strconv.ParseFloat(component.APIVersion, 64)
b, _ := time.Parse(time.RFC3339, component.BuildTime)
report.Server = &define.Version{
APIVersion: int64(f),
APIVersion: component.APIVersion,
Version: component.Version.Version,
GoVersion: component.GoVersion,
GitCommit: component.GitCommit,
@ -129,6 +129,12 @@ func Version(ctx context.Context) (*entities.SystemVersionReport, error) {
Built: b.Unix(),
OsArch: fmt.Sprintf("%s/%s", component.Os, component.Arch),
}
for _, c := range component.Components {
if c.Name == "Podman Engine" {
report.Server.APIVersion = c.Details["APIVersion"]
}
}
return &report, err
}

2
pkg/domain/infra/abi/system_varlink.go
View File

@ -22,7 +22,7 @@ func (ic *ContainerEngine) VarlinkService(_ context.Context, opts entities.Servi
service, err := varlink.NewService(
"Atomic",
"podman",
version.Version,
version.Version.String(),
"https://github.com/containers/podman",
)
if err != nil {

2
pkg/systemd/generate/containers.go
View File

@ -256,7 +256,7 @@ func executeContainerTemplate(info *containerInfo, options entities.GenerateSyst
}
if info.PodmanVersion == "" {
info.PodmanVersion = version.Version
info.PodmanVersion = version.Version.String()
}
if info.GenerateTimestamp {
info.TimeStamp = fmt.Sprintf("%v", time.Now().Format(time.UnixDate))

2
pkg/systemd/generate/pods.go
View File

@ -299,7 +299,7 @@ func executePodTemplate(info *podInfo, options entities.GenerateSystemdOptions)
info.ExecStopPost = "{{.Executable}} pod rm --ignore -f --pod-id-file {{.PodIDFile}}"
}
if info.PodmanVersion == "" {
info.PodmanVersion = version.Version
info.PodmanVersion = version.Version.String()
}
if info.GenerateTimestamp {
info.TimeStamp = fmt.Sprintf("%v", time.Now().Format(time.UnixDate))

6
test/e2e/version_test.go
View File

@ -37,21 +37,21 @@ var _ = Describe("Podman version", func() {
session := podmanTest.Podman([]string{"version"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(session.Out.Contents()).Should(ContainSubstring(version.Version))
Expect(session.Out.Contents()).Should(ContainSubstring(version.Version.String()))
})
It("podman -v", func() {
session := podmanTest.Podman([]string{"-v"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(session.Out.Contents()).Should(ContainSubstring(version.Version))
Expect(session.Out.Contents()).Should(ContainSubstring(version.Version.String()))
})
It("podman --version", func() {
session := podmanTest.Podman([]string{"--version"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(session.Out.Contents()).Should(ContainSubstring(version.Version))
Expect(session.Out.Contents()).Should(ContainSubstring(version.Version.String()))
})
It("podman version --format json", func() {

8
version/version.go
View File

@ -1,12 +1,16 @@
package version
import (
"github.com/blang/semver"
)
// Version is the version of the build.
// NOTE: remember to bump the version at the top
// of the top-level README.md file when this is
// bumped.
const Version = "2.1.0-dev"
var Version = semver.MustParse("2.1.0-dev")
// APIVersion is the version for the remote
// client API. It is used to determine compatibility
// between a remote podman client and its backend
const APIVersion = 1
var APIVersion = semver.MustParse("2.0.0")