Merge branch 'main' into bugfix/agent-ngt/remove-invalid-index-hung

Signed-off-by: kpango <[email protected]>

Makefile

@@ -369,6 +369,7 @@ clean-generated:
 	mv $(ROOTDIR)/apis/grpc/v1/vald/vald.go $(TEMP_DIR)/vald.go
 	mv $(ROOTDIR)/apis/grpc/v1/agent/core/agent.go $(TEMP_DIR)/agent.go
 	mv $(ROOTDIR)/apis/grpc/v1/payload/interface.go $(TEMP_DIR)/interface.go
+	mv $(ROOTDIR)/apis/grpc/v1/mirror/mirror.go $(TEMP_DIR)/mirror.go
 	rm -rf \
 		$(ROOTDIR)/*.log \
 		$(ROOTDIR)/*.svg \
@@ -384,6 +385,8 @@ clean-generated:
 	mv $(TEMP_DIR)/agent.go $(ROOTDIR)/apis/grpc/v1/agent/core/agent.go
 	mkdir -p $(ROOTDIR)/apis/grpc/v1/payload
 	mv $(TEMP_DIR)/interface.go $(ROOTDIR)/apis/grpc/v1/payload/interface.go
+	mkdir -p $(ROOTDIR)/apis/grpc/v1/mirror
+	mv $(TEMP_DIR)/mirror.go $(ROOTDIR)/apis/grpc/v1/mirror/mirror.go
 
 .PHONY: license
 ## add license to files

README.md

@@ -237,10 +237,16 @@ Docker images tagging policy:
 ## Vald Users
 
 <p align="center">
-    <img src="./assets/image/vald-users/yahoojapan.svg" alt="yahoojapan" width="30%" />
-&nbsp; &nbsp; &nbsp; &nbsp;
-    <img src="./assets/image/vald-users/japansearch_color.png.webp" alt="jpsearch" />
-  </ul>
+  <a href="https://www.lycorp.co.jp/en/" target="_blank">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="./assets/image/vald-users/lycorp_white.png">
+    <source media="(prefers-color-scheme: light)" srcset="./assets/image/vald-users/lycorp_black.png">
+    <img alt="LY" src="./assets/image/vald-users/lycorp.png" width="150" height="120">
+  </picture>
+  </a>
+  <a href="https://jpsearch.go.jp/" target="_blank">
+    <img src="./assets/image/vald-users/japansearch_color.png" alt="jpsearch" width="150" height="120"/>
+  </a>
 </p>
 
 ## Contribution

apis/grpc/v1/mirror/mirror.go

@@ -0,0 +1,23 @@
+//
+// Copyright (C) 2019-2024 vdaas.org vald team <[email protected]>
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// You may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// Package mirror provides vald server interface
+package mirror
+
+const (
+	RPCServiceName  = "Mirror"
+	RegisterRPCName = "Register"
+)

apis/grpc/v1/vald/vald.go

@@ -18,7 +18,6 @@
 package vald
 
 import (
-	"github.com/vdaas/vald/apis/grpc/v1/mirror"
 	grpc "google.golang.org/grpc"
 )
 
@@ -36,11 +35,6 @@ type ServerWithFilter interface {
 	FilterServer
 }
 
-type ServerWithMirror interface {
-	Server
-	mirror.MirrorServer
-}
-
 type UnimplementedValdServer struct {
 	UnimplementedInsertServer
 	UnimplementedUpdateServer
@@ -55,11 +49,6 @@ type UnimplementedValdServerWithFilter struct {
 	UnimplementedFilterServer
 }
 
-type UnimplementedValdServerWithMirror struct {
-	UnimplementedValdServer
-	mirror.UnimplementedMirrorServer
-}
-
 type Client interface {
 	InsertClient
 	UpdateClient
@@ -74,11 +63,6 @@ type ClientWithFilter interface {
 	FilterClient
 }
 
-type ClientWithMirror interface {
-	Client
-	mirror.MirrorClient
-}
-
 const PackageName = "vald.v1"
 
 const (
@@ -89,7 +73,6 @@ const (
 	RemoveRPCServiceName = "Remove"
 	ObjectRPCServiceName = "Object"
 	FilterRPCServiceName = "Filter"
-	MirrorRPCServiceName = "Mirror"
 )
 
 const (
@@ -143,8 +126,6 @@ const (
 	GetTimestampRPCName     = "GetTimestamp"
 	StreamGetObjectRPCName  = "StreamGetObject"
 	StreamListObjectRPCName = "StreamListObject"
-
-	RegisterRPCName = "Register"
 )
 
 type client struct {
@@ -156,11 +137,6 @@ type client struct {
 	ObjectClient
 }
 
-type clientWithMirror struct {
-	Client
-	mirror.MirrorClient
-}
-
 func RegisterValdServer(s *grpc.Server, srv Server) {
 	RegisterInsertServer(s, srv)
 	RegisterUpdateServer(s, srv)
@@ -175,11 +151,6 @@ func RegisterValdServerWithFilter(s *grpc.Server, srv ServerWithFilter) {
 	RegisterFilterServer(s, srv)
 }
 
-func RegisterValdServerWithMirror(s *grpc.Server, srv ServerWithMirror) {
-	RegisterValdServer(s, srv)
-	mirror.RegisterMirrorServer(s, srv)
-}
-
 func NewValdClient(conn *grpc.ClientConn) Client {
 	return &client{
 		NewInsertClient(conn),
@@ -190,10 +161,3 @@ func NewValdClient(conn *grpc.ClientConn) Client {
 		NewObjectClient(conn),
 	}
 }
-
-func NewValdClientWithMirror(conn *grpc.ClientConn) ClientWithMirror {
-	return &clientWithMirror{
-		Client:       NewValdClient(conn),
-		MirrorClient: mirror.NewMirrorClient(conn),
-	}
-}

internal/client/v1/client/mirror/mirror.go

@@ -18,7 +18,6 @@ import (
 
 	"github.com/vdaas/vald/apis/grpc/v1/mirror"
 	"github.com/vdaas/vald/apis/grpc/v1/payload"
-	"github.com/vdaas/vald/apis/grpc/v1/vald"
 	"github.com/vdaas/vald/internal/errors"
 	"github.com/vdaas/vald/internal/net/grpc"
 	"github.com/vdaas/vald/internal/observability/trace"
@@ -69,7 +68,7 @@ func (c *client) GRPCClient() grpc.Client {
 }
 
 func (c *client) Register(ctx context.Context, in *payload.Mirror_Targets, opts ...grpc.CallOption) (res *payload.Mirror_Targets, err error) {
-	ctx, span := trace.StartSpan(grpc.WrapGRPCMethod(ctx, "internal/client/"+vald.RegisterRPCName), apiName+"/"+vald.RegisterRPCName)
+	ctx, span := trace.StartSpan(grpc.WrapGRPCMethod(ctx, "internal/client/"+mirror.RegisterRPCName), apiName+"/"+mirror.RegisterRPCName)
 	defer func() {
 		if span != nil {
 			span.End()

internal/test/mock/client/mirror_client_mock.go

@@ -16,13 +16,15 @@ package client
 import (
 	"context"
 
+	"github.com/vdaas/vald/apis/grpc/v1/mirror"
 	"github.com/vdaas/vald/apis/grpc/v1/payload"
 	"github.com/vdaas/vald/apis/grpc/v1/vald"
 	"github.com/vdaas/vald/internal/net/grpc"
 )
 
 type MirrorClientMock struct {
-	vald.ClientWithMirror
+	vald.Client
+	mirror.MirrorClient
 
 	InsertFunc            func(ctx context.Context, in *payload.Insert_Request, opts ...grpc.CallOption) (*payload.Object_Location, error)
 	UpdateFunc            func(ctx context.Context, in *payload.Update_Request, opts ...grpc.CallOption) (*payload.Object_Location, error)