fix extensions versions

This commit is contained in:
Willy Kloucek
2021-10-05 12:39:31 +02:00
parent 3afc5992e6
commit 68ba24ff73
54 changed files with 51 additions and 287 deletions
+2
View File
@@ -13,6 +13,7 @@ import (
"github.com/owncloud/ocis/storage/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/sync"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/cs3org/reva/cmd/revad/runtime"
"github.com/gofrs/uuid"
@@ -64,6 +65,7 @@ func Gateway(cfg *config.Config) *cli.Command {
"com.owncloud.storage",
uuid.String(),
cfg.Reva.Gateway.GRPCAddr,
version.String,
logger,
)
+1 -1
View File
@@ -5,9 +5,9 @@ import (
"strings"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/storage/pkg/config"
"github.com/owncloud/ocis/storage/pkg/flagset"
"github.com/owncloud/ocis/storage/pkg/version"
"github.com/spf13/viper"
"github.com/urfave/cli/v2"
)
+2
View File
@@ -12,6 +12,7 @@ import (
"github.com/gofrs/uuid"
"github.com/oklog/run"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/storage/pkg/config"
"github.com/owncloud/ocis/storage/pkg/flagset"
"github.com/owncloud/ocis/storage/pkg/server/debug"
@@ -124,6 +125,7 @@ func StorageMetadata(cfg *config.Config) *cli.Command {
"com.owncloud.storage.metadata",
uuid.Must(uuid.NewV4()).String(),
cfg.Reva.StorageMetadata.GRPCAddr,
version.String,
logger,
); err != nil {
logger.Fatal().Err(err).Msg("failed to register the grpc endpoint")
+1 -1
View File
@@ -5,8 +5,8 @@ import (
"net/http"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/storage/pkg/config"
"github.com/owncloud/ocis/storage/pkg/version"
)
// Server initializes the debug service and server.
+2 -2
View File
@@ -13,7 +13,7 @@ import (
// RegisterGRPCEndpoint publishes an arbitrary endpoint to the service-registry. This allows to query 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, logger log.Logger) error {
func RegisterGRPCEndpoint(ctx context.Context, serviceID, uuid, addr string, version string, logger log.Logger) error {
node := &registry.Node{
Id: serviceID + "-" + uuid,
Address: addr,
@@ -29,7 +29,7 @@ func RegisterGRPCEndpoint(ctx context.Context, serviceID, uuid, addr string, log
service := &registry.Service{
Name: serviceID,
Version: "",
Version: version,
Nodes: []*registry.Node{node},
Endpoints: make([]*registry.Endpoint, 0),
}
-19
View File
@@ -1,19 +0,0 @@
package version
import (
"time"
)
var (
// String gets defined by the build system.
String = "0.0.0"
// Date indicates the build date.
Date = "00000000"
)
// Compiled returns the compile time of this service.
func Compiled() time.Time {
t, _ := time.Parse("20060102", Date)
return t
}