Skip to content
This repository has been archived by the owner on Dec 10, 2024. It is now read-only.

Commit

Permalink
Tweak stuff just a little…
Browse files Browse the repository at this point in the history
  • Loading branch information
svanharmelen committed Apr 2, 2022
1 parent 48c5ce4 commit 33864fa
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 47 deletions.
12 changes: 6 additions & 6 deletions group_access_tokens.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ type GroupAccessTokensService struct {
client *Client
}

// GroupAccessToken represents a GitLab Group Access Token.
// GroupAccessToken represents a GitLab group access token.
//
// GitLab API docs: https://docs.gitlab.com/ee/api/group_access_tokens.html
type GroupAccessToken struct {
Expand All @@ -57,7 +57,7 @@ func (v GroupAccessToken) String() string {
// https://docs.gitlab.com/ee/api/group_access_tokens.html#list-group-access-tokens
type ListGroupAccessTokensOptions ListOptions

// ListGroupAccessTokens gets a list of all Group Access Tokens in a group.
// ListGroupAccessTokens gets a list of all group access tokens in a group.
//
// GitLab API docs:
// https://docs.gitlab.com/ee/api/group_access_tokens.html#list-group-access-tokens
Expand All @@ -82,7 +82,7 @@ func (s *GroupAccessTokensService) ListGroupAccessTokens(gid interface{}, opt *L
return gats, resp, err
}

// GetGroupAccessToken gets a single Group Access Tokens in a group.
// GetGroupAccessToken gets a single group access tokens in a group.
//
// GitLab API docs:
// https://docs.gitlab.com/ee/api/group_access_tokens.html#get-a-group-access-token
Expand Down Expand Up @@ -119,7 +119,7 @@ type CreateGroupAccessTokenOptions struct {
ExpiresAt *ISOTime `url:"expires_at,omitempty" json:"expires_at,omitempty"`
}

// CreateGroupAccessToken creates a new Group Access Token.
// CreateGroupAccessToken creates a new group access token.
//
// GitLab API docs:
// https://docs.gitlab.com/ee/api/group_access_tokens.html#create-a-group-access-token
Expand All @@ -144,11 +144,11 @@ func (s *GroupAccessTokensService) CreateGroupAccessToken(gid interface{}, opt *
return pat, resp, err
}

// DeleteGroupAccessToken deletes a Group Access Token.
// RevokeGroupAccessToken revokes a group access token.
//
// GitLab API docs:
// https://docs.gitlab.com/ee/api/group_access_tokens.html#revoke-a-group-access-token
func (s *GroupAccessTokensService) DeleteGroupAccessToken(gid interface{}, id int, options ...RequestOptionFunc) (*Response, error) {
func (s *GroupAccessTokensService) RevokeGroupAccessToken(gid interface{}, id int, options ...RequestOptionFunc) (*Response, error) {
groups, err := parseID(gid)
if err != nil {
return nil, err
Expand Down
6 changes: 3 additions & 3 deletions group_access_tokens_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,16 +145,16 @@ func TestCreateGroupAccessToken(t *testing.T) {
}
}

func TestDeleteGroupAccessToken(t *testing.T) {
func TestRevokeGroupAccessToken(t *testing.T) {
mux, server, client := setup(t)
defer teardown(server)

mux.HandleFunc("/api/v4/groups/1/access_tokens/1234", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, http.MethodDelete)
})

_, err := client.GroupAccessTokens.DeleteGroupAccessToken("1", 1234)
_, err := client.GroupAccessTokens.RevokeGroupAccessToken("1", 1234)
if err != nil {
t.Errorf("GroupAccessTokens.DeleteGroupAccessToken returned error: %v", err)
t.Errorf("GroupAccessTokens.RevokeGroupAccessToken returned error: %v", err)
}
}
10 changes: 5 additions & 5 deletions project_access_tokens.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ type ProjectAccessTokensService struct {
client *Client
}

// ProjectAccessToken represents a GitLab Project Access Token.
// ProjectAccessToken represents a GitLab project access token.
//
// GitLab API docs: https://docs.gitlab.com/ee/api/resource_access_tokens.html
type ProjectAccessToken struct {
Expand All @@ -57,7 +57,7 @@ func (v ProjectAccessToken) String() string {
// https://docs.gitlab.com/ee/api/resource_access_tokens.html#list-project-access-tokens
type ListProjectAccessTokensOptions ListOptions

// ListProjectAccessTokens gets a list of all Project Access Tokens in a
// ListProjectAccessTokens gets a list of all project access tokens in a
// project.
//
// GitLab API docs:
Expand All @@ -83,7 +83,7 @@ func (s *ProjectAccessTokensService) ListProjectAccessTokens(pid interface{}, op
return pats, resp, err
}

// GetProjectAccessToken gets a single Project Access Tokens in a project.
// GetProjectAccessToken gets a single project access tokens in a project.
//
// GitLab API docs:
// https://docs.gitlab.com/ee/api/project_access_tokens.html#get-a-project-access-token
Expand Down Expand Up @@ -145,11 +145,11 @@ func (s *ProjectAccessTokensService) CreateProjectAccessToken(pid interface{}, o
return pat, resp, err
}

// DeleteProjectAccessToken deletes a Project Access Token.
// RevokeProjectAccessToken revokes a project access token.
//
// GitLab API docs:
// https://docs.gitlab.com/ee/api/resource_access_tokens.html#revoke-a-project-access-token
func (s *ProjectAccessTokensService) DeleteProjectAccessToken(pid interface{}, id int, options ...RequestOptionFunc) (*Response, error) {
func (s *ProjectAccessTokensService) RevokeProjectAccessToken(pid interface{}, id int, options ...RequestOptionFunc) (*Response, error) {
project, err := parseID(pid)
if err != nil {
return nil, err
Expand Down
6 changes: 3 additions & 3 deletions project_access_tokens_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,16 +145,16 @@ func TestCreateProjectAccessToken(t *testing.T) {
}
}

func TestDeleteProjectAccessToken(t *testing.T) {
func TestRevokeProjectAccessToken(t *testing.T) {
mux, server, client := setup(t)
defer teardown(server)

mux.HandleFunc("/api/v4/projects/1/access_tokens/1234", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, http.MethodDelete)
})

_, err := client.ProjectAccessTokens.DeleteProjectAccessToken("1", 1234)
_, err := client.ProjectAccessTokens.RevokeProjectAccessToken("1", 1234)
if err != nil {
t.Errorf("ProjectAccessTokens.DeleteProjectAccessToken returned error: %v", err)
t.Errorf("ProjectAccessTokens.RevokeProjectAccessToken returned error: %v", err)
}
}
25 changes: 10 additions & 15 deletions testdata/get_group_access_token.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
{
"id": 1,
"name": "token 10",
"revoked": false,
"created_at": "2021-03-09T21:11:47.271Z",
"scopes": [
"api",
"read_api",
"read_repository",
"write_repository"
],
"user_id": 2453,
"active": true,
"expires_at": null,
"access_level": 40
}
"id": 1,
"name": "token 10",
"revoked": false,
"created_at": "2021-03-09T21:11:47.271Z",
"scopes": ["api", "read_api", "read_repository", "write_repository"],
"user_id": 2453,
"active": true,
"expires_at": null,
"access_level": 40
}
25 changes: 10 additions & 15 deletions testdata/get_project_access_token.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
{
"id": 1,
"name": "token 10",
"revoked": false,
"created_at": "2021-03-09T21:11:47.271Z",
"scopes": [
"api",
"read_api",
"read_repository",
"write_repository"
],
"user_id": 2453,
"active": true,
"expires_at": null,
"access_level": 40
}
"id": 1,
"name": "token 10",
"revoked": false,
"created_at": "2021-03-09T21:11:47.271Z",
"scopes": ["api", "read_api", "read_repository", "write_repository"],
"user_id": 2453,
"active": true,
"expires_at": null,
"access_level": 40
}

0 comments on commit 33864fa

Please # to comment.