diff --git a/go.mod b/go.mod index c9fb45e04..c55a6229e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.25.0 require ( al.essio.dev/pkg/shellescape v1.6.0 - code.gitea.io/sdk/gitea v0.22.1 + code.gitea.io/sdk/gitea v0.23.2 codeberg.org/6543/go-yaml2json v1.0.0 codeberg.org/6543/xyaml v1.1.0 codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2 v2.2.0 @@ -16,7 +16,7 @@ require ( github.com/charmbracelet/huh/spinner v0.0.0-20240327025511-ec643317aa10 github.com/containerd/errdefs v1.0.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v29.2.0+incompatible + github.com/docker/cli v29.2.1+incompatible github.com/docker/docker v28.5.2+incompatible github.com/docker/go-connections v0.6.0 github.com/docker/go-units v0.5.0 diff --git a/go.sum b/go.sum index d90e69332..189a77cc0 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ al.essio.dev/pkg/shellescape v1.6.0 h1:NxFcEqzFSEVCGN2yq7Huv/9hyCEGVa/TncnOOBBeXHA= al.essio.dev/pkg/shellescape v1.6.0/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890= -code.gitea.io/sdk/gitea v0.22.1 h1:7K05KjRORyTcTYULQ/AwvlVS6pawLcWyXZcTr7gHFyA= -code.gitea.io/sdk/gitea v0.22.1/go.mod h1:yyF5+GhljqvA30sRDreoyHILruNiy4ASufugzYg0VHM= +code.gitea.io/sdk/gitea v0.23.2 h1:iJB1FDmLegwfwjX8gotBDHdPSbk/ZR8V9VmEJaVsJYg= +code.gitea.io/sdk/gitea v0.23.2/go.mod h1:yyF5+GhljqvA30sRDreoyHILruNiy4ASufugzYg0VHM= codeberg.org/6543/go-yaml2json v1.0.0 h1:heGqo9VEi7gY2yNqjj7X4ADs5nzlFIbGsJtgYDLrnig= codeberg.org/6543/go-yaml2json v1.0.0/go.mod h1:mz61q14LWF4ZABrgMEDMmk3t9dPi6zgR1uBh2VKV2RQ= codeberg.org/6543/xyaml v1.1.0 h1:0PWTy8OUqshshjrrnAXFWXSPUEa8R49DIh2ah07SxFc= @@ -125,8 +125,8 @@ github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDror github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/cli v29.2.0+incompatible h1:9oBd9+YM7rxjZLfyMGxjraKBKE4/nVyvVfN4qNl9XRM= -github.com/docker/cli v29.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v29.2.1+incompatible h1:n3Jt0QVCN65eiVBoUTZQM9mcQICCJt3akW4pKAbKdJg= +github.com/docker/cli v29.2.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM= github.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8= diff --git a/server/forge/gitea/gitea.go b/server/forge/gitea/gitea.go index 26c88d26c..ecff4a50f 100644 --- a/server/forge/gitea/gitea.go +++ b/server/forge/gitea/gitea.go @@ -581,7 +581,7 @@ func (c *Gitea) Org(ctx context.Context, u *model.User, owner string) (*model.Or org, _, orgErr := client.GetOrg(owner) if orgErr == nil && org != nil { return &model.Org{ - Name: org.UserName, + Name: org.Name, Private: gitea.VisibleType(org.Visibility) != gitea.VisibleTypePublic, }, nil } diff --git a/server/forge/gitea/helper.go b/server/forge/gitea/helper.go index 595b5758c..01bf70782 100644 --- a/server/forge/gitea/helper.go +++ b/server/forge/gitea/helper.go @@ -64,7 +64,7 @@ func toPerm(from *gitea.Permission) *model.Perm { // toTeam converts a Gitea team to a Woodpecker team. func toTeam(from *gitea.Organization, link string) *model.Team { return &model.Team{ - Login: from.UserName, + Login: from.Name, Avatar: expandAvatar(link, from.AvatarURL), } } diff --git a/server/forge/gitea/helper_test.go b/server/forge/gitea/helper_test.go index b728699ae..5a4c974b9 100644 --- a/server/forge/gitea/helper_test.go +++ b/server/forge/gitea/helper_test.go @@ -181,12 +181,12 @@ func Test_toPerm(t *testing.T) { func Test_toTeam(t *testing.T) { from := &gitea.Organization{ - UserName: "woodpecker", + Name: "woodpecker", AvatarURL: "/avatars/1", } to := toTeam(from, "http://localhost:80") - assert.Equal(t, from.UserName, to.Login) + assert.Equal(t, from.Name, to.Login) assert.Equal(t, "http://localhost:80/avatars/1", to.Avatar) }