Skip to content
Snippets Groups Projects
Commit 93a66f40 authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Fixed janitor build and upgraded gitlab lib

parent 816bbd64
Branches
Tags
No related merge requests found
syntax = "proto3"; syntax = "proto3";
package v1; package v1;
option go_package = "./;v1";
option java_package = "net.geant.nmaas.externalservices.inventory.janitor"; option java_package = "net.geant.nmaas.externalservices.inventory.janitor";
option java_outer_classname = "JanitorManager"; option java_outer_classname = "JanitorManager";
......
module code.geant.net/stash/scm/nmaas/nmaas-janitor module bitbucket.software.geant.org/projects/NMAAS/repos/nmaas-janitor
require ( require (
github.com/davecgh/go-spew v1.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect
...@@ -9,7 +9,7 @@ require ( ...@@ -9,7 +9,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // 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 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
google.golang.org/grpc v1.31.0 google.golang.org/grpc v1.31.0
google.golang.org/protobuf v1.24.0 google.golang.org/protobuf v1.24.0
......
...@@ -9,8 +9,8 @@ import ( ...@@ -9,8 +9,8 @@ import (
"github.com/xanzy/go-gitlab" "github.com/xanzy/go-gitlab"
"log" "log"
"code.geant.net/stash/scm/nmaas/nmaas-janitor/pkg/protocol/grpc" "bitbucket.software.geant.org/projects/NMAAS/repos/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/service/v1"
) )
// Config is configuration for Server // Config is configuration for Server
......
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"os" "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() { func main() {
......
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"google.golang.org/grpc" "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, 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 ...@@ -39,4 +39,4 @@ func RunServer(ctx context.Context, confAPI v1.ConfigServiceServer, authAPI v1.B
// start gRPC server // start gRPC server
return server.Serve(listen) return server.Serve(listen)
} }
\ No newline at end of file
...@@ -14,7 +14,7 @@ import ( ...@@ -14,7 +14,7 @@ import (
"math/rand" "math/rand"
"strings" "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" "github.com/johnaoss/htpasswd/apr1"
) )
......
package v1 package v1
import ( 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" "context"
"github.com/xanzy/go-gitlab" "github.com/xanzy/go-gitlab"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment