Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove github.com/pkg/errors with appropriate replacements (#3172)

Browse Source 
* errors.Wrap* removal

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* remove errors.Errorf

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Remove remaining calls

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Few more errors

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Fix golint errors

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

---------

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2025-02-20 08:58:37 +05:30
committed by GitHub
parent 2fd44174ce
commit caffed92f4
113 changed files with 585 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cmd/timetrigger/create.go
+7 -6
View File
@@ -23,7 +23,8 @@ import (
"github.com/fission/fission/pkg/fission-cli/cmd"
"github.com/fission/fission/pkg/utils/uuid"
"github.com/pkg/errors"
"errors"
"github.com/robfig/cron/v3"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -65,7 +66,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) (err error) {
userProvidedNS, fnNamespace, err := opts.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
return fmt.Errorf("error in deleting function : %w", err)
}
cronSpec := input.String(flagkey.TtCron)
@@ -78,7 +79,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) (err error) {
specIgnore := util.GetSpecIgnore(input)
fr, err := spec.ReadSpecs(specDir, specIgnore, false)
if err != nil {
return errors.Wrap(err, fmt.Sprintf("error reading spec in '%v'", specDir))
return fmt.Errorf("error reading spec in '%v': %w", specDir, err)
}
exists, err := fr.ExistsInSpecs(fv1.Function{
@@ -135,14 +136,14 @@ func (opts *CreateSubCommand) run(input cli.Input) error {
specFile := fmt.Sprintf("timetrigger-%v.yaml", opts.trigger.ObjectMeta.Name)
err := spec.SpecSave(*opts.trigger, specFile, false)
if err != nil {
return errors.Wrap(err, "error saving time trigger spec")
return fmt.Errorf("error saving time trigger spec: %w", err)
}
return nil
}
_, err := opts.Client().FissionClientSet.CoreV1().TimeTriggers(opts.trigger.Namespace).Create(input.Context(), opts.trigger, metav1.CreateOptions{})
if err != nil {
return errors.Wrap(err, "error creating Time trigger")
return fmt.Errorf("error creating Time trigger: %w", err)
}
fmt.Printf("trigger '%v' created\n", opts.trigger.ObjectMeta.Name)
@@ -151,7 +152,7 @@ func (opts *CreateSubCommand) run(input cli.Input) error {
err = getCronNextNActivationTime(opts.trigger.Spec.Cron, t, 1)
if err != nil {
return errors.Wrap(err, "error passing cron spec examination")
return fmt.Errorf("error passing cron spec examination: %w", err)
}
return nil
pkg/fission-cli/cmd/timetrigger/delete.go
+2 -3
View File
@@ -19,7 +19,6 @@ package timetrigger
import (
"fmt"
"github.com/pkg/errors"
kerrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -40,7 +39,7 @@ func (opts *DeleteSubCommand) do(input cli.Input) (err error) {
_, namespace, err := opts.GetResourceNamespace(input, flagkey.NamespaceTrigger)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
return fmt.Errorf("error in deleting function : %w", err)
}
err = opts.Client().FissionClientSet.CoreV1().TimeTriggers(namespace).Delete(input.Context(), input.String(flagkey.TtName), metav1.DeleteOptions{})
@@ -48,7 +47,7 @@ func (opts *DeleteSubCommand) do(input cli.Input) (err error) {
if input.Bool(flagkey.IgnoreNotFound) && kerrors.IsNotFound(err) {
return nil
}
return errors.Wrap(err, "error deleting trigger")
return fmt.Errorf("error deleting trigger: %w", err)
}
fmt.Printf("trigger '%v' deleted\n", input.String(flagkey.TtName))
pkg/fission-cli/cmd/timetrigger/list.go
+2 -3
View File
@@ -21,7 +21,6 @@ import (
"os"
"text/tabwriter"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
@@ -40,7 +39,7 @@ func List(input cli.Input) error {
func (opts *ListSubCommand) do(input cli.Input) (err error) {
_, ttNs, err := opts.GetResourceNamespace(input, flagkey.NamespaceTrigger)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
return fmt.Errorf("error in deleting function : %w", err)
}
if input.Bool(flagkey.AllNamespaces) {
@@ -49,7 +48,7 @@ func (opts *ListSubCommand) do(input cli.Input) (err error) {
tts, err := opts.Client().FissionClientSet.CoreV1().TimeTriggers(ttNs).List(input.Context(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "list Time triggers")
return fmt.Errorf("list Time triggers: %w", err)
}
w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
pkg/fission-cli/cmd/timetrigger/test.go
+4 -2
View File
@@ -17,7 +17,9 @@ limitations under the License.
package timetrigger
import (
"github.com/pkg/errors"
"fmt"
"errors"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
"github.com/fission/fission/pkg/fission-cli/cmd"
@@ -49,7 +51,7 @@ func (opts *ShowSubCommand) run(flaginput cli.Input) error {
err := getCronNextNActivationTime(cronSpec, t, round)
if err != nil {
return errors.Wrap(err, "error passing cron spec examination")
return fmt.Errorf("error passing cron spec examination: %w", err)
}
return nil
pkg/fission-cli/cmd/timetrigger/update.go
+7 -6
View File
@@ -19,7 +19,8 @@ package timetrigger
import (
"fmt"
"github.com/pkg/errors"
"errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fv1 "github.com/fission/fission/pkg/apis/core/v1"
@@ -51,12 +52,12 @@ func (opts *UpdateSubCommand) do(input cli.Input) error {
func (opts *UpdateSubCommand) complete(input cli.Input) error {
_, namespace, err := opts.GetResourceNamespace(input, flagkey.NamespaceTrigger)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
return fmt.Errorf("error in deleting function : %w", err)
}
tt, err := opts.Client().FissionClientSet.CoreV1().TimeTriggers(namespace).Get(input.Context(), input.String(flagkey.TtName), metav1.GetOptions{})
if err != nil {
return errors.Wrap(err, "error getting time trigger")
return fmt.Errorf("error getting time trigger: %w", err)
}
updated := false
@@ -105,13 +106,13 @@ func (opts *UpdateSubCommand) run(input cli.Input) error {
specFile := fmt.Sprintf("timetrigger-%s.yaml", opts.trigger.ObjectMeta.Name)
err = spec.SpecSave(*opts.trigger, specFile, true)
if err != nil {
return errors.Wrap(err, "error saving time trigger spec")
return fmt.Errorf("error saving time trigger spec: %w", err)
}
return nil
}
_, err := opts.Client().FissionClientSet.CoreV1().TimeTriggers(opts.trigger.ObjectMeta.Namespace).Update(input.Context(), opts.trigger, metav1.UpdateOptions{})
if err != nil {
return errors.Wrap(err, "error updating Time trigger")
return fmt.Errorf("error updating Time trigger: %w", err)
}
fmt.Printf("trigger '%v' updated\n", opts.trigger.ObjectMeta.Name)
@@ -123,7 +124,7 @@ func (opts *UpdateSubCommand) run(input cli.Input) error {
err = getCronNextNActivationTime(opts.trigger.Spec.Cron, t, 1)
if err != nil {
return errors.Wrap(err, "error passing cron spec examination")
return fmt.Errorf("error passing cron spec examination: %w", err)
}
return nil