feat: make public api prefix configurable (#63)

* feat: make public api prefix configurable * fix: default public api prefix
goto · Jun 4, 2024 · b05419b · b05419b
1 parent 5b52f3a
commit b05419b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/internal/server/config.go b/internal/server/config.go
@@ -65,4 +65,6 @@ type Config struct {
 	DefaultSystemEmail string `yaml:"default_system_email" mapstructure:"default_system_email"  default:"[email protected]"`
 
 	ServiceData ServiceDataConfig `yaml:"service_data" mapstructure:"service_data"`
+
+	PublicAPIPrefix string `yaml:"public_api_prefix" mapstructure:"public_api_prefix"  default:"/api"`
 }
diff --git a/internal/server/server.go b/internal/server/server.go
@@ -71,7 +71,7 @@ func Serve(
 		runtime.WithIncomingHeaderMatcher(customHeaderMatcherFunc(map[string]bool{cfg.IdentityProxyHeader: true})),
 	)
 
-	httpMux.Handle("/shield/", http.StripPrefix("/shield", grpcServiceDataGateway))
+	httpMux.Handle(fmt.Sprintf("%s/", cfg.PublicAPIPrefix), http.StripPrefix(cfg.PublicAPIPrefix, grpcServiceDataGateway))
 
 	if err := shieldv1beta1.RegisterServiceDataServiceHandler(ctx, grpcServiceDataGateway, grpcConn); err != nil {
 		return err

diff --git a/test/e2e_test/testbench/testbench.go b/test/e2e_test/testbench/testbench.go
@@ -207,6 +207,7 @@ func SetupTests(t *testing.T) (shieldv1beta1.ShieldServiceClient, shieldv1beta1.
 				BootstrapEnabled: true,
 				MaxNumUpsertData: 1,
 			},
+			PublicAPIPrefix: "/api",
 		},
 		Proxy: proxy.ServicesConfig{
 			Services: []proxy.Config{

diff --git a/test/e2e_test/testbench/testdata/configs/rules/rule.yaml b/test/e2e_test/testbench/testdata/configs/rules/rule.yaml
@@ -1,7 +1,7 @@
 rules:
   - backends:
       - name: entropy
-        target: "http://localhost:52118"
+        target: "http://localhost:51463"
         frontends:
           - name: ping
             path: "/api/ping"