fix struct & consistency

Signed-off-by: zhuxiaoyang <sunzhu@yunify.com>

Author: zhuxiaoyang

scm/content.go

@@ -4,9 +4,7 @@
 
 package scm
 
-import (
-	"context"
-)
+import "context"
 
 type (
 	// Content stores the contents of a repository file.
@@ -18,10 +16,11 @@ type (
 	// ContentParams provide parameters for creating and
 	// updating repository content.
 	ContentParams struct {
+		Ref       string
 		Branch    string
 		Message   string
 		Data      []byte
-		SHA       string
+		Sha       string
 		Signature Signature
 	}
 

scm/driver/github/content.go

@@ -9,7 +9,6 @@ import (
 	"encoding/base64"
 	"fmt"
 	"github.com/drone/go-scm/scm"
-	"time"
 )
 
 type contentService struct {
@@ -29,30 +28,41 @@ func (s *contentService) Find(ctx context.Context, repo, path, ref string) (*scm
 
 func (s *contentService) Create(ctx context.Context, repo, path string, params *scm.ContentParams) (*scm.Response, error) {
 	endpoint := fmt.Sprintf("repos/%s/contents/%s", repo, path)
-	in := new(contentCreateUpdate)
-	in.Committer.Name = params.Signature.Name
-	in.Committer.Email = params.Signature.Email
-	in.Author.Name = params.Signature.Name
-	in.Author.Email = params.Signature.Email
-	in.Message = params.Message
-	in.Branch = params.Branch
-	in.Content = params.Data
-	in.SHA = params.SHA
+	in := &contentCreateUpdate{
+		Message: params.Message,
+		Branch:  params.Branch,
+		Content: params.Data,
+		Sha:     params.Sha,
+		Committer: commitAuthor{
+			Name:  params.Signature.Name,
+			Email: params.Signature.Email,
+		},
+		Author: commitAuthor{
+			Name:  params.Signature.Name,
+			Email: params.Signature.Email,
+		},
+	}
+
 	res, err := s.client.do(ctx, "PUT", endpoint, in, nil)
 	return res, err
 }
 
 func (s *contentService) Update(ctx context.Context, repo, path string, params *scm.ContentParams) (*scm.Response, error) {
 	endpoint := fmt.Sprintf("repos/%s/contents/%s", repo, path)
-	in := new(contentCreateUpdate)
-	in.Committer.Name = params.Signature.Name
-	in.Committer.Email = params.Signature.Email
-	in.Author.Name = params.Signature.Name
-	in.Author.Email = params.Signature.Email
-	in.Message = params.Message
-	in.Branch = params.Branch
-	in.Content = params.Data
-	in.SHA = params.SHA
+	in := &contentCreateUpdate{
+		Message: params.Message,
+		Branch:  params.Branch,
+		Content: params.Data,
+		Sha:     params.Sha,
+		Committer: commitAuthor{
+			Name:  params.Signature.Name,
+			Email: params.Signature.Email,
+		},
+		Author: commitAuthor{
+			Name:  params.Signature.Name,
+			Email: params.Signature.Email,
+		},
+	}
 	res, err := s.client.do(ctx, "PUT", endpoint, in, nil)
 	return res, err
 }
@@ -77,18 +87,17 @@ type content struct {
 }
 
 type contentCreateUpdate struct {
-	Branch    string
-	Message   string
-	Content   []byte
-	SHA       string
-	Author    CommitAuthor
-	Committer CommitAuthor
+	Branch    string       `json:"branch"`
+	Message   string       `json:"message"`
+	Content   []byte       `json:"content"`
+	Sha       string       `json:"sha"`
+	Author    commitAuthor `json:"author"`
+	Committer commitAuthor `json:"committer"`
 }
 
-type CommitAuthor struct {
-	Date  *time.Time
-	Name  string
-	Email string
+type commitAuthor struct {
+	Name  string `json:"name"`
+	Email string `json:"email"`
 }
 
 func convertContentInfoList(from []*content) []*scm.ContentInfo {

scm/driver/github/content_test.go

@@ -101,7 +101,7 @@ func TestContentUpdate(t *testing.T) {
 	params := &scm.ContentParams{
 		Message: "a new commit message",
 		Data:    []byte("bXkgdXBkYXRlZCBmaWxlIGNvbnRlbnRz"),
-		SHA:     "95b966ae1c166bd92f8ae7d1c313e738c731dfc3",
+		Sha:     "95b966ae1c166bd92f8ae7d1c313e738c731dfc3",
 		Signature: scm.Signature{
 			Name:  "Monalisa Octocat",
 			Email: "octocat@github.com",

scm/driver/gitlab/content.go

@@ -44,13 +44,14 @@ func (s *contentService) Create(ctx context.Context, repo, path string, params *
 	path = url.QueryEscape(path)
 	path = strings.Replace(path, ".", "%2E", -1)
 	endpoint := fmt.Sprintf("api/v4/projects/%s/repository/files/%s", encode(repo), path)
-	in := new(createUpdateContent)
-	in.Branch = params.Branch
-	in.Content = params.Data
-	in.CommitMessage = params.Message
-	in.Encoding = "base64"
-	in.AuthorEmail = params.Signature.Email
-	in.AuthorName = params.Signature.Name
+	in := &createUpdateContent{
+		Branch:        params.Branch,
+		Content:       params.Data,
+		CommitMessage: params.Message,
+		Encoding:      "base64",
+		AuthorName:    params.Signature.Name,
+		AuthorEmail:   params.Signature.Email,
+	}
 	res, err := s.client.do(ctx, "POST", endpoint, in, nil)
 	return res, err
 
@@ -60,13 +61,14 @@ func (s *contentService) Update(ctx context.Context, repo, path string, params *
 	path = url.QueryEscape(path)
 	path = strings.Replace(path, ".", "%2E", -1)
 	endpoint := fmt.Sprintf("api/v4/projects/%s/repository/files/%s", encode(repo), path)
-	in := new(createUpdateContent)
-	in.Branch = params.Branch
-	in.Content = params.Data
-	in.CommitMessage = params.Message
-	in.Encoding = "base64"
-	in.AuthorEmail = params.Signature.Email
-	in.AuthorName = params.Signature.Name
+	in := &createUpdateContent{
+		Branch:        params.Branch,
+		Content:       params.Data,
+		CommitMessage: params.Message,
+		Encoding:      "base64",
+		AuthorName:    params.Signature.Name,
+		AuthorEmail:   params.Signature.Email,
+	}
 	res, err := s.client.do(ctx, "PUT", endpoint, in, nil)
 	return res, err
 }