Skip to content

G
go-gitlab
Commit 4f1f8d2b authored by Sander van Harmelen's avatar Sander van Harmelen Committed by GitHub
Browse files
Options

Convert all *Options structs to use pointer for fields and fixup the README and… 

Convert all *Options structs to use pointer for fields and fixup the README and project struct (#66)

* Convert all *Options structs to use pointer for fields, per #29.

* Update README and fix project struct

The `project` struct was the only one that had all pointers, so I reverted that to make things consistent again.

The same goes for the `time.Time` pointers. In some cases the API does not return a time and if the field is not a pointer to `time.Time`, this will generate an error. So to be consistent now all `time.Time` fields are pointer fields.
parent 2df15271
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 450 additions and 431 deletions
README.md
View file @ 4f1f8d2b
......@@ -2,9 +2,17 @@
A GitLab API client enabling Go programs to interact with GitLab in a simple and uniform way
**Documentation:** [![GoDoc](https://godoc.org/github.com/xanzy/go-gitlab?status.svg)](https://godoc.org/github.com/xanzy/go-gitlab)
**Documentation:** [![GoDoc](https://godoc.org/github.com/xanzy/go-gitlab?status.svg)](https://godoc.org/github.com/xanzy/go-gitlab)
**Build Status:** [![Build Status](https://travis-ci.org/xanzy/go-gitlab.svg?branch=master)](https://travis-ci.org/xanzy/go-gitlab)
## NOTE
Release v0.2.0 (released on 26-07-2016), is unfortunately backwards incompatible. We
understand very well that this will cause some additional work in order to get your
code working again, but we believe this is a necessary eval to improve functionality
and fix some use cases (see [GH-29](https://github.com/xanzy/go-gitlab/issues/29) and
[GH-53](https://github.com/xanzy/go-gitlab/issues/53)).
## Coverage
This API client package covers **100%** of the existing GitLab API calls! So this
......@@ -51,7 +59,7 @@ to list all projects for user "svanharmelen":
```go
git := gitlab.NewClient(nil)
opt := &ListProjectsOptions{Search: "svanharmelen"})
opt := &ListProjectsOptions{Search: gitlab.String("svanharmelen")})
projects, _, err := git.Projects.ListProjects(opt)
```
......@@ -74,11 +82,11 @@ func main() {
// Create new project
p := &gitlab.CreateProjectOptions{
Name: "My Project",
Description: "Just a test project to play with",
MergeRequestsEnabled: true,
SnippetsEnabled: true,
VisibilityLevel: gitlab.PublicVisibility,
Name: gitlab.String("My Project"),
Description: gitlab.String("Just a test project to play with"),
MergeRequestsEnabled: gitlab.Bool(true),
SnippetsEnabled: gitlab.Bool(true),
VisibilityLevel: gitlab.VisibilityLevel(gitlab.PublicVisibility),
}
project, _, err := git.Projects.CreateProject(p)
if err != nil {
......@@ -87,10 +95,10 @@ func main() {
// Add a new snippet
s := &gitlab.CreateSnippetOptions{
Title: "Dummy Snippet",
FileName: "snippet.go",
Code: "package main....",
VisibilityLevel: gitlab.PublicVisibility,
Title: gitlab.String("Dummy Snippet"),
FileName: gitlab.String("snippet.go"),
Code: gitlab.String("package main...."),
VisibilityLevel: gitlab.VisibilityLevel(gitlab.PublicVisibility),
}
_, _, err = git.ProjectSnippets.CreateSnippet(project.ID, s)
if err != nil {
......
branches.go
View file @ 4f1f8d2b
......@@ -154,8 +154,8 @@ func (s *BranchesService) UnprotectBranch(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/branches.html#create-repository-branch
type CreateBranchOptions struct {
BranchName string `url:"branch_name,omitempty" json:"branch_name,omitempty"`
Ref string `url:"ref,omitempty" json:"ref,omitempty"`
BranchName *string `url:"branch_name,omitempty" json:"branch_name,omitempty"`
Ref *string `url:"ref,omitempty" json:"ref,omitempty"`
}
// CreateBranch creates branch from commit SHA or existing branch.
......
commits.go
View file @ 4f1f8d2b
......@@ -34,16 +34,16 @@ type CommitsService struct {
//
// GitLab API docs: http://doc.gitlab.com/ce/api/commits.html
type Commit struct {
ID string `json:"id"`
ShortID string `json:"short_id"`
Title string `json:"title"`
AuthorName string `json:"author_name"`
AuthorEmail string `json:"author_email"`
AuthoredDate time.Time `json:"authored_date"`
CommittedDate time.Time `json:"committed_date"`
CreatedAt time.Time `json:"created_at"`
Message string `json:"message"`
ParentsIds []string `json:"parents_ids"`
ID string `json:"id"`
ShortID string `json:"short_id"`
Title string `json:"title"`
AuthorName string `json:"author_name"`
AuthorEmail string `json:"author_email"`
AuthoredDate *time.Time `json:"authored_date"`
CommittedDate *time.Time `json:"committed_date"`
CreatedAt *time.Time `json:"created_at"`
Message string `json:"message"`
ParentsIds []string `json:"parents_ids"`
}
func (c Commit) String() string {
......@@ -55,7 +55,7 @@ func (c Commit) String() string {
// GitLab API docs: http://doc.gitlab.com/ce/api/commits.html#list-commits
type ListCommitsOptions struct {
ListOptions
RefName string `url:"ref_name,omitempty" json:"ref_name,omitempty"`
RefName *string `url:"ref_name,omitempty" json:"ref_name,omitempty"`
}
// ListCommits gets a list of repository commits in a project.
......@@ -167,15 +167,14 @@ type CommitComment struct {
Author Author `json:"author"`
}
type Author struct {
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
Blocked bool `json:"blocked"`
CreatedAt time.Time `json:"created_at"`
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
Blocked bool `json:"blocked"`
CreatedAt *time.Time `json:"created_at"`
}
func (c CommitComment) String() string {
......@@ -215,10 +214,10 @@ func (s *CommitsService) GetCommitComments(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/commits.html#post-comment-to-commit
type PostCommitCommentOptions struct {
Note string `url:"note,omitempty" json:"note,omitempty"`
Path string `url:"path" json:"path"`
Line int `url:"line" json:"line"`
LineType string `url:"line_type" json:"line_type"`
Note *string `url:"note,omitempty" json:"note,omitempty"`
Path *string `url:"path" json:"path"`
Line *int `url:"line" json:"line"`
LineType *string `url:"line_type" json:"line_type"`
}
// PostCommitComment adds a comment to a commit. Optionally you can post
......@@ -255,27 +254,27 @@ func (s *CommitsService) PostCommitComment(
//
// GitLab API docs: http://doc.gitlab.com/ce/api/commits.html#get-the-status-of-a-commit
type GetCommitStatusesOptions struct {
Ref string `url:"ref,omitempty" json:"ref,omitempty"`
Stage string `url:"stage,omitempty" json:"stage,omitempty"`
Name string `url:"name,omitempty" json:"name,omitempty"`
All bool `url:"all,omitempty" json:"all,omitempty"`
Ref *string `url:"ref,omitempty" json:"ref,omitempty"`
Stage *string `url:"stage,omitempty" json:"stage,omitempty"`
Name *string `url:"name,omitempty" json:"name,omitempty"`
All *bool `url:"all,omitempty" json:"all,omitempty"`
}
// CommitStatus represents a GitLab commit status.
//
// GitLab API docs: http://doc.gitlab.com/ce/api/commits.html#get-the-status-of-a-commit
type CommitStatus struct {
ID int `json:"id"`
SHA string `json:"sha"`
Ref string `json:"ref"`
Status string `json:"status"`
Name string `json:"name"`
TargetUrl string `json:"target_url"`
Description string `json:"description"`
CreatedAt time.Time `json:"created_at"`
StartedAt time.Time `json:"started_at"`
FinishedAt time.Time `json:"finished_at"`
Author Author `json:"author"`
ID int `json:"id"`
SHA string `json:"sha"`
Ref string `json:"ref"`
Status string `json:"status"`
Name string `json:"name"`
TargetUrl string `json:"target_url"`
Description string `json:"description"`
CreatedAt *time.Time `json:"created_at"`
StartedAt *time.Time `json:"started_at"`
FinishedAt *time.Time `json:"finished_at"`
Author Author `json:"author"`
}
// GetCommitStatuses gets the statuses of a commit in a project.
......@@ -310,11 +309,11 @@ func (s *CommitsService) GetCommitStatuses(
// GitLab API docs: http://doc.gitlab.com/ce/api/commits.html#post-the-status-to-commit
type SetCommitStatusOptions struct {
State BuildState `url:"state" json:"state"`
Ref string `url:"ref,omitempty" json:"ref,omitempty"`
Name string `url:"name,omitempty" json:"name,omitempty"`
Context string `url:"context,omitempty" json:"context,omitempty"`
TargetUrl string `url:"target_url,omitempty" json:"target_url,omitempty"`
Description string `url:"description,omitempty" json:"description,omitempty"`
Ref *string `url:"ref,omitempty" json:"ref,omitempty"`
Name *string `url:"name,omitempty" json:"name,omitempty"`
Context *string `url:"context,omitempty" json:"context,omitempty"`
TargetUrl *string `url:"target_url,omitempty" json:"target_url,omitempty"`
Description *string `url:"description,omitempty" json:"description,omitempty"`
}
type BuildState string
......
commits_test.go
View file @ 4f1f8d2b
......@@ -14,15 +14,15 @@ func TestGetCommitStatuses(t *testing.T) {
mux.HandleFunc("/projects/1/repository/commits/b0b3a907f41409829b307a28b82fdbd552ee5a27/statuses", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "GET")
testFormValues(t, r, values{
"ref": "master",
"ref": "master",
"stage": "test",
"name": "ci/jenkins",
"all": "true",
"name": "ci/jenkins",
"all": "true",
})
fmt.Fprint(w, `[{"id":1}]`)
})
opt := &GetCommitStatusesOptions{"master", "test", "ci/jenkins", true}
opt := &GetCommitStatusesOptions{String("master"), String("test"), String("ci/jenkins"), Bool(true)}
statuses, _, err := client.Commits.GetCommitStatuses("1", "b0b3a907f41409829b307a28b82fdbd552ee5a27", opt)
if err != nil {
......@@ -42,16 +42,17 @@ func TestSetCommitStatus(t *testing.T) {
mux.HandleFunc("/projects/1/statuses/b0b3a907f41409829b307a28b82fdbd552ee5a27", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "POST")
testJsonBody(t, r, values{
"state": "running",
"ref": "master",
"name": "ci/jenkins",
"target_url": "http://abc",
"state": "running",
"context": "",
"ref": "master",
"name": "ci/jenkins",
"target_url": "http://abc",
"description": "build",
})
fmt.Fprint(w, `{"id":1}`)
})
opt := &SetCommitStatusOptions{Running, "master", "ci/jenkins", "", "http://abc", "build"}
opt := &SetCommitStatusOptions{Running, String("master"), String("ci/jenkins"), String(""), String("http://abc"), String("build")}
status, _, err := client.Commits.SetCommitStatus("1", "b0b3a907f41409829b307a28b82fdbd552ee5a27", opt)
if err != nil {
......
deploy_keys.go
View file @ 4f1f8d2b
......@@ -32,10 +32,10 @@ type DeployKeysService struct {
// DeployKey represents a GitLab deploy key.
type DeployKey struct {
ID int `json:"id"`
Title string `json:"title"`
Key string `json:"key"`
CreatedAt time.Time `json:"created_at"`
ID int `json:"id"`
Title string `json:"title"`
Key string `json:"key"`
CreatedAt *time.Time `json:"created_at"`
}
func (k DeployKey) String() string {
......@@ -99,8 +99,8 @@ func (s *DeployKeysService) GetDeployKey(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/deploy_keys.html#add-deploy-key
type AddDeployKeyOptions struct {
Title string `url:"title,omitempty" json:"title,omitempty"`
Key string `url:"key,omitempty" json:"key,omitempty"`
Title *string `url:"title,omitempty" json:"title,omitempty"`
Key *string `url:"key,omitempty" json:"key,omitempty"`
}
// AddDeployKey creates a new deploy key for a project. If deploy key already
......
examples/labels.go
View file @ 4f1f8d2b
......@@ -11,8 +11,8 @@ func labelExample() {
// Create new label
l := &gitlab.CreateLabelOptions{
Name: "My Label",
Color: "#11FF22",
Name: gitlab.String("My Label"),
Color: gitlab.String("#11FF22"),
}
label, _, err := git.Labels.CreateLabel("myname/myproject", l)
if err != nil {
......
examples/projects.go
View file @ 4f1f8d2b
......@@ -11,11 +11,11 @@ func projectExample() {
// Create new project
p := &gitlab.CreateProjectOptions{
Name: "My Project",
Description: "Just a test project to play with",
MergeRequestsEnabled: true,
SnippetsEnabled: true,
VisibilityLevel: gitlab.PublicVisibility,
Name: gitlab.String("My Project"),
Description: gitlab.String("Just a test project to play with"),
MergeRequestsEnabled: gitlab.Bool(true),
SnippetsEnabled: gitlab.Bool(true),
VisibilityLevel: gitlab.VisibilityLevel(gitlab.PublicVisibility),
}
project, _, err := git.Projects.CreateProject(p)
if err != nil {
......@@ -24,10 +24,10 @@ func projectExample() {
// Add a new snippet
s := &gitlab.CreateSnippetOptions{
Title: "Dummy Snippet",
FileName: "snippet.go",
Code: "package main....",
VisibilityLevel: gitlab.PublicVisibility,
Title: gitlab.String("Dummy Snippet"),
FileName: gitlab.String("snippet.go"),
Code: gitlab.String("package main...."),
VisibilityLevel: gitlab.VisibilityLevel(gitlab.PublicVisibility),
}
_, _, err = git.ProjectSnippets.CreateSnippet(project.ID, s)
if err != nil {
......
examples/repository_files.go
View file @ 4f1f8d2b
......@@ -12,11 +12,11 @@ func repositoryFileExample() {
// Create a new repository file
cf := &gitlab.CreateFileOptions{
FilePath: "file.go",
BranchName: "master",
Encoding: "text",
Content: "My file contenxst",
CommitMessage: "Adding a test file",
FilePath: gitlab.String("file.go"),
BranchName: gitlab.String("master"),
Encoding: gitlab.String("text"),
Content: gitlab.String("My file contents"),
CommitMessage: gitlab.String("Adding a test file"),
}
file, _, err := git.RepositoryFiles.CreateFile("myname/myproject", cf)
if err != nil {
......@@ -25,11 +25,11 @@ func repositoryFileExample() {
// Update a repository file
uf := &gitlab.UpdateFileOptions{
FilePath: file.FilePath,
BranchName: "master",
Encoding: "text",
Content: "My file content",
CommitMessage: "Fixing typo",
FilePath: gitlab.String(file.FilePath),
BranchName: gitlab.String("master"),
Encoding: gitlab.String("text"),
Content: gitlab.String("My file content"),
CommitMessage: gitlab.String("Fixing typo"),
}
_, _, err = git.RepositoryFiles.UpdateFile("myname/myproject", uf)
if err != nil {
......@@ -37,8 +37,8 @@ func repositoryFileExample() {
}
gf := &gitlab.GetFileOptions{
FilePath: file.FilePath,
Ref: "master",
FilePath: gitlab.String(file.FilePath),
Ref: gitlab.String("master"),
}
f, _, err := git.RepositoryFiles.GetFile("myname/myproject", gf)
if err != nil {
......
gitlab.go
View file @ 4f1f8d2b
......@@ -49,50 +49,50 @@ const (
oAuthToken
)
// AccessLevel represents a permission level within GitLab.
// AccessLevelValue represents a permission level within GitLab.
//
// GitLab API docs: http://doc.gitlab.com/ce/permissions/permissions.html
type AccessLevel int
type AccessLevelValue int
// List of available access levels
//
// GitLab API docs: http://doc.gitlab.com/ce/permissions/permissions.html
const (
GuestPermissions AccessLevel = 10
ReporterPermissions AccessLevel = 20
DeveloperPermissions AccessLevel = 30
MasterPermissions AccessLevel = 40
OwnerPermission AccessLevel = 50
GuestPermissions AccessLevelValue = 10
ReporterPermissions AccessLevelValue = 20
DeveloperPermissions AccessLevelValue = 30
MasterPermissions AccessLevelValue = 40
OwnerPermission AccessLevelValue = 50
)
// NotificationLevel represents a notification level within Gitlab.
// NotificationLevelValue represents a notification level within Gitlab.
//
// GitLab API docs: http://doc.gitlab.com/ce/api/
type NotificationLevel int
type NotificationLevelValue int
// List of available notification levels
//
// GitLab API docs: http://doc.gitlab.com/ce/api/
const (
DisabledNotifications NotificationLevel = iota
DisabledNotifications NotificationLevelValue = iota
ParticipatingNotifications
WatchNotifications
GlobalNotifications
MentionNotifications
)
// VisibilityLevel represents a visibility level within GitLab.
// VisibilityLevelValue represents a visibility level within GitLab.
//
// GitLab API docs: http://doc.gitlab.com/ce/api/
type VisibilityLevel int
type VisibilityLevelValue int
// List of available visibility levels
//
// GitLab API docs: http://doc.gitlab.com/ce/api/
const (
PrivateVisibility VisibilityLevel = 0
InternalVisibility VisibilityLevel = 10
PublicVisibility VisibilityLevel = 20
PrivateVisibility VisibilityLevelValue = 0
InternalVisibility VisibilityLevelValue = 10
PublicVisibility VisibilityLevelValue = 20
)
// A Client manages communication with the GitLab API.
......@@ -469,3 +469,19 @@ func String(v string) *string {
*p = v
return p
}
// AccessLevel is a helper routine that allocates a new AccessLevelValue
// to store v and returns a pointer to it.
func AccessLevel(v AccessLevelValue) *AccessLevelValue {
p := new(AccessLevelValue)
*p = v
return p
}
// VisibilityLevel is a helper routine that allocates a new VisibilityLevelValue
// to store v and returns a pointer to it.
func VisibilityLevel(v VisibilityLevelValue) *VisibilityLevelValue {
p := new(VisibilityLevelValue)
*p = v
return p
}
groups.go
View file @ 4f1f8d2b
......@@ -45,7 +45,7 @@ type Group struct {
// GitLab API docs: http://doc.gitlab.com/ce/api/groups.html#list-project-groups
type ListGroupsOptions struct {
ListOptions
Search string `url:"search,omitempty" json:"search,omitempty"`
Search *string `url:"search,omitempty" json:"search,omitempty"`
}
// ListGroups gets a list of groups. (As user: my groups, as admin: all groups)
......@@ -95,15 +95,10 @@ func (s *GroupsService) GetGroup(gid interface{}) (*Group, *Response, error) {
//
// GitLab API docs: http://doc.gitlab.com/ce/api/groups.html#new-group
type CreateGroupOptions struct {
Name string `url:"name,omitempty" json:"name,omitempty"`
Path string `url:"path,omitempty" json:"path,omitempty"`
Description string `url:"description,omitempty" json:"description,omitempty"`
// TODO (SvH) This should have the `omitempty` tag, but until issue #29
// is implemented, there is no clean way of adding those tags and still
// being able to define private groups (as the visibility level for that
// is 0 and so it would be omitted defaulting to a public group instead).
VisibilityLevel VisibilityLevel `url:"visibility_level" json:"visibility_level"`
Name *string `url:"name,omitempty" json:"name,omitempty"`
Path *string `url:"path,omitempty" json:"path,omitempty"`
Description *string `url:"description,omitempty" json:"description,omitempty"`
VisibilityLevel *VisibilityLevelValue `url:"visibility_level" json:"visibility_level,omitempty"`
}
// CreateGroup creates a new project group. Available only for users who can
......@@ -201,13 +196,13 @@ func (s *GroupsService) SearchGroup(query string) ([]*Group, *Response, error) {
//
// GitLab API docs: http://doc.gitlab.com/ce/api/groups.html
type GroupMember struct {
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt time.Time `json:"created_at"`
AccessLevel AccessLevel `json:"access_level"`
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt *time.Time `json:"created_at"`
AccessLevel AccessLevelValue `json:"access_level"`
}
// ListGroupMembers get a list of group members viewable by the authenticated
......@@ -240,8 +235,8 @@ func (s *GroupsService) ListGroupMembers(gid interface{}) ([]*GroupMember, *Resp
//
// GitLab API docs: http://doc.gitlab.com/ce/api/groups.html#add-group-member
type AddGroupMemberOptions struct {
UserID int `url:"user_id,omitempty" json:"user_id,omitempty"`
AccessLevel AccessLevel `url:"access_level,omitempty" json:"access_level,omitempty"`
UserID *int `url:"user_id,omitempty" json:"user_id,omitempty"`
AccessLevel *AccessLevelValue `url:"access_level,omitempty" json:"access_level,omitempty"`
}
// AddGroupMember adds a user to the list of group members.
......@@ -277,7 +272,7 @@ func (s *GroupsService) AddGroupMember(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/groups.html#edit-group-team-member
type UpdateGroupMemberOptions struct {
AccessLevel AccessLevel `url:"access_level,omitempty" json:"access_level,omitempty"`
AccessLevel *AccessLevelValue `url:"access_level,omitempty" json:"access_level,omitempty"`
}
// UpdateGroupMember updates a group team member to a specified access level.
......
issues.go
View file @ 4f1f8d2b
......@@ -44,33 +44,33 @@ type Issue struct {
Description string `json:"description"`
Labels []string `json:"labels"`
Milestone struct {
ID int `json:"id"`
Title string `json:"title"`
Description string `json:"description"`
DueDate string `json:"due_date"`
State string `json:"state"`
UpdatedAt time.Time `json:"updated_at"`
CreatedAt time.Time `json:"created_at"`
ID int `json:"id"`
Title string `json:"title"`
Description string `json:"description"`
DueDate string `json:"due_date"`
State string `json:"state"`
UpdatedAt *time.Time `json:"updated_at"`
CreatedAt *time.Time `json:"created_at"`
} `json:"milestone"`
Assignee struct {
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt time.Time `json:"created_at"`
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt *time.Time `json:"created_at"`
} `json:"assignee"`
Author struct {
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt time.Time `json:"created_at"`
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt *time.Time `json:"created_at"`
} `json:"author"`
State string `json:"state"`
UpdatedAt time.Time `json:"updated_at"`
CreatedAt time.Time `json:"created_at"`
State string `json:"state"`
UpdatedAt *time.Time `json:"updated_at"`
CreatedAt *time.Time `json:"created_at"`
}
func (i Issue) String() string {
......@@ -90,10 +90,10 @@ func (l *Labels) MarshalJSON() ([]byte, error) {
// GitLab API docs: http://doc.gitlab.com/ce/api/issues.html#list-issues
type ListIssuesOptions struct {
ListOptions
State string `url:"state,omitempty" json:"state,omitempty"`
Labels Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
OrderBy string `url:"order_by,omitempty" json:"order_by,omitempty"`
Sort string `url:"sort,omitempty" json:"sort,omitempty"`
State *string `url:"state,omitempty" json:"state,omitempty"`
Labels Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
OrderBy *string `url:"order_by,omitempty" json:"order_by,omitempty"`
Sort *string `url:"sort,omitempty" json:"sort,omitempty"`
}
// ListIssues gets all issues created by authenticated user. This function
......@@ -120,12 +120,12 @@ func (s *IssuesService) ListIssues(opt *ListIssuesOptions) ([]*Issue, *Response,
// GitLab API docs: http://doc.gitlab.com/ce/api/issues.html#list-issues
type ListProjectIssuesOptions struct {
ListOptions
IID int `url:"iid,omitempty" json:"iid,omitempty"`
State string `url:"state,omitempty" json:"state,omitempty"`
Labels Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
Milestone string `url:"milestone,omitempty" json:"milestone,omitempty"`
OrderBy string `url:"order_by,omitempty" json:"order_by,omitempty"`
Sort string `url:"sort,omitempty" json:"sort,omitempty"`
IID *int `url:"iid,omitempty" json:"iid,omitempty"`
State *string `url:"state,omitempty" json:"state,omitempty"`
Labels Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
Milestone *string `url:"milestone,omitempty" json:"milestone,omitempty"`
OrderBy *string `url:"order_by,omitempty" json:"order_by,omitempty"`
Sort *string `url:"sort,omitempty" json:"sort,omitempty"`
}
// ListProjectIssues gets a list of project issues. This function accepts
......@@ -183,11 +183,11 @@ func (s *IssuesService) GetIssue(pid interface{}, issue int) (*Issue, *Response,
//
// GitLab API docs: http://doc.gitlab.com/ce/api/issues.html#new-issues
type CreateIssueOptions struct {
Title string `url:"title,omitempty" json:"title,omitempty"`
Description string `url:"description,omitempty" json:"description,omitempty"`
AssigneeID int `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
MilestoneID int `url:"milestone_id,omitempty" json:"milestone_id,omitempty"`
Labels Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
Title *string `url:"title,omitempty" json:"title,omitempty"`
Description *string `url:"description,omitempty" json:"description,omitempty"`
AssigneeID *int `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
MilestoneID *int `url:"milestone_id,omitempty" json:"milestone_id,omitempty"`
Labels Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
}
// CreateIssue creates a new project issue.
......@@ -222,12 +222,12 @@ func (s *IssuesService) CreateIssue(
//
// GitLab API docs: http://doc.gitlab.com/ce/api/issues.html#edit-issues
type UpdateIssueOptions struct {
Title string `url:"title,omitempty" json:"title,omitempty"`
Description string `url:"description,omitempty" json:"description,omitempty"`
AssigneeID int `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
MilestoneID int `url:"milestone_id,omitempty" json:"milestone_id,omitempty"`
Labels Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
StateEvent string `url:"state_event,omitempty" json:"state_event,omitempty"`
Title *string `url:"title,omitempty" json:"title,omitempty"`
Description *string `url:"description,omitempty" json:"description,omitempty"`
AssigneeID *int `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
MilestoneID *int `url:"milestone_id,omitempty" json:"milestone_id,omitempty"`
Labels Labels `url:"labels,comma,omitempty" json:"labels,omitempty"`
StateEvent *string `url:"state_event,omitempty" json:"state_event,omitempty"`
}
// UpdateIssue updates an existing project issue. This function is also used
......
labels.go
View file @ 4f1f8d2b
......@@ -73,9 +73,9 @@ func (s *LabelsService) ListLabels(pid interface{}) ([]*Label, *Response, error)
//
// GitLab API docs: http://doc.gitlab.com/ce/api/labels.html#create-a-new-label
type CreateLabelOptions struct {
Name string `url:"name,omitempty" json:"name,omitempty"`
Color string `url:"color,omitempty" json:"color,omitempty"`
Description string `url:"description,omitempty" json:"description,omitempty"`
Name *string `url:"name,omitempty" json:"name,omitempty"`
Color *string `url:"color,omitempty" json:"color,omitempty"`
Description *string `url:"description,omitempty" json:"description,omitempty"`
}
// CreateLabel creates a new label for given repository with given name and
......@@ -109,7 +109,7 @@ func (s *LabelsService) CreateLabel(
//
// GitLab API docs: http://doc.gitlab.com/ce/api/labels.html#delete-a-label
type DeleteLabelOptions struct {
Name string `url:"name,omitempty" json:"name,omitempty"`
Name *string `url:"name,omitempty" json:"name,omitempty"`
}
// DeleteLabel deletes a label given by its name.
......@@ -139,10 +139,10 @@ func (s *LabelsService) DeleteLabel(pid interface{}, opt *DeleteLabelOptions) (*
//
// GitLab API docs: http://doc.gitlab.com/ce/api/labels.html#delete-a-label
type UpdateLabelOptions struct {
Name string `url:"name,omitempty" json:"name,omitempty"`
NewName string `url:"new_name,omitempty" json:"new_name,omitempty"`
Color string `url:"color,omitempty" json:"color,omitempty"`
Description string `url:"description,omitempty" json:"description,omitempty"`
Name *string `url:"name,omitempty" json:"name,omitempty"`
NewName *string `url:"new_name,omitempty" json:"new_name,omitempty"`
Color *string `url:"color,omitempty" json:"color,omitempty"`
Description *string `url:"description,omitempty" json:"description,omitempty"`
}
// UpdateLabel updates an existing label with new name or now color. At least
......
merge_requests.go
View file @ 4f1f8d2b
......@@ -34,19 +34,19 @@ type MergeRequestsService struct {
//
// GitLab API docs: http://doc.gitlab.com/ce/api/merge_requests.html
type MergeRequest struct {
ID int `json:"id"`
IID int `json:"iid"`
ProjectID int `json:"project_id"`
Title string `json:"title"`
Description string `json:"description"`
WorkInProgress bool `json:"work_in_progress"`
State string `json:"state"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
TargetBranch string `json:"target_branch"`
SourceBranch string `json:"source_branch"`
Upvotes int `json:"upvotes"`
Downvotes int `json:"downvotes"`
ID int `json:"id"`
IID int `json:"iid"`
ProjectID int `json:"project_id"`
Title string `json:"title"`
Description string `json:"description"`
WorkInProgress bool `json:"work_in_progress"`
State string `json:"state"`
CreatedAt *time.Time `json:"created_at"`
UpdatedAt *time.Time `json:"updated_at"`
TargetBranch string `json:"target_branch"`
SourceBranch string `json:"source_branch"`
Upvotes int `json:"upvotes"`
Downvotes int `json:"downvotes"`
Author struct {
Name string `json:"name"`
Username string `json:"username"`
......@@ -65,15 +65,15 @@ type MergeRequest struct {
TargetProjectID int `json:"target_project_id"`
Labels []string `json:"labels"`
Milestone struct {
ID int `json:"id"`
Iid int `json:"iid"`
ProjectID int `json:"project_id"`
Title string `json:"title"`
Description string `json:"description"`
State string `json:"state"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
DueDate string `json:"due_date"`
ID int `json:"id"`
Iid int `json:"iid"`
ProjectID int `json:"project_id"`
Title string `json:"title"`
Description string `json:"description"`
State string `json:"state"`
CreatedAt *time.Time `json:"created_at"`
UpdatedAt *time.Time `json:"updated_at"`
DueDate string `json:"due_date"`
} `json:"milestone"`
MergeWhenBuildSucceeds bool `json:"merge_when_build_succeeds"`
MergeStatus string `json:"merge_status"`
......@@ -104,10 +104,10 @@ func (m MergeRequest) String() string {
// http://doc.gitlab.com/ce/api/merge_requests.html#list-merge-requests
type ListMergeRequestsOptions struct {
ListOptions
IID int `url:"iid,omitempty" json:"iid,omitempty"`
State string `url:"state,omitempty" json:"state,omitempty"`
OrderBy string `url:"order_by,omitempty" json:"order_by,omitempty"`
Sort string `url:"sort,omitempty" json:"sort,omitempty"`
IID *int `url:"iid,omitempty" json:"iid,omitempty"`
State *string `url:"state,omitempty" json:"state,omitempty"`
OrderBy *string `url:"order_by,omitempty" json:"order_by,omitempty"`
Sort *string `url:"sort,omitempty" json:"sort,omitempty"`
}
// ListMergeRequests gets all merge requests for this project. The state
......@@ -201,12 +201,12 @@ func (s *MergeRequestsService) GetMergeRequestChanges(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/merge_requests.html#create-mr
type CreateMergeRequestOptions struct {
Title string `url:"title,omitempty" json:"title,omitempty"`
Description string `url:"description,omitempty" json:"description,omitempty"`
SourceBranch string `url:"source_branch,omitemtpy" json:"source_branch,omitemtpy"`
TargetBranch string `url:"target_branch,omitemtpy" json:"target_branch,omitemtpy"`
AssigneeID int `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
TargetProjectID int `url:"target_project_id,omitempty" json:"target_project_id,omitempty"`
Title *string `url:"title,omitempty" json:"title,omitempty"`
Description *string `url:"description,omitempty" json:"description,omitempty"`
SourceBranch *string `url:"source_branch,omitemtpy" json:"source_branch,omitemtpy"`
TargetBranch *string `url:"target_branch,omitemtpy" json:"target_branch,omitemtpy"`
AssigneeID *int `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
TargetProjectID *int `url:"target_project_id,omitempty" json:"target_project_id,omitempty"`
}
// CreateMergeRequest creates a new merge request.
......@@ -242,11 +242,11 @@ func (s *MergeRequestsService) CreateMergeRequest(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/merge_requests.html#update-mr
type UpdateMergeRequestOptions struct {
Title string `url:"title,omitempty" json:"title,omitempty"`
Description string `url:"description,omitempty" json:"description,omitempty"`
TargetBranch string `url:"target_branch,omitemtpy" json:"target_branch,omitemtpy"`
AssigneeID int `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
StateEvent string `url:"state_event,omitempty" json:"state_event,omitempty"`
Title *string `url:"title,omitempty" json:"title,omitempty"`
Description *string `url:"description,omitempty" json:"description,omitempty"`
TargetBranch *string `url:"target_branch,omitemtpy" json:"target_branch,omitemtpy"`
AssigneeID *int `url:"assignee_id,omitempty" json:"assignee_id,omitempty"`
StateEvent *string `url:"state_event,omitempty" json:"state_event,omitempty"`
}
// UpdateMergeRequest updates an existing project milestone.
......@@ -313,12 +313,12 @@ func (s *MergeRequestsService) AcceptMergeRequest(
type MergeRequestComment struct {
Note string `json:"note"`
Author struct {
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt time.Time `json:"created_at"`
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt *time.Time `json:"created_at"`
} `json:"author"`
}
......@@ -370,7 +370,7 @@ func (s *MergeRequestsService) GetMergeRequestComments(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/commits.html#post-comment-to-mr
type PostMergeRequestCommentOptions struct {
Note string `url:"note,omitempty" json:"note,omitempty"`
Note *string `url:"note,omitempty" json:"note,omitempty"`
}
// PostMergeRequestComment dds a comment to a merge request.
......
milestones.go
View file @ 4f1f8d2b
......@@ -34,15 +34,15 @@ type MilestonesService struct {
//
// GitLab API docs: http://doc.gitlab.com/ce/api/branches.html
type Milestone struct {
ID int `json:"id"`
Iid int `json:"iid"`
ProjectID int `json:"project_id"`
Title string `json:"title"`
Description string `json:"description"`
DueDate string `json:"due_date"`
State string `json:"state"`
UpdatedAt time.Time `json:"updated_at"`
CreatedAt time.Time `json:"created_at"`
ID int `json:"id"`
Iid int `json:"iid"`
ProjectID int `json:"project_id"`
Title string `json:"title"`
Description string `json:"description"`
DueDate string `json:"due_date"`
State string `json:"state"`
UpdatedAt *time.Time `json:"updated_at"`
CreatedAt *time.Time `json:"created_at"`
}
func (m Milestone) String() string {
......@@ -55,7 +55,7 @@ func (m Milestone) String() string {
// http://doc.gitlab.com/ce/api/milestones.html#list-project-milestones
type ListMilestonesOptions struct {
ListOptions
IID int `url:"iid,omitempty" json:"iid,omitempty"`
IID *int `url:"iid,omitempty" json:"iid,omitempty"`
}
// ListMilestones returns a list of project milestones.
......@@ -117,9 +117,9 @@ func (s *MilestonesService) GetMilestone(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/milestones.html#create-new-milestone
type CreateMilestoneOptions struct {
Title string `url:"title,omitempty" json:"title,omitempty"`
Description string `url:"description,omitempty" json:"description,omitempty"`
DueDate string `url:"due_date,omitempty" json:"due_date,omitempty"`
Title *string `url:"title,omitempty" json:"title,omitempty"`
Description *string `url:"description,omitempty" json:"description,omitempty"`
DueDate *string `url:"due_date,omitempty" json:"due_date,omitempty"`
}
// CreateMilestone creates a new project milestone.
......@@ -154,10 +154,10 @@ func (s *MilestonesService) CreateMilestone(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/milestones.html#edit-milestone
type UpdateMilestoneOptions struct {
Title string `url:"title,omitempty" json:"title,omitempty"`
Description string `url:"description,omitempty" json:"description,omitempty"`
DueDate string `url:"due_date,omitempty" json:"due_date,omitempty"`
StateEvent string `url:"state_event,omitempty" json:"state_event,omitempty"`
Title *string `url:"title,omitempty" json:"title,omitempty"`
Description *string `url:"description,omitempty" json:"description,omitempty"`
DueDate *string `url:"due_date,omitempty" json:"due_date,omitempty"`
StateEvent *string `url:"state_event,omitempty" json:"state_event,omitempty"`
}
// UpdateMilestone updates an existing project milestone.
......
namespaces.go
View file @ 4f1f8d2b
......@@ -42,7 +42,7 @@ func (n Namespace) String() string {
// GitLab API docs: http://doc.gitlab.com/ce/api/namespaces.html#list-namespaces
type ListNamespacesOptions struct {
ListOptions
Search string `url:"search,omitempty" json:"search,omitempty"`
Search *string `url:"search,omitempty" json:"search,omitempty"`
}
// ListNamespaces gets a list of projects accessible by the authenticated user.
......
notes.go
View file @ 4f1f8d2b
......@@ -40,16 +40,16 @@ type Note struct {
Title string `json:"title"`
FileName string `json:"file_name"`
Author struct {
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt time.Time `json:"created_at"`
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt *time.Time `json:"created_at"`
} `json:"author"`
ExpiresAt *time.Time `json:"expires_at"`
UpdatedAt time.Time `json:"updated_at"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt *time.Time `json:"updated_at"`
CreatedAt *time.Time `json:"created_at"`
}
func (n Note) String() string {
......@@ -126,7 +126,7 @@ func (s *NotesService) GetIssueNote(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/notes.html#create-new-issue-note
type CreateIssueNoteOptions struct {
Body string `url:"body,omitempty" json:"body,omitempty"`
Body *string `url:"body,omitempty" json:"body,omitempty"`
}
// CreateIssueNote creates a new note to a single project issue.
......@@ -163,7 +163,7 @@ func (s *NotesService) CreateIssueNote(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/notes.html#modify-existing-issue-note
type UpdateIssueNoteOptions struct {
Body string `url:"body,omitempty" json:"body,omitempty"`
Body *string `url:"body,omitempty" json:"body,omitempty"`
}
// UpdateIssueNote modifies existing note of an issue.
......@@ -254,7 +254,7 @@ func (s *NotesService) GetSnippetNote(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/notes.html#create-new-snippet-note
type CreateSnippetNoteOptions struct {
Body string `url:"body,omitempty" json:"body,omitempty"`
Body *string `url:"body,omitempty" json:"body,omitempty"`
}
// CreateSnippetNote creates a new note for a single snippet. Snippet notes are
......@@ -292,7 +292,7 @@ func (s *NotesService) CreateSnippetNote(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/notes.html#modify-existing-snippet-note
type UpdateSnippetNoteOptions struct {
Body string `url:"body,omitempty" json:"body,omitempty"`
Body *string `url:"body,omitempty" json:"body,omitempty"`
}
// UpdateSnippetNote modifies existing note of a snippet.
......@@ -384,7 +384,7 @@ func (s *NotesService) GetMergeRequestNote(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/notes.html#create-new-merge-request-note
type CreateMergeRequestNoteOptions struct {
Body string `url:"body,omitempty" json:"body,omitempty"`
Body *string `url:"body,omitempty" json:"body,omitempty"`
}
// CreateMergeRequestNote creates a new note for a single merge request.
......@@ -421,7 +421,7 @@ func (s *NotesService) CreateMergeRequestNote(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/notes.html#modify-existing-merge-request-note
type UpdateMergeRequestNoteOptions struct {
Body string `url:"body,omitempty" json:"body,omitempty"`
Body *string `url:"body,omitempty" json:"body,omitempty"`
}
// UpdateMergeRequestNote modifies existing note of a merge request.
......
project_snippets.go
View file @ 4f1f8d2b
......@@ -39,16 +39,16 @@ type Snippet struct {
Title string `json:"title"`
FileName string `json:"file_name"`
Author struct {
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt time.Time `json:"created_at"`
ID int `json:"id"`
Username string `json:"username"`
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt *time.Time `json:"created_at"`
} `json:"author"`
ExpiresAt *time.Time `json:"expires_at"`
UpdatedAt time.Time `json:"updated_at"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt *time.Time `json:"updated_at"`
CreatedAt *time.Time `json:"created_at"`
}
func (s Snippet) String() string {
......@@ -120,10 +120,10 @@ func (s *ProjectSnippetsService) GetSnippet(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/project_snippets.html#create-new-snippet
type CreateSnippetOptions struct {
Title string `url:"title,omitempty" json:"title,omitempty"`
FileName string `url:"file_name,omitempty" json:"file_name,omitempty"`
Code string `url:"code,omitempty" json:"code,omitempty"`
VisibilityLevel VisibilityLevel `url:"visibility_level,omitempty" json:"visibility_level,omitempty"`
Title *string `url:"title,omitempty" json:"title,omitempty"`
FileName *string `url:"file_name,omitempty" json:"file_name,omitempty"`
Code *string `url:"code,omitempty" json:"code,omitempty"`
VisibilityLevel *VisibilityLevelValue `url:"visibility_level,omitempty" json:"visibility_level,omitempty"`
}
// CreateSnippet creates a new project snippet. The user must have permission
......@@ -159,10 +159,10 @@ func (s *ProjectSnippetsService) CreateSnippet(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/project_snippets.html#update-snippet
type UpdateSnippetOptions struct {
Title string `url:"title,omitempty" json:"title,omitempty"`
FileName string `url:"file_name,omitempty" json:"file_name,omitempty"`
Code string `url:"code,omitempty" json:"code,omitempty"`
VisibilityLevel VisibilityLevel `url:"visibility_level,omitempty" json:"visibility_level,omitempty"`
Title *string `url:"title,omitempty" json:"title,omitempty"`
FileName *string `url:"file_name,omitempty" json:"file_name,omitempty"`
Code *string `url:"code,omitempty" json:"code,omitempty"`
VisibilityLevel *VisibilityLevelValue `url:"visibility_level,omitempty" json:"visibility_level,omitempty"`
}
// UpdateSnippet updates an existing project snippet. The user must have
......
projects.go
View file @ 4f1f8d2b
This diff is collapsed.
projects_test.go
View file @ 4f1f8d2b
......@@ -14,25 +14,25 @@ func TestListProjects(t *testing.T) {
mux.HandleFunc("/projects", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "GET")
testFormValues(t, r, values{
"page": "2",
"per_page": "3",
"archived": "true",
"order_by": "name",
"sort": "asc",
"search": "query",
"page": "2",
"per_page": "3",
"archived": "true",
"order_by": "name",
"sort": "asc",
"search": "query",
"ci_enabled_first": "true",
})
fmt.Fprint(w, `[{"id":1},{"id":2}]`)
})
opt := &ListProjectsOptions{ListOptions{2, 3}, true, "name", "asc", "query", true}
opt := &ListProjectsOptions{ListOptions{2, 3}, Bool(true), String("name"), String("asc"), String("query"), Bool(true)}
projects, _, err := client.Projects.ListProjects(opt)
if err != nil {
t.Errorf("Projects.ListProjects returned error: %v", err)
}
want := []*Project{{ID: Int(1)},{ID: Int(2)}}
want := []*Project{{ID: 1}, {ID: 2}}
if !reflect.DeepEqual(want, projects) {
t.Errorf("Projects.ListProjects returned %+v, want %+v", projects, want)
}
......@@ -45,25 +45,25 @@ func TestListOwnedProjects(t *testing.T) {
mux.HandleFunc("/projects/owned", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "GET")
testFormValues(t, r, values{
"page": "2",
"per_page": "3",
"archived": "true",
"order_by": "name",
"sort": "asc",
"search": "query",
"page": "2",
"per_page": "3",
"archived": "true",
"order_by": "name",
"sort": "asc",
"search": "query",
"ci_enabled_first": "true",
})
fmt.Fprint(w, `[{"id":1},{"id":2}]`)
})
opt := &ListProjectsOptions{ListOptions{2, 3}, true, "name", "asc", "query", true}
opt := &ListProjectsOptions{ListOptions{2, 3}, Bool(true), String("name"), String("asc"), String("query"), Bool(true)}
projects, _, err := client.Projects.ListOwnedProjects(opt)
if err != nil {
t.Errorf("Projects.ListOwnedProjects returned error: %v", err)
}
want := []*Project{{ID: Int(1)},{ID: Int(2)}}
want := []*Project{{ID: 1}, {ID: 2}}
if !reflect.DeepEqual(want, projects) {
t.Errorf("Projects.ListOwnedProjects returned %+v, want %+v", projects, want)
}
......@@ -76,25 +76,25 @@ func TestListStarredProjects(t *testing.T) {
mux.HandleFunc("/projects/starred", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "GET")
testFormValues(t, r, values{
"page": "2",
"per_page": "3",
"archived": "true",
"order_by": "name",
"sort": "asc",
"search": "query",
"page": "2",
"per_page": "3",
"archived": "true",
"order_by": "name",
"sort": "asc",
"search": "query",
"ci_enabled_first": "true",
})
fmt.Fprint(w, `[{"id":1},{"id":2}]`)
})
opt := &ListProjectsOptions{ListOptions{2, 3}, true, "name", "asc", "query", true}
opt := &ListProjectsOptions{ListOptions{2, 3}, Bool(true), String("name"), String("asc"), String("query"), Bool(true)}
projects, _, err := client.Projects.ListStarredProjects(opt)
if err != nil {
t.Errorf("Projects.ListStarredProjects returned error: %v", err)
}
want := []*Project{{ID: Int(1)},{ID: Int(2)}}
want := []*Project{{ID: 1}, {ID: 2}}
if !reflect.DeepEqual(want, projects) {
t.Errorf("Projects.ListStarredProjects returned %+v, want %+v", projects, want)
}
......@@ -107,25 +107,25 @@ func TestListAllProjects(t *testing.T) {
mux.HandleFunc("/projects/all", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "GET")
testFormValues(t, r, values{
"page": "2",
"per_page": "3",
"archived": "true",
"order_by": "name",
"sort": "asc",
"search": "query",
"page": "2",
"per_page": "3",
"archived": "true",
"order_by": "name",
"sort": "asc",
"search": "query",
"ci_enabled_first": "true",
})
fmt.Fprint(w, `[{"id":1},{"id":2}]`)
})
opt := &ListProjectsOptions{ListOptions{2, 3}, true, "name", "asc", "query", true}
opt := &ListProjectsOptions{ListOptions{2, 3}, Bool(true), String("name"), String("asc"), String("query"), Bool(true)}
projects, _, err := client.Projects.ListAllProjects(opt)
if err != nil {
t.Errorf("Projects.ListAllProjects returned error: %v", err)
}
want := []*Project{{ID: Int(1)},{ID: Int(2)}}
want := []*Project{{ID: 1}, {ID: 2}}
if !reflect.DeepEqual(want, projects) {
t.Errorf("Projects.ListAllProjects returned %+v, want %+v", projects, want)
}
......@@ -139,7 +139,7 @@ func TestGetProject_byID(t *testing.T) {
testMethod(t, r, "GET")
fmt.Fprint(w, `{"id":1}`)
})
want := &Project{ID: Int(1)}
want := &Project{ID: 1}
project, _, err := client.Projects.GetProject(1)
......@@ -161,7 +161,7 @@ func TestGetProject_byName(t *testing.T) {
testMethod(t, r, "GET")
fmt.Fprint(w, `{"id":1}`)
})
want := &Project{ID: Int(1)}
want := &Project{ID: 1}
project, _, err := client.Projects.GetProject("namespace/name")
......@@ -181,22 +181,22 @@ func TestSearchProjects(t *testing.T) {
mux.HandleFunc("/projects/search/query", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "GET")
testFormValues(t, r, values{
"page": "2",
"page": "2",
"per_page": "3",
"order_by": "name",
"sort": "asc",
"sort": "asc",
})
fmt.Fprint(w, `[{"id":1},{"id":2}]`)
})
opt := &SearchProjectsOptions{ListOptions{2, 3}, "name", "asc"}
opt := &SearchProjectsOptions{ListOptions{2, 3}, String("name"), String("asc")}
projects, _, err := client.Projects.SearchProjects("query", opt)
if err != nil {
t.Errorf("Projects.SearchProjects returned error: %v", err)
}
want := []*Project{{ID: Int(1)},{ID: Int(2)}}
want := []*Project{{ID: 1}, {ID: 2}}
if !reflect.DeepEqual(want, projects) {
t.Errorf("Projects.SearchProjects returned %+v, want %+v", projects, want)
}
......@@ -215,14 +215,14 @@ func TestCreateProject(t *testing.T) {
fmt.Fprint(w, `{"id":1}`)
})
opt := &CreateProjectOptions{Name: "n"}
opt := &CreateProjectOptions{Name: String("n")}
project, _, err := client.Projects.CreateProject(opt)
if err != nil {
t.Errorf("Projects.CreateProject returned error: %v", err)
}
want := &Project{ID: Int(1)}
want := &Project{ID: 1}
if !reflect.DeepEqual(want, project) {
t.Errorf("Projects.CreateProject returned %+v, want %+v", project, want)
}
......
repositories.go
View file @ 4f1f8d2b
......@@ -75,9 +75,9 @@ func (s *RepositoriesService) ListTags(pid interface{}) ([]*Tag, *Response, erro
// GitLab API docs:
// http://doc.gitlab.com/ce/api/repositories.html#create-a-new-tag
type CreateTagOptions struct {
TagName string `url:"tag_name,omitempty" json:"tag_name,omitempty"`
Ref string `url:"ref,omitempty" json:"ref,omitempty"`
Message string `url:"message,omitempty" json:"message,omitempty"`
TagName *string `url:"tag_name,omitempty" json:"tag_name,omitempty"`
Ref *string `url:"ref,omitempty" json:"ref,omitempty"`
Message *string `url:"message,omitempty" json:"message,omitempty"`
}
// CreateTag creates a new tag in the repository that points to the supplied ref.
......@@ -127,8 +127,8 @@ func (t TreeNode) String() string {
// GitLab API docs:
// http://doc.gitlab.com/ce/api/repositories.html#list-repository-tree
type ListTreeOptions struct {
Path string `url:"path,omitempty" json:"path,omitempty"`
RefName string `url:"ref_name,omitempty" json:"ref_name,omitempty"`
Path *string `url:"path,omitempty" json:"path,omitempty"`
RefName *string `url:"ref_name,omitempty" json:"ref_name,omitempty"`
}
// ListTree gets a list of repository files and directories in a project.
......@@ -163,7 +163,7 @@ func (s *RepositoriesService) ListTree(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/repositories.html#raw-file-content
type RawFileContentOptions struct {
FilePath string `url:"filepath,omitempty" json:"filepath,omitempty"`
FilePath *string `url:"filepath,omitempty" json:"filepath,omitempty"`
}
// RawFileContent gets the raw file contents for a file by commit SHA and path
......@@ -226,7 +226,7 @@ func (s *RepositoriesService) RawBlobContent(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/repositories.html#get-file-archive
type ArchiveOptions struct {
SHA string `url:"sha,omitempty" json:"sha,omitempty"`
SHA *string `url:"sha,omitempty" json:"sha,omitempty"`
}
// Archive gets an archive of the repository.
......@@ -277,8 +277,8 @@ func (c Compare) String() string {
// GitLab API docs:
// http://doc.gitlab.com/ce/api/repositories.html#compare-branches-tags-or-commits
type CompareOptions struct {
From string `url:"from,omitempty" json:"from,omitempty"`
To string `url:"to,omitempty" json:"to,omitempty"`
From *string `url:"from,omitempty" json:"from,omitempty"`
To *string `url:"to,omitempty" json:"to,omitempty"`
}
// Compare compares branches, tags or commits.
......
repository_files.go
View file @ 4f1f8d2b
......@@ -52,8 +52,8 @@ func (r File) String() string {
// GitLab API docs:
// http://doc.gitlab.com/ce/api/repository_files.html#get-file-from-respository
type GetFileOptions struct {
FilePath string `url:"file_path,omitempty" json:"file_path,omitempty"`
Ref string `url:"ref,omitempty" json:"ref,omitempty"`
FilePath *string `url:"file_path,omitempty" json:"file_path,omitempty"`
Ref *string `url:"ref,omitempty" json:"ref,omitempty"`
}
// GetFile allows you to receive information about a file in repository like
......@@ -101,11 +101,11 @@ func (r FileInfo) String() string {
// GitLab API docs:
// http://doc.gitlab.com/ce/api/repository_files.html#create-new-file-in-repository
type CreateFileOptions struct {
FilePath string `url:"file_path,omitempty" json:"file_path,omitempty"`
BranchName string `url:"branch_name,omitempty" json:"branch_name,omitempty"`
Encoding string `url:"encoding,omitempty" json:"encoding,omitempty"`
Content string `url:"content,omitempty" json:"content,omitempty"`
CommitMessage string `url:"commit_message,omitempty" json:"commit_message,omitempty"`
FilePath *string `url:"file_path,omitempty" json:"file_path,omitempty"`
BranchName *string `url:"branch_name,omitempty" json:"branch_name,omitempty"`
Encoding *string `url:"encoding,omitempty" json:"encoding,omitempty"`
Content *string `url:"content,omitempty" json:"content,omitempty"`
CommitMessage *string `url:"commit_message,omitempty" json:"commit_message,omitempty"`
}
// CreateFile creates a new file in a repository.
......@@ -140,11 +140,11 @@ func (s *RepositoryFilesService) CreateFile(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/repository_files.html#update-existing-file-in-repository
type UpdateFileOptions struct {
FilePath string `url:"file_path,omitempty" json:"file_path,omitempty"`
BranchName string `url:"branch_name,omitempty" json:"branch_name,omitempty"`
Encoding string `url:"encoding,omitempty" json:"encoding,omitempty"`
Content string `url:"content,omitempty" json:"content,omitempty"`
CommitMessage string `url:"commit_message,omitempty" json:"commit_message,omitempty"`
FilePath *string `url:"file_path,omitempty" json:"file_path,omitempty"`
BranchName *string `url:"branch_name,omitempty" json:"branch_name,omitempty"`
Encoding *string `url:"encoding,omitempty" json:"encoding,omitempty"`
Content *string `url:"content,omitempty" json:"content,omitempty"`
CommitMessage *string `url:"commit_message,omitempty" json:"commit_message,omitempty"`
}
// UpdateFile updates an existing file in a repository
......@@ -179,9 +179,9 @@ func (s *RepositoryFilesService) UpdateFile(
// GitLab API docs:
// http://doc.gitlab.com/ce/api/repository_files.html#delete-existing-file-in-repository
type DeleteFileOptions struct {
FilePath string `url:"file_path,omitempty" json:"file_path,omitempty"`
BranchName string `url:"branch_name,omitempty" json:"branch_name,omitempty"`
CommitMessage string `url:"commit_message,omitempty" json:"commit_message,omitempty"`
FilePath *string `url:"file_path,omitempty" json:"file_path,omitempty"`
BranchName *string `url:"branch_name,omitempty" json:"branch_name,omitempty"`
CommitMessage *string `url:"commit_message,omitempty" json:"commit_message,omitempty"`
}
// DeleteFile deletes an existing file in a repository
......
services.go
View file @ 4f1f8d2b
......@@ -49,8 +49,8 @@ type Service struct {
// GitLab API docs:
// http://doc.gitlab.com/ce/api/services.html#edit-gitlab-ci-service
type SetGitLabCIServiceOptions struct {
Token string `url:"token,omitempty" json:"token,omitempty"`
ProjectURL string `url:"project_url,omitempty" json:"project_url,omitempty"`
Token *string `url:"token,omitempty" json:"token,omitempty"`
ProjectURL *string `url:"project_url,omitempty" json:"project_url,omitempty"`
}
// SetGitLabCIService sets GitLab CI service for a project.
......@@ -109,8 +109,8 @@ func (s *ServicesService) DeleteGitLabCIService(pid interface{}) (*Response, err
// GitLab API docs:
// http://doc.gitlab.com/ce/api/services.html#edit-hipchat-service
type SetHipChatServiceOptions struct {
Token string `url:"token,omitempty" json:"token,omitempty" `
Room string `url:"room,omitempty" json:"room,omitempty"`
Token *string `url:"token,omitempty" json:"token,omitempty" `
Room *string `url:"room,omitempty" json:"room,omitempty"`
}
// SetHipChatService sets HipChat service for a project
......@@ -169,9 +169,9 @@ func (s *ServicesService) DeleteHipChatService(pid interface{}) (*Response, erro
// GitLab API docs:
// http://doc.gitlab.com/ce/api/services.html#createedit-drone-ci-service
type SetDroneCIServiceOptions struct {
Token string `url:"token" json:"token" `
DroneURL string `url:"drone_url" json:"drone_url"`
EnableSSLVerification string `url:"enable_ssl_verification,omitempty" json:"enable_ssl_verification,omitempty"`
Token *string `url:"token" json:"token" `
DroneURL *string `url:"drone_url" json:"drone_url"`
EnableSSLVerification *string `url:"enable_ssl_verification,omitempty" json:"enable_ssl_verification,omitempty"`
}
// SetDroneCIService sets Drone CI service for a project.
......@@ -268,9 +268,9 @@ func (s *ServicesService) GetDroneCIService(pid interface{}) (*DroneCIService, *
// GitLab API docs:
// http://doc.gitlab.com/ce/api/services.html#edit-slack-service
type SetSlackServiceOptions struct {
WebHook string `url:"webhook,omitempty" json:"webhook,omitempty" `
Username string `url:"username,omitempty" json:"username,omitempty" `
Channel string `url:"channel,omitempty" json:"channel,omitempty"`
WebHook *string `url:"webhook,omitempty" json:"webhook,omitempty" `
Username *string `url:"username,omitempty" json:"username,omitempty" `
Channel *string `url:"channel,omitempty" json:"channel,omitempty"`
}
// SetSlackService sets Slack service for a project
......
services_test.go
View file @ 4f1f8d2b
......@@ -14,13 +14,13 @@ func TestSetDroneCIService(t *testing.T) {
mux.HandleFunc("/projects/1/services/drone-ci", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "PUT")
testJsonBody(t, r, values{
"token": "t",
"drone_url": "u",
"token": "t",
"drone_url": "u",
"enable_ssl_verification": "true",
})
})
opt := &SetDroneCIServiceOptions{"t", "u", "true"}
opt := &SetDroneCIServiceOptions{String("t"), String("u"), String("true")}
_, err := client.Services.SetDroneCIService(1, opt)
if err != nil {
......
session.go
View file @ 4f1f8d2b
......@@ -36,7 +36,7 @@ type Session struct {
Name string `json:"name"`
PrivateToken string `json:"private_token"`
Blocked bool `json:"blocked"`
CreatedAt time.Time `json:"created_at"`
CreatedAt *time.Time `json:"created_at"`
Bio interface{} `json:"bio"`
Skype string `json:"skype"`
Linkedin string `json:"linkedin"`
......@@ -54,9 +54,9 @@ type Session struct {
//
// GitLab API docs: http://doc.gitlab.com/ce/api/session.html#session
type GetSessionOptions struct {
Login string `url:"login,omitempty" json:"login,omitempty"`
Email string `url:"email,omitempty" json:"email,omitempty"`
Password string `url:"password,omitempty" json:"password,omitempty"`
Login *string `url:"login,omitempty" json:"login,omitempty"`
Email *string `url:"email,omitempty" json:"email,omitempty"`
Password *string `url:"password,omitempty" json:"password,omitempty"`
}
// GetSession logs in to get private token.
......
settings.go
View file @ 4f1f8d2b
......@@ -30,25 +30,25 @@ type SettingsService struct {
//
// GitLab API docs: http://doc.gitlab.com/ce/api/settings.html
type Settings struct {
ID int `json:"id"`
DefaultProjectsLimit int `json:"default_projects_limit"`
SignupEnabled bool `json:"signup_enabled"`
SigninEnabled bool `json:"signin_enabled"`
GravatarEnabled bool `json:"gravatar_enabled"`
SignInText string `json:"sign_in_text"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
HomePageURL string `json:"home_page_url"`
DefaultBranchProtection int `json:"default_branch_protection"`
TwitterSharingEnabled bool `json:"twitter_sharing_enabled"`
RestrictedVisibilityLevels []VisibilityLevel `json:"restricted_visibility_levels"`
MaxAttachmentSize int `json:"max_attachment_size"`
SessionExpireDelay int `json:"session_expire_delay"`
DefaultProjectVisibility int `json:"default_project_visibility"`
DefaultSnippetVisibility int `json:"default_snippet_visibility"`
RestrictedSignupDomains []string `json:"restricted_signup_domains"`
UserOauthApplications bool `json:"user_oauth_applications"`
AfterSignOutPath string `json:"after_sign_out_path"`
ID int `json:"id"`
DefaultProjectsLimit int `json:"default_projects_limit"`
SignupEnabled bool `json:"signup_enabled"`
SigninEnabled bool `json:"signin_enabled"`
GravatarEnabled bool `json:"gravatar_enabled"`
SignInText string `json:"sign_in_text"`
CreatedAt *time.Time `json:"created_at"`
UpdatedAt *time.Time `json:"updated_at"`
HomePageURL string `json:"home_page_url"`
DefaultBranchProtection int `json:"default_branch_protection"`
TwitterSharingEnabled bool `json:"twitter_sharing_enabled"`
RestrictedVisibilityLevels []VisibilityLevelValue `json:"restricted_visibility_levels"`
MaxAttachmentSize int `json:"max_attachment_size"`
SessionExpireDelay int `json:"session_expire_delay"`
DefaultProjectVisibility int `json:"default_project_visibility"`
DefaultSnippetVisibility int `json:"default_snippet_visibility"`
RestrictedSignupDomains []string `json:"restricted_signup_domains"`
UserOauthApplications bool `json:"user_oauth_applications"`
AfterSignOutPath string `json:"after_sign_out_path"`
}
func (s Settings) String() string {
......@@ -79,22 +79,22 @@ func (s *SettingsService) GetSettings() (*Settings, *Response, error) {
// GitLab API docs:
// http://doc.gitlab.com/ce/api/settings.html#change-application.settings
type UpdateSettingsOptions struct {
DefaultProjectsLimit int `url:"default_projects_limit,omitempty" json:"default_projects_limit,omitempty"`
SignupEnabled bool `url:"signup_enabled,omitempty" json:"signup_enabled,omitempty"`
SigninEnabled bool `url:"signin_enabled,omitempty" json:"signin_enabled,omitempty"`
GravatarEnabled bool `url:"gravatar_enabled,omitempty" json:"gravatar_enabled,omitempty"`
SignInText string `url:"sign_in_text,omitempty" json:"sign_in_text,omitempty"`
HomePageURL string `url:"home_page_url,omitempty" json:"home_page_url,omitempty"`
DefaultBranchProtection int `url:"default_branch_protection,omitempty" json:"default_branch_protection,omitempty"`
TwitterSharingEnabled bool `url:"twitter_sharing_enabled,omitempty" json:"twitter_sharing_enabled,omitempty"`
RestrictedVisibilityLevels []VisibilityLevel `url:"restricted_visibility_levels,omitempty" json:"restricted_visibility_levels,omitempty"`
MaxAttachmentSize int `url:"max_attachment_size,omitempty" json:"max_attachment_size,omitempty"`
SessionExpireDelay int `url:"session_expire_delay,omitempty" json:"session_expire_delay,omitempty"`
DefaultProjectVisibility int `url:"default_project_visibility,omitempty" json:"default_project_visibility,omitempty"`
DefaultSnippetVisibility int `url:"default_snippet_visibility,omitempty" json:"default_snippet_visibility,omitempty"`
RestrictedSignupDomains []string `url:"restricted_signup_domains,omitempty" json:"restricted_signup_domains,omitempty"`
UserOauthApplications bool `url:"user_oauth_applications,omitempty" json:"user_oauth_applications,omitempty"`
AfterSignOutPath string `url:"after_sign_out_path,omitempty" json:"after_sign_out_path,omitempty"`
DefaultProjectsLimit *int `url:"default_projects_limit,omitempty" json:"default_projects_limit,omitempty"`
SignupEnabled *bool `url:"signup_enabled,omitempty" json:"signup_enabled,omitempty"`
SigninEnabled *bool `url:"signin_enabled,omitempty" json:"signin_enabled,omitempty"`
GravatarEnabled *bool `url:"gravatar_enabled,omitempty" json:"gravatar_enabled,omitempty"`
SignInText *string `url:"sign_in_text,omitempty" json:"sign_in_text,omitempty"`
HomePageURL *string `url:"home_page_url,omitempty" json:"home_page_url,omitempty"`
DefaultBranchProtection *int `url:"default_branch_protection,omitempty" json:"default_branch_protection,omitempty"`
TwitterSharingEnabled *bool `url:"twitter_sharing_enabled,omitempty" json:"twitter_sharing_enabled,omitempty"`
RestrictedVisibilityLevels []VisibilityLevelValue `url:"restricted_visibility_levels,omitempty" json:"restricted_visibility_levels,omitempty"`
MaxAttachmentSize *int `url:"max_attachment_size,omitempty" json:"max_attachment_size,omitempty"`
SessionExpireDelay *int `url:"session_expire_delay,omitempty" json:"session_expire_delay,omitempty"`
DefaultProjectVisibility *int `url:"default_project_visibility,omitempty" json:"default_project_visibility,omitempty"`
DefaultSnippetVisibility *int `url:"default_snippet_visibility,omitempty" json:"default_snippet_visibility,omitempty"`
RestrictedSignupDomains []string `url:"restricted_signup_domains,omitempty" json:"restricted_signup_domains,omitempty"`
UserOauthApplications *bool `url:"user_oauth_applications,omitempty" json:"user_oauth_applications,omitempty"`
AfterSignOutPath *string `url:"after_sign_out_path,omitempty" json:"after_sign_out_path,omitempty"`
}
// UpdateSettings updates the application settings.
......
system_hooks.go
View file @ 4f1f8d2b
......@@ -33,9 +33,9 @@ type SystemHooksService struct {
//
// GitLab API docs: http://doc.gitlab.com/ce/api/system_hooks.html
type Hook struct {
ID int `json:"id"`
URL string `json:"url"`
CreatedAt time.Time `json:"created_at"`
ID int `json:"id"`
URL string `json:"url"`
CreatedAt *time.Time `json:"created_at"`
}
func (h Hook) String() string {
......@@ -66,7 +66,7 @@ func (s *SystemHooksService) ListHooks() ([]*Hook, *Response, error) {
// GitLab API docs:
// http://doc.gitlab.com/ce/api/system_hooks.html#add-new-system-hook-hook
type AddHookOptions struct {
URL string `url:"url,omitempty" json:"url,omitempty"`
URL *string `url:"url,omitempty" json:"url,omitempty"`
}
// AddHook adds a new system hook hook.
......
users.go
View file @ 4f1f8d2b
......@@ -39,7 +39,7 @@ type User struct {
Email string `json:"email"`
Name string `json:"name"`
State string `json:"state"`
CreatedAt time.Time `json:"created_at"`
CreatedAt *time.Time `json:"created_at"`
Bio string `json:"bio"`
Skype string `json:"skype"`
Linkedin string `json:"linkedin"`
......@@ -60,6 +60,7 @@ type User struct {
Identities []*UserIdentity `json:"identities"`
}
// UserIdentity represents a user identity
type UserIdentity struct {
Provider string `json:"provider"`
ExternUID string `json:"extern_uid"`
......@@ -70,8 +71,8 @@ type UserIdentity struct {
// GitLab API docs: http://doc.gitlab.com/ce/api/users.html#list-users
type ListUsersOptions struct {
ListOptions
Active bool `url:"active,omitempty" json:"active,omitempty"`
Search string `url:"search,omitempty" json:"search,omitempty"`
Active *bool `url:"active,omitempty" json:"active,omitempty"`
Search *string `url:"search,omitempty" json:"search,omitempty"`
}
// ListUsers gets a list of users.
......@@ -116,21 +117,21 @@ func (s *UsersService) GetUser(user int) (*User, *Response, error) {
//
// GitLab API docs: http://doc.gitlab.com/ce/api/users.html#user-creation
type CreateUserOptions struct {
Email string `url:"email,omitempty" json:"email,omitempty"`
Password string `url:"password,omitempty" json:"password,omitempty"`
Username string `url:"username,omitempty" json:"username,omitempty"`
Name string `url:"name,omitempty" json:"name,omitempty"`
Skype string `url:"skype,omitempty" json:"skype,omitempty"`
Linkedin string `url:"linkedin,omitempty" json:"linkedin,omitempty"`
Twitter string `url:"twitter,omitempty" json:"twitter,omitempty"`
WebsiteURL string `url:"website_url,omitempty" json:"website_url,omitempty"`
ProjectsLimit int `url:"projects_limit,omitempty" json:"projects_limit,omitempty"`
ExternUID string `url:"extern_uid,omitempty" json:"extern_uid,omitempty"`
Provider string `url:"provider,omitempty" json:"provider,omitempty"`
Bio string `url:"bio,omitempty" json:"bio,omitempty"`
Admin bool `url:"admin,omitempty" json:"admin,omitempty"`
CanCreateGroup bool `url:"can_create_group,omitempty" json:"can_create_group,omitempty"`
Confirm bool `url:"confirm,omitempty" json:"confirm,omitempty"`
Email *string `url:"email,omitempty" json:"email,omitempty"`
Password *string `url:"password,omitempty" json:"password,omitempty"`
Username *string `url:"username,omitempty" json:"username,omitempty"`
Name *string `url:"name,omitempty" json:"name,omitempty"`
Skype *string `url:"skype,omitempty" json:"skype,omitempty"`
Linkedin *string `url:"linkedin,omitempty" json:"linkedin,omitempty"`
Twitter *string `url:"twitter,omitempty" json:"twitter,omitempty"`
WebsiteURL *string `url:"website_url,omitempty" json:"website_url,omitempty"`
ProjectsLimit *int `url:"projects_limit,omitempty" json:"projects_limit,omitempty"`
ExternUID *string `url:"extern_uid,omitempty" json:"extern_uid,omitempty"`
Provider *string `url:"provider,omitempty" json:"provider,omitempty"`
Bio *string `url:"bio,omitempty" json:"bio,omitempty"`
Admin *bool `url:"admin,omitempty" json:"admin,omitempty"`
CanCreateGroup *bool `url:"can_create_group,omitempty" json:"can_create_group,omitempty"`
Confirm *bool `url:"confirm,omitempty" json:"confirm,omitempty"`
}
// CreateUser creates a new user. Note only administrators can create new users.
......@@ -155,20 +156,20 @@ func (s *UsersService) CreateUser(opt *CreateUserOptions) (*User, *Response, err
//
// GitLab API docs: http://doc.gitlab.com/ce/api/users.html#user-modification
type ModifyUserOptions struct {
Email string `url:"email,omitempty" json:"email,omitempty"`
Password string `url:"password,omitempty" json:"password,omitempty"`
Username string `url:"username,omitempty" json:"username,omitempty"`
Name string `url:"name,omitempty" json:"name,omitempty"`
Skype string `url:"skype,omitempty" json:"skype,omitempty"`
Linkedin string `url:"linkedin,omitempty" json:"linkedin,omitempty"`
Twitter string `url:"twitter,omitempty" json:"twitter,omitempty"`
WebsiteURL string `url:"website_url,omitempty" json:"website_url,omitempty"`
ProjectsLimit int `url:"projects_limit,omitempty" json:"projects_limit,omitempty"`
ExternUID string `url:"extern_uid,omitempty" json:"extern_uid,omitempty"`
Provider string `url:"provider,omitempty" json:"provider,omitempty"`
Bio string `url:"bio,omitempty" json:"bio,omitempty"`
Admin bool `url:"admin,omitempty" json:"admin,omitempty"`
CanCreateGroup bool `url:"can_create_group,omitempty" json:"can_create_group,omitempty"`
Email *string `url:"email,omitempty" json:"email,omitempty"`
Password *string `url:"password,omitempty" json:"password,omitempty"`
Username *string `url:"username,omitempty" json:"username,omitempty"`
Name *string `url:"name,omitempty" json:"name,omitempty"`
Skype *string `url:"skype,omitempty" json:"skype,omitempty"`
Linkedin *string `url:"linkedin,omitempty" json:"linkedin,omitempty"`
Twitter *string `url:"twitter,omitempty" json:"twitter,omitempty"`
WebsiteURL *string `url:"website_url,omitempty" json:"website_url,omitempty"`
ProjectsLimit *int `url:"projects_limit,omitempty" json:"projects_limit,omitempty"`
ExternUID *string `url:"extern_uid,omitempty" json:"extern_uid,omitempty"`
Provider *string `url:"provider,omitempty" json:"provider,omitempty"`
Bio *string `url:"bio,omitempty" json:"bio,omitempty"`
Admin *bool `url:"admin,omitempty" json:"admin,omitempty"`
CanCreateGroup *bool `url:"can_create_group,omitempty" json:"can_create_group,omitempty"`
}
// ModifyUser modifies an existing user. Only administrators can change attributes
......@@ -237,10 +238,10 @@ func (s *UsersService) CurrentUser() (*User, *Response, error) {
//
// GitLab API docs: http://doc.gitlab.com/ce/api/users.html#list-ssh-keys
type SSHKey struct {
ID int `json:"id"`
Title string `json:"title"`
Key string `json:"key"`
CreatedAt time.Time `json:"created_at"`
ID int `json:"id"`
Title string `json:"title"`
Key string `json:"key"`
CreatedAt *time.Time `json:"created_at"`
}
// ListSSHKeys gets a list of currently authenticated user's SSH keys.
......@@ -307,8 +308,8 @@ func (s *UsersService) GetSSHKey(kid int) (*SSHKey, *Response, error) {
//
// GitLab API docs: http://doc.gitlab.com/ce/api/projects.html#add-ssh-key
type AddSSHKeyOptions struct {
Title string `url:"title,omitempty" json:"title,omitempty"`
Key string `url:"key,omitempty" json:"key,omitempty"`
Title *string `url:"title,omitempty" json:"title,omitempty"`
Key *string `url:"key,omitempty" json:"key,omitempty"`
}
// AddSSHKey creates a new key owned by the currently authenticated user.
......@@ -449,5 +450,4 @@ func (s *UsersService) UnblockUser(user int) error {
default:
return fmt.Errorf("Received unexpected result code: %d", resp.StatusCode)
}
return err
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment