test: update e2e tests (#1452)

Signed-off-by: Pradeep <[email protected]>
open-feature · Nov 19, 2024 · 65bf635 · 65bf635
1 parent 8c6d91d
commit 65bf635
Show file tree

Hide file tree

Showing 8 changed files with 119 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -147,5 +147,9 @@ jobs:
           -f file:${{ github.workspace }}/test-harness/flags/zero-flags.json \
           -f file:${{ github.workspace }}/test-harness/flags/edge-case-flags.json &
 
+      - name: Run envoy proxy in background
+        run: |
+          envoy -c ./test/integration/config/envoy.yaml &
+
       - name: Run evaluation test suite
         run: go clean -testcache && go test -cover ./test/integration
diff --git a/schemas b/schemas
diff --git a/spec b/spec
diff --git a/test-harness b/test-harness
diff --git a/test/integration/config/envoy.yaml b/test/integration/config/envoy.yaml
@@ -0,0 +1,49 @@
+static_resources:
+  listeners:
+    - name: local-envoy
+      address:
+        socket_address:
+          address: 0.0.0.0
+          port_value: 9211
+      filter_chains:
+        - filters:
+            - name: envoy.filters.network.http_connection_manager
+              typed_config:
+                "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
+                stat_prefix: ingress_http
+                access_log:
+                  - name: envoy.access_loggers.stdout
+                    typed_config:
+                      "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog
+                http_filters:
+                  - name: envoy.filters.http.router
+                    typed_config:
+                      "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
+                route_config:
+                  name: local_route
+                  virtual_hosts:
+                    - name: local_service
+                      domains:
+                        - "flagd-sync.service"
+                      routes:
+                        - match:
+                            prefix: "/"
+                            grpc: {}
+                          route:
+                            cluster: local-sync-service
+
+  clusters:
+    - name: local-sync-service
+      type: LOGICAL_DNS
+      # Comment out the following line to test on v6 networks
+      dns_lookup_family: V4_ONLY
+      http2_protocol_options: {}
+      load_assignment:
+        cluster_name: local-sync-service
+        endpoints:
+          - lb_endpoints:
+              - endpoint:
+                  address:
+                    socket_address:
+                      address: sync-service
+                      port_value: 8015
diff --git a/test/integration/evaluation_test.go b/test/integration/evaluation_test.go
@@ -43,3 +43,34 @@ func TestEvaluation(t *testing.T) {
 		t.Fatal("non-zero status returned, failed to run evaluation tests")
 	}
 }
+
+func TestEvaluationUsingEnvoy(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+
+	flag.Parse()
+
+	name := "evaluation_envoy.feature"
+	providerOptions := []flagd.ProviderOption{
+		flagd.WithTargetUri("envoy://localhost:9211/flagd-sync.service"),
+	}
+
+	testSuite := godog.TestSuite{
+		Name: name,
+		TestSuiteInitializer: integration.InitializeTestSuite(func() openfeature.FeatureProvider {
+			return flagd.NewProvider(providerOptions...)
+		}),
+		ScenarioInitializer: integration.InitializeEvaluationScenario,
+		Options: &godog.Options{
+			Format:   "pretty",
+			Paths:    []string{"../../spec/specification/assets/gherkin/evaluation.feature"},
+			TestingT: t, // Testing instance that will run subtests.
+			Strict:   true,
+		},
+	}
+
+	if testSuite.Run() != 0 {
+		t.Fatal("non-zero status returned, failed to run evaluation tests")
+	}
+}
diff --git a/test/integration/go.mod b/test/integration/go.mod
@@ -7,7 +7,7 @@ toolchain go1.21.4
 require (
 	github.com/cucumber/godog v0.14.0
 	github.com/open-feature/go-sdk v1.10.0
-	github.com/open-feature/go-sdk-contrib/providers/flagd v0.1.22
+	github.com/open-feature/go-sdk-contrib/providers/flagd v0.2.3
 	github.com/open-feature/go-sdk-contrib/tests/flagd v1.4.1
 )
 

diff --git a/test/integration/json_evaluator_test.go b/test/integration/json_evaluator_test.go
@@ -38,3 +38,34 @@ func TestJsonEvaluator(t *testing.T) {
 		t.Fatal("non-zero status returned, failed to run evaluation tests")
 	}
 }
+
+func TestJsonEvaluatorUsingEnvoy(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+
+	flag.Parse()
+
+	name := "flagd-json-evaluator-envoy.feature"
+	providerOptions := []flagd.ProviderOption{
+		flagd.WithTargetUri("envoy://localhost:9211/flagd-sync.service"),
+	}
+
+	testSuite := godog.TestSuite{
+		Name: name,
+		TestSuiteInitializer: integration.InitializeFlagdJsonTestSuite(func() openfeature.FeatureProvider {
+			return flagd.NewProvider(providerOptions...)
+		}),
+		ScenarioInitializer: integration.InitializeFlagdJsonScenario,
+		Options: &godog.Options{
+			Format:   "pretty",
+			Paths:    []string{"../../test-harness/gherkin/flagd-json-evaluator.feature"},
+			TestingT: t, // Testing instance that will run subtests.
+			Strict:   true,
+		},
+	}
+
+	if testSuite.Run() != 0 {
+		t.Fatal("non-zero status returned, failed to run evaluation tests")
+	}
+}