opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle CLI default organization when none exists in <v2.9.0 coderd (#12594)

Browse Source 
* chore: 'coder org set' help message was incorrect
* fix: handler coder cli against older versions of Coder
This commit is contained in:
Steven Masley
2024-03-14 15:11:29 -05:00
committed by GitHub
parent f78b5c1cfe
commit 29c8cf20e0
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/root.go
+8 -1
View File
@@ -749,7 +749,14 @@ func CurrentOrganization(r *RootCmd, inv *clibase.Invocation, client *codersdk.C
return org.IsDefault
})
if index < 0 {
return codersdk.Organization{}, xerrors.Errorf("unable to determine current organization. Use 'coder set <org>' to select an organization to use")
if len(orgs) == 1 {
// If there is no "isDefault", but only 1 org is present. We can just
// assume the single organization is correct. This is mainly a helper
// for cli hitting an old instance, or a user that belongs to a single
// org that is not the default.
return orgs[0], nil
}
return codersdk.Organization{}, xerrors.Errorf("unable to determine current organization. Use 'coder org set <org>' to select an organization to use")
}
return orgs[index], nil