Skip to content

Commit d7f79c8

Browse files
authored
Fix gitlab token length requirements (gabrie30#176)
1 parent 18cc8a3 commit d7f79c8

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
1111
### Deprecated
1212
### Removed
1313
### Fixed
14+
- Gitlab token length requirements; thanks @dschafhauser
1415
### Security
1516

1617
## [1.7.5] - 12/11/21

configs/configs.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,11 @@ func VerifyTokenSet() error {
228228
token = os.Getenv("GHORG_GITLAB_TOKEN")
229229
if strings.HasPrefix(token, "glpat-") {
230230
tokenLength = 26
231+
} else if len(token) > 0 {
232+
// gitlab admins can change token prefixes so we dont know the exact length
233+
tokenLength = len(token)
231234
} else {
232-
tokenLength = 20
235+
tokenLength = -1
233236
}
234237
}
235238

configs/configs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestVerifyTokenSet(t *testing.T) {
2626

2727
err := configs.VerifyTokenSet()
2828
if err != configs.ErrNoGitLabToken {
29-
tt.Errorf("Expected ErrNoGitHubTokenError, got: %v", err)
29+
tt.Errorf("Expected ErrNoGitLabTokenError, got: %v", err)
3030
}
3131

3232
})

0 commit comments

Comments
 (0)