gitlab.go

@@ -813,6 +813,7 @@ func (c *Client) Do(req *retryablehttp.Request, v interface{}) (*Response, error
 		return c.Do(req, v)
 	}
 	defer resp.Body.Close()
+	defer io.Copy(io.Discard, resp.Body)
 
 	// If not yet configured, try to configure the rate limiter
 	// using the response headers we just received. Fail silently

jobs.go

@@ -564,3 +564,22 @@ func (s *JobsService) DeleteArtifacts(pid interface{}, jobID int, options ...Req
 
 	return s.client.Do(req, nil)
 }
+
+// DeleteProjectArtifacts delete artifacts eligible for deletion in a project
+//
+// GitLab API docs:
+// https://docs.gitlab.com/ee/api/job_artifacts.html#delete-project-artifacts
+func (s *JobsService) DeleteProjectArtifacts(pid interface{}, options ...RequestOptionFunc) (*Response, error) {
+	project, err := parseID(pid)
+	if err != nil {
+		return nil, err
+	}
+	u := fmt.Sprintf("projects/%s/artifacts", PathEscape(project))
+
+	req, err := s.client.NewRequest(http.MethodDelete, u, nil, options)
+	if err != nil {
+		return nil, err
+	}
+
+	return s.client.Do(req, nil)
+}

merge_requests.go

@@ -493,18 +493,18 @@ func (s *MergeRequestsService) GetMergeRequestChanges(pid interface{}, mergeRequ
 	return m, resp, nil
 }
 
-// ListMergeRequesDiffsOptions represents the available ListMergeRequesDiffs()
+// ListMergeRequestDiffsOptions represents the available ListMergeRequesDiffs()
 // options.
 //
 // GitLab API docs:
 // https://docs.gitlab.com/ee/api/merge_requests.html#list-merge-request-diffs
-type ListMergeRequesDiffsOptions ListOptions
+type ListMergeRequestDiffsOptions ListOptions
 
-// ListMergeRequesDiffs List diffs of the files changed in a merge request
+// ListMergeRequestDiffs List diffs of the files changed in a merge request
 //
 // GitLab API docs:
 // https://docs.gitlab.com/ee/api/merge_requests.html#list-merge-request-diffs
