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/environment/create.go
+2 -3
View File
@@ -20,7 +20,6 @@ import (
"fmt"
"github.com/hashicorp/go-multierror"
"github.com/pkg/errors"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -101,7 +100,7 @@ func (opts *CreateSubCommand) run(input cli.Input) (err error) {
specFile := fmt.Sprintf("env-%v.yaml", opts.env.ObjectMeta.Name)
err = spec.SpecSave(*opts.env, specFile, false)
if err != nil {
return errors.Wrap(err, "error saving environment spec")
return fmt.Errorf("error saving environment spec: %w", err)
}
return nil
}
@@ -110,7 +109,7 @@ func (opts *CreateSubCommand) run(input cli.Input) (err error) {
_, err = opts.Client().FissionClientSet.CoreV1().Environments(opts.env.Namespace).Create(input.Context(), opts.env, metav1.CreateOptions{})
if err != nil {
return errors.Wrap(err, "error creating resource")
return fmt.Errorf("error creating resource: %w", err)
}
fmt.Printf("environment '%v' created\n", opts.env.ObjectMeta.Name)
pkg/fission-cli/cmd/environment/delete.go
+4 -4
View File
@@ -17,9 +17,9 @@ limitations under the License.
package environment
import (
"errors"
"fmt"
"github.com/pkg/errors"
kerrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -41,7 +41,7 @@ func (opts *DeleteSubCommand) do(input cli.Input) (err error) {
_, currentContextNS, err := opts.GetResourceNamespace(input, flagkey.NamespaceEnvironment)
if err != nil {
return errors.Wrap(err, "error creating environment")
return fmt.Errorf("error creating environment: %w", err)
}
console.Verbose(2, "Searching for resource in %s Namespace", currentContextNS)
envName := input.String(flagkey.EnvName)
@@ -49,7 +49,7 @@ func (opts *DeleteSubCommand) do(input cli.Input) (err error) {
if !input.Bool(flagkey.EnvForce) {
fns, err := opts.Client().FissionClientSet.CoreV1().Functions(metav1.NamespaceAll).List(input.Context(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "Error getting functions wrt environment.")
return fmt.Errorf("Error getting functions wrt environment.: %w", err)
}
for _, fn := range fns.Items {
@@ -65,7 +65,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 environment")
return fmt.Errorf("error deleting environment: %w", err)
}
fmt.Printf("environment '%s' deleted\n", envName)
pkg/fission-cli/cmd/environment/get.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"
@@ -41,12 +40,12 @@ func (opts *GetSubCommand) do(input cli.Input) (err error) {
_, currentNS, err := opts.GetResourceNamespace(input, flagkey.NamespaceEnvironment)
if err != nil {
return errors.Wrap(err, "error creating environment")
return fmt.Errorf("error creating environment: %w", err)
}
env, err := opts.Client().FissionClientSet.CoreV1().Environments(currentNS).Get(input.Context(), input.String(flagkey.EnvName), metav1.GetOptions{})
if err != nil {
return errors.Wrap(err, "error getting environment")
return fmt.Errorf("error getting environment: %w", err)
}
w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
pkg/fission-cli/cmd/environment/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"
@@ -41,7 +40,7 @@ func (opts *ListSubCommand) do(input cli.Input) (err error) {
_, currentNS, err := opts.GetResourceNamespace(input, flagkey.NamespaceEnvironment)
if err != nil {
return errors.Wrap(err, "error creating environment")
return fmt.Errorf("error creating environment: %w", err)
}
if input.Bool(flagkey.AllNamespaces) {
@@ -50,7 +49,7 @@ func (opts *ListSubCommand) do(input cli.Input) (err error) {
response, err := opts.Client().FissionClientSet.CoreV1().Environments(currentNS).List(input.Context(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "error listing environments")
return fmt.Errorf("error listing environments: %w", err)
}
envs := response.Items
pkg/fission-cli/cmd/environment/pods.go
+3 -4
View File
@@ -21,7 +21,6 @@ import (
"os"
"text/tabwriter"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
@@ -44,12 +43,12 @@ func (opts *ListPodsSubCommand) do(input cli.Input) (err error) {
_, currentNS, err := opts.GetResourceNamespace(input, flagkey.NamespaceEnvironment)
if err != nil {
return errors.Wrap(err, "error creating environment")
return fmt.Errorf("error creating environment: %w", err)
}
_, err = opts.Client().FissionClientSet.CoreV1().Environments(currentNS).Get(input.Context(), input.String(flagkey.EnvName), metav1.GetOptions{})
if err != nil {
return errors.Wrap(err, "error getting environment")
return fmt.Errorf("error getting environment: %w", err)
}
// label selector
@@ -65,7 +64,7 @@ func (opts *ListPodsSubCommand) do(input cli.Input) (err error) {
LabelSelector: labels.Set(selector).AsSelector().String(),
})
if err != nil {
return errors.Wrap(err, "error listing environments")
return fmt.Errorf("error listing environments: %w", err)
}
w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
pkg/fission-cli/cmd/environment/update.go
+10 -9
View File
@@ -17,11 +17,12 @@ limitations under the License.
package environment
import (
"errors"
"fmt"
"strconv"
"github.com/hashicorp/go-multierror"
"github.com/pkg/errors"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -57,11 +58,11 @@ func (opts *UpdateSubCommand) complete(input cli.Input) (err error) {
_, currentContextNS, err := opts.GetResourceNamespace(input, flagkey.NamespaceEnvironment)
if err != nil {
return errors.Wrap(err, "error creating environment")
return fmt.Errorf("error creating environment: %w", err)
}
env, err := opts.Client().FissionClientSet.CoreV1().Environments(currentContextNS).Get(input.Context(), input.String(flagkey.EnvName), metav1.GetOptions{})
if err != nil {
return errors.Wrap(err, "error finding environment")
return fmt.Errorf("error finding environment: %w", err)
}
env, err = updateExistingEnvironmentWithCmd(env, input)
@@ -89,13 +90,13 @@ func (opts *UpdateSubCommand) run(input cli.Input) error {
specFile := fmt.Sprintf("env-%s.yaml", m.Name)
err = spec.SpecSave(*opts.env, specFile, true)
if err != nil {
return errors.Wrap(err, "error saving environment spec")
return fmt.Errorf("error saving environment spec: %w", err)
}
return nil
}
enew, err := opts.Client().FissionClientSet.CoreV1().Environments(opts.env.ObjectMeta.Namespace).Update(input.Context(), opts.env, metav1.UpdateOptions{})
if err != nil {
return errors.Wrap(err, "error updating environment")
return fmt.Errorf("error updating environment: %w", err)
}
fmt.Printf("environment '%v' updated\n", enew.ObjectMeta.Name)
@@ -151,7 +152,7 @@ func updateExistingEnvironmentWithCmd(env *fv1.Environment, input cli.Input) (*f
mincpu := input.Int(flagkey.RuntimeMincpu)
cpuRequest, err := resource.ParseQuantity(strconv.Itoa(mincpu) + "m")
if err != nil {
e = multierror.Append(e, errors.Wrap(err, "Failed to parse mincpu"))
e = multierror.Append(e, fmt.Errorf("failed to parse mincpu: %w", err))
}
env.Spec.Resources.Requests[v1.ResourceCPU] = cpuRequest
}
@@ -160,7 +161,7 @@ func updateExistingEnvironmentWithCmd(env *fv1.Environment, input cli.Input) (*f
maxcpu := input.Int(flagkey.RuntimeMaxcpu)
cpuLimit, err := resource.ParseQuantity(strconv.Itoa(maxcpu) + "m")
if err != nil {
e = multierror.Append(e, errors.Wrap(err, "Failed to parse maxcpu"))
e = multierror.Append(e, fmt.Errorf("Failed to parse maxcpu: %w", err))
}
env.Spec.Resources.Limits[v1.ResourceCPU] = cpuLimit
}
@@ -169,7 +170,7 @@ func updateExistingEnvironmentWithCmd(env *fv1.Environment, input cli.Input) (*f
minmem := input.Int(flagkey.RuntimeMinmemory)
memRequest, err := resource.ParseQuantity(strconv.Itoa(minmem) + "Mi")
if err != nil {
e = multierror.Append(e, errors.Wrap(err, "Failed to parse minmemory"))
e = multierror.Append(e, fmt.Errorf("Failed to parse minmemory: %w", err))
}
env.Spec.Resources.Requests[v1.ResourceMemory] = memRequest
}
@@ -178,7 +179,7 @@ func updateExistingEnvironmentWithCmd(env *fv1.Environment, input cli.Input) (*f
maxmem := input.Int(flagkey.RuntimeMaxmemory)
memLimit, err := resource.ParseQuantity(strconv.Itoa(maxmem) + "Mi")
if err != nil {
e = multierror.Append(e, errors.Wrap(err, "Failed to parse maxmemory"))
e = multierror.Append(e, fmt.Errorf("Failed to parse maxmemory: %w", err))
}
env.Spec.Resources.Limits[v1.ResourceMemory] = memLimit
}