From 89e5adf04024124b5c7576e2148f23162be49668 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Mon, 10 Apr 2023 11:28:34 +0200 Subject: [PATCH] Fix PR --- personal_access_tokens.go | 31 ++++++++++--------- .../list_personal_access_tokens_single.json | 22 ++++++------- ...rsonal_access_tokens_with_user_filter.json | 9 ++---- testdata/list_project_feature_flags.json | 20 ++++++------ 4 files changed, 38 insertions(+), 44 deletions(-) diff --git a/personal_access_tokens.go b/personal_access_tokens.go index 9aafeda6c..07d6de28d 100644 --- a/personal_access_tokens.go +++ b/personal_access_tokens.go @@ -79,44 +79,45 @@ func (s *PersonalAccessTokensService) ListPersonalAccessTokens(opt *ListPersonal return pats, resp, err } -// GetSinglePersonalAccessToken get a single personal access token by its ID +// GetSinglePersonalAccessTokenByID get a single personal access token by its ID. +// // GitLab API docs: // https://docs.gitlab.com/ee/api/personal_access_tokens.html#using-a-personal-access-token-id -func (s *PersonalAccessTokensService) GetSinglePersonalAccessToken(userId int, options ...RequestOptionFunc) (*PersonalAccessToken, *Response, error) { - fmt.Println("being called.....") - u := fmt.Sprintf("%s/%d", "personal_access_tokens", userId) +func (s *PersonalAccessTokensService) GetSinglePersonalAccessTokenByID(user int, options ...RequestOptionFunc) (*PersonalAccessToken, *Response, error) { + u := fmt.Sprintf("personal_access_tokens/%d", user) req, err := s.client.NewRequest(http.MethodGet, u, nil, options) if err != nil { - fmt.Println("fuckimng error", err) return nil, nil, err } - var pats *PersonalAccessToken - resp, err := s.client.Do(req, &pats) + pat := new(PersonalAccessToken) + resp, err := s.client.Do(req, pat) if err != nil { - fmt.Println("fucking error", err) return nil, resp, err } - return pats, resp, err + return pat, resp, err } -// GetSingleSelfPersonalAccessToken get a single personal access token by using passing the token in a header +// GetSinglePersonalAccessToken get a single personal access token by using +// passing the token in a header. +// // GitLab API docs: // https://docs.gitlab.com/ee/api/personal_access_tokens.html#using-a-request-header -func (s *PersonalAccessTokensService) GetSingleSelfPersonalAccessToken(options ...RequestOptionFunc) (*PersonalAccessToken, *Response, error) { - req, err := s.client.NewRequest(http.MethodGet, "personal_access_tokens/self", nil, options) +func (s *PersonalAccessTokensService) GetSinglePersonalAccessToken(options ...RequestOptionFunc) (*PersonalAccessToken, *Response, error) { + u := "personal_access_tokens/self" + req, err := s.client.NewRequest(http.MethodGet, u, nil, options) if err != nil { return nil, nil, err } - var pats *PersonalAccessToken - resp, err := s.client.Do(req, &pats) + pat := new(PersonalAccessToken) + resp, err := s.client.Do(req, pat) if err != nil { return nil, resp, err } - return pats, resp, err + return pat, resp, err } // RevokePersonalAccessToken revokes a personal access token. diff --git a/testdata/list_personal_access_tokens_single.json b/testdata/list_personal_access_tokens_single.json index 689a5ed56..6c87a1245 100644 --- a/testdata/list_personal_access_tokens_single.json +++ b/testdata/list_personal_access_tokens_single.json @@ -1,13 +1,11 @@ { - "id": 1, - "name": "Test Token", - "revoked": false, - "created_at": "2020-07-23T14:31:47.729Z", - "scopes": [ - "api" - ], - "user_id": 1, - "last_used_at": "2021-10-06T17:58:37.550Z", - "active": true, - "expires_at": null -} \ No newline at end of file + "id": 1, + "name": "Test Token", + "revoked": false, + "created_at": "2020-07-23T14:31:47.729Z", + "scopes": ["api"], + "user_id": 1, + "last_used_at": "2021-10-06T17:58:37.550Z", + "active": true, + "expires_at": null +} diff --git a/testdata/list_personal_access_tokens_with_user_filter.json b/testdata/list_personal_access_tokens_with_user_filter.json index 2278678cb..bcda5dd94 100644 --- a/testdata/list_personal_access_tokens_with_user_filter.json +++ b/testdata/list_personal_access_tokens_with_user_filter.json @@ -4,9 +4,7 @@ "name": "test 1", "revoked": true, "created_at": "2020-02-20T14:58:56.238Z", - "scopes": [ - "api" - ], + "scopes": ["api"], "user_id": 1, "last_used_at": "2021-04-20T16:31:39.105Z", "active": false, @@ -17,10 +15,7 @@ "name": "test 2", "revoked": false, "created_at": "2022-03-20T03:56:18.968Z", - "scopes": [ - "api", - "read_user" - ], + "scopes": ["api", "read_user"], "user_id": 1, "last_used_at": null, "active": false, diff --git a/testdata/list_project_feature_flags.json b/testdata/list_project_feature_flags.json index 660fd2fcf..2e1c540e5 100644 --- a/testdata/list_project_feature_flags.json +++ b/testdata/list_project_feature_flags.json @@ -1,12 +1,12 @@ [ { - "name":"merge_train", - "description":"This feature is about merge train", + "name": "merge_train", + "description": "This feature is about merge train", "active": true, "version": "new_version_flag", - "created_at":"2019-11-04T08:13:51Z", - "updated_at":"2019-11-04T08:13:11Z", - "scopes":[], + "created_at": "2019-11-04T08:13:51Z", + "updated_at": "2019-11-04T08:13:11Z", + "scopes": [], "strategies": [ { "id": 1, @@ -24,13 +24,13 @@ ] }, { - "name":"new_live_trace", - "description":"This is a new live trace feature", + "name": "new_live_trace", + "description": "This is a new live trace feature", "active": true, "version": "new_version_flag", - "created_at":"2019-11-04T08:13:10Z", - "updated_at":"2019-11-04T08:13:10Z", - "scopes":[], + "created_at": "2019-11-04T08:13:10Z", + "updated_at": "2019-11-04T08:13:10Z", + "scopes": [], "strategies": [ { "id": 2,