sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[full-ci] enhancement: use reva client pool selectors (#6452)

Browse Source 
* enhancement: use reva client pool selectors

register mock service to registry and pass tests

* enhancement: bump reva

* Fix a couple of linter issues

---------

Co-authored-by: Ralf Haferkamp <rhaferkamp@owncloud.com>
This commit is contained in:
Florian Schade
2023-06-08 12:41:04 +02:00
committed by GitHub
co-authored by Ralf Haferkamp
parent 021c9fcdd9
commit 4f26424db6
157 changed files with 2845 additions and 1901 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ocis-pkg/service/external/external.go
Vendored
-120
View File
@@ -1,120 +0,0 @@
package external
import (
"context"
"time"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
oregistry "github.com/owncloud/ocis/v2/ocis-pkg/registry"
"go-micro.dev/v4/registry"
)
// RegisterGRPCEndpoint publishes an arbitrary endpoint to the service-registry. This allows querying nodes of
// non-micro GRPC-services like reva. No health-checks are done, thus the caller is responsible for canceling.
func RegisterGRPCEndpoint(ctx context.Context, serviceID, uuid, addr string, version string, logger log.Logger) error {
node := &registry.Node{
Id: serviceID + "-" + uuid,
Address: addr,
Metadata: make(map[string]string),
}
ocisRegistry := oregistry.GetRegistry()
node.Metadata["registry"] = ocisRegistry.String()
node.Metadata["server"] = "grpc"
node.Metadata["transport"] = "grpc"
node.Metadata["protocol"] = "grpc"
service := &registry.Service{
Name: serviceID,
Version: version,
Nodes: []*registry.Node{node},
Endpoints: make([]*registry.Endpoint, 0),
}
logger.Info().Msgf("registering external service %v@%v", node.Id, node.Address)
rOpts := []registry.RegisterOption{registry.RegisterTTL(time.Minute)}
if err := ocisRegistry.Register(service, rOpts...); err != nil {
logger.Fatal().Err(err).Msgf("Registration error for external service %v", serviceID)
}
t := time.NewTicker(time.Second * 30)
go func() {
for {
select {
case <-t.C:
logger.Debug().Interface("service", service).Msg("refreshing external service-registration")
err := ocisRegistry.Register(service, rOpts...)
if err != nil {
logger.Error().Err(err).Msgf("registration error for external service %v", serviceID)
}
case <-ctx.Done():
logger.Debug().Interface("service", service).Msg("unregistering")
t.Stop()
err := ocisRegistry.Deregister(service)
if err != nil {
logger.Err(err).Msgf("Error unregistering external service %v", serviceID)
}
}
}
}()
return nil
}
// RegisterHTTPEndpoint publishes an arbitrary endpoint to the service-registry. This allows querying nodes of
// non-micro HTTP-services like reva. No health-checks are done, thus the caller is responsible for canceling.
func RegisterHTTPEndpoint(ctx context.Context, serviceID, uuid, addr string, version string, logger log.Logger) error {
node := &registry.Node{
Id: serviceID + "-" + uuid,
Address: addr,
Metadata: make(map[string]string),
}
ocisRegistry := oregistry.GetRegistry()
node.Metadata["registry"] = ocisRegistry.String()
node.Metadata["server"] = "http"
node.Metadata["transport"] = "http"
node.Metadata["protocol"] = "http"
service := &registry.Service{
Name: serviceID,
Version: version,
Nodes: []*registry.Node{node},
Endpoints: make([]*registry.Endpoint, 0),
}
logger.Info().Msgf("registering external service %v@%v", node.Id, node.Address)
rOpts := []registry.RegisterOption{registry.RegisterTTL(time.Minute)}
if err := ocisRegistry.Register(service, rOpts...); err != nil {
logger.Fatal().Err(err).Msgf("Registration error for external service %v", serviceID)
}
t := time.NewTicker(time.Second * 30)
go func() {
for {
select {
case <-t.C:
logger.Debug().Interface("service", service).Msg("refreshing external service-registration")
err := ocisRegistry.Register(service, rOpts...)
if err != nil {
logger.Error().Err(err).Msgf("registration error for external service %v", serviceID)
}
case <-ctx.Done():
logger.Debug().Interface("service", service).Msg("unregistering")
t.Stop()
err := ocisRegistry.Deregister(service)
if err != nil {
logger.Err(err).Msgf("Error unregistering external service %v", serviceID)
}
}
}
}()
return nil
}
ocis-pkg/service/external/external_test.go
Vendored
-61
View File
@@ -1,61 +0,0 @@
package external
//
//import (
// "context"
// "testing"
//
// "github.com/micro/go-micro/v2/registry"
// "github.com/owncloud/ocis/v2/ocis-pkg/log"
//)
//
//func TestRegisterGRPCEndpoint(t *testing.T) {
// ctx, cancel := context.WithCancel(context.Background())
// err := RegisterGRPCEndpoint(ctx, "test", "1234", "192.168.0.1:777", log.Logger{})
// if err != nil {
// t.Errorf("Unexpected error: %v", err)
// }
//
// s, err := registry.GetService("test")
// if err != nil {
// t.Errorf("Unexpected error: %v", err)
// }
//
// if len(s) != 1 {
// t.Errorf("Expected exactly one service to be returned got %v", len(s))
// }
//
// if len(s[0].Nodes) != 1 {
// t.Errorf("Expected exactly one node to be returned got %v", len(s[0].Nodes))
// }
//
// testSvc := s[0]
// if testSvc.Name != "test" {
// t.Errorf("Expected service name to be 'test' got %v", s[0].Name)
// }
//
// testNode := testSvc.Nodes[0]
//
// if testNode.Address != "192.168.0.1:777" {
// t.Errorf("Expected node address to be '192.168.0.1:777' got %v", testNode.Address)
// }
//
// if testNode.Id != "test-1234" {
// t.Errorf("Expected node id to be 'test-1234' got %v", testNode.Id)
// }
//
// cancel()
//
// // When switching over to monorepo this little test fails. We're unsure of what the cause is, but since this test
// // is testing a framework specific behavior, we're better off letting it commented out. There is also no use of
// // com.owncloud.reva anywhere in the codebase, so we're effectively only registering reva as a go-micro service,
// // but not sending any message.
// s, err = registry.GetService("test")
// if err != nil {
// t.Errorf("Unexpected error: %v", err)
// }
//
// if len(s) != 0 {
// t.Errorf("Deregister on cancelation failed. Result-length should be zero, got %v", len(s))
// }
//}