Skip to content

Commit

Permalink
monorepo change structure
Browse files Browse the repository at this point in the history
  • Loading branch information
@vahidlazio
vahidlazio committed May 23, 2024
1 parent 2f6be28 commit 58414ce
Show file tree
Hide file tree
Showing 28 changed files with 86 additions and 38 deletions.
8 changes: 8 additions & 0 deletions .idea/.gitignore
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/confidence-openfeature-provider-go.iml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/google-java-format.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions confidence/go.mod
View file

This file was deleted.

10 changes: 0 additions & 10 deletions confidence/go.sum
View file

This file was deleted.

4 changes: 2 additions & 2 deletions demo-open-feature/GoDemoApp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/google/uuid"
"github.com/open-feature/go-sdk/openfeature"
c "github.com/spotify/confidence-sdk-go/confidence"
p "github.com/spotify/confidence-sdk-go/provider"
c "github.com/spotify/confidence-sdk-go/pkg/confidence"
p "github.com/spotify/confidence-sdk-go/pkg/provider"
)

func main() {
Expand Down
8 changes: 2 additions & 6 deletions demo-open-feature/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@ go 1.22.2
require (
github.com/google/uuid v1.6.0
github.com/open-feature/go-sdk v1.10.0
github.com/spotify/confidence-sdk-go/confidence v1.0.0
github.com/spotify/confidence-sdk-go/provider v0.1.7
github.com/spotify/confidence-sdk-go v0.2.2-0.20240523155444-45dc4c1525bf
)

replace github.com/spotify/confidence-sdk-go/provider v0.1.7 => ../provider

replace github.com/spotify/confidence-sdk-go/confidence v1.0.0 => ../confidence

require (
github.com/go-logr/logr v1.4.1 // indirect
github.com/spotify/confidence-sdk-go/confidence v0.0.0-20240523131533-2f6be28355f0 // indirect
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
)
15 changes: 15 additions & 0 deletions demo-open-feature/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
github.com/cucumber/gherkin/go/v26 v26.2.0/go.mod h1:t2GAPnB8maCT4lkHL99BDCVNzCh1d7dBhCLt150Nr/0=
github.com/cucumber/godog v0.14.0/go.mod h1:FX3rzIDybWABU4kuIXLZ/qtqEe1Ac5RdXmqvACJOces=
github.com/cucumber/messages/go/v21 v21.0.1/go.mod h1:zheH/2HS9JLVFukdrsPWoPdmUtmYQAQPLk7w5vWsk5s=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/gofrs/uuid v4.3.1+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/open-feature/go-sdk v1.10.0 h1:druQtYOrN+gyz3rMsXp0F2jW1oBXJb0V26PVQnUGLbM=
github.com/open-feature/go-sdk v1.10.0/go.mod h1:+rkJhLBtYsJ5PZNddAgFILhRAAxwrJ32aU7UEUm4zQI=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spotify/confidence-sdk-go v0.2.2-0.20240523155444-45dc4c1525bf h1:fVeVQLC/sfoqtu3sGyazaCWQneKU+vc44EF0kCozkl4=
github.com/spotify/confidence-sdk-go v0.2.2-0.20240523155444-45dc4c1525bf/go.mod h1:TYBqx3F0AZO7HZF8Nkf2dWnvVHH91ICo0W6e9wmLsk4=
github.com/spotify/confidence-sdk-go/confidence v0.0.0-20240523131533-2f6be28355f0 h1:AumcdzoJZ7v7I4LnT0bZhNI0GTHgp8npL25LqlO3Lmo=
github.com/spotify/confidence-sdk-go/confidence v0.0.0-20240523131533-2f6be28355f0/go.mod h1:+KRet032Z5tsLOsVz+a2WN1hvz346R9atyplffpjJnM=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2 changes: 1 addition & 1 deletion demo/GoDemoApp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"context"
"fmt"
c "github.com/spotify/confidence-sdk-go/confidence"
c "github.com/spotify/confidence-sdk-go/pkg/confidence"
)

func main() {
Expand Down
4 changes: 1 addition & 3 deletions demo/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ module demo

go 1.22.2

require github.com/spotify/confidence-sdk-go/confidence v1.0.0

replace github.com/spotify/confidence-sdk-go/confidence v1.0.0 => ../confidence
require github.com/spotify/confidence-sdk-go v0.2.2-0.20240523155258-4bbc177010cc
2 changes: 2 additions & 0 deletions demo/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/spotify/confidence-sdk-go v0.2.2-0.20240523155258-4bbc177010cc h1:CyQdom204c6w4UjbT63Otk3axZff4mEbeVDF/snvfas=
github.com/spotify/confidence-sdk-go v0.2.2-0.20240523155258-4bbc177010cc/go.mod h1:TYBqx3F0AZO7HZF8Nkf2dWnvVHH91ICo0W6e9wmLsk4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
Expand Down
6 changes: 2 additions & 4 deletions provider/go.mod → go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
module github.com/spotify/confidence-sdk-go/provider
module github.com/spotify/confidence-sdk-go

go 1.19

replace github.com/spotify/confidence-sdk-go/confidence v1.0.0 => ../confidence

require (
github.com/open-feature/go-sdk v1.10.0
github.com/spotify/confidence-sdk-go/confidence v1.0.0
github.com/spotify/confidence-sdk-go/confidence v0.0.0-20240523131533-2f6be28355f0
github.com/stretchr/testify v1.9.0
)

Expand Down
16 changes: 16 additions & 0 deletions provider/go.sum → go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,33 @@
github.com/cucumber/gherkin/go/v26 v26.2.0/go.mod h1:t2GAPnB8maCT4lkHL99BDCVNzCh1d7dBhCLt150Nr/0=
github.com/cucumber/godog v0.14.0/go.mod h1:FX3rzIDybWABU4kuIXLZ/qtqEe1Ac5RdXmqvACJOces=
github.com/cucumber/messages/go/v21 v21.0.1/go.mod h1:zheH/2HS9JLVFukdrsPWoPdmUtmYQAQPLk7w5vWsk5s=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/gofrs/uuid v4.3.1+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/open-feature/go-sdk v1.10.0 h1:druQtYOrN+gyz3rMsXp0F2jW1oBXJb0V26PVQnUGLbM=
github.com/open-feature/go-sdk v1.10.0/go.mod h1:+rkJhLBtYsJ5PZNddAgFILhRAAxwrJ32aU7UEUm4zQI=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spotify/confidence-sdk-go/confidence v0.0.0-20240523131533-2f6be28355f0 h1:AumcdzoJZ7v7I4LnT0bZhNI0GTHgp8npL25LqlO3Lmo=
github.com/spotify/confidence-sdk-go/confidence v0.0.0-20240523131533-2f6be28355f0/go.mod h1:+KRet032Z5tsLOsVz+a2WN1hvz346R9atyplffpjJnM=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
Expand Down
0 confidence/EventUploader.go → pkg/confidence/EventUploader.go
View file
File renamed without changes.
0 confidence/confidence.go → pkg/confidence/confidence.go
View file
File renamed without changes.
0 confidence/confidence_context_test.go → pkg/confidence/confidence_context_test.go
View file
File renamed without changes.
0 confidence/confidence_internal_test.go → pkg/confidence/confidence_internal_test.go
View file
File renamed without changes.
0 confidence/http_resolve_client.go → pkg/confidence/http_resolve_client.go
View file
File renamed without changes.
0 confidence/models.go → pkg/confidence/models.go
View file
File renamed without changes.
0 confidence/resolution_details.go → pkg/confidence/resolution_details.go
View file
File renamed without changes.
0 confidence/utils.go → pkg/confidence/utils.go
View file
File renamed without changes.
0 confidence/utils_test.go → pkg/confidence/utils_test.go
View file
File renamed without changes.
0 provider/modules.xml → pkg/provider/modules.xml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion provider/provider.go → pkg/provider/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package provider
import (
"context"
"github.com/open-feature/go-sdk/openfeature"
c "github.com/spotify/confidence-sdk-go/confidence"
c "github.com/spotify/confidence-sdk-go/pkg/confidence"
"reflect"
)

Expand Down
0 provider/provider_internal_test.go → pkg/provider/provider_internal_test.go
View file
File renamed without changes.

0 comments on commit 58414ce

Please sign in to comment.