fix version check (#14395)

vault/token_store.go

@@ -996,16 +996,22 @@ func (ts *TokenStore) create(ctx context.Context, entry *logical.TokenEntry) err
 		if err != nil {
 			return err
 		}
-		newestVersion, err := version.NewVersion(ver)
-		if err != nil {
-			return err
-		}
-		oneTen, err := version.NewVersion("1.10.0")
-		if err != nil {
-			return err
+
+		var newestVersion *version.Version
+		var oneTen *version.Version
+
+		if ver != "" {
+			newestVersion, err = version.NewVersion(ver)
+			if err != nil {
+				return err
+			}
+			oneTen, err = version.NewVersion("1.10.0")
+			if err != nil {
+				return err
+			}
 		}
 
-		if ts.core.DisableSSCTokens() || newestVersion.LessThan(oneTen) {
+		if ts.core.DisableSSCTokens() || (newestVersion != nil && newestVersion.LessThan(oneTen)) {
 			entry.ID = consts.LegacyBatchTokenPrefix + bEntry
 		} else {
 			entry.ID = consts.BatchTokenPrefix + bEntry

vault/version_store.go

@@ -70,7 +70,7 @@ func (c *Core) storeVersionTimestamp(ctx context.Context, version string, timest
 // FindOldestVersionTimestamp searches for the vault version with the oldest
 // upgrade timestamp from storage. The earliest version this can be is 1.9.0.
 func (c *Core) FindOldestVersionTimestamp() (string, time.Time, error) {
-	if len(c.versionTimestamps) == 0 {
+	if c.versionTimestamps == nil {
 		return "", time.Time{}, fmt.Errorf("version timestamps are not initialized")
 	}
 
@@ -87,7 +87,7 @@ func (c *Core) FindOldestVersionTimestamp() (string, time.Time, error) {
 }
 
 func (c *Core) FindNewestVersionTimestamp() (string, time.Time, error) {
-	if len(c.versionTimestamps) == 0 {
+	if c.versionTimestamps == nil {
 		return "", time.Time{}, fmt.Errorf("version timestamps are not initialized")
 	}