Verified Commit a0dfb23a authored by Oleksandr Redko's avatar Oleksandr Redko Committed by GitLab
Browse files

fix: decrease the number of the library dependencies 

Changelog: Improvements
parent b8817d2f

.gitlab-ci.yml

+6 −7
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ golangci-lint: 
    REPORT_FILENAME: "gl-code-quality-report.json"

  image: golang:1.25-bookworm

  script:

    - golangci-lint run

    - go list -f '{{.Dir}}' -m | xargs golangci-lint run

  artifacts:

    reports:

      codequality: $REPORT_FILENAME
@@ -163,19 +163,18 @@ Download GraphQL schema: 
  image: node:25-alpine

  script:

    - |

      if [ ! -f schema/gitlab.graphql ]; then

        mkdir schema

      if [ ! -f graphql_test/schema/gitlab.graphql ]; then

        npm install -g get-graphql-schema

        get-graphql-schema "${CI_API_GRAPHQL_URL}" --sdl >schema/gitlab.graphql

        get-graphql-schema "${CI_API_GRAPHQL_URL}" --sdl > graphql_test/schema/gitlab.graphql

      fi

  cache:

    key: $CI_COMMIT_REF_SLUG

    paths:

      - schema/gitlab.graphql

      - graphql_test/schema/gitlab.graphql

    policy: pull-push

  artifacts:

    paths:

      - schema/gitlab.graphql

      - graphql_test/schema/gitlab.graphql



tests:unit:

  extends:
@@ -194,7 +193,7 @@ tests:unit: 
    COVERPROFILE_FILENAME: coverage.out

    COVERPROFILE_XML_FILENAME: coverage.xml

  script:

    - go run gotest.tools/gotestsum@${GOTESTSUM_VERSION} --format=standard-quiet --junitfile=$JUNIT_FILENAME -- -race -coverprofile=$COVERPROFILE_FILENAME -covermode=atomic ./...

    - go run gotest.tools/gotestsum@${GOTESTSUM_VERSION} --format=standard-quiet --junitfile=$JUNIT_FILENAME -- -race -coverprofile=$COVERPROFILE_FILENAME -covermode=atomic work

    - grep -v '_generated.go' "$COVERPROFILE_FILENAME" | grep -v '_mock.go' > "${COVERPROFILE_FILENAME}.tmp"

    - mv "${COVERPROFILE_FILENAME}.tmp" "$COVERPROFILE_FILENAME"

    - go run github.com/boumenot/gocover-cobertura@${GOCOVER_COBERTURA_VERSION} < $COVERPROFILE_FILENAME > $COVERPROFILE_XML_FILENAME

Makefile

