Skip to content

Commit

Permalink
Added missing scopes to deploy token (#769)
Browse files Browse the repository at this point in the history
* added missing scopes to gitlab deploy token

* removed write_repository, because it is not allowed

Co-authored-by: Johannes Gesenhues <johannes.gesenhues@obi.de>
  • Loading branch information
johannges and Johannes Gesenhues committed Dec 17, 2021
1 parent e89922e commit 12ae791
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 6 deletions.
24 changes: 18 additions & 6 deletions gitlab/resource_gitlab_deploy_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,15 @@ func resourceGitlabDeployToken() *schema.Resource {
Required: true,
ForceNew: true,
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice([]string{"read_registry", "read_repository"}, false),
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice(
[]string{
"read_registry",
"read_repository",
"read_package_registry",
"write_registry",
"write_package_registry",
}, false),
},
},

Expand Down Expand Up @@ -169,12 +176,17 @@ func resourceGitlabDeployTokenRead(d *schema.ResourceData, meta interface{}) err
}

for _, scope := range token.Scopes {
if scope == "read_repository" {
switch scope {
case "read_repository":
d.Set("scopes.read_repository", true)
}

if scope == "read_registry" {
case "read_registry":
d.Set("scopes.read_registry", true)
case "read_package_registry":
d.Set("scopes.read_package_registry", true)
case "write_registry":
d.Set("scopes.write_registry", true)
case "write_package_registry":
d.Set("scopes.write_package_registry", true)
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions gitlab/resource_gitlab_deploy_token_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ resource "gitlab_deploy_token" "foo" {
scopes = [
"read_registry",
"read_repository",
"read_package_registry",
"write_registry",
"write_package_registry",
]
}
`, rInt, rInt)
Expand Down

0 comments on commit 12ae791

Please sign in to comment.