Skip to content

feat!: use new eval/sync protos (requires flagd v0.7.3+) #451

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

Merged
merged 1 commit into from
Feb 22, 2024
Merged

feat!: use new eval/sync protos (requires flagd v0.7.3+) #451

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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ jobs:
services:
# flagd-testbed for flagd-provider e2e tests
flagd:
image: ghcr.io/open-feature/flagd-testbed:v0.4.11
image: ghcr.io/open-feature/flagd-testbed:v0.5.1
ports:
- 8013:8013
# sync-testbed for flagd-provider e2e tests
sync:
image: ghcr.io/open-feature/sync-testbed:v0.4.11
image: ghcr.io/open-feature/sync-testbed:v0.5.1
ports:
- 9090:9090
steps:
Expand Down
40 changes: 21 additions & 19 deletions providers/flagd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
module github.com/open-feature/go-sdk-contrib/providers/flagd

go 1.20
go 1.21

toolchain go1.21.4

require (
buf.build/gen/go/open-feature/flagd/connectrpc/go v1.12.0-20231031123731-ac2ec0f39838.1
buf.build/gen/go/open-feature/flagd/grpc/go v1.3.0-20231031123731-ac2ec0f39838.2
buf.build/gen/go/open-feature/flagd/protocolbuffers/go v1.31.0-20231031123731-ac2ec0f39838.2
connectrpc.com/connect v1.14.0
buf.build/gen/go/open-feature/flagd/connectrpc/go v1.15.0-20240215170432-1e611e2999cc.1
buf.build/gen/go/open-feature/flagd/grpc/go v1.3.0-20240215170432-1e611e2999cc.2
buf.build/gen/go/open-feature/flagd/protocolbuffers/go v1.32.0-20240215170432-1e611e2999cc.1
connectrpc.com/connect v1.15.0
connectrpc.com/otelconnect v0.7.0
github.com/cucumber/godog v0.13.0
github.com/cucumber/godog v0.14.0
github.com/go-logr/logr v1.4.1
github.com/google/go-cmp v0.6.0
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/open-feature/flagd/core v0.7.4
github.com/open-feature/go-sdk v1.9.0
github.com/open-feature/flagd/core v0.8.0
github.com/open-feature/go-sdk v1.10.0
github.com/open-feature/go-sdk-contrib/tests/flagd v1.4.0
go.uber.org/mock v0.3.0
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
golang.org/x/net v0.19.0
google.golang.org/grpc v1.60.1
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3
golang.org/x/net v0.21.0
google.golang.org/grpc v1.61.1
google.golang.org/protobuf v1.32.0
sigs.k8s.io/controller-runtime v0.16.3
)
Expand All @@ -43,28 +45,28 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/open-feature/schemas v0.2.8 // indirect
github.com/open-feature/flagd-schemas v0.2.9-0.20240215170351-8c72c14eebff // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/twmb/murmur3 v1.1.8 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.opentelemetry.io/otel v1.23.1 // indirect
go.opentelemetry.io/otel/metric v1.23.1 // indirect
go.opentelemetry.io/otel/trace v1.23.1 // indirect
go.uber.org/goleak v1.3.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apimachinery v0.29.0 // indirect
k8s.io/apimachinery v0.29.2 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
106 changes: 62 additions & 44 deletions providers/flagd/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions providers/flagd/pkg/service/in_process/service_grpc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package process

import (
"buf.build/gen/go/open-feature/flagd/grpc/go/sync/v1/syncv1grpc"
v1 "buf.build/gen/go/open-feature/flagd/protocolbuffers/go/sync/v1"
"buf.build/gen/go/open-feature/flagd/grpc/go/flagd/sync/v1/syncv1grpc"
v1 "buf.build/gen/go/open-feature/flagd/protocolbuffers/go/flagd/sync/v1"
"context"
"fmt"
"github.com/open-feature/go-sdk/openfeature"
Expand Down Expand Up @@ -43,7 +43,6 @@ func TestInProcessProviderEvaluation(t *testing.T) {
mockResponses: []*v1.SyncFlagsResponse{
{
FlagConfiguration: flagRsp,
State: v1.SyncState_SYNC_STATE_ALL,
},
},
fetchAllFlagsResponse: nil,
Expand Down Expand Up @@ -142,6 +141,10 @@ func (b *bufferedServer) FetchAllFlags(_ context.Context, _ *v1.FetchAllFlagsReq
return b.fetchAllFlagsResponse, b.fetchAllFlagsError
}

func (b *bufferedServer) GetMetadata(_ context.Context, _ *v1.GetMetadataRequest) (*v1.GetMetadataResponse, error) {
return &v1.GetMetadataResponse{}, nil
}

// serve serves a bufferedServer. This is a blocking call
func serve(bServer *bufferedServer) {
server := grpc.NewServer()
Expand Down
2 changes: 1 addition & 1 deletion providers/flagd/pkg/service/rpc/mock_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package rpc

import (
v1 "buf.build/gen/go/open-feature/flagd/protocolbuffers/go/schema/v1"
v1 "buf.build/gen/go/open-feature/flagd/protocolbuffers/go/flagd/evaluation/v1"
"connectrpc.com/connect"
"context"
)
Expand Down
4 changes: 2 additions & 2 deletions providers/flagd/pkg/service/rpc/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"os"
"time"

schemaConnectV1 "buf.build/gen/go/open-feature/flagd/connectrpc/go/schema/v1/schemav1connect"
schemaV1 "buf.build/gen/go/open-feature/flagd/protocolbuffers/go/schema/v1"
schemaConnectV1 "buf.build/gen/go/open-feature/flagd/connectrpc/go/flagd/evaluation/v1/evaluationv1connect"
schemaV1 "buf.build/gen/go/open-feature/flagd/protocolbuffers/go/flagd/evaluation/v1"
"connectrpc.com/connect"
"connectrpc.com/otelconnect"
"github.com/go-logr/logr"
Expand Down
4 changes: 2 additions & 2 deletions providers/flagd/pkg/service/rpc/service_evaluation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"
"testing"

schemaConnectV1 "buf.build/gen/go/open-feature/flagd/connectrpc/go/schema/v1/schemav1connect"
v1 "buf.build/gen/go/open-feature/flagd/protocolbuffers/go/schema/v1"
schemaConnectV1 "buf.build/gen/go/open-feature/flagd/connectrpc/go/flagd/evaluation/v1/evaluationv1connect"
v1 "buf.build/gen/go/open-feature/flagd/protocolbuffers/go/flagd/evaluation/v1"
"github.com/go-logr/logr"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down
2 changes: 1 addition & 1 deletion providers/flagd/pkg/service/rpc/service_eventing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package rpc

import (
schemaV1 "buf.build/gen/go/open-feature/flagd/protocolbuffers/go/schema/v1"
schemaV1 "buf.build/gen/go/open-feature/flagd/protocolbuffers/go/flagd/evaluation/v1"
"context"
"errors"
"github.com/open-feature/go-sdk-contrib/providers/flagd/internal/cache"
Expand Down