Skip to content

feat: add os dragonfly rollout release flag in ff interceptor #6545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paulrosca-snyk wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −9
Open

feat: add os dragonfly rollout release flag in ff interceptor #6545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions cliv2/internal/proxy/interceptor/legacyfeatureflaginterceptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ import (

const FeatureFlagShowMavenBuildScope = "internal_snyk_show_maven_scope_enabled"
const FeatureFlagShowNpmBuildScope = "internal_snyk_show_npm_scope_enabled"
const FeatureFlagRolloutDflyOSCLI = "internal_snyk_rollout_dfly_os_cli"

// featureFlagPaths maps CLI config feature-flag URL paths to their config keys.
var featureFlagPaths = map[string]string{
"/v1/cli-config/feature-flags/show-maven-build-scope": FeatureFlagShowMavenBuildScope,
"/v1/cli-config/feature-flags/show-npm-scope": FeatureFlagShowNpmBuildScope,
"/v1/cli-config/feature-flags/rollout-dfly-os-cli": FeatureFlagRolloutDflyOSCLI,
}

type legacyFeatureFlagInterceptor struct {
requestCondition goproxy.ReqCondition
Expand All @@ -29,17 +37,12 @@ func (ni legacyFeatureFlagInterceptor) GetCondition() goproxy.ReqCondition {

// GetHandler for legacyFeatureFlagInterceptor will re-route all registry requests from the proxy to the configured feature flag values.
// This ensures that we can control feature flag values for the legacy CLI from the CLIv2 configuration.
// Currently, only the "show-maven-build-scope" and "show-npm-scope" feature flags are supported.
// Currently, only the "show-maven-build-scope", "show-npm-scope" and "rollout-dfly-os-cli" feature flags are supported.
func (ni legacyFeatureFlagInterceptor) GetHandler() goproxy.FuncReqHandler {
return func(req *http.Request, proxyCtx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
ni.invocationCtx.GetEnhancedLogger().Printf("legacyFeatureFlagInterceptor handling request for %s", req.URL.Path)
var configKey string
switch req.URL.Path {
case "/v1/cli-config/feature-flags/show-maven-build-scope":
configKey = FeatureFlagShowMavenBuildScope
case "/v1/cli-config/feature-flags/show-npm-scope":
configKey = FeatureFlagShowNpmBuildScope
default:
configKey, ok := featureFlagPaths[req.URL.Path]
if !ok {
return req, nil
}

Expand Down Expand Up @@ -70,7 +73,7 @@ func (ni legacyFeatureFlagInterceptor) GetHandler() goproxy.FuncReqHandler {
func NewLegacyFeatureFlagInterceptor(invocationCtx workflow.InvocationContext) Interceptor {
i := legacyFeatureFlagInterceptor{
requestCondition: goproxy.UrlMatches(
regexp.MustCompile(`/cli-config/feature-flags/(show-maven-build-scope|show-npm-scope)/?(?:\?.*)?$`),
regexp.MustCompile(`/cli-config/feature-flags/(show-maven-build-scope|show-npm-scope|rollout-dfly-os-cli)/?(?:\?.*)?$`),
),
invocationCtx: invocationCtx,
}
Expand Down
7 changes: 7 additions & 0 deletions cliv2/internal/proxy/interceptor/legacyfeatureflaginterceptor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ func TestLegacyFeatureFlagInterceptor_Routing(t *testing.T) {
shouldHandle: true,
configKey: FeatureFlagShowNpmBuildScope,
},
{
name: "cli dfly path",
path: "https://example.com/v1/cli-config/feature-flags/rollout-dfly-os-cli?org=abc",
shouldHandle: true,
configKey: FeatureFlagRolloutDflyOSCLI,
},

{
name: "other path",
path: "https://example.com/api/v1/other-endpoint",
Expand Down