feat: add gitea remote driver. #2017

appleboy · 2017-05-01T10:36:36Z

Since Gitea already supports status API. go-gitea/gitea#1332 It is time to create a new remote driver for Gitea.

ref: #1978

lunny · 2017-05-01T12:10:43Z

remote/gitea/gitea_test.go

+ "github.com/gin-gonic/gin"
+)
+
+func Test_gogs(t *testing.T) {


lunny · 2017-05-01T12:10:58Z

remote/gitea/gitea.go

+ client := c.newClientToken(u.Token)
+ ref := b.Commit
+
+ // TODO gogs does not yet return a sha with the pull request


Is this still the case for gitea?

lunny · 2017-05-01T12:34:41Z

remote/gitea/fixtures/handler.go

+ } `json:"config"`
+ }{}
+ c.BindJSON(&in)
+ if in.Type != "gogs" ||


lunny · 2017-05-01T12:35:22Z

remote/gitea/fixtures/hooks.go

@@ -0,0 +1,140 @@
+package fixtures
+
+// Sample Gogs push hook


tboerger · 2017-05-01T12:33:56Z

remote/gitea/gitea.go

+ "github.com/drone/drone/model"
+ "github.com/drone/drone/remote"
+
+ "github.com/go-gitea/go-sdk/gitea"


code.gitea.io/sdk should be the correct import path.

tboerger · 2017-05-01T12:34:12Z

remote/gitea/gitea.go

