Skip to content

Fix reversed errors.Is() argument order in CLI uploader #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Forceu merged 2 commits into from
Sep 12, 2026
Merged

Fix reversed errors.Is() argument order in CLI uploader #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
889899b
Fix reversed errors.Is() argument order in cliconfig.go
bauerpawel Sep 8, 2026
76501c3
Fix reversed errors.Is() argument order in Main.go
bauerpawel Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/cli-uploader/Main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func processUpload(mode int) {
result, err := cliapi.UploadFile(uploadParam)
if err != nil {
fmt.Println()
if errors.Is(cliapi.ErrUnauthorised, err) {
if errors.Is(err, cliapi.ErrUnauthorised) {
fmt.Println("ERROR: Unauthorised API key. Please re-run login or make sure that the API key has the permission to upload files.")
} else {
fmt.Println("ERROR: Could not upload file")
Expand Down Expand Up @@ -88,7 +88,7 @@ func processDownload() {
err := cliapi.DownloadFile(uploadParam)
if err != nil {
fmt.Println()
if errors.Is(cliapi.ErrUnauthorised, err) {
if errors.Is(err, cliapi.ErrUnauthorised) {
fmt.Println("ERROR: Unauthorised API key. Please re-run login or make sure that the API key has the permission to download files.")
} else {
fmt.Println("ERROR: Could not download file")
Expand Down
10 changes: 5 additions & 5 deletions cmd/cli-uploader/cliconfig/cliconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ func CreateLogin() {
vstr, vint, err := cliapi.GetVersion()
if err != nil {
fmt.Println()
if errors.Is(cliapi.ErrUnauthorised, err) {
if errors.Is(err, cliapi.ErrUnauthorised) {
fmt.Println("ERROR: Unauthorised API key")
os.Exit(1)
}
if errors.Is(cliapi.ErrNotFound, err) {
if errors.Is(err, cliapi.ErrNotFound) {
fmt.Println("ERROR: API not found")
fmt.Println("The provided URL does not respond to API calls as expected. You most likely entered an incorrect URL.")
os.Exit(1)
}
if errors.Is(cliapi.ErrInvalidRequest, err) {
if errors.Is(err, cliapi.ErrInvalidRequest) {
fmt.Println("ERROR: API does not support Gokapi CLI")
fmt.Println("This is most likely caused by an old Gokapi version. Please make sure that your Gokapi instance is running v2.1.0 or newer.")
os.Exit(1)
Expand All @@ -78,7 +78,7 @@ func CreateLogin() {
_, _, isE2E, err := cliapi.GetConfig()
if err != nil {
fmt.Println("FAIL")
if errors.Is(cliapi.ErrUnauthorised, err) {
if errors.Is(err, cliapi.ErrUnauthorised) {
fmt.Println("ERROR: API key does not have the permission to upload new files.")
} else {
fmt.Println(err)
Expand All @@ -98,7 +98,7 @@ func CreateLogin() {
cliapi.Init(url, apikey, e2ekey)
_, err = cliapi.GetE2eInfo(true)
if err != nil {
if errors.Is(cliapi.ErrE2eKeyIncorrect, err) {
if errors.Is(err, cliapi.ErrE2eKeyIncorrect) {
fmt.Println("ERROR: Incorrect end-to-end encryption key")
} else {
fmt.Println(err)
Expand Down