fix(storage/git): support fs.WalkDir and current dir path

internal/server/environments/storage.go

@@ -77,19 +77,34 @@
 }
 
 type EnvironmentStore struct {
-	byName map[string]Environment
+	byName     map[string]Environment
+	defaultEnv Environment
 }
 
-func NewEnvironmentStore(envs ...Environment) *EnvironmentStore {
+func NewEnvironmentStore(envs ...Environment) (*EnvironmentStore, error) {
 	store := &EnvironmentStore{
 		byName: map[string]Environment{},
 	}
 
 	for _, env := range envs {
 		store.byName[env.Name()] = env
+		if env.Default() {
+			store.defaultEnv = env
+		}
+	}
+
+	if store.defaultEnv == nil {
+		env, ok := store.byName["default"]
+		if ok {
+			store.defaultEnv = env
+		} else if len(envs) == 1 {
+			store.defaultEnv = envs[0]
+		} else {
+			return nil, errors.New("explicit default environment required")
+		}
 	}
 
-	return store
+	return store, nil
 }
 
 func (e *EnvironmentStore) List(ctx context.Context) iter.Seq[Environment] {
@@ -111,3 +126,8 @@
 
 	return env, nil
 }
+
+// GetDefault returns the environment identified by name.
+func (e *EnvironmentStore) GetDefault(ctx context.Context) Environment {
+	return e.defaultEnv
+}

internal/server/evaluation/evaluation_test.go

@@ -28,7 +28,7 @@ func TestVariant_FlagNotFound(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 
 	environment.On("EvaluationStore").Return(store, nil)
 
@@ -59,7 +59,7 @@ func TestVariant_NonVariantFlag(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{
@@ -92,7 +92,7 @@ func TestVariant_FlagDisabled(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{
@@ -131,7 +131,7 @@ func TestVariant_EvaluateFailure_OnGetEvaluationRules(t *testing.T) {
 		}
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(flag, nil)
@@ -166,7 +166,7 @@ func TestVariant_Success(t *testing.T) {
 		}
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(flag, nil)
@@ -228,7 +228,7 @@ func TestBoolean_FlagNotFoundError(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{}, errs.ErrNotFound("test-flag"))
@@ -257,7 +257,7 @@ func TestBoolean_NonBooleanFlagError(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{
@@ -290,7 +290,7 @@ func TestBoolean_DefaultRule_NoRollouts(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{
@@ -327,7 +327,7 @@ func TestBoolean_DefaultRuleFallthrough_WithPercentageRollout(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{
@@ -374,7 +374,7 @@ func TestBoolean_PercentageRuleMatch(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{
@@ -421,7 +421,7 @@ func TestBoolean_PercentageRuleFallthrough_SegmentMatch(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{
@@ -491,7 +491,7 @@ func TestBoolean_SegmentMatch_MultipleConstraints(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{
@@ -558,7 +558,7 @@ func TestBoolean_SegmentMatch_Constraint_EntityId(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{
@@ -617,7 +617,7 @@ func TestBoolean_SegmentMatch_MultipleSegments_WithAnd(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{
@@ -691,7 +691,7 @@ func TestBoolean_RulesOutOfOrder(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{
@@ -759,7 +759,7 @@ func TestBatch_UnknownFlagType(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{
@@ -797,7 +797,7 @@ func TestBatch_InternalError_GetFlag(t *testing.T) {
 		s            = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{}, errors.New("internal error"))
@@ -832,7 +832,7 @@ func TestBatch_Success(t *testing.T) {
 		s              = New(logger, envStore)
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{

internal/server/evaluation/ofrep_bridge_test.go

@@ -31,7 +31,7 @@ func TestOFREPFlagEvaluation_Variant(t *testing.T) {
 		}
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(flag, nil)
@@ -97,7 +97,7 @@ func TestOFREPFlagEvaluation_Boolean(t *testing.T) {
 		}
 	)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(flag, nil)

internal/server/evaluation/server.go

@@ -12,7 +12,7 @@ import (
 
 // EnvironmentStore is the minimal abstraction for interacting with the storage layer for evaluation.
 type EnvironmentStore interface {
-	Get(context.Context, string) (environments.Environment, error)
+	GetDefault(context.Context) environments.Environment
 }
 
 // Server serves the Flipt evaluate v2 gRPC Server.
@@ -47,10 +47,5 @@ func (s *Server) SkipsAuthorization(ctx context.Context) bool {
 func (s *Server) getEvalStore(ctx context.Context) (storage.ReadOnlyStore, error) {
 	// TODO(georgemac): update this to support overriding default environment based
 	// on configuration or header metadata on the request
-	env, err := s.store.Get(ctx, "default")
-	if err != nil {
-		return nil, err
-	}
-
-	return env.EvaluationStore()
+	return s.store.GetDefault(ctx).EvaluationStore()
 }

internal/server/flag_test.go

@@ -31,7 +31,7 @@ func TestListFlags_PaginationOffset(t *testing.T) {
 
 	defer store.AssertExpectations(t)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("ListFlags", mock.Anything, storage.ListWithOptions(storage.NewNamespace(""),
@@ -75,7 +75,7 @@ func TestListFlags_PaginationPageToken(t *testing.T) {
 
 	defer store.AssertExpectations(t)
 
-	envStore.On("Get", mock.Anything, "default").Return(environment, nil)
+	envStore.On("GetDefault", mock.Anything).Return(environment)
 	environment.On("EvaluationStore").Return(store, nil)
 
 	store.On("ListFlags", mock.Anything, storage.ListWithOptions(storage.NewNamespace(""),