From b23e1025be650a2d32e970b5a93862f4dbedeef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=C5=81opatowski?= <llopat@man.poznan.pl>
Date: Mon, 28 Apr 2025 11:46:43 +0200
Subject: [PATCH] Using updated library for GitLab go client
---
.github-disabled/workflows/00-run-unit-tests.yml | 2 +-
.gitlab-ci.yml | 2 +-
Dockerfile | 2 +-
docs/DEVELOPMENT.md | 2 +-
go.mod | 6 +++---
pkg/api/cmd/server.go | 2 +-
pkg/service/v1/config-service.go | 2 +-
pkg/service/v1/config-service_test.go | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.github-disabled/workflows/00-run-unit-tests.yml b/.github-disabled/workflows/00-run-unit-tests.yml
index f4e8f69..71bce52 100644
--- a/.github-disabled/workflows/00-run-unit-tests.yml
+++ b/.github-disabled/workflows/00-run-unit-tests.yml
@@ -24,7 +24,7 @@ jobs:
- name: Load dependencies
run: |
go get github.com/johnaoss/htpasswd/apr1
- go get github.com/xanzy/go-gitlab
+ go get gitlab.com/gitlab-org/api/client-go
go get k8s.io/api/core/v1
go get k8s.io/apimachinery/pkg/apis/meta/v1
go get k8s.io/apimachinery/pkg/types
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b976a3..f1ee791 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ test:
script:
- |
go get github.com/johnaoss/htpasswd/apr1
- go get github.com/xanzy/go-gitlab
+ go get gitlab.com/gitlab-org/api/client-go
go get k8s.io/api/core/v1
go get k8s.io/apimachinery/pkg/apis/meta/v1
go get k8s.io/apimachinery/pkg/types
diff --git a/Dockerfile b/Dockerfile
index 6aab5b8..501f9ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ COPY go.mod/ .
COPY go.sum/ .
RUN go get github.com/johnaoss/htpasswd/apr1
-RUN go get github.com/xanzy/go-gitlab
+RUN go get gitlab.com/gitlab-org/api/client-go
RUN go get k8s.io/api/core/v1
RUN go get k8s.io/apimachinery/pkg/apis/meta/v1
RUN go get k8s.io/apimachinery/pkg/types
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index a0d61ca..0c84ba8 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -6,7 +6,7 @@
* [Protobuf](https://protobuf.dev/)
* [gRPC](https://grpc.io/)
* [kubernetes/client-go](https://github.com/kubernetes/client-go)
-* [go-gitlab](https://pkg.go.dev/github.com/xanzy/go-gitlab)
+* [gitlab-org/api/client-go](https://gitlab.com/gitlab-org/api/client-go)
### Deploying
diff --git a/go.mod b/go.mod
index 935f9db..bafe197 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module gitlab.software.geant.org/nmaas/nmaas-janitor
require (
github.com/johnaoss/htpasswd v0.0.0-20190120213328-a0cc59f788da
- github.com/xanzy/go-gitlab v0.115.0
+ gitlab.com/gitlab-org/api/client-go v0.128.0
google.golang.org/grpc v1.72.0
google.golang.org/protobuf v1.36.6
k8s.io/api v0.32.4
@@ -56,6 +56,6 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)
-go 1.24.1
+go 1.24.2
-toolchain go1.24.1
+toolchain go1.24.2
diff --git a/pkg/api/cmd/server.go b/pkg/api/cmd/server.go
index 77ddb0d..230b03b 100644
--- a/pkg/api/cmd/server.go
+++ b/pkg/api/cmd/server.go
@@ -6,7 +6,7 @@ import (
"fmt"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
- "github.com/xanzy/go-gitlab"
+ "gitlab.com/gitlab-org/api/client-go"
"log"
"gitlab.software.geant.org/nmaas/nmaas-janitor/pkg/protocol/grpc"
diff --git a/pkg/service/v1/config-service.go b/pkg/service/v1/config-service.go
index 1298f81..5ecea5f 100644
--- a/pkg/service/v1/config-service.go
+++ b/pkg/service/v1/config-service.go
@@ -3,7 +3,7 @@ package v1
import (
"context"
"encoding/base64"
- "github.com/xanzy/go-gitlab"
+ "gitlab.com/gitlab-org/api/client-go"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
apiv1 "k8s.io/api/core/v1"
diff --git a/pkg/service/v1/config-service_test.go b/pkg/service/v1/config-service_test.go
index cd15e52..e1c6f11 100644
--- a/pkg/service/v1/config-service_test.go
+++ b/pkg/service/v1/config-service_test.go
@@ -3,7 +3,7 @@ package v1
import (
v1 "gitlab.software.geant.org/nmaas/nmaas-janitor/pkg/api/v1"
"context"
- "github.com/xanzy/go-gitlab"
+ "gitlab.com/gitlab-org/api/client-go"
corev1 "k8s.io/api/core/v1"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
--
GitLab