+5 −3
Original line number Diff line number Diff line
@@ -11,9 +11,11 @@ reviewable: setup generate fmt lint test ## Run before committing. 
fmt: ## Format code

	@buf format -w

	@gofumpt -l -w *.go testing/*.go

	@gofumpt -l -w config/*.go

	@gofumpt -l -w graphql_test/*.go



lint: ## Run linter

	@golangci-lint run

	@go list -f '{{.Dir}}' -m | xargs golangci-lint run

	@buf format --exit-code

	@buf lint
@@ -36,10 +38,10 @@ clean: ## Remove generated files 
		*_generated_test.go



test: ## Run tests

	go test ./... -race

	go test work -race



test-integration: ## Run integration tests

	go test ./... -race -tags=integration

	go test ./gitlab_test/... -race -tags=integration -v



testacc-up: ## Launch a GitLab instance.

	GITLAB_TOKEN=$(GITLAB_TOKEN) $(CONTAINER_COMPOSE_ENGINE) up -d $(SERVICE)

config/go.mod

0 → 100644
+38 −0
Original line number Diff line number Diff line 
module gitlab.com/gitlab-org/api/client-go/v2/config



go 1.25.0



require (

	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260209202127-80ab13bee0bf.1

	buf.build/go/protovalidate v1.1.3

	buf.build/go/protoyaml v0.6.0

	github.com/MakeNowJust/heredoc/v2 v2.0.1

	github.com/stretchr/testify v1.11.1

	github.com/zalando/go-keyring v0.2.8

	gitlab.com/gitlab-org/api/client-go/v2 v2.13.0

	go.yaml.in/yaml/v3 v3.0.4

	golang.org/x/oauth2 v0.36.0

	golang.org/x/time v0.14.0

	google.golang.org/protobuf v1.36.11

)



require (

	cel.dev/expr v0.25.1 // indirect

	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect

	github.com/danieljoos/wincred v1.2.3 // indirect

	github.com/davecgh/go-spew v1.1.1 // indirect

	github.com/godbus/dbus/v5 v5.2.2 // indirect

	github.com/google/cel-go v0.27.0 // indirect

	github.com/google/go-querystring v1.2.0 // indirect

	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect

	github.com/hashicorp/go-retryablehttp v0.7.8 // indirect

	github.com/pmezard/go-difflib v1.0.0 // indirect

	golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect

	golang.org/x/sys v0.39.0 // indirect

	golang.org/x/text v0.32.0 // indirect

	google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a // indirect

	google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect

	gopkg.in/yaml.v3 v3.0.1 // indirect

)



replace gitlab.com/gitlab-org/api/client-go/v2 => ../

config/go.sum

0 → 100644
+76 −0
Original line number Diff line number Diff line 
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260209202127-80ab13bee0bf.1 h1:PMmTMyvHScV9Mn8wc6ASge9uRcHy0jtqPd+fM35LmsQ=

buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260209202127-80ab13bee0bf.1/go.mod h1:tvtbpgaVXZX4g6Pn+AnzFycuRK3MOz5HJfEGeEllXYM=

buf.build/go/protovalidate v1.1.3 h1:m2GVEgQWd7rk+vIoAZ+f0ygGjvQTuqPQapBBdcpWVPE=

buf.build/go/protovalidate v1.1.3/go.mod h1:9XIuohWz+kj+9JVn3WQneHA5LZP50mjvneZMnbLkiIE=

buf.build/go/protoyaml v0.6.0 h1:Nzz1lvcXF8YgNZXk+voPPwdU8FjDPTUV4ndNTXN0n2w=

buf.build/go/protoyaml v0.6.0/go.mod h1:RgUOsBu/GYKLDSIRgQXniXbNgFlGEZnQpRAUdLAFV2Q=

cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=

cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=

github.com/MakeNowJust/heredoc/v2 v2.0.1 h1:rlCHh70XXXv7toz95ajQWOWQnN4WNLt0TdpZYIR/J6A=

github.com/MakeNowJust/heredoc/v2 v2.0.1/go.mod h1:6/2Abh5s+hc3g9nbWLe9ObDIOhaRrqsyY9MWy+4JdRM=

github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=

github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=

github.com/brianvoe/gofakeit/v6 v6.28.0 h1:Xib46XXuQfmlLS2EXRuJpqcw8St6qSZz75OUo0tgAW4=

github.com/brianvoe/gofakeit/v6 v6.28.0/go.mod h1:Xj58BMSnFqcn/fAQeSK+/PLtC5kSb7FJIq4JyGa8vEs=

github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=

github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=

github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=

github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=

github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=

github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=

github.com/google/cel-go v0.27.0 h1:e7ih85+4qVrBuqQWTW4FKSqZYokVuc3HnhH5keboFTo=

github.com/google/cel-go v0.27.0/go.mod h1:tTJ11FWqnhw5KKpnWpvW9CJC3Y9GK4EIS0WXnBbebzw=

github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=

github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=

github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=

github.com/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0=

github.com/google/go-querystring v1.2.0/go.mod h1:8IFJqpSRITyJ8QhQ13bmbeMBDfmeEJZD5A0egEOmkqU=

github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=

github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=

github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=

github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=

github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48=

github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=

github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=

github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=

github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=

github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=

github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=

github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=

github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=

github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

github.com/rodaine/protogofakeit v0.1.1 h1:ZKouljuRM3A+TArppfBqnH8tGZHOwM/pjvtXe9DaXH8=

github.com/rodaine/protogofakeit v0.1.1/go.mod h1:pXn/AstBYMaSfc1/RqH3N82pBuxtWgejz1AlYpY1mI0=

github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=

github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=

github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=

github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=

github.com/zalando/go-keyring v0.2.8 h1:6sD/Ucpl7jNq10rM2pgqTs0sZ9V3qMrqfIIy5YPccHs=

github.com/zalando/go-keyring v0.2.8/go.mod h1:tsMo+VpRq5NGyKfxoBVjCuMrG47yj8cmakZDO5QGii0=

go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=

go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=

golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 h1:SbTAbRFnd5kjQXbczszQ0hdk3ctwYf3qBNH9jIsGclE=

golang.org/x/exp v0.0.0-20250813145105-42675adae3e6/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=

golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=

golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=

golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=

golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=

golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=

golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=

golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=

golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=

google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a h1:DMCgtIAIQGZqJXMVzJF4MV8BlWoJh2ZuFiRdAleyr58=

google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a/go.mod h1:y2yVLIE/CSMCPXaHnSKXxu1spLPnglFLegmgdY23uuE=

google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a h1:tPE/Kp+x9dMSwUm/uM0JKK0IfdiJkwAbSMSeZBXXJXc=

google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo=

google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=

google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=

gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=

gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go.mod

+0 −18
Original line number Diff line number Diff line
@@ -3,35 +3,17 @@ module gitlab.com/gitlab-org/api/client-go/v2 
go 1.25.0



require (

	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260209202127-80ab13bee0bf.1

	buf.build/go/protovalidate v1.1.3

	buf.build/go/protoyaml v0.6.0

	github.com/MakeNowJust/heredoc/v2 v2.0.1

	github.com/google/go-querystring v1.2.0

	github.com/graph-gophers/graphql-go v1.9.0

	github.com/hashicorp/go-cleanhttp v0.5.2

	github.com/hashicorp/go-retryablehttp v0.7.8

	github.com/stretchr/testify v1.11.1

	github.com/zalando/go-keyring v0.2.8

	go.uber.org/mock v0.6.0

	go.yaml.in/yaml/v3 v3.0.4

	golang.org/x/oauth2 v0.36.0

	golang.org/x/time v0.14.0

	google.golang.org/protobuf v1.36.11

)



require (

	cel.dev/expr v0.25.1 // indirect

	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect

	github.com/danieljoos/wincred v1.2.3 // indirect

	github.com/davecgh/go-spew v1.1.1 // indirect

	github.com/godbus/dbus/v5 v5.2.2 // indirect

	github.com/google/cel-go v0.28.0 // indirect

	github.com/pmezard/go-difflib v1.0.0 // indirect

	golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect

	golang.org/x/sys v0.39.0 // indirect

	golang.org/x/text v0.35.0 // indirect

	google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a // indirect

	google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect

	gopkg.in/yaml.v3 v3.0.1 // indirect

)