feat: add /version endpoint and global X-Minder-Version header

internal/controlplane/handlers.go

@@ -11,6 +11,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
+	"github.com/mindersec/minder/internal/constants"
 	pb "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
 )
 
@@ -25,3 +26,11 @@ func (s *Server) CheckHealth(ctx context.Context, _ *pb.CheckHealthRequest) (*pb
 	}
 	return &pb.CheckHealthResponse{Status: "OK"}, nil
 }
+
+// GetVersion returns the build and version info of the Minder server
+func (*Server) GetVersion(_ context.Context, _ *pb.GetVersionRequest) (*pb.GetVersionResponse, error) {
+	return &pb.GetVersionResponse{
+		Version: constants.CLIVersion,
+		Commit:  constants.Revision,
+	}, nil
+}

internal/controlplane/server.go

@@ -35,6 +35,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"
+	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/reflection"
 	"google.golang.org/grpc/status"
 
@@ -43,6 +44,7 @@ import (
 	"github.com/mindersec/minder/internal/auth"
 	"github.com/mindersec/minder/internal/auth/jwt"
 	"github.com/mindersec/minder/internal/authz"
+	"github.com/mindersec/minder/internal/constants"
 	"github.com/mindersec/minder/internal/controlplane/metrics"
 	"github.com/mindersec/minder/internal/crypto"
 	datasourcessvc "github.com/mindersec/minder/internal/datasources/service"
@@ -215,8 +217,7 @@ func initMetrics(r sdkmetric.Reader) *sdkmetric.MeterProvider {
 	res := resource.NewWithAttributes(
 		semconv.SchemaURL,
 		semconv.ServiceName("minder"),
-		// TODO: Make this auto-generated
-		semconv.ServiceVersion("v0.1.0"),
+		semconv.ServiceVersion(constants.CLIVersion),
 	)
 	// By default/spec (?!), otel includes net.sock.peer.{addr,port}.
 	// See https://github.com/open-telemetry/opentelemetry-go-contrib/issues/3071
@@ -265,6 +266,7 @@ func (s *Server) StartGRPCServer(ctx context.Context) error {
 		s.TokenValidationInterceptor,
 		EntityContextProjectInterceptor,
 		ProjectAuthorizationInterceptor,
+		VersionHeaderInterceptor(),
 		recovery.UnaryServerInterceptor(recovery.WithRecoveryHandlerContext(recoveryHandler)),
 	}
 
@@ -542,3 +544,12 @@ func withMaxSizeMiddleware(h http.Handler) http.Handler {
 		h.ServeHTTP(w, r)
 	})
 }
+
+// VersionHeaderInterceptor injects the Minder version into the HTTP response headers
+func VersionHeaderInterceptor() grpc.UnaryServerInterceptor {
+	return func(ctx context.Context, req interface{}, _ *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+		// SetHeader tells gRPC-Gateway to add this to the HTTP response
+		_ = grpc.SetHeader(ctx, metadata.Pairs("x-minder-version", constants.CLIVersion))
+		return handler(ctx, req)
+	}
+}

internal/controlplane/server_test.go

@@ -28,6 +28,7 @@ import (
 	"github.com/mindersec/minder/internal/auth"
 	mockjwt "github.com/mindersec/minder/internal/auth/jwt/mock"
 	mockauthz "github.com/mindersec/minder/internal/authz/mock"
+	"github.com/mindersec/minder/internal/constants"
 	"github.com/mindersec/minder/internal/controlplane/metrics"
 	"github.com/mindersec/minder/internal/crypto"
 	mock_service "github.com/mindersec/minder/internal/entities/properties/service/mock"
@@ -220,3 +221,30 @@ func httpDoWithRetry(client *http.Client, createRequest func() (*http.Request, e
 
 	return resp, err
 }
+
+func TestGetVersion(t *testing.T) {
+	t.Parallel()
+
+	server := &Server{}
+
+	resp, err := server.GetVersion(context.Background(), &pb.GetVersionRequest{})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Equal(t, constants.CLIVersion, resp.Version)
+	require.Equal(t, constants.Revision, resp.Commit)
+}
+
+func TestVersionHeaderInterceptor(t *testing.T) {
+	t.Parallel()
+
+	interceptor := VersionHeaderInterceptor()
+
+	handler := func(_ context.Context, _ interface{}) (interface{}, error) {
+		return "success", nil
+	}
+
+	_, err := interceptor(context.Background(), nil, &grpc.UnaryServerInfo{}, handler)
+
+	require.NoError(t, err)
+}