Skip to content

Commit c8ccebd

Browse files
committed
Improve error handling
Signed-off-by: Tamal Saha <[email protected]>
1 parent 7dd35b1 commit c8ccebd

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

kubernetes/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ toolchain go1.24.1
66

77
require (
88
github.com/gogo/protobuf v1.3.2
9-
github.com/pkg/errors v0.9.1
109
go.bytebuilders.dev/license-proxyserver v0.0.20
1110
go.bytebuilders.dev/license-verifier v0.14.7
1211
k8s.io/api v0.30.2
@@ -49,6 +48,7 @@ require (
4948
github.com/modern-go/reflect2 v1.0.2 // indirect
5049
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5150
github.com/opencontainers/go-digest v1.0.0 // indirect
51+
github.com/pkg/errors v0.9.1 // indirect
5252
github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9 // indirect
5353
github.com/rancher/rancher/pkg/client v0.0.0-20240710123941-93e332156bbe // indirect
5454
github.com/rancher/wrangler/v3 v3.0.0 // indirect

kubernetes/lib.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1"
3232
"go.bytebuilders.dev/license-verifier/info"
3333

34-
"github.com/pkg/errors"
34+
"errors"
3535
proxyserver "go.bytebuilders.dev/license-proxyserver/apis/proxyserver/v1alpha1"
3636
proxyclient "go.bytebuilders.dev/license-proxyserver/client/clientset/versioned"
3737
verifier "go.bytebuilders.dev/license-verifier"
@@ -109,15 +109,18 @@ func (le *LicenseEnforcer) getLicense() ([]byte, error) {
109109
}
110110
pc, err := proxyclient.NewForConfig(le.config)
111111
if err != nil {
112-
return nil, errors.Wrap(err, "failed create client for license-proxyserver")
112+
return nil, fmt.Errorf("failed to instantiate proxy client, err: %w", err)
113113
}
114114
resp, err := pc.ProxyserverV1alpha1().LicenseRequests().Create(context.TODO(), &req, metav1.CreateOptions{})
115115
if err != nil {
116-
return nil, errors.Wrap(err, "failed to read license")
116+
return nil, fmt.Errorf("failed to read license from proxy, err: %w", err)
117+
}
118+
if resp.Response.License == "" {
119+
return nil, errors.New("missing license from proxy")
117120
}
118121
licenseBytes = []byte(resp.Response.License)
119122
} else if err != nil {
120-
return nil, errors.Wrap(err, "failed to read license")
123+
return nil, fmt.Errorf("failed to read license from file, err: %w", err)
121124
}
122125
return licenseBytes, nil
123126
}

lib.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func VerifyLicense(opts Options) (v1alpha1.License, error) {
200200
func BadLicense(err error) (v1alpha1.License, error) {
201201
if err == nil {
202202
// This should never happen
203-
panic(err)
203+
panic("bad license: expected error")
204204
}
205205
return v1alpha1.License{
206206
TypeMeta: metav1.TypeMeta{

0 commit comments

Comments
 (0)