+
+const (
+ DescPending = "the build is pending"
+ DescRunning = "the buils is running"


tboerger · 2017-05-01T12:34:57Z

remote/gitea/gitea.go

+
+// Login authenticates an account with Gitea using basic authenticaiton. The
+// Gitea account details are returned when the user is successfully authenticated.
+func (c *client) Login(res http.ResponseWriter, req *http.Request) (*model.User, error) {


OAuth2 provider is not done yet, right?

Yes. you are right.

tboerger · 2017-05-01T12:35:34Z

remote/gitea/gitea.go

+ client := c.newClientToken(u.Token)
+ ref := b.Commit
+
+ // TODO gogs does not yet return a sha with the pull request


Is this still the case for gitea?

appleboy · 2017-05-01T12:55:01Z

@tboerger @lunny just fix testing first.

appleboy · 2017-05-01T13:00:16Z

remote/gitea/fixtures/handler.go

@@ -79,7 +79,6 @@ const repoPayload = `
 {
 "owner": {
 "login": "test_name",
- "username": "test_name",


See https://developer.github.com/v3/users/#get-a-single-user

mrueg · 2017-05-01T13:46:23Z

remote/gitea/fixtures/handler.go

+)
+
+// Handler returns an http.Handler that is capable of handling a variety of mock
+// Bitbucket requests and returning mock responses.


d631966 done

bkcsoft

A few notes and questions :)

bkcsoft · 2017-05-01T13:44:11Z

drone/server/server.go

+ EnvVar: "DRONE_GITEA_URL",
+ Name: "gitea-server",
+ Usage: "gitea server address",
+ Value: "https://github.com",


Might wanna have https://try.gitea.io as default instead

bkcsoft · 2017-05-01T13:44:53Z

remote/gitea/fixtures/handler.go

+)
+
+// Handler returns an http.Handler that is capable of handling a variety of mock
+// Bitbucket requests and returning mock responses.


s/Bitbucket/Gitea

bkcsoft · 2017-05-01T13:49:42Z

remote/gitea/gitea.go

+ return gitea.StatusFailure
+ case model.StatusKilled:
+ return gitea.StatusFailure
+ default:


Maybe have

case model.StatusDesclined: return gitea.StatusWarning

Though I'm not sure what StatusDeclined is actually :)

This is related to the gating of drone if the gating have been declined. So I think gitea.StatusWarning makes sense.

Add model.StatusDeclined

bkcsoft · 2017-05-01T13:50:40Z

remote/gitea/gitea.go

+ return "", fmt.Errorf("Not Implemented")
+}
+
+// Teams is not supported by the Gitea driver.


Why not? 😄

I think this comment is outdated.

bkcsoft · 2017-05-01T13:51:05Z

remote/gitea/gitea.go

+ return c.newClientToken(u.Token).GetFile(r.Owner, r.Name, ref, f)
+}
+
+// Status is not supported by the Gitea driver.


Status is supported 😉

Yep, outdated comment as well :D

bkcsoft · 2017-05-01T13:51:22Z

remote/gitea/gitea.go

+ "content_type": "json",
+ }
+ hook := gitea.CreateHookOption{
+ Type: "gogs",


bkcsoft · 2017-05-01T13:51:44Z

remote/gitea/gitea.go

+ return err
+}
+
+// Deactivate is not supported by the Gitea driver.


Any reason why not? We have delete webhook no?

Please take a look at my pending pull-request, I have started to integrate that for Gogs some time ago.

For reference: #1752

Waiting for reference PR #1752

The reference PR is only for the Gogs driver, not for Gitea.

@tboerger Yes. I can create another PR to implement Deactivate.

yes, we should implement Deactivate as part of this PR. Without the ability to deactivate, a repository cannot be re-enabled correctly

bkcsoft · 2017-05-01T15:23:07Z

remote/gitea/helper.go

@@ -186,7 +186,7 @@ func parsePullRequest(r io.Reader) (*pullRequestHook, error) {
 }

 // fixMalformedAvatar is a helper function that fixes an avatar url if malformed
-// (currently a known bug with gogs)
+// (currently a known bug with gitea)


Link to bug issue?

tboerger · 2017-05-01T17:00:39Z

remote/gitea/gitea.go

+
+ "github.com/drone/drone/model"
+ "github.com/drone/drone/remote"
+


We are not on Gitea, drop this empty line :)

tboerger · 2017-05-01T17:01:58Z

remote/gitea/gitea.go

+ return gitea.StatusFailure
+ case model.StatusKilled:
+ return gitea.StatusFailure
+ default:


This is related to the gating of drone if the gating have been declined. So I think gitea.StatusWarning makes sense.

tboerger · 2017-05-01T17:03:58Z

remote/gitea/gitea.go

+ return "", fmt.Errorf("Not Implemented")
+}
+
+// Teams is not supported by the Gitea driver.


I think this comment is outdated.

tboerger · 2017-05-01T17:04:37Z

remote/gitea/gitea.go

+ return teams, nil
+}
+
+// TeamPerm is not supported by the Gitea driver.


Is this really not supported?

this function is no longer used so we can remove from Remote

tboerger · 2017-05-01T17:05:31Z

remote/gitea/gitea.go

+ client := c.newClientToken(u.Token)
+ ref := b.Commit
+
+ // TODO gitea does not yet return a sha with the pull request


Is this still valid for Gitea?

No, we send a sha now :)

Should we update this to include sha?

tboerger · 2017-05-01T17:05:49Z

remote/gitea/gitea.go

+ return c.newClientToken(u.Token).GetFile(r.Owner, r.Name, ref, f)
+}
+
+// Status is not supported by the Gitea driver.


Yep, outdated comment as well :D

tboerger · 2017-05-01T17:06:25Z

remote/gitea/gitea.go

+ return err
+}
+
+// Deactivate is not supported by the Gitea driver.


Please take a look at my pending pull-request, I have started to integrate that for Gogs some time ago.

tboerger · 2017-05-01T17:07:34Z

remote/gitea/helper.go

+}
+
+// fixMalformedAvatar is a helper function that fixes an avatar url if malformed
+// (currently a known bug with gitea)


Again, is that still the case for Gitea?

tboerger · 2017-05-01T17:08:04Z

remote/gitea/parse.go

+)
+
+const (
+ hookEvent = "X-Gogs-Event"


X-Gitea-Event? AFAIK we got this as fallback.

We can create next PR to improvement this event.

because we need to update Gitea source code first.

You are right, I thought we already added Gitea there: https://github.com/go-gitea/gitea/blob/master/models/webhook.go#L539-L542

I think we can improve this with another PR. This PR just support commit status and create the new Gitea driver.

mrueg · 2017-05-02T17:09:08Z

remote/gitea/gitea.go

+)
+
+// getStatus is a helper functin that converts a Drone
+// status to a GitHub status.


s/GitHub/gitea/

mrueg · 2017-05-02T17:10:38Z

remote/gitea/parse.go

+ refTag = "tag"
+)
+
+// parseHook parses a Bitbucket hook from an http.Request request and returns


s/Bitbucket/Gitea/

bkcsoft · 2017-05-02T17:49:04Z

remote/gitea/gitea.go

+ }
+ return &model.Netrc{
+ Login: u.Token,
+ Password: "x-oauth-basic",


"x-oauth-basic" ?

bkcsoft · 2017-05-02T17:52:28Z

remote/gitea/gitea_test.go

+ })
+ })
+
+ g.It("Should register repositroy hooks", func() {


"repositroy" => "repository"

bkcsoft · 2017-05-02T17:53:08Z

remote/gitea/gitea_test.go

+ g.Assert(string(raw)).Equal("{ platform: linux/amd64 }")
+ })
+
+ g.It("Should return nil frome send build status", func() {


"frome" => "from"

tonivj5 · 2017-05-03T07:21:51Z

remote/gitea/gitea.go

+ DescDeclined = "the build was rejected"
+)
+
+// getStatus is a helper functin that converts a Drone


typo in functin

vtolstov · 2017-05-10T11:46:12Z

Very nice, when this can be merged ?=)

bradrydzewski · 2017-05-22T09:52:19Z

vendor/vendor.json

@@ -7,6 +7,12 @@
 "revision": ""
 },
 {
+ "checksumSHA1": "Vrt1uoeOOk9fp1aa9d7huQhzexU=",
+ "path": "code.gitea.io/sdk/gitea",


should this be github.com/go-gitea/go-sdk?

when I visit code.gitea.io/sdk/gitea I don't see any source code (maybe I'm not understanding the UI though). I would not feel comfortable with a dependency that developers cannot trace back to the origin source.

Nope, this is the correct import path :). It's simple go get magic:

# curl -sL code.gitea.io/sdk/gitea?go-get=1 | grep code.gitea.io/sdk <meta name="go-import" content="code.gitea.io/sdk git https://github.com/go-gitea/go-sdk"> <meta name="go-source" content="code.gitea.io/sdk https://github.com/go-gitea/go-sdk https://github.com/go-gitea/go-sdk/tree/master{/dir} https://github.com/go-gitea/go-sdk/blob/master{/dir}/{file}#L{line}">

Just to give you more background information: We introduced a custom import path directly at the beginning to be able to switch to dog-fooding at some point without distroying previous installs.

bradrydzewski

two minor comments and then I think we can get this merged. I am going to cut an 0.7 tag end of week and it would be great to get this included :)

bradrydzewski · 2017-05-22T23:10:25Z

remote/gitea/gitea.go

+ client := c.newClientToken(u.Token)
+ ref := b.Commit
+
+ // TODO gitea does not yet return a sha with the pull request


Should we update this to include sha?

bradrydzewski · 2017-05-22T23:10:53Z

remote/gitea/gitea.go

+ return err
+}
+
+// Deactivate is not supported by the Gitea driver.


yes, we should implement Deactivate as part of this PR. Without the ability to deactivate, a repository cannot be re-enabled correctly

appleboy · 2017-05-24T02:08:01Z

@bradrydzewski @lunny @bkcsoft @tboerger @DblK

7641092

I already finished the implements of deactivate and refactor the file method finally. Please help to review again and make sure you need to update some changes from go-gitea/gitea#1755 before testing this PR.

Signed-off-by: Bo-Yi Wu <[email protected]>

strk · 2018-01-19T20:00:52Z

which release of Drone will first have this support ?

appleboy · 2018-01-20T01:44:06Z

@strk I guess the 1.2 version.

strk · 2018-01-20T07:07:28Z

I mean Drone version - latest is 0.8

appleboy · 2018-01-20T15:32:14Z

@strk 0.7 version

lunny reviewed May 1, 2017

View reviewed changes

remote/gitea/gitea_test.go Outdated

"github.com/gin-gonic/gin"

)

func Test_gogs(t *testing.T) {

Copy link

lunny May 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gitea

lunny reviewed May 1, 2017

View reviewed changes

remote/gitea/fixtures/handler.go Outdated

} `json:"config"`

}{}

c.BindJSON(&in)

if in.Type != "gogs" ||

Copy link

lunny May 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gitea

lunny reviewed May 1, 2017

View reviewed changes

remote/gitea/fixtures/hooks.go Outdated

@@ -0,0 +1,140 @@

package fixtures

// Sample Gogs push hook

Copy link

lunny May 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gitea

tboerger reviewed May 1, 2017

View reviewed changes

appleboy commented May 1, 2017

View reviewed changes

mrueg reviewed May 1, 2017

View reviewed changes

bkcsoft suggested changes May 1, 2017

View reviewed changes

bkcsoft reviewed May 1, 2017

View reviewed changes

tboerger reviewed May 1, 2017

View reviewed changes

lunny mentioned this pull request May 2, 2017

Gitea hosted Gitea go-gitea/gitea#1029

Open

20 tasks

mrueg reviewed May 2, 2017

View reviewed changes

remote/gitea/gitea.go Outdated

)

// getStatus is a helper functin that converts a Drone

// status to a GitHub status.

Copy link

mrueg May 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/GitHub/gitea/

mrueg reviewed May 2, 2017

View reviewed changes

bkcsoft reviewed May 2, 2017

View reviewed changes

appleboy force-pushed the gitea branch from cb9b82d to a74f70c Compare May 3, 2017 02:25

tonivj5 reviewed May 3, 2017

View reviewed changes

appleboy force-pushed the gitea branch from 4996718 to 5f418e2 Compare May 7, 2017 02:36

appleboy mentioned this pull request May 7, 2017

Show commit status icon in commits table go-gitea/gitea#1688

Merged

appleboy force-pushed the gitea branch from 5f418e2 to 2a52d07 Compare May 14, 2017 09:08

DblK mentioned this pull request May 19, 2017

Add Gitea Webhook go-gitea/gitea#1755

Merged

bradrydzewski requested changes May 22, 2017

View reviewed changes

appleboy force-pushed the gitea branch 2 times, most recently from 82f4efa to 7641092 Compare May 24, 2017 02:02

appleboy added 3 commits May 24, 2017 10:16

feat: add gitea remote driver.

35b1e1d

fix: testing

82548c4

fix: add commit status testing.

4329268

appleboy added 14 commits May 24, 2017 10:16

fix: remove username json field.

7007232

fix: rename Gogs to Gitea

2263ba2

refactor: update vendor.

4f256bf

fix: [ci skip] update comment.

0f95c50

fix: update

568e8f8

fix: comment

c018f1a

fix typo

fefbf9f

Signed-off-by: Bo-Yi Wu <[email protected]>

fix import

1417948

Signed-off-by: Bo-Yi Wu <[email protected]>

fix typo

8e58099

Signed-off-by: Bo-Yi Wu <[email protected]>

remove unnecessary slashes from url

92a8c23

Signed-off-by: Bo-Yi Wu <[email protected]>

Gitea return a sha with the pull request

f186d4c

Signed-off-by: Bo-Yi Wu <[email protected]>

fix gitea file testing.

7f072e3

Signed-off-by: Bo-Yi Wu <[email protected]>

support deactivate method and refactor file method

25ddaf8

Signed-off-by: Bo-Yi Wu <[email protected]>

update hook event

f2b63b6

Signed-off-by: Bo-Yi Wu <[email protected]>

appleboy force-pushed the gitea branch from 3cc79e4 to f2b63b6 Compare May 24, 2017 02:16

bradrydzewski approved these changes May 24, 2017

View reviewed changes

bradrydzewski merged commit 85c8627 into harness:master May 24, 2017

appleboy deleted the gitea branch May 24, 2017 14:27

bot2-harness pushed a commit that referenced this pull request Apr 26, 2024

[code-1822-maint] minor requested changes (#2017)

ed97ff8


		"github.com/drone/drone/model"
		"github.com/drone/drone/remote"

feat: add gitea remote driver. #2017

feat: add gitea remote driver. #2017

Conversation

appleboy commented May 1, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

appleboy commented May 1, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bkcsoft left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vtolstov commented May 10, 2017

Choose a reason for hiding this comment

tboerger May 22, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bradrydzewski left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

appleboy commented May 24, 2017 • edited Loading

strk commented Jan 19, 2018

appleboy commented Jan 20, 2018

strk commented Jan 20, 2018

appleboy commented Jan 20, 2018

appleboy commented May 1, 2017 •

edited

Loading

appleboy commented May 1, 2017 •

edited

Loading

tboerger May 22, 2017 •

edited

Loading

bradrydzewski left a comment •

edited

Loading

appleboy commented May 24, 2017 •

edited

Loading