Skip to content

chore: Migrate pkg/errors to errors #146

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

Open
cychiang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: Migrate pkg/errors to errors #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ require (
github.com/alecthomas/kingpin/v2 v2.4.0
github.com/crossplane/crossplane-runtime/v2 v2.0.0
github.com/google/go-cmp v0.7.0
github.com/pkg/errors v0.9.1
google.golang.org/grpc v1.74.2
k8s.io/apiextensions-apiserver v0.33.0
k8s.io/apimachinery v0.33.3
Expand Down Expand Up @@ -54,6 +53,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.22.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
Expand Down
18 changes: 9 additions & 9 deletions hack/helpers/controller/KIND_LOWER/KIND_LOWER.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ package {{ .Env.KIND | strings.ToLower }}

import (
"context"
"errors"
"fmt"

"github.com/crossplane/crossplane-runtime/v2/pkg/feature"

"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -59,7 +59,7 @@ var (
func SetupGated(mgr ctrl.Manager, o controller.Options) error {
o.Gate.Register(func() {
if err := Setup(mgr, o); err != nil {
panic(errors.Wrap(err, "cannot setup {{ .Env.KIND }} controller"))
panic(fmt.Errorf("cannot setup {{ .Env.KIND }} controller: %w", err))
}
}, v1alpha1.{{ .Env.KIND }}GroupVersionKind)
return nil
Expand Down Expand Up @@ -95,7 +95,7 @@ func Setup(mgr ctrl.Manager, o controller.Options) error {
mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.{{ .Env.KIND }}List{}, o.MetricOptions.PollStateMetricInterval,
)
if err := mgr.Add(stateMetricsRecorder); err != nil {
return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.{{ .Env.KIND }}List")
return fmt.Errorf("cannot register MR state metrics recorder for kind v1alpha1.{{ .Env.KIND }}List: %w", err)
}
}

Expand Down Expand Up @@ -129,7 +129,7 @@ func (c *connector) Connect(ctx context.Context, mg resource.Managed) (managed.E
}

if err := c.usage.Track(ctx, cr); err != nil {
return nil, errors.Wrap(err, errTrackPCUsage)
return nil, fmt.Errorf("%s: %w", errTrackPCUsage, err)
}

var cd apisv1alpha1.ProviderCredentials
Expand All @@ -142,26 +142,26 @@ func (c *connector) Connect(ctx context.Context, mg resource.Managed) (managed.E
case "ProviderConfig":
pc := &apisv1alpha1.ProviderConfig{}
if err := c.kube.Get(ctx, types.NamespacedName{Name: ref.Name, Namespace: m.GetNamespace()}, pc); err != nil {
return nil, errors.Wrap(err, errGetPC)
return nil, fmt.Errorf("%s: %w", errGetPC, err)
}
cd = pc.Spec.Credentials
case "ClusterProviderConfig":
cpc := &apisv1alpha1.ClusterProviderConfig{}
if err := c.kube.Get(ctx, types.NamespacedName{Name: ref.Name}, cpc); err != nil {
return nil, errors.Wrap(err, errGetCPC)
return nil, fmt.Errorf("%s: %w", errGetCPC, err)
}
cd = cpc.Spec.Credentials
default:
return nil, errors.Errorf("unsupported provider config kind: %s", ref.Kind)
return nil, fmt.Errorf("unsupported provider config kind: %s", ref.Kind)
}
data, err := resource.CommonCredentialExtractor(ctx, cd.Source, c.kube, cd.CommonCredentialSelectors)
if err != nil {
return nil, errors.Wrap(err, errGetCreds)
return nil, fmt.Errorf("%s: %w", errGetCreds, err)
}

svc, err := c.newServiceFn(data)
if err != nil {
return nil, errors.Wrap(err, errNewClient)
return nil, fmt.Errorf("%s: %w", errNewClient, err)
}

return &external{service: svc}, nil
Expand Down
18 changes: 9 additions & 9 deletions internal/controller/mytype/mytype.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package mytype

import (
"context"
"errors"
"fmt"

xpv1 "github.com/crossplane/crossplane-runtime/v2/apis/common/v1"
Expand All @@ -29,7 +30,6 @@ import (
"github.com/crossplane/crossplane-runtime/v2/pkg/reconciler/managed"
"github.com/crossplane/crossplane-runtime/v2/pkg/resource"
"github.com/crossplane/crossplane-runtime/v2/pkg/statemetrics"
"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -59,7 +59,7 @@ var (
func SetupGated(mgr ctrl.Manager, o controller.Options) error {
o.Gate.Register(func() {
if err := Setup(mgr, o); err != nil {
panic(errors.Wrap(err, "cannot setup MyType controller"))
panic(fmt.Errorf("cannot setup MyType controller: %w", err))
}
}, v1alpha1.MyTypeGroupVersionKind)
return nil
Expand Down Expand Up @@ -96,7 +96,7 @@ func Setup(mgr ctrl.Manager, o controller.Options) error {
mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.MyTypeList{}, o.MetricOptions.PollStateMetricInterval,
)
if err := mgr.Add(stateMetricsRecorder); err != nil {
return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.MyTypeList")
return fmt.Errorf("cannot register MR state metrics recorder for kind v1alpha1.MyTypeList: %w", err)
}
}

Expand Down Expand Up @@ -130,7 +130,7 @@ func (c *connector) Connect(ctx context.Context, mg resource.Managed) (managed.E
}

if err := c.usage.Track(ctx, cr); err != nil {
return nil, errors.Wrap(err, errTrackPCUsage)
return nil, fmt.Errorf("%s: %w", errTrackPCUsage, err)
}

var cd apisv1alpha1.ProviderCredentials
Expand All @@ -143,27 +143,27 @@ func (c *connector) Connect(ctx context.Context, mg resource.Managed) (managed.E
case "ProviderConfig":
pc := &apisv1alpha1.ProviderConfig{}
if err := c.kube.Get(ctx, types.NamespacedName{Name: ref.Name, Namespace: m.GetNamespace()}, pc); err != nil {
return nil, errors.Wrap(err, errGetPC)
return nil, fmt.Errorf("%s: %w", errGetPC, err)
}
cd = pc.Spec.Credentials
case "ClusterProviderConfig":
cpc := &apisv1alpha1.ClusterProviderConfig{}
if err := c.kube.Get(ctx, types.NamespacedName{Name: ref.Name}, cpc); err != nil {
return nil, errors.Wrap(err, errGetCPC)
return nil, fmt.Errorf("%s: %w", errGetCPC, err)
}
cd = cpc.Spec.Credentials
default:
return nil, errors.Errorf("unsupported provider config kind: %s", ref.Kind)
return nil, fmt.Errorf("unsupported provider config kind: %s", ref.Kind)
}

data, err := resource.CommonCredentialExtractor(ctx, cd.Source, c.kube, cd.CommonCredentialSelectors)
if err != nil {
return nil, errors.Wrap(err, errGetCreds)
return nil, fmt.Errorf("%s: %w", errGetCreds, err)
}

svc, err := c.newServiceFn(data)
if err != nil {
return nil, errors.Wrap(err, errNewClient)
return nil, fmt.Errorf("%s: %w", errNewClient, err)
}

return &external{service: svc}, nil
Expand Down
Loading