feat!: Updated service to use connect

README.md

@@ -36,13 +36,13 @@ This now provides an accessible http or [https](#https) endpoint for flag evalua
 Command:
 
 ```sh
-curl -X POST "localhost:8013/flags/myBoolFlag/resolve/boolean"
+curl -X POST "localhost:8013/schema.v1.Service/ResolveBoolean" -d '{"flagKey":"myBoolFlag","context":{}}' -H "Content-Type: application/json"
 ```
 
 Result:
 
 ```sh
-{"value":true,"reason":"STATIC","variant":"on"}
+{"value":true,"reason":"TARGETING_MATCH","variant":"on"}
 ```
 
 <br />
@@ -52,7 +52,7 @@ Result:
 Command:
 
 ```sh
-curl -X POST "localhost:8013/flags/myStringFlag/resolve/string"
+curl -X POST "localhost:8013/schema.v1.Service/ResolveString" -d '{"flagKey":"myStringFlag","context":{}}' -H "Content-Type: application/json"
 ```
 
 Result:
@@ -68,7 +68,7 @@ Result:
 Command:
 
 ```sh
-curl -X POST "localhost:8013/flags/myIntFlag/resolve/int"
+curl -X POST "localhost:8013/schema.v1.Service/ResolveInt" -d '{"flagKey":"myIntFlag","context":{}}' -H "Content-Type: application/json"
 ```
 
 Result:
@@ -86,7 +86,7 @@ Result:
 Command:
 
 ```sh
-curl -X POST "localhost:8013/flags/myFloatFlag/resolve/float"
+curl -X POST "localhost:8013/schema.v1.Service/ResolveFloat" -d '{"flagKey":"myFloatFlag","context":{}}' -H "Content-Type: application/json"
 ```
 
 Result:
@@ -102,7 +102,7 @@ Result:
 Command:
 
 ```sh
-curl -X POST "localhost:8013/flags/myObjectFlag/resolve/object"
+curl -X POST "localhost:8013/schema.v1.Service/ResolveObject" -d '{"flagKey":"myObjectFlag","context":{}}' -H "Content-Type: application/json"
 ```
 
 Result:
@@ -118,7 +118,7 @@ Result:
 Command:
 
 ```sh
-curl -X POST "localhost:8013/flags/isColorYellow/resolve/boolean" -d '{"color": "yellow"}'
+curl -X POST "localhost:8013/schema.v1.Service/ResolveBoolean" -d '{"flagKey":"isColorYellow","context":{"color":"yellow"}}' -H "Content-Type: application/json"
 ```
 
 Result:
@@ -136,13 +136,13 @@ A type mismatch error is returned when the resolved value of a flag does not mat
 Command:
 
 ```sh
-curl -X POST "localhost:8013/flags/myBoolFlag/resolve/string"
+curl -X POST "localhost:8013/schema.v1.Service/ResolveString" -d '{"flagKey":"myBoolFlag","context":{}}' -H "Content-Type: application/json"
 ```
 
 Result:
 
 ```sh
-{"error_code":"TYPE_MISMATCH","reason":"ERROR"}
+{"code":"invalid_argument","message":"TYPE_MISMATCH"}
 ```
 
 <br />
@@ -154,13 +154,13 @@ The flag not found error is returned when flag key in the request doesn't match
 Command:
 
 ```sh
-curl -X POST "localhost:8013/flags/aMissingFlag/resolve/string"
+curl -X POST "localhost:8013/schema.v1.Service/ResolveBoolean" -d '{"flagKey":"aMissingFlag","context":{}}' -H "Content-Type: application/json"
 ```
 
 Result:
 
 ```sh
-{"error_code":"FLAG_NOT_FOUND","reason":"ERROR"}
+{"code":"not_found","message":"FLAG_NOT_FOUND"}
 ```
 
 ### https
@@ -243,7 +243,7 @@ returns
 whereas
 
 ```shell
-curl -X POST "localhost:8013/flags/isColorYellow/resolve/boolean" -d '{"color": "white"}'
+curl -X POST "localhost:8013/schema.v1.Service/ResolveBoolean" -d '{"flagKey":"isColorYellow","context":{"color":"white"}}' -H "Content-Type: application/json"
 ```
 
 returns

cmd/start.go

@@ -11,16 +11,15 @@ import (
 )
 
 const (
-	portFlagName            = "port"
-	serviceProviderFlagName = "service-provider"
-	socketPathFlagName      = "socket-path"
-	syncProviderFlagName    = "sync-provider"
-	providerArgsFlagName    = "sync-provider-args"
-	evaluatorFlagName       = "evaluator"
-	serverCertPathFlagName  = "server-cert-path"
-	serverKeyPathFlagName   = "server-key-path"
-	uriFlagName             = "uri"
-	bearerTokenFlagName     = "bearer-token"
+	portFlagName           = "port"
+	socketPathFlagName     = "socket-path"
+	syncProviderFlagName   = "sync-provider"
+	providerArgsFlagName   = "sync-provider-args"
+	evaluatorFlagName      = "evaluator"
+	serverCertPathFlagName = "server-cert-path"
+	serverKeyPathFlagName  = "server-key-path"
+	uriFlagName            = "uri"
+	bearerTokenFlagName    = "bearer-token"
 )
 
 func init() {
@@ -34,7 +33,6 @@ func init() {
 	flags.StringP(socketPathFlagName, "d", "", "Flagd socket path. "+
 		"With grpc the service will become available on this address. "+
 		"With http(s) the grpc-gateway proxy will use this address internally.")
-	flags.StringP(serviceProviderFlagName, "s", "http", "Set a service provider e.g. http or grpc")
 	flags.StringP(
 		syncProviderFlagName, "y", "filepath", "Set a sync provider e.g. filepath or remote",
 	)
@@ -52,7 +50,6 @@ func init() {
 
 	_ = viper.BindPFlag(portFlagName, flags.Lookup(portFlagName))
 	_ = viper.BindPFlag(socketPathFlagName, flags.Lookup(socketPathFlagName))
-	_ = viper.BindPFlag(serviceProviderFlagName, flags.Lookup(serviceProviderFlagName))
 	_ = viper.BindPFlag(syncProviderFlagName, flags.Lookup(syncProviderFlagName))
 	_ = viper.BindPFlag(providerArgsFlagName, flags.Lookup(providerArgsFlagName))
 	_ = viper.BindPFlag(evaluatorFlagName, flags.Lookup(evaluatorFlagName))
@@ -78,7 +75,6 @@ var startCmd = &cobra.Command{
 		}
 		// Build Runtime -----------------------------------------------------------
 		rt, err := runtime.FromConfig(runtime.Config{
-			ServiceProvider:   viper.GetString(serviceProviderFlagName),
 			ServicePort:       viper.GetInt32(portFlagName),
 			ServiceSocketPath: viper.GetString(socketPathFlagName),
 			ServiceCertPath:   viper.GetString(serverCertPathFlagName),

docs/configuration.md

@@ -12,7 +12,6 @@ Supported flags are as follows (result of running `./flagd start --help`):
   -p, --port int32                Port to listen on (default 8013)
   -c, --server-cert-path string   Server side tls certificate path
   -k, --server-key-path string    Server side tls key path
-  -s, --service-provider string   Set a service provider e.g. http or grpc (default "http")
   -a, --sync-provider-args        Sync provider arguments as key values separated by =
   -d, --socket-path string        Set the flagd socket path. With grpc the service will become available on this address. With http(s) the grpc-gateway proxy will use this address internally
   -y, --sync-provider string      Set a sync provider e.g. filepath or remote (default "filepath")

docs/configuration.md.orig

@@ -0,0 +1,50 @@
+### Configuration
+
+`flagd` supports configuration via config file, environment variables and flags. In cases of conflict, flags have the
+highest priority, followed by environment variables and finally config file.
+
+Supported flags are as follows (result of running `./flagd start --help`):
+
+```
+  -b, --bearer-token string       Set a bearer token to use for remote sync
+  -e, --evaluator string          Set an evaluator e.g. json (default "json")
+  -h, --help                      help for start
+  -p, --port int32                Port to listen on (default 8013)
+  -c, --server-cert-path string   Server side tls certificate path
+  -k, --server-key-path string    Server side tls key path
+<<<<<<< HEAD
+=======
+  -s, --service-provider string   Set a service provider e.g. http or grpc (default "http")
+  -a, --sync-provider-args        Sync provider arguments as key values separated by =
+>>>>>>> 82278c7cf08cc6b50f49ab500caf6f9003fc0823
+  -d, --socket-path string        Set the flagd socket path. With grpc the service will become available on this address. With http(s) the grpc-gateway proxy will use this address internally
+  -y, --sync-provider string      Set a sync provider e.g. filepath or remote (default "filepath")
+  -f, --uri strings               Set a sync provider uri to read data from this can be a filepath or url. Using multiple providers is supported where collisions between flags with the same key, the later will be used.
+```
+
+Environment variable keys are uppercased, prefixed with `FLAGD_` and all `-` are replaced with `_`. For example,
+`sync-provider` in environment variable form is `FLAGD_SYNC_PROVIDER`.
+
+Config file expects the keys to have the exact naming as the flags.
+
+
+### Customising sync providers
+
+Custom sync providers can be used to provide flag evaluation logic.
+
+#### Kubernetes provider 
+
+The Kubernetes provider allows flagD to connect to a Kubernetes cluster and evaluate flags against a specified FeatureFlagConfiguration resource as defined within the [open-feature-operator](https://github.com/open-feature/open-feature-operator/blob/main/apis/core/v1alpha1/featureflagconfiguration_types.go) spec.
+
+To use an existing FeatureFlagConfiguration custom resource, start flagD with the following command:
+
+```shell
+flagd start --sync-provider=kubernetes --sync-provider-args=featureflagconfiguration=my-example --sync-provider-args=namespace=default
+```
+
+An additional optional flag `refreshtime` can be applied to shorten the cache refresh when using the Kubernetes provider ( The default is 5s ). As an example: 
+
+```shell
+flagd start --sync-provider=kubernetes --sync-provider-args=featureflagconfiguration=my-example --sync-provider-args=namespace=default
+--sync-provider-args=refreshtime=1s
+```

docs/fractional_evaluation.md

@@ -45,9 +45,9 @@ Flags defined as such:
 will return variant `red` 50% of the time, `blue` 20% of the time & `green` 30% of the time.
 
 ```shell
-$ curl -X POST "localhost:8013/flags/headerColor/resolve/string" -d '{"email": "foo@bar.com"}'
+$ curl -X POST "localhost:8013/schema.v1.Service/ResolveString" -d ''{"flagKey":"headerColor","context":{"email": "foo@bar.com"}}'' -H "Content-Type: application/json"
 {"value":"#0000FF","reason":"TARGETING_MATCH","variant":"blue"}%
 
-$ curl -X POST "localhost:8013/flags/headerColor/resolve/string" -d '{"email": "foo@test.com"}'
+$ curl -X POST "localhost:8013/schema.v1.Service/ResolveString" -d ''{"flagKey":"headerColor","context":{"email": "foo@test.com"}}'' -H "Content-Type: application/json"
 {"value":"#00FF00","reason":"TARGETING_MATCH","variant":"green"}%
 ```

docs/http_int_response.md

@@ -4,7 +4,7 @@
 Why is my `int` response a `string`?
 Command:
 ```sh
-curl -X POST "localhost:8013/flags/myIntFlag/resolve/int"
+curl -X POST "localhost:8013/schema.v1.Service/ResolveInt" -d '{"flagKey":"myIntFlag","context":{}}' -H "Content-Type: application/json"
 ```
 Result:
 ```sh
@@ -14,9 +14,9 @@ When interacting directly with the flagD http(s) api and requesting an `int` the
 <br />
 Command:
 ```sh
-curl -X POST "localhost:8013/flags/myIntFlag/resolve/float"
+curl -X POST "localhost:8013/schema.v1.Service/ResolveFloat" -d '{"flagKey":"myIntFlag","context":{}}' -H "Content-Type: application/json"
 ```
 Result:
 ```sh
-{"value":1.23,"reason":"STATIC","variant":"one"}
+{"value":1,"reason":"STATIC","variant":"one"}
 ```

go.mod

@@ -3,25 +3,26 @@ module github.com/open-feature/flagd
 go 1.18
 
 require (
+	github.com/bufbuild/connect-go v0.4.0
 	github.com/deepmap/oapi-codegen v1.11.0
 	github.com/diegoholiveira/jsonlogic/v3 v3.2.3
 	github.com/dimiro1/banner v1.1.0
 	github.com/fsnotify/fsnotify v1.5.4
 	github.com/go-chi/chi/v5 v5.0.7
 	github.com/golang/mock v1.6.0
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.1
 	github.com/mattn/go-colorable v0.1.12
 	github.com/open-feature/open-feature-operator v0.0.10-0.20220826061622-a6421d66936a
 	github.com/open-feature/schemas v0.0.0-20220809125333-185e3bd77775
 	github.com/robfig/cron v1.2.0
+	github.com/rs/cors v1.8.2
 	github.com/sirupsen/logrus v1.8.1
-	github.com/soheilhy/cmux v0.1.5
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/viper v1.12.0
 	github.com/stretchr/testify v1.7.4
 	github.com/xeipuuv/gojsonschema v1.2.0
 	github.com/zeebo/xxh3 v1.0.2
-	go.buf.build/open-feature/flagd-server/open-feature/flagd v1.1.2
+	go.buf.build/open-feature/flagd-connect/open-feature/flagd v1.1.3
+	golang.org/x/net v0.0.0-20220909164309-bea034e7d591
 	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
 	google.golang.org/grpc v1.48.0
 	google.golang.org/protobuf v1.28.1
@@ -73,7 +74,6 @@ require (
 	github.com/subosito/gotenv v1.3.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
 	golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect