From d3701bb9efdd2cbfdf21b2560ea22f273ee1120b Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Thu, 30 Jun 2022 13:59:47 +0200 Subject: git2go: Convert injection of feature flags to not use raw flags Convert the logic to inject and extract feature flags in `gitaly-git2go` to not use raw feature flags anymore. Instead, use `FromMetadataKey()` and `FromContext()` to work on typed `FeatureFlag`s. This prepares for the removal of `featureflag.Raw`. --- internal/git2go/executor.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'internal/git2go/executor.go') diff --git a/internal/git2go/executor.go b/internal/git2go/executor.go index c1e220f43..5007b6c6f 100644 --- a/internal/git2go/executor.go +++ b/internal/git2go/executor.go @@ -59,14 +59,12 @@ func (b *Executor) run(ctx context.Context, repo repository.GitRepo, stdin io.Re var enabledFeatureFlags, disabledFeatureFlags []string - for ff, value := range featureflag.RawFromContext(ctx) { + for flag, value := range featureflag.FromContext(ctx) { switch value { - case "true": - enabledFeatureFlags = append(enabledFeatureFlags, ff) - case "false": - disabledFeatureFlags = append(disabledFeatureFlags, ff) - default: - return nil, fmt.Errorf("invalid value for feature flag %q: %q", ff, value) + case true: + enabledFeatureFlags = append(enabledFeatureFlags, flag.MetadataKey()) + case false: + disabledFeatureFlags = append(disabledFeatureFlags, flag.MetadataKey()) } } -- cgit v1.2.3