Commit d8d0754
Eric Bower
·
2026-08-30 09:28:33 -0400 EDT
parent 3a4fd49
fix(pgs): better pico+ error message when uploading
2 files changed,
+10,
-4
+4,
-4
| ... | ... | @@ -21,7 +21,7 @@ func findFeatureFlag(dbpool pgsdb.PgsDB, cfg *PgsConfig, userID string) (*db.Fea | |
| 21 | 21 | setFeatureLimits(ff, cfg) | |
| 22 | 22 | return ff, nil | |
| 23 | 23 | } | |
| 24 | - | err = fmt.Errorf("your pico+ has expired") | |
| 24 | + | err = fmt.Errorf("ERROR: your pico+ has expired, https://blog.pico.sh/ann-037-pgs-pico-plus-only") | |
| 25 | 25 | } | |
| 26 | 26 | ||
| 27 | 27 | ffPgs, pgsErr := dbpool.FindFeature(userID, "pgs") |
| ... | ... | @@ -30,14 +30,14 @@ func findFeatureFlag(dbpool pgsdb.PgsDB, cfg *PgsConfig, userID string) (*db.Fea | |
| 30 | 30 | setFeatureLimits(ffPgs, cfg) | |
| 31 | 31 | return ffPgs, nil | |
| 32 | 32 | } | |
| 33 | - | pgsErr = fmt.Errorf("your pgs access has expired") | |
| 33 | + | pgsErr = fmt.Errorf("ERROR: your pgs access has expired, https://blog.pico.sh/ann-037-pgs-pico-plus-only") | |
| 34 | 34 | } | |
| 35 | 35 | ||
| 36 | 36 | if err != nil && strings.Contains(err.Error(), "expired") { | |
| 37 | 37 | return nil, err | |
| 38 | 38 | } | |
| 39 | - | if pgsErr != nil { | |
| 39 | + | if pgsErr != nil && strings.Contains(pgsErr.Error(), "expired") { | |
| 40 | 40 | return nil, pgsErr | |
| 41 | 41 | } | |
| 42 | - | return nil, err | |
| 42 | + | return nil, fmt.Errorf("ERROR: uploading to pgs requires pico+, https://blog.pico.sh/ann-037-pgs-pico-plus-only") | |
| 43 | 43 | } |
+6,
-0
| ... | ... | @@ -646,6 +646,9 @@ func TestFindFeatureFlag(t *testing.T) { | |
| 646 | 646 | if err == nil { | |
| 647 | 647 | t.Fatal("expected error, got nil") | |
| 648 | 648 | } | |
| 649 | + | if !strings.Contains(err.Error(), "https://blog.pico.sh/ann-037-pgs-pico-plus-only") { | |
| 650 | + | t.Errorf("expected blog link in error, got %v", err) | |
| 651 | + | } | |
| 649 | 652 | }) | |
| 650 | 653 | ||
| 651 | 654 | t.Run("error when neither plus nor pgs exists", func(t *testing.T) { |
| ... | ... | @@ -654,6 +657,9 @@ func TestFindFeatureFlag(t *testing.T) { | |
| 654 | 657 | if err == nil { | |
| 655 | 658 | t.Fatal("expected error, got nil") | |
| 656 | 659 | } | |
| 660 | + | if !strings.Contains(err.Error(), "pico+") || !strings.Contains(err.Error(), "https://blog.pico.sh/ann-037-pgs-pico-plus-only") { | |
| 661 | + | t.Errorf("expected pico+ requirement and blog link in error, got %v", err) | |
| 662 | + | } | |
| 657 | 663 | }) | |
| 658 | 664 | } | |
| 659 | 665 |