From 93a66f40ae169c40684a84cb1c4af25b05845611 Mon Sep 17 00:00:00 2001
From: Lukasz Lopatowski <llopat@man.poznan.pl>
Date: Tue, 6 Apr 2021 20:09:46 +0200
Subject: [PATCH] Fixed janitor build and upgraded gitlab lib
---
api/proto/v1/config-service.proto | 2 ++
go.mod | 4 ++--
pkg/api/cmd/server.go | 4 ++--
pkg/cmd/server/main.go | 2 +-
pkg/protocol/grpc/server.go | 4 ++--
pkg/service/v1/config-service.go | 2 +-
pkg/service/v1/config-service_test.go | 2 +-
7 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/api/proto/v1/config-service.proto b/api/proto/v1/config-service.proto
index d626cd8..4593e7a 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 d691cef..73b56b4 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 3171b56..2836e27 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 6c1a039..d80d848 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 100dad0..4a2f8da 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 c48df51..bab3b13 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 c80601a..b6f1aa8 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"
--
GitLab