Revert "Merge main"

This reverts commit 89f95b15482030ed9d3aee8d3caab68c65f43055.

version/version.go

@@ -2,75 +2,19 @@ package version
 
 import (
 	"regexp"
-	"runtime/debug"
-	"strings"
 
 	v "github.com/hashicorp/go-version"
 )
 
-// DevelopmentVersion is the value of NetbirdVersion() for non-release builds.
-// Wire-format consumers (management server, dashboard) match against this
-// string, so it must not change without coordinating those consumers.
-const DevelopmentVersion = "development"
-
 // will be replaced with the release version when using goreleaser
-var version = DevelopmentVersion
+var version = "development"
 
 var (
 	VersionRegexp = regexp.MustCompile("^" + v.VersionRegexpRaw + "$")
 	SemverRegexp  = regexp.MustCompile("^" + v.SemverRegexpRaw + "$")
 )
 
-// NetbirdVersion returns the Netbird version. For non-release builds the
-// value is the literal DevelopmentVersion constant; the VCS revision is
-// exposed separately via NetbirdCommit so the wire format stays stable.
+// NetbirdVersion returns the Netbird version
 func NetbirdVersion() string {
 	return version
 }
-
-// NetbirdCommit returns the VCS revision (truncated to 12 chars) of the
-// build, with a "-dirty" suffix when the working tree was modified.
-// Returns an empty string when no build info is embedded (e.g. release
-// builds compiled by goreleaser without -buildvcs).
-func NetbirdCommit() string {
-	info, ok := debug.ReadBuildInfo()
-	if !ok {
-		return ""
-	}
-
-	var revision string
-	var modified bool
-	for _, s := range info.Settings {
-		switch s.Key {
-		case "vcs.revision":
-			revision = s.Value
-		case "vcs.modified":
-			modified = s.Value == "true"
-		}
-	}
-
-	if revision == "" {
-		return ""
-	}
-
-	if len(revision) > 12 {
-		revision = revision[:12]
-	}
-
-	if modified {
-		revision += "-dirty"
-	}
-	return revision
-}
-
-// IsDevelopmentVersion reports whether the given version string identifies
-// a non-release / development build. It is the single source of truth for
-// "is this a dev build" checks across the codebase; use it instead of
-// comparing against the "development" literal or ad-hoc substring checks.
-//
-// Matches the bare DevelopmentVersion constant as well as any future
-// extension such as "development-<sha>" or "development-<sha>-dirty",
-// while excluding tagged prereleases like "v0.31.1-dev".
-func IsDevelopmentVersion(v string) bool {
-	return strings.HasPrefix(v, DevelopmentVersion)
-}

version/version_test.go

@@ -1,26 +0,0 @@
-package version
-
-import "testing"
-
-func TestIsDevelopmentVersion(t *testing.T) {
-	tests := []struct {
-		version string
-		want    bool
-	}{
-		{"development", true},
-		{"development-0823f3ff9ab1", true},
-		{"development-0823f3ff9ab1-dirty", true},
-		{"0.50.0", false},
-		{"v0.31.1-dev", false},
-		{"1.0.0-dev", false},
-		{"dev", false},
-		{"", false},
-	}
-	for _, tt := range tests {
-		t.Run(tt.version, func(t *testing.T) {
-			if got := IsDevelopmentVersion(tt.version); got != tt.want {
-				t.Errorf("IsDevelopmentVersion(%q) = %v, want %v", tt.version, got, tt.want)
-			}
-		})
-	}
-}