Skip to content

Commit c0675af

Browse files
committed
Use new access levels permissions
1 parent be4666c commit c0675af

File tree

2 files changed

+31
-21
lines changed

2 files changed

+31
-21
lines changed

gitlab/resource_gitlab_project.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func resourceGitlabProject() *schema.Resource {
106106
Type: schema.TypeString,
107107
Required: true,
108108
ValidateFunc: validation.StringInSlice([]string{
109-
"guest", "reporter", "developer", "master"}, false),
109+
"no one", "guest", "reporter", "developer", "maintainer"}, false),
110110
},
111111
"group_name": {
112112
Type: schema.TypeString,

gitlab/util.go

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,24 @@ import (
1111
)
1212

1313
var accessLevelNameToValue = map[string]gitlab.AccessLevelValue{
14-
"guest": gitlab.GuestPermissions,
15-
"reporter": gitlab.ReporterPermissions,
16-
"developer": gitlab.DeveloperPermissions,
17-
"master": gitlab.MasterPermissions,
18-
"owner": gitlab.OwnerPermission,
14+
"no one": gitlab.NoPermissions,
15+
"guest": gitlab.GuestPermissions,
16+
"reporter": gitlab.ReporterPermissions,
17+
"developer": gitlab.DeveloperPermissions,
18+
"maintainer": gitlab.MaintainerPermissions,
19+
"owner": gitlab.OwnerPermission,
20+
21+
// Deprecated
22+
"master": gitlab.MaintainerPermissions,
1923
}
2024

2125
var accessLevelValueToName = map[gitlab.AccessLevelValue]string{
22-
gitlab.GuestPermissions: "guest",
23-
gitlab.ReporterPermissions: "reporter",
24-
gitlab.DeveloperPermissions: "developer",
25-
gitlab.MasterPermissions: "master",
26-
gitlab.OwnerPermission: "owner",
26+
gitlab.NoPermissions: "no one",
27+
gitlab.GuestPermissions: "guest",
28+
gitlab.ReporterPermissions: "reporter",
29+
gitlab.DeveloperPermissions: "developer",
30+
gitlab.MaintainerPermissions: "maintainer",
31+
gitlab.OwnerPermissions: "owner",
2732
}
2833

2934
// copied from ../github/util.go
@@ -106,17 +111,22 @@ func buildTwoPartID(a, b *string) string {
106111
}
107112

108113
var accessLevelID = map[string]gitlab.AccessLevelValue{
109-
"guest": gitlab.GuestPermissions,
110-
"reporter": gitlab.ReporterPermissions,
111-
"developer": gitlab.DeveloperPermissions,
112-
"master": gitlab.MasterPermissions,
113-
"owner": gitlab.OwnerPermission,
114+
"no one": gitlab.NoPermissions,
115+
"guest": gitlab.GuestPermissions,
116+
"reporter": gitlab.ReporterPermissions,
117+
"developer": gitlab.DeveloperPermissions,
118+
"maintainer": gitlab.MaintainerPermissions,
119+
"owner": gitlab.OwnerPermission,
120+
121+
// Deprecated
122+
"master": gitlab.MaintainerPermissions,
114123
}
115124

116125
var accessLevel = map[gitlab.AccessLevelValue]string{
117-
gitlab.GuestPermissions: "guest",
118-
gitlab.ReporterPermissions: "reporter",
119-
gitlab.DeveloperPermissions: "developer",
120-
gitlab.MasterPermissions: "master",
121-
gitlab.OwnerPermission: "owner",
126+
gitlab.NoPermissions: "no one",
127+
gitlab.GuestPermissions: "guest",
128+
gitlab.ReporterPermissions: "reporter",
129+
gitlab.DeveloperPermissions: "developer",
130+
gitlab.MaintainerPermissions: "maintainer",
131+
gitlab.OwnerPermission: "owner",
122132
}

0 commit comments

Comments
 (0)