diff --git a/.cliff.toml b/.cliff.toml index 249039b..9309597 100644 --- a/.cliff.toml +++ b/.cliff.toml @@ -72,7 +72,7 @@ footer = """""" trim = true # postprocessors postprocessors = [ - { pattern = '', replace = "https://github.com/jaredallard/gitlab" }, # replace repository URL + { pattern = '', replace = "https://github.com/1password/gitlab" }, # replace repository URL ] [git] diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 1f98654..56ad6e0 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -43,12 +43,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gotestsum -- -coverprofile=cover.out ./... - - name: Upload test coverage - uses: codecov/codecov-action@v5 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: ./cover.out - fail_ci_if_error: true golangci-lint: name: golangci-lint diff --git a/.goreleaser.yaml b/.goreleaser.yaml index e3e4315..244ca3f 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -15,7 +15,7 @@ changelog: release: prerelease: "auto" footer: |- - **Full Changelog**: https://github.com/jaredallard/gitlab/compare/{{ .PreviousTag }}...{{ .Tag }} + **Full Changelog**: https://github.com/1password/gitlab/compare/{{ .PreviousTag }}...{{ .Tag }} ## <> diff --git a/.mise.toml b/.mise.toml index c248e60..d794749 100644 --- a/.mise.toml +++ b/.mise.toml @@ -9,9 +9,9 @@ goreleaser = "latest" "go:gotest.tools/gotestsum" = "1.12.0" "go:golang.org/x/tools/cmd/goimports" = "latest" "go:mvdan.cc/sh/v3/cmd/shfmt" = "latest" +"go:github.com/thenativeweb/get-next-version" = "latest" "go:github.com/vburenin/ifacemaker" = "latest" "go:go.uber.org/mock/mockgen" = "0.5.0" -"go:github.com/thenativeweb/get-next-version" = "latest" [tasks.build] description = "Build a binary for the current platform/architecture" diff --git a/README.md b/README.md index 4cee463..3989717 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ # gitlab - - Latest Version + + Latest Version - - License + + License - - GitHub Workflow Status + + GitHub Workflow Status - - Codecov + + Codecov
@@ -21,7 +21,7 @@ that supports mocking. ## Usage -See our [Go docs](https://pkg.go.dev/github.com/jaredallard/gitlab) as +See our [Go docs](https://pkg.go.dev/github.com/1password/gitlab) as well as the upstream [go-gitlab] documentation which this package provides. diff --git a/bun.lockb b/bun.lockb index 54f68e5..56e96f9 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/example_test.go b/example_test.go index 8766192..969f44e 100644 --- a/example_test.go +++ b/example_test.go @@ -21,7 +21,7 @@ package gitlab_test import ( "testing" - "github.com/jaredallard/gitlab" + "github.com/1password/gitlab" "gotest.tools/v3/assert" ) diff --git a/go.mod b/go.mod index 9f419d6..28fb740 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/jaredallard/gitlab +module github.com/1password/gitlab go 1.23 diff --git a/go.sum b/go.sum index bc8f80b..6363b89 100644 --- a/go.sum +++ b/go.sum @@ -34,7 +34,5 @@ golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= -gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q= gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA= diff --git a/go.work.sum b/go.work.sum index 76e82c1..4baba44 100644 --- a/go.work.sum +++ b/go.work.sum @@ -7,6 +7,7 @@ github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSC github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= +github.com/ProtonMail/go-crypto v1.1.5/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4= github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA= github.com/caarlos0/go-version v0.1.1/go.mod h1:Ze5Qx4TsBBi5FyrSKVg1Ibc44KGV/llAaKGp86oTwZ0= @@ -29,8 +30,10 @@ github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmS github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= github.com/go-git/go-billy/v5 v5.6.0/go.mod h1:sFDq7xD3fn3E0GOwUSZqHo9lrkmx8xJhA0ZrfvjBRGM= github.com/go-git/go-billy/v5 v5.6.1/go.mod h1:0AsLr1z2+Uksi4NlElmMblP5rPcDZNRCD8ujZCRR2BE= +github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU= github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= github.com/go-git/go-git/v5 v5.13.1/go.mod h1:qryJB4cSBoq3FRoBRf5A77joojuBcmPJ0qu3XXXVixc= +github.com/go-git/go-git/v5 v5.13.2/go.mod h1:hWdW5P4YZRjmpGHwRH2v3zkWcNl6HeXaXQEMGb3NJ9A= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= @@ -40,6 +43,7 @@ github.com/google/go-github/v68 v68.0.0/go.mod h1:K9HAUBovM2sLwM408A18h+wd9vqdLO github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-plugin v1.6.1/go.mod h1:XPHFku2tFo3o3QKFgSYo+cghcUhw1NA1hZyMK0PWAw0= github.com/hashicorp/go-plugin v1.6.2/go.mod h1:CkgLQ5CZqNmdL9U9JzM532t8ZiYQ35+pj3b1FD37R0Q= +github.com/hashicorp/go-plugin v1.6.3/go.mod h1:MRobyh+Wc/nYy1V4KAXUiYfzxoYhs7V1mlH1Z7iY2h0= github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= @@ -62,10 +66,12 @@ github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JX github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= +github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/princjef/gomarkdoc v1.1.0/go.mod h1:HI3w0Zv8H03ecak/IqVAcPFTuPt7sn7Top6xbgCs1Qk= github.com/princjef/mageutil v1.0.0/go.mod h1:mkShhaUomCYfAoVvTKRcbAs8YSVPdtezI5j6K+VXhrs= github.com/puzpuzpuz/xsync/v3 v3.4.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA= +github.com/puzpuzpuz/xsync/v3 v3.5.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA= github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY= @@ -95,12 +101,14 @@ golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/ golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -111,6 +119,7 @@ golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= @@ -126,6 +135,7 @@ google.golang.org/grpc v1.69.0/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/mock_client.go b/mock_client.go index 02cf649..8845b08 100644 --- a/mock_client.go +++ b/mock_client.go @@ -21,7 +21,7 @@ package gitlab import ( "testing" - "github.com/jaredallard/gitlab/mocks" + "github.com/1password/gitlab/mocks" "go.uber.org/mock/gomock" ) diff --git a/package.json b/package.json index 7bca5e4..8c2c30f 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "//": "Used for prettier", - "name": "@jaredallard/gitlab", + "name": "@1password/gitlab", "devDependencies": { - "prettier": "^3.3.2" + "prettier": "^3.5.1" }, "private": true } diff --git a/stencil.lock b/stencil.lock index 604873f..36c559c 100644 --- a/stencil.lock +++ b/stencil.lock @@ -1,10 +1,10 @@ -version: 2.0.1 +version: 2.1.0 modules: - name: github.com/rgst-io/stencil-golang url: https://github.com/rgst-io/stencil-golang version: - commit: 9cd5b2ee72f3bcdbd73a8514b1f2b29faf5dcf5f - tag: v1.4.0 + commit: f0322bcd01439b092b27cbaabdf2e3e3e2d0ebe3 + tag: v1.5.0 files: - name: .cliff.toml template: .cliff.toml.tpl diff --git a/stencil.yaml b/stencil.yaml index 76d6e56..b9ab615 100644 --- a/stencil.yaml +++ b/stencil.yaml @@ -1,7 +1,7 @@ name: gitlab arguments: license: LGPL-3.0 - org: jaredallard + org: 1password library: true modules: - name: github.com/rgst-io/stencil-golang diff --git a/tools/codegen/codegen.go b/tools/codegen/codegen.go index e62afd4..b42cfa8 100644 --- a/tools/codegen/codegen.go +++ b/tools/codegen/codegen.go @@ -191,7 +191,7 @@ func generateMocks(log slogext.Logger) error { return fmt.Errorf("failed to read mock file: %w", err) } - b = []byte(strings.ReplaceAll(string(b), `gitlab "github.com/jaredallard/gitlab"`, `gitlab "gitlab.com/gitlab-org/api/client-go"`)) + b = []byte(strings.ReplaceAll(string(b), `gitlab "github.com/1password/gitlab"`, `gitlab "gitlab.com/gitlab-org/api/client-go"`)) //nolint:gosec // Why: OK. if err := os.WriteFile(filepath.Join("mocks", file), b, 0o644); err != nil { return fmt.Errorf("failed to write mock file: %w", err) diff --git a/tools/codegen/embed/mock_client.go.tpl b/tools/codegen/embed/mock_client.go.tpl index 7f29d9b..9da9425 100644 --- a/tools/codegen/embed/mock_client.go.tpl +++ b/tools/codegen/embed/mock_client.go.tpl @@ -21,8 +21,8 @@ package gitlab import ( "testing" - "github.com/jaredallard/gitlab" - "github.com/jaredallard/gitlab/mocks" + "github.com/1password/gitlab" + "github.com/1password/gitlab/mocks" "go.uber.org/mock/gomock" ) diff --git a/tools/codegen/go.mod b/tools/codegen/go.mod index d2600d4..afb5a06 100644 --- a/tools/codegen/go.mod +++ b/tools/codegen/go.mod @@ -1,4 +1,4 @@ -module github.com/jaredallard/gitlab/tools/codegen +module github.com/1password/gitlab/tools/codegen go 1.23.4