diff --git a/api/proto/v1/config-service.proto b/api/proto/v1/config-service.proto index d626cd817695d8f6bcc93c703fb150a46e6717d6..4593e7a1bffb0667163fa78c90705ae7a608652a 100644 --- a/api/proto/v1/config-service.proto +++ b/api/proto/v1/config-service.proto @@ -1,6 +1,8 @@ syntax = "proto3"; + package v1; +option go_package = "./;v1"; option java_package = "net.geant.nmaas.externalservices.inventory.janitor"; option java_outer_classname = "JanitorManager"; diff --git a/go.mod b/go.mod index d691cef8244829d10c0ce906c8052341ee5e9978..73b56b4a70362dd94194f8047068a22a7a433669 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module code.geant.net/stash/scm/nmaas/nmaas-janitor +module bitbucket.software.geant.org/projects/NMAAS/repos/nmaas-janitor require ( github.com/davecgh/go-spew v1.1.1 // indirect @@ -9,7 +9,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.1 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect - github.com/xanzy/go-gitlab v0.40.1 + github.com/xanzy/go-gitlab v0.48.0 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b google.golang.org/grpc v1.31.0 google.golang.org/protobuf v1.24.0 diff --git a/pkg/api/cmd/server.go b/pkg/api/cmd/server.go index 3171b567907d206642885db2eea1719c9adbbc4a..2836e2760bb3d60c38133d449e364c1f4997f932 100644 --- a/pkg/api/cmd/server.go +++ b/pkg/api/cmd/server.go @@ -9,8 +9,8 @@ import ( "github.com/xanzy/go-gitlab" "log" - "code.geant.net/stash/scm/nmaas/nmaas-janitor/pkg/protocol/grpc" - "code.geant.net/stash/scm/nmaas/nmaas-janitor/pkg/service/v1" + "bitbucket.software.geant.org/projects/NMAAS/repos/nmaas-janitor/pkg/protocol/grpc" + "bitbucket.software.geant.org/projects/NMAAS/repos/nmaas-janitor/pkg/service/v1" ) // Config is configuration for Server diff --git a/pkg/cmd/server/main.go b/pkg/cmd/server/main.go index 6c1a039766a92d22113c25e26d6ad3d2edfb2d78..d80d84866736c351a5db1777c193889a0af4e7a1 100644 --- a/pkg/cmd/server/main.go +++ b/pkg/cmd/server/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "code.geant.net/stash/scm/nmaas/nmaas-janitor/pkg/api/cmd" + "bitbucket.software.geant.org/projects/NMAAS/repos/nmaas-janitor/pkg/api/cmd" ) func main() { diff --git a/pkg/protocol/grpc/server.go b/pkg/protocol/grpc/server.go index 100dad00a591ce3f4b98dfd3bd5fac388d1a126a..4a2f8dadaa5c68199974783557a4084b0ed29908 100644 --- a/pkg/protocol/grpc/server.go +++ b/pkg/protocol/grpc/server.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc" - "code.geant.net/stash/scm/nmaas/nmaas-janitor/pkg/api/v1" + v1 "bitbucket.software.geant.org/projects/NMAAS/repos/nmaas-janitor/pkg/api/v1" ) func RunServer(ctx context.Context, confAPI v1.ConfigServiceServer, authAPI v1.BasicAuthServiceServer, @@ -39,4 +39,4 @@ func RunServer(ctx context.Context, confAPI v1.ConfigServiceServer, authAPI v1.B // start gRPC server return server.Serve(listen) -} \ No newline at end of file +} diff --git a/pkg/service/v1/config-service.go b/pkg/service/v1/config-service.go index c48df51e6d6ec5f8f215cfc9db629030e96d16ee..bab3b134711052f31487339232aa7e067059c9b2 100644 --- a/pkg/service/v1/config-service.go +++ b/pkg/service/v1/config-service.go @@ -14,7 +14,7 @@ import ( "math/rand" "strings" - "code.geant.net/stash/scm/nmaas/nmaas-janitor/pkg/api/v1" + v1 "bitbucket.software.geant.org/projects/NMAAS/repos/nmaas-janitor/pkg/api/v1" "github.com/johnaoss/htpasswd/apr1" ) diff --git a/pkg/service/v1/config-service_test.go b/pkg/service/v1/config-service_test.go index c80601afb3af5f59fa1ac15ab4a3ce25513525eb..b6f1aa85acd6bdb018fa3762862f6d3a134934e4 100644 --- a/pkg/service/v1/config-service_test.go +++ b/pkg/service/v1/config-service_test.go @@ -1,7 +1,7 @@ package v1 import ( - "code.geant.net/stash/scm/nmaas/nmaas-janitor/pkg/api/v1" + v1 "bitbucket.software.geant.org/projects/NMAAS/repos/nmaas-janitor/pkg/api/v1" "context" "github.com/xanzy/go-gitlab" corev1 "k8s.io/api/core/v1"