Change storage and common version files to emulate image's

Change the version file for c/common and c/storage to emulate
the version file that is in c/image.  This updates version/version.go in
c/common, and moves the VERSION file in c/storage to version/version.go.

Signed-off-by: Tom Sweeney <tsweeney@redhat.com>

Author: TomSweeneyRedHat

common/pkg/apparmor/apparmor.go

@@ -9,12 +9,12 @@ import (
 const (
 	// ProfilePrefix is used for version-independent presence checks.
 	ProfilePrefix = "containers-default-"
+)
 
+var (
 	// Profile default name.
 	Profile = ProfilePrefix + version.Version
-)
 
-var (
 	// ErrApparmorUnsupported indicates that AppArmor support is not supported.
 	ErrApparmorUnsupported = errors.New("AppArmor is not supported")
 	// ErrApparmorRootless indicates that AppArmor support is not supported in rootless mode.

common/version/version.go

@@ -1,4 +1,18 @@
 package version
 
-// Version is the version of the build.
-const Version = "0.69.0-dev"
+import "fmt"
+
+const (
+	// VersionMajor is for an API incompatible changes
+	VersionMajor = 0
+	// VersionMinor is for functionality in a backwards-compatible manner
+	VersionMinor = 69
+	// VersionPatch is for backwards-compatible bug fixes
+	VersionPatch = 0
+
+	// VersionDev indicates development branch. Releases will be empty string.
+	VersionDev = "-dev"
+)
+
+// Version is the specification version that the package types support.
+var Version = fmt.Sprintf("%d.%d.%d%s", VersionMajor, VersionMinor, VersionPatch, VersionDev)

storage/VERSION

@@ -1,7 +1,6 @@
 package storage
 
 import (
-	_ "embed"
 	"encoding/base64"
 	"errors"
 	"fmt"
@@ -35,6 +34,7 @@ import (
 	"go.podman.io/storage/pkg/stringutils"
 	"go.podman.io/storage/pkg/system"
 	"go.podman.io/storage/types"
+	"go.podman.io/storage/version"
 )
 
 type updateNameOperation int
@@ -2960,8 +2960,7 @@ func (s *store) Status() ([][2]string, error) {
 	return rlstore.Status()
 }
 
-//go:embed VERSION
-var storageVersion string
+var storageVersion = version.Version
 
 func (s *store) Version() ([][2]string, error) {
 	if trimmedVersion := strings.TrimSpace(storageVersion); trimmedVersion != "" {

storage/store.go

@@ -0,0 +1,18 @@
+package version
+
+import "fmt"
+
+const (
+	// VersionMajor is for an API incompatible changes
+	VersionMajor = 1
+	// VersionMinor is for functionality in a backwards-compatible manner
+	VersionMinor = 64
+	// VersionPatch is for backwards-compatible bug fixes
+	VersionPatch = 0
+
+	// VersionDev indicates development branch. Releases will be empty string.
+	VersionDev = "-dev"
+)
+
+// Version is the specification version that the package types support.
+var Version = fmt.Sprintf("%d.%d.%d%s", VersionMajor, VersionMinor, VersionPatch, VersionDev)