Few minor tweaks after merging a round of PRs

examples/repository_archive.go

@@ -31,9 +31,7 @@ func repositoryArchiveExample() {
 	// Get repository archive
 	opt := &gitlab.ArchiveOptions{
 		Format: gitlab.String("tar.gz"),
-		// Gitlab API supports archiving first level directories at the moment, e.g. "mygroup/myproject/mydir".
-		// If you pass 2+ level directory in path, whole repository will be archived and downloaded.
-		Path: gitlab.String("mydir"),
+		Path:   gitlab.String("mydir"),
 	}
 	content, _, err := git.Repositories.Archive("mygroup/myproject", opt, nil)
 	if err != nil {

examples/services.go

@@ -32,11 +32,11 @@ func dataDogExample() {
 	// Create new DataDog integration
 	opts := &gitlab.SetDataDogServiceOptions{
 		APIKey:             gitlab.String("testing"),
-		ArchiveTraceEvents: gitlab.Bool(true),
 		DataDogEnv:         gitlab.String("sandbox"),
 		DataDogService:     gitlab.String("test"),
 		DataDogSite:        gitlab.String("datadoghq.com"),
 		DataDogTags:        gitlab.String("country:canada\nprovince:ontario"),
+		ArchiveTraceEvents: gitlab.Bool(true),
 	}
 
 	_, err = git.Services.SetDataDogService(1, opts)
@@ -50,9 +50,9 @@ func dataDogExample() {
 		log.Fatal(err)
 	}
 	fmt.Printf(
-		"api_url: %s, archive_trace_events: %v, datadog_env: %s, datadog_service: %s, datadog_site: %s, datadog_tags: %s",
-		svc.Properties.APIURL, svc.Properties.ArchiveTraceEvents, svc.Properties.DataDogEnv,
-		svc.Properties.DataDogService, svc.Properties.DataDogSite, svc.Properties.DataDogTags,
+		"api_url: %s, datadog_env: %s, datadog_service: %s, datadog_site: %s, datadog_tags: %s",
+		svc.Properties.APIURL, svc.Properties.DataDogEnv, svc.Properties.DataDogService,
+		svc.Properties.DataDogSite, svc.Properties.DataDogTags,
 	)
 
 	// Delete the integration

group_access_tokens.go

@@ -147,6 +147,7 @@ func (s *GroupAccessTokensService) CreateGroupAccessToken(gid interface{}, opt *
 
 // RotateGroupAccessToken revokes a group access token and returns a new group
 // access token that expires in one week.
+//
 // GitLab API docs:
 // https://docs.gitlab.com/ee/api/group_access_tokens.html#rotate-a-group-access-token
 func (s *GroupAccessTokensService) RotateGroupAccessToken(gid interface{}, id int, options ...RequestOptionFunc) (*GroupAccessToken, *Response, error) {

merge_requests.go

@@ -542,18 +542,19 @@ func (s *MergeRequestsService) GetMergeRequestParticipants(pid interface{}, merg
 		return nil, nil, err
 	}
 
-	var ps []*BasicUser
-	resp, err := s.client.Do(req, &ps)
+	var bu []*BasicUser
+	resp, err := s.client.Do(req, &bu)
 	if err != nil {
 		return nil, resp, err
 	}
 
-	return ps, resp, nil
+	return bu, resp, nil
 }
 
 // MergeRequestReviewer represents a GitLab merge request reviewer.
 //
-// GitLab API docs: https://docs.gitlab.com/ee/api/merge_requests.html#get-single-merge-request-reviewers
+// GitLab API docs:
+// https://docs.gitlab.com/ee/api/merge_requests.html#get-single-merge-request-reviewers
 type MergeRequestReviewer struct {
 	User      *BasicUser `json:"user"`
 	State     string     `json:"state"`
@@ -576,13 +577,13 @@ func (s *MergeRequestsService) GetMergeRequestReviewers(pid interface{}, mergeRe
 		return nil, nil, err
 	}
 
-	var ps []*MergeRequestReviewer
-	resp, err := s.client.Do(req, &ps)
+	var mrr []*MergeRequestReviewer
+	resp, err := s.client.Do(req, &mrr)
 	if err != nil {
 		return nil, resp, err
 	}
 
-	return ps, resp, nil
+	return mrr, resp, nil
 }
 
 // ListMergeRequestPipelines gets all pipelines for the provided merge request.

project_access_tokens.go

@@ -148,6 +148,7 @@ func (s *ProjectAccessTokensService) CreateProjectAccessToken(pid interface{}, o
 
 // RotateProjectAccessToken revokes a project access token and returns a new
 // project access token that expires in one week.
+//
 // GitLab API docs:
 // https://docs.gitlab.com/ee/api/project_access_tokens.html#rotate-a-project-access-token
 func (s *ProjectAccessTokensService) RotateProjectAccessToken(pid interface{}, id int, options ...RequestOptionFunc) (*ProjectAccessToken, *Response, error) {

services.go

@@ -194,11 +194,11 @@ type DataDogService struct {
 // https://docs.gitlab.com/ee/api/services.html#datadog
 type DataDogServiceProperties struct {
 	APIURL             string `url:"api_url,omitempty" json:"api_url,omitempty"`
-	ArchiveTraceEvents bool   `url:"archive_trace_events,omitempty" json:"archive_trace_events,omitempty"`
 	DataDogEnv         string `url:"datadog_env,omitempty" json:"datadog_env,omitempty"`
 	DataDogService     string `url:"datadog_service,omitempty" json:"datadog_service,omitempty"`
 	DataDogSite        string `url:"datadog_site,omitempty" json:"datadog_site,omitempty"`
 	DataDogTags        string `url:"datadog_tags,omitempty" json:"datadog_tags,omitempty"`
+	ArchiveTraceEvents bool   `url:"archive_trace_events,omitempty" json:"archive_trace_events,omitempty"`
 }
 
 // GetDataDogService gets DataDog service settings for a project.
@@ -234,11 +234,11 @@ func (s *ServicesService) GetDataDogService(pid interface{}, options ...RequestO
 type SetDataDogServiceOptions struct {
 	APIKey             *string `url:"api_key,omitempty" json:"api_key,omitempty"`
 	APIURL             *string `url:"api_url,omitempty" json:"api_url,omitempty"`
-	ArchiveTraceEvents *bool   `url:"archive_trace_events,omitempty" json:"archive_trace_events,omitempty"`
 	DataDogEnv         *string `url:"datadog_env,omitempty" json:"datadog_env,omitempty"`
 	DataDogService     *string `url:"datadog_service,omitempty" json:"datadog_service,omitempty"`
 	DataDogSite        *string `url:"datadog_site,omitempty" json:"datadog_site,omitempty"`
 	DataDogTags        *string `url:"datadog_tags,omitempty" json:"datadog_tags,omitempty"`
+	ArchiveTraceEvents *bool   `url:"archive_trace_events,omitempty" json:"archive_trace_events,omitempty"`
 }
 
 // SetDataDogService sets DataDog service settings for a project.

testdata/list_merge_request_diff.json

@@ -19,4 +19,4 @@
     "renamed_file": false,
     "deleted_file": false
   }
-]
+]