-func (s *MergeRequestsService) ListMergeRequesDiffs(pid interface{}, mergeRequest int, opt *ListMergeRequesDiffsOptions, options ...RequestOptionFunc) ([]*MergeRequestDiff, *Response, error) {
+func (s *MergeRequestsService) ListMergeRequestDiffs(pid interface{}, mergeRequest int, opt *ListMergeRequestDiffsOptions, options ...RequestOptionFunc) ([]*MergeRequestDiff, *Response, error) {
 	project, err := parseID(pid)
 	if err != nil {
 		return nil, nil, err

merge_requests_test.go

@@ -260,7 +260,7 @@ func TestGetMergeRequestReviewers(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	createdAt := time.Date(2022, 07, 27, 17, 3, 27, 684000000, time.UTC)
+	createdAt := time.Date(2022, 0o7, 27, 17, 3, 27, 684000000, time.UTC)
 	user1 := BasicUser{ID: 1, Name: "John Doe1", Username: "user1", State: "active", AvatarURL: "http://www.gravatar.com/avatar/c922747a93b40d1ea88262bf1aebee62?s=80&d=identicon", WebURL: "http://localhost/user1"}
 	user2 := BasicUser{ID: 2, Name: "John Doe2", Username: "user2", State: "active", AvatarURL: "http://www.gravatar.com/avatar/10fc7f102be8de7657fb4d80898bbfe3?s=80&d=identicon", WebURL: "http://localhost/user2"}
 
@@ -296,12 +296,12 @@ func TestListMergeRequesDiffs(t *testing.T) {
 		mustWriteHTTPResponse(t, w, "testdata/list_merge_request_diff.json")
 	})
 
-	opts := &ListMergeRequesDiffsOptions{
+	opts := &ListMergeRequestDiffsOptions{
 		Page:    1,
 		PerPage: 2,
 	}
 
-	diffs, _, err := client.MergeRequests.ListMergeRequesDiffs(1, 1, opts)
+	diffs, _, err := client.MergeRequests.ListMergeRequestDiffs(1, 1, opts)
 	if err != nil {
 		t.Errorf("MergeRequests.ListMergeRequesDiffs returned error: %v", err)
 	}

testdata/post_user_personal_access_tokens.json

@@ -0,0 +1,13 @@
+{
+  "id": 3,
+  "name": "mytoken",
+  "revoked": false,
+  "created_at": "2020-10-14T11:58:53.526Z",
+  "scopes": [
+    "k8s_proxy"
+  ],
+  "user_id": 42,
+  "active": true,
+  "expires_at": "2020-10-15",
+  "token": "glpat-aaaaaaaa-bbbbbbbbb"
+}

users.go

@@ -1301,6 +1301,38 @@ func (s *UsersService) CreatePersonalAccessToken(user int, opt *CreatePersonalAc
 	return t, resp, nil
 }
 
+// CreatePersonalAccessTokenForCurrentUserOptions represents the available
+// CreatePersonalAccessTokenForCurrentUser() options.
+//
+// GitLab API docs:
+// https://docs.gitlab.com/ee/api/users.html#create-a-personal-access-token-with-limited-scopes-for-the-currently-authenticated-user
+type CreatePersonalAccessTokenForCurrentUserOptions struct {
+	Name      *string   `url:"name,omitempty" json:"name,omitempty"`
+	Scopes    *[]string `url:"scopes,omitempty" json:"scopes,omitempty"`
+	ExpiresAt *ISOTime  `url:"expires_at,omitempty" json:"expires_at,omitempty"`
+}
+
+// CreatePersonalAccessTokenForCurrentUser creates a personal access token with limited scopes for the currently authenticated user.
+//
+// GitLab API docs:
+// https://docs.gitlab.com/ee/api/users.html#create-a-personal-access-token-with-limited-scopes-for-the-currently-authenticated-user
+func (s *UsersService) CreatePersonalAccessTokenForCurrentUser(opt *CreatePersonalAccessTokenForCurrentUserOptions, options ...RequestOptionFunc) (*PersonalAccessToken, *Response, error) {
+	u := "user/personal_access_tokens"
+
+	req, err := s.client.NewRequest(http.MethodPost, u, opt, options)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	t := new(PersonalAccessToken)
+	resp, err := s.client.Do(req, &t)
+	if err != nil {
+		return nil, resp, err
+	}
+
+	return t, resp, nil
+}
+
 // UserActivity represents an entry in the user/activities response
 //
 // GitLab API docs:

users_test.go

@@ -682,3 +682,37 @@ func TestCreateUserRunner(t *testing.T) {
 	require.Equal(t, "glrt-1234567890ABCD", response.Token)
 	require.Equal(t, (*time.Time)(nil), response.TokenExpiresAt)
 }
+
+func TestCreatePersonalAccessTokenForCurrentUser(t *testing.T) {
+	mux, client := setup(t)
+
+	path := "/api/v4/user/personal_access_tokens"
+
+	mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, http.MethodPost)
+		mustWriteHTTPResponse(t, w, "testdata/post_user_personal_access_tokens.json")
+	})
+
+	scopes := []string{"k8s_proxy"}
+	expiresAt := ISOTime(time.Date(2020, time.October, 15, 0, 0, 0, 0, time.UTC))
+	user, _, err := client.Users.CreatePersonalAccessTokenForCurrentUser(&CreatePersonalAccessTokenForCurrentUserOptions{
+		Name:      String("mytoken"),
+		Scopes:    &scopes,
+		ExpiresAt: &expiresAt,
+	})
+	require.NoError(t, err)
+
+	createdAt := time.Date(2020, time.October, 14, 11, 58, 53, 526000000, time.UTC)
+	want := &PersonalAccessToken{
+		ID:        3,
+		Name:      "mytoken",
+		Revoked:   false,
+		CreatedAt: &createdAt,
+		Scopes:    scopes,
+		UserID:    42,
+		Active:    true,
+		ExpiresAt: &expiresAt,
+		Token:     "glpat-aaaaaaaa-bbbbbbbbb",
+	}
+	require.Equal(t, want, user)
+}