Skip to content

Commit 34eee25

Browse files
lunnylunny
authored
Move sdk structs to modules/structs (#6905)
* move sdk structs to moduels/structs * fix tests * fix fmt * fix swagger * fix vendor
1 parent 1658cd0 commit 34eee25

File tree

188 files changed

+717
-2144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+717
-2144
lines changed

‎go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module code.gitea.io/gitea
33
go 1.12
44

55
require (
6-
code.gitea.io/sdk v0.0.0-20190510041517-9251befd3702
76
github.com/BurntSushi/toml v0.3.1 // indirect
87
github.com/PuerkitoBio/goquery v0.0.0-20170324135448-ed7d758e9a34
98
github.com/RoaringBitmap/roaring v0.4.7 // indirect

‎go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
cloud.google.com/go v0.30.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
2-
code.gitea.io/sdk v0.0.0-20190419065346-2858b80da5f7 h1:YggbbCVgggcOjKYmcB2wVOsEtJHgHUNFFJZDB6QcYTg=
3-
code.gitea.io/sdk v0.0.0-20190419065346-2858b80da5f7/go.mod h1:5bZt0dRznpn2JysytQnV0yCru3FwDv9O5G91jo+lDAk=
4-
code.gitea.io/sdk v0.0.0-20190510041517-9251befd3702 h1:MyOmF6QejeIZfsEQYoJVHOm1PGNyGZMAZmo6cO8Hq80=
5-
code.gitea.io/sdk v0.0.0-20190510041517-9251befd3702/go.mod h1:5bZt0dRznpn2JysytQnV0yCru3FwDv9O5G91jo+lDAk=
62
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
73
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
84
github.com/PuerkitoBio/goquery v0.0.0-20170324135448-ed7d758e9a34 h1:UsHpWO0Elp6NaWVARdZHjiYwkhrspHVEGsyIKPb9OI8=

‎integrations/api_admin_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
api "code.gitea.io/sdk/gitea"
13+
api "code.gitea.io/gitea/modules/structs"
1414

1515
"github.com/stretchr/testify/assert"
1616
)

‎integrations/api_branch_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http"
99
"testing"
1010

11-
api "code.gitea.io/sdk/gitea"
11+
api "code.gitea.io/gitea/modules/structs"
1212

1313
"github.com/stretchr/testify/assert"
1414
)

‎integrations/api_comment_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
api "code.gitea.io/sdk/gitea"
13+
api "code.gitea.io/gitea/modules/structs"
1414

1515
"github.com/stretchr/testify/assert"
1616
)

‎integrations/api_fork_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http"
99
"testing"
1010

11-
api "code.gitea.io/sdk/gitea"
11+
api "code.gitea.io/gitea/modules/structs"
1212
)
1313

1414
func TestCreateForkNoLogin(t *testing.T) {

‎integrations/api_gpg_keys_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"strconv"
1111
"testing"
1212

13-
api "code.gitea.io/sdk/gitea"
13+
api "code.gitea.io/gitea/modules/structs"
1414

1515
"github.com/stretchr/testify/assert"
1616
)

‎integrations/api_helper_for_declarative_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/http"
1111
"testing"
1212

13-
api "code.gitea.io/sdk/gitea"
13+
api "code.gitea.io/gitea/modules/structs"
1414
"github.com/stretchr/testify/assert"
1515
)
1616

‎integrations/api_issue_label_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
api "code.gitea.io/sdk/gitea"
13+
api "code.gitea.io/gitea/modules/structs"
1414

1515
"github.com/stretchr/testify/assert"
1616
)

‎integrations/api_issue_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
api "code.gitea.io/sdk/gitea"
13+
api "code.gitea.io/gitea/modules/structs"
1414

1515
"github.com/stretchr/testify/assert"
1616
)

‎integrations/api_keys_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/stretchr/testify/assert"
1414

1515
"code.gitea.io/gitea/models"
16-
api "code.gitea.io/sdk/gitea"
16+
api "code.gitea.io/gitea/modules/structs"
1717
)
1818

1919
func TestViewDeployKeysNoLogin(t *testing.T) {

‎integrations/api_org_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"code.gitea.io/gitea/models"
1414
"code.gitea.io/gitea/modules/setting"
15-
api "code.gitea.io/sdk/gitea"
15+
api "code.gitea.io/gitea/modules/structs"
1616

1717
"github.com/stretchr/testify/assert"
1818
)

‎integrations/api_pull_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"code.gitea.io/gitea/models"
1313
"code.gitea.io/gitea/modules/auth"
1414
"code.gitea.io/gitea/modules/setting"
15-
api "code.gitea.io/sdk/gitea"
15+
api "code.gitea.io/gitea/modules/structs"
1616

1717
"github.com/stretchr/testify/assert"
1818
)

‎integrations/api_releases_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"code.gitea.io/gitea/models"
1313
"code.gitea.io/gitea/modules/git"
14-
api "code.gitea.io/sdk/gitea"
14+
api "code.gitea.io/gitea/modules/structs"
1515

1616
"github.com/stretchr/testify/assert"
1717
)

‎integrations/api_repo_file_content_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"code.gitea.io/gitea/modules/base"
1414
"code.gitea.io/gitea/modules/context"
1515
"code.gitea.io/gitea/modules/setting"
16-
api "code.gitea.io/sdk/gitea"
16+
api "code.gitea.io/gitea/modules/structs"
1717

1818
"github.com/stretchr/testify/assert"
1919
)

‎integrations/api_repo_file_create_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"code.gitea.io/gitea/modules/context"
1717
"code.gitea.io/gitea/modules/git"
1818
"code.gitea.io/gitea/modules/setting"
19-
api "code.gitea.io/sdk/gitea"
19+
api "code.gitea.io/gitea/modules/structs"
2020

2121
"github.com/stretchr/testify/assert"
2222
)

‎integrations/api_repo_file_delete_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"code.gitea.io/gitea/models"
1313
"code.gitea.io/gitea/modules/base"
1414
"code.gitea.io/gitea/modules/context"
15-
api "code.gitea.io/sdk/gitea"
15+
api "code.gitea.io/gitea/modules/structs"
1616

1717
"github.com/stretchr/testify/assert"
1818
)

‎integrations/api_repo_file_helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package integrations
77
import (
88
"code.gitea.io/gitea/models"
99
"code.gitea.io/gitea/modules/repofiles"
10-
api "code.gitea.io/sdk/gitea"
10+
api "code.gitea.io/gitea/modules/structs"
1111
)
1212

1313
func createFileInBranch(user *models.User, repo *models.Repository, treePath, branchName string) (*api.FileResponse, error) {

‎integrations/api_repo_file_update_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"code.gitea.io/gitea/modules/context"
1717
"code.gitea.io/gitea/modules/git"
1818
"code.gitea.io/gitea/modules/setting"
19-
api "code.gitea.io/sdk/gitea"
19+
api "code.gitea.io/gitea/modules/structs"
2020

2121
"github.com/stretchr/testify/assert"
2222
)

‎integrations/api_repo_git_blobs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010

1111
"code.gitea.io/gitea/models"
12-
api "code.gitea.io/sdk/gitea"
12+
api "code.gitea.io/gitea/modules/structs"
1313

1414
"github.com/stretchr/testify/assert"
1515
)

‎integrations/api_repo_git_hook_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
api "code.gitea.io/sdk/gitea"
13+
api "code.gitea.io/gitea/modules/structs"
1414

1515
"github.com/stretchr/testify/assert"
1616
)

‎integrations/api_repo_lfs_locks_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"code.gitea.io/gitea/models"
1414
"code.gitea.io/gitea/modules/setting"
15-
api "code.gitea.io/sdk/gitea"
15+
api "code.gitea.io/gitea/modules/structs"
1616

1717
"github.com/stretchr/testify/assert"
1818
)

‎integrations/api_repo_tags_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"code.gitea.io/gitea/models"
1313
"code.gitea.io/gitea/modules/setting"
14-
api "code.gitea.io/sdk/gitea"
14+
api "code.gitea.io/gitea/modules/structs"
1515

1616
"github.com/stretchr/testify/assert"
1717
)

‎integrations/api_repo_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"testing"
1414

1515
"code.gitea.io/gitea/models"
16-
api "code.gitea.io/sdk/gitea"
16+
api "code.gitea.io/gitea/modules/structs"
1717

1818
"github.com/stretchr/testify/assert"
1919
)

‎integrations/api_team_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"testing"
1212

1313
"code.gitea.io/gitea/models"
14+
api "code.gitea.io/gitea/modules/structs"
1415
"code.gitea.io/gitea/routers/api/v1/convert"
15-
api "code.gitea.io/sdk/gitea"
1616

1717
"github.com/stretchr/testify/assert"
1818
)

‎integrations/api_token_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010

1111
"code.gitea.io/gitea/models"
12-
api "code.gitea.io/sdk/gitea"
12+
api "code.gitea.io/gitea/modules/structs"
1313
)
1414

1515
// TestAPICreateAndDeleteToken tests that token that was just created can be deleted

‎integrations/api_user_orgs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
api "code.gitea.io/sdk/gitea"
13+
api "code.gitea.io/gitea/modules/structs"
1414

1515
"github.com/stretchr/testify/assert"
1616
)

‎integrations/api_user_search_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http"
99
"testing"
1010

11-
api "code.gitea.io/sdk/gitea"
11+
api "code.gitea.io/gitea/modules/structs"
1212

1313
"github.com/stretchr/testify/assert"
1414
)

‎integrations/benchmarks_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
api "code.gitea.io/sdk/gitea"
13+
api "code.gitea.io/gitea/modules/structs"
1414
)
1515

1616
func BenchmarkRepo(b *testing.B) {

‎integrations/links_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"testing"
1212

1313
"code.gitea.io/gitea/modules/setting"
14+
api "code.gitea.io/gitea/modules/structs"
1415
"code.gitea.io/gitea/modules/test"
15-
api "code.gitea.io/sdk/gitea"
1616

1717
"github.com/stretchr/testify/assert"
1818
)

‎integrations/pull_status_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/models"
13-
api "code.gitea.io/sdk/gitea"
13+
api "code.gitea.io/gitea/modules/structs"
1414

1515
"github.com/stretchr/testify/assert"
1616
)

‎integrations/repo_commits_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"path"
1010
"testing"
1111

12-
api "code.gitea.io/sdk/gitea"
12+
api "code.gitea.io/gitea/modules/structs"
1313

1414
"github.com/stretchr/testify/assert"
1515
)

‎integrations/ssh_key_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"time"
1616

1717
"code.gitea.io/gitea/modules/git"
18-
api "code.gitea.io/sdk/gitea"
18+
api "code.gitea.io/gitea/modules/structs"
1919
"github.com/stretchr/testify/assert"
2020
)
2121

‎integrations/version_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010

1111
"code.gitea.io/gitea/modules/setting"
12-
"code.gitea.io/sdk/gitea"
12+
"code.gitea.io/gitea/modules/structs"
1313

1414
"github.com/stretchr/testify/assert"
1515
)
@@ -21,7 +21,7 @@ func TestVersion(t *testing.T) {
2121
req := NewRequest(t, "GET", "/api/v1/version")
2222
resp := MakeRequest(t, req, http.StatusOK)
2323

24-
var version gitea.ServerVersion
24+
var version structs.ServerVersion
2525
DecodeJSON(t, resp, &version)
2626
assert.Equal(t, setting.AppVer, string(version.Version))
2727
}

‎models/action.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"code.gitea.io/gitea/modules/git"
2121
"code.gitea.io/gitea/modules/log"
2222
"code.gitea.io/gitea/modules/setting"
23+
api "code.gitea.io/gitea/modules/structs"
2324
"code.gitea.io/gitea/modules/util"
24-
api "code.gitea.io/sdk/gitea"
2525

2626
"github.com/Unknwon/com"
2727
"github.com/go-xorm/builder"

‎models/attachment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"path"
1212

1313
"code.gitea.io/gitea/modules/setting"
14+
api "code.gitea.io/gitea/modules/structs"
1415
"code.gitea.io/gitea/modules/util"
15-
api "code.gitea.io/sdk/gitea"
1616

1717
"github.com/go-xorm/xorm"
1818
gouuid "github.com/satori/go.uuid"

‎models/issue.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"code.gitea.io/gitea/modules/base"
1515
"code.gitea.io/gitea/modules/log"
1616
"code.gitea.io/gitea/modules/setting"
17+
api "code.gitea.io/gitea/modules/structs"
1718
"code.gitea.io/gitea/modules/util"
18-
api "code.gitea.io/sdk/gitea"
1919

2020
"github.com/Unknwon/com"
2121
"github.com/go-xorm/builder"

‎models/issue_assignees.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"code.gitea.io/gitea/modules/log"
1111

12-
api "code.gitea.io/sdk/gitea"
12+
api "code.gitea.io/gitea/modules/structs"
1313
"github.com/go-xorm/xorm"
1414
)
1515

‎models/issue_comment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/go-xorm/builder"
1919
"github.com/go-xorm/xorm"
2020

21-
api "code.gitea.io/sdk/gitea"
21+
api "code.gitea.io/gitea/modules/structs"
2222

2323
"code.gitea.io/gitea/modules/log"
2424
"code.gitea.io/gitea/modules/markup"

‎models/issue_label.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/go-xorm/xorm"
1515

16-
api "code.gitea.io/sdk/gitea"
16+
api "code.gitea.io/gitea/modules/structs"
1717
)
1818

1919
var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")

‎models/issue_label_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"html/template"
99
"testing"
1010

11-
api "code.gitea.io/sdk/gitea"
11+
api "code.gitea.io/gitea/modules/structs"
1212

1313
"github.com/stretchr/testify/assert"
1414
)

‎models/issue_milestone.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"code.gitea.io/gitea/modules/log"
1111
"code.gitea.io/gitea/modules/setting"
12+
api "code.gitea.io/gitea/modules/structs"
1213
"code.gitea.io/gitea/modules/util"
13-
api "code.gitea.io/sdk/gitea"
1414
"github.com/go-xorm/xorm"
1515
)
1616

0 commit comments

Comments
 (0)