Fixup the PR

xanzy · Oct 29, 2022 · 26519c9 · 26519c9
1 parent d643424
commit 26519c9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/protected_tags.go b/protected_tags.go
@@ -44,10 +44,10 @@ type ProtectedTag struct {
 // GitLab API docs:
 // https://docs.gitlab.com/ee/api/protected_tags.html
 type TagAccessDescription struct {
+	UserID                 int              `json:"user_id"`
+	GroupID                int              `json:"group_id"`
 	AccessLevel            AccessLevelValue `json:"access_level"`
 	AccessLevelDescription string           `json:"access_level_description"`
-	UserID                 *int             `url:"user_id,omitempty" json:"user_id,omitempty"`
-	GroupID                *int             `url:"group_id,omitempty" json:"group_id,omitempty"`
 }
 
 // ListProtectedTagsOptions represents the available ListProtectedTags()
@@ -113,16 +113,16 @@ func (s *ProtectedTagsService) GetProtectedTag(pid interface{}, tag string, opti
 // GitLab API docs:
 // https://docs.gitlab.com/ee/api/protected_tags.html#protect-repository-tags
 type ProtectRepositoryTagsOptions struct {
-	Name              *string                                   `url:"name" json:"name"`
-	CreateAccessLevel *AccessLevelValue                         `url:"create_access_level,omitempty" json:"create_access_level,omitempty"`
-	AllowedToCreate   *[]ProtectRepositoryTagsPermissionOptions `url:"allowed_to_create,omitempty" json:"allowed_to_create,omitempty"`
+	Name              *string                   `url:"name,omitempty" json:"name,omitempty"`
+	CreateAccessLevel *AccessLevelValue         `url:"create_access_level,omitempty" json:"create_access_level,omitempty"`
+	AllowedToCreate   *[]*TagsPermissionOptions `url:"allowed_to_create,omitempty" json:"allowed_to_create,omitempty"`
 }
 
-// ProtectRepositoryTagsPermissionOptions represents a protected tag permission option.
+// TagsPermissionOptions represents a protected tag permission option.
 //
 // GitLab API docs:
 // https://docs.gitlab.com/ee/api/protected_tags.html#protect-repository-tags
-type ProtectRepositoryTagsPermissionOptions struct {
+type TagsPermissionOptions struct {
 	UserID      *int              `url:"user_id,omitempty" json:"user_id,omitempty"`
 	GroupID     *int              `url:"group_id,omitempty" json:"group_id,omitempty"`
 	AccessLevel *AccessLevelValue `url:"access_level,omitempty" json:"access_level,omitempty"`

diff --git a/protected_tags_test.go b/protected_tags_test.go
@@ -80,7 +80,7 @@ func TestGetProtectedTag(t *testing.T) {
 			},
 			{
 				AccessLevel:            40,
-				GroupID:                Int(300),
+				GroupID:                300,
 				AccessLevelDescription: "Sample Group",
 			},
 		},
@@ -110,7 +110,7 @@ func TestProtectRepositoryTags(t *testing.T) {
 			},
 			{
 				AccessLevel:            40,
-				GroupID:                Int(300),
+				GroupID:                300,
 				AccessLevelDescription: "Sample Group",
 			},
 		},
@@ -119,7 +119,7 @@ func TestProtectRepositoryTags(t *testing.T) {
 	opt := &ProtectRepositoryTagsOptions{
 		Name:              String("my-awesome-tag"),
 		CreateAccessLevel: AccessLevel(30),
-		AllowedToCreate: &[]ProtectRepositoryTagsPermissionOptions{
+		AllowedToCreate: &[]*TagsPermissionOptions{
 			{
 				GroupID: Int(300),
 			},