Skip to content

Commit c704f95

Browse files
eccleseccles
authored
Standard service connection (#26)
Assets and PublicAssets proto interface has standard service connection AB#8170
1 parent ffbc326 commit c704f95

File tree

5 files changed

+90
-15
lines changed

5 files changed

+90
-15
lines changed

‎datatrails-common-api/assets/v2/assets/client.go

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package assets
2+
3+
import (
4+
"github.com/datatrails/go-datatrails-common/grpcclient"
5+
)
6+
7+
type ClientOption = grpcclient.ClientOption
8+
9+
type Client struct {
10+
g *grpcclient.Client
11+
Client AssetsClient
12+
}
13+
14+
func NewClient(log Logger, address string, opts ...ClientOption) *Client {
15+
return &Client{
16+
g: grpcclient.New(log, "assetsv2", address, opts...),
17+
}
18+
}
19+
20+
func (c *Client) Open() error {
21+
if c.Client != nil {
22+
return nil
23+
}
24+
err := c.g.Open()
25+
if err != nil {
26+
return err
27+
}
28+
c.Client = NewAssetsClient(c.g.Connector())
29+
return nil
30+
}
31+
32+
func (c *Client) Close() {
33+
c.g.Close()
34+
}
35+

‎datatrails-common-api/assets/v2/assets/logger.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package assets
2+
3+
import (
4+
"github.com/datatrails/go-datatrails-common/logger"
5+
)
6+
7+
type Logger = logger.Logger

‎datatrails-common-api/assets/v2/assets/publicclient.go

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package assets
2+
3+
import (
4+
"github.com/datatrails/go-datatrails-common/grpcclient"
5+
)
6+
7+
type PublicClient struct {
8+
g *grpcclient.Client
9+
Client PublicAssetsClient
10+
}
11+
12+
func NewPublicClient(log Logger, address string, opts ...ClientOption) *Client {
13+
return &Client{
14+
g: grpcclient.New(log, "publicassetsv2", address, opts...),
15+
}
16+
}
17+
18+
func (c *PublicClient) Open() error {
19+
if c.Client != nil {
20+
return nil
21+
}
22+
err := c.g.Open()
23+
if err != nil {
24+
return err
25+
}
26+
c.Client = NewPublicAssetsClient(c.g.Connector())
27+
return nil
28+
}
29+
30+
func (c *PublicClient) Close() {
31+
c.g.Close()
32+
}
33+

‎datatrails-common-api/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ go 1.22
1111
// replace github.com/datatrails/go-datatrails-common-api-gen => ./
1212

1313
require (
14-
github.com/datatrails/go-datatrails-common v0.10.2
14+
github.com/datatrails/go-datatrails-common v0.15.3
1515
github.com/envoyproxy/protoc-gen-validate v1.0.2
1616
github.com/google/uuid v1.4.0
1717
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1
1818
github.com/lyft/protoc-gen-star/v2 v2.0.3
1919
github.com/pseudomuto/protoc-gen-doc v1.5.1
2020
github.com/spf13/afero v1.3.3
21-
github.com/stretchr/testify v1.8.4
21+
github.com/stretchr/testify v1.9.0
2222
go.mongodb.org/mongo-driver v1.12.1
2323
google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4
2424
google.golang.org/grpc v1.59.0
@@ -54,10 +54,10 @@ require (
5454
go.uber.org/automaxprocs v1.5.3 // indirect
5555
go.uber.org/multierr v1.10.0 // indirect
5656
go.uber.org/zap v1.25.0 // indirect
57-
golang.org/x/crypto v0.16.0 // indirect
57+
golang.org/x/crypto v0.21.0 // indirect
5858
golang.org/x/mod v0.11.0 // indirect
59-
golang.org/x/net v0.17.0 // indirect
60-
golang.org/x/sys v0.15.0 // indirect
59+
golang.org/x/net v0.21.0 // indirect
60+
golang.org/x/sys v0.18.0 // indirect
6161
golang.org/x/text v0.14.0 // indirect
6262
golang.org/x/tools v0.10.0 // indirect
6363
google.golang.org/genproto v0.0.0-20231127180814-3a041ad873d4 // indirect

‎datatrails-common-api/go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ github.com/containerd/cgroups/v3 v3.0.1 h1:4hfGvu8rfGIwVIDd+nLzn/B9ZXx4BcCjzt5To
1414
github.com/containerd/cgroups/v3 v3.0.1/go.mod h1:/vtwk1VXrtoa5AaZLkypuOJgA/6DyPMZHJPGQNtlHnw=
1515
github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
1616
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
17-
github.com/datatrails/go-datatrails-common v0.10.2 h1:OnvayMGpeia3wHMrj26njuQlpsOvGjYOsHChvj6ErtQ=
18-
github.com/datatrails/go-datatrails-common v0.10.2/go.mod h1:LsPfbYoTEEdPnANm0+seLRX2OO7c5yF7tZw8499prAM=
17+
github.com/datatrails/go-datatrails-common v0.15.3 h1:GM45N4Gje6gWgcHzqYQP9LFRFn6MYma8PnGXvmXlW0o=
18+
github.com/datatrails/go-datatrails-common v0.15.3/go.mod h1:lVLYVw5o+Wj+z8sn8bJBzp9qBCdYQ0DUX91+R5Gn73Q=
1919
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2020
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2121
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -91,8 +91,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
9191
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
9292
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
9393
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
94-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
95-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
94+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
95+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
9696
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
9797
github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
9898
github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
@@ -116,8 +116,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
116116
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
117117
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
118118
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
119-
golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
120-
golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
119+
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
120+
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
121121
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
122122
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
123123
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -130,8 +130,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
130130
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
131131
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
132132
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
133-
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
134-
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
133+
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
134+
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
135135
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
136136
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
137137
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -145,8 +145,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
145145
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
146146
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
147147
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
148-
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
149-
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
148+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
149+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
150150
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
151151
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
152152
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

0 commit comments

Comments
 (0)