77	"net/url" 
88	"strings" 
99
10- 	v1pb "buf.build/gen/go/ bytebase/bytebase/protocolbuffers/ go/v1" 
10+ 	v1pb "github.com/ bytebase/bytebase/proto/generated- go/v1" 
1111	"google.golang.org/protobuf/encoding/protojson" 
1212)
1313
@@ -24,8 +24,7 @@ func (c *client) GetDatabase(ctx context.Context, databaseName string) (*v1pb.Da
2424	}
2525
2626	var  res  v1pb.Database 
27- 	err  =  ProtojsonUnmarshaler .Unmarshal (body , & res )
28- 	if  err  !=  nil  {
27+ 	if  err  :=  ProtojsonUnmarshaler .Unmarshal (body , & res ); err  !=  nil  {
2928		return  nil , err 
3029	}
3130
@@ -50,8 +49,7 @@ func (c *client) ListDatabase(ctx context.Context, instanceID, filter string) (*
5049	}
5150
5251	var  res  v1pb.ListDatabasesResponse 
53- 	err  =  ProtojsonUnmarshaler .Unmarshal (body , & res )
54- 	if  err  !=  nil  {
52+ 	if  err  :=  ProtojsonUnmarshaler .Unmarshal (body , & res ); err  !=  nil  {
5553		return  nil , err 
5654	}
5755
@@ -65,14 +63,6 @@ func (c *client) UpdateDatabase(ctx context.Context, patch *v1pb.Database, updat
6563		return  nil , err 
6664	}
6765
68- 	// updateMask := []string{} 
69- 	// if patch.Project != nil { 
70- 	// 	updateMask = append(updateMask, "project") 
71- 	// } 
72- 	// if patch.Labels != nil { 
73- 	// 	updateMask = append(updateMask, "labels") 
74- 	// } 
75- 
7666	req , err  :=  http .NewRequestWithContext (ctx , "PATCH" , fmt .Sprintf ("%s/%s/%s?update_mask=%s" , c .url , c .version , patch .Name , strings .Join (updateMasks , "," )), strings .NewReader (string (payload )))
7767	if  err  !=  nil  {
7868		return  nil , err 
@@ -84,8 +74,7 @@ func (c *client) UpdateDatabase(ctx context.Context, patch *v1pb.Database, updat
8474	}
8575
8676	var  res  v1pb.Database 
87- 	err  =  ProtojsonUnmarshaler .Unmarshal (body , & res )
88- 	if  err  !=  nil  {
77+ 	if  err  :=  ProtojsonUnmarshaler .Unmarshal (body , & res ); err  !=  nil  {
8978		return  nil , err 
9079	}
9180
0 commit comments