Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions hack/cmd/components/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func main() {
// regenerate .sh to keep up to date if changed
err = writeScript(componentList, fileScript)
if err != nil {
err = fmt.Errorf("failed to re-generate script: %v", err)
err = fmt.Errorf("failed to re-generate script: %w", err)
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
Expand All @@ -127,7 +127,7 @@ func main() {
}

if err := writeFiles(componentList, fileScript, fileJson); err != nil {
err = fmt.Errorf("failed to write files: %v", err)
err = fmt.Errorf("failed to write files: %w", err)
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
Expand All @@ -147,7 +147,7 @@ func update(ctx context.Context, client *github.Client, cl *ComponentList) (bool

newV, err := getLatestVersion(ctx, client, c.Owner, c.Repo)
if err != nil {
err = fmt.Errorf("error while getting latest v of %s/%s: %v", c.Owner, c.Repo, err)
err = fmt.Errorf("error while getting latest v of %s/%s: %w", c.Owner, c.Repo, err)
return false, err
}

Expand Down Expand Up @@ -183,12 +183,12 @@ func writeFiles(cl ComponentList, script, json string) error {
// write to json
err := writeSource(cl, json)
if err != nil {
return fmt.Errorf("failed to write to json: %v", err)
return fmt.Errorf("failed to write to json: %w", err)
}
// write to script file
err = writeScript(cl, script)
if err != nil {
return fmt.Errorf("failed to generate script: %v", err)
return fmt.Errorf("failed to generate script: %w", err)
}
return nil
}
Expand All @@ -197,7 +197,7 @@ func writeFiles(cl ComponentList, script, json string) error {
func writeSource(cl ComponentList, file string) error {
vB, err := json.MarshalIndent(cl, "", " ")
if err != nil {
return fmt.Errorf("can't Marshal versions: %v", err)
return fmt.Errorf("can't Marshal versions: %w", err)
}
f, err := os.Create(file)
if err != nil {
Expand Down Expand Up @@ -232,7 +232,7 @@ func writeScript(cl ComponentList, file string) error {
func getLatestVersion(ctx context.Context, client *github.Client, owner string, repo string) (v string, err error) {
rr, res, err := client.Repositories.GetLatestRelease(ctx, owner, repo)
if err != nil {
err = fmt.Errorf("error: request for latest %s release: %v", owner+"/"+repo, err)
err = fmt.Errorf("error: request for latest %s release: %w", owner+"/"+repo, err)
return
}
if res.StatusCode < 200 && res.StatusCode > 299 {
Expand Down
6 changes: 3 additions & 3 deletions pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func NewDefault() (cfg Global, err error) {
func Load(path string) (c Global, err error) {
bb, err := os.ReadFile(path)
if err != nil {
return c, fmt.Errorf("error reading global config: %v", err)
return c, fmt.Errorf("error reading global config: %w", err)
}
err = yaml.Unmarshal(bb, &c)
return
Expand Down Expand Up @@ -219,10 +219,10 @@ func RepositoriesPath() string {
// ~/.config/func/repositories
func CreatePaths() (err error) {
if err = os.MkdirAll(Dir(), 0755); err != nil { // rwxr-xr-x for directories
return fmt.Errorf("error creating global config path: %v", err)
return fmt.Errorf("error creating global config path: %w", err)
}
if err = os.MkdirAll(RepositoriesPath(), 0755); err != nil { // rwxr-xr-x for directories
return fmt.Errorf("error creating global config repositories path: %v", err)
return fmt.Errorf("error creating global config repositories path: %w", err)
}
return
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/docker/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,16 +160,16 @@ func (n *Runner) Run(ctx context.Context, f fn.Function, address string, startTi
Timeout: &timeoutSecs,
}
if _, err = c.ContainerStop(ctx, id, ctrStopOpts); err != nil {
return fmt.Errorf("error stopping container %v: %v", id, err)
return fmt.Errorf("error stopping container %v: %w", id, err)
}
if _, err = c.ContainerRemove(ctx, id, client.ContainerRemoveOptions{}); err != nil {
return fmt.Errorf("error removing container %v: %v", id, err)
return fmt.Errorf("error removing container %v: %w", id, err)
}
if err = conn.Close(); err != nil {
return fmt.Errorf("error closing connection to container: %v", err)
return fmt.Errorf("error closing connection to container: %w", err)
}
if err = c.Close(); err != nil {
return fmt.Errorf("error closing daemon client: %v", err)
return fmt.Errorf("error closing daemon client: %w", err)
}
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/functions/function.go
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ func (f Function) ImageName() (image string, err error) {

ref, err := name.ParseReference(refStr)
if err != nil {
return "", fmt.Errorf("%w: cannot determine function image: %v", ErrInvalidRegistry, err)
return "", fmt.Errorf("%w: cannot determine function image: %w", ErrInvalidRegistry, err)
}

return ref.Name(), nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/functions/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ func templates(fs filesystem.Filesystem, repoCfg repoConfig, runtimeCfg runtimeC
// Validate runtime path
runtimePath := path.Join(repoCfg.TemplatesPath, runtimeName)
if err = checkDir(fs, runtimePath); err != nil {
err = fmt.Errorf("runtime path '%v' not found. %v", runtimePath, err)
err = fmt.Errorf("runtime path '%v' not found. %w", runtimePath, err)
return
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/k8s/describer.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func (d *Describer) Describe(ctx context.Context, name, namespace string) (fn.In

clientset, err := NewKubernetesClientset()
if err != nil {
return fn.Instance{}, fmt.Errorf("unable to create k8s client: %v", err)
return fn.Instance{}, fmt.Errorf("unable to create k8s client: %w", err)
}

deploymentClient := clientset.AppsV1().Deployments(namespace)
Expand All @@ -67,7 +67,7 @@ func (d *Describer) Describe(ctx context.Context, name, namespace string) (fn.In

deployment, err := deploymentClient.Get(ctx, name, metav1.GetOptions{})
if err != nil {
return fn.Instance{}, fmt.Errorf("unable to get deployment %q: %v", name, err)
return fn.Instance{}, fmt.Errorf("unable to get deployment %q: %w", name, err)
}

ready := corev1.ConditionUnknown
Expand Down
6 changes: 3 additions & 3 deletions pkg/k8s/lister.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func NewLister(verbose bool) fn.Lister {
func (l *Lister) List(ctx context.Context, namespace string) ([]fn.ListItem, error) {
clientset, err := NewKubernetesClientset()
if err != nil {
return nil, fmt.Errorf("unable to create k8s client: %v", err)
return nil, fmt.Errorf("unable to create k8s client: %w", err)
}

serviceClient := clientset.CoreV1().Services(namespace)
Expand All @@ -33,7 +33,7 @@ func (l *Lister) List(ctx context.Context, namespace string) ([]fn.ListItem, err
LabelSelector: "function.knative.dev/name",
})
if err != nil {
return nil, fmt.Errorf("unable to list services: %v", err)
return nil, fmt.Errorf("unable to list services: %w", err)
}

listItems := make([]fn.ListItem, 0, len(services.Items))
Expand All @@ -44,7 +44,7 @@ func (l *Lister) List(ctx context.Context, namespace string) ([]fn.ListItem, err

item, err := l.get(ctx, clientset, service.Name, service.Namespace)
if err != nil {
return nil, fmt.Errorf("unable to get details about function: %v", err)
return nil, fmt.Errorf("unable to get details about function: %w", err)
}

listItems = append(listItems, item)
Expand Down
4 changes: 2 additions & 2 deletions pkg/k8s/remover.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ func (remover *Remover) Remove(ctx context.Context, name, ns string) error {
if apiErrors.IsNotFound(err) {
return fn.ErrFunctionNotFound
}
return fmt.Errorf("k8s remover failed to delete the deployment: %v", err)
return fmt.Errorf("k8s remover failed to delete the deployment: %w", err)
}

if err := WaitForServiceRemoved(ctx, clientset, ns, name, DefaultWaitingTimeout); err != nil {
return fmt.Errorf("k8s remover failed to propagate service deletion: %v", err)
return fmt.Errorf("k8s remover failed to propagate service deletion: %w", err)
}

return nil
Expand Down
8 changes: 4 additions & 4 deletions pkg/keda/deployer.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,17 @@ func (d *Deployer) Deploy(ctx context.Context, f fn.Function) (fn.DeploymentResu

k8sClientset, err := k8s.NewKubernetesClientset()
if err != nil {
return fn.DeploymentResult{}, fmt.Errorf("failed to create K8sClientset: %v", err)
return fn.DeploymentResult{}, fmt.Errorf("failed to create K8sClientset: %w", err)
}

deployment, err := k8sClientset.AppsV1().Deployments(namespace).Get(ctx, f.Name, metav1.GetOptions{})
if err != nil {
return fn.DeploymentResult{}, fmt.Errorf("failed to get deployment %s/%s: %v", namespace, f.Name, err)
return fn.DeploymentResult{}, fmt.Errorf("failed to get deployment %s/%s: %w", namespace, f.Name, err)
}

appService, err := k8sClientset.CoreV1().Services(namespace).Get(ctx, f.Name, metav1.GetOptions{})
if err != nil {
return fn.DeploymentResult{}, fmt.Errorf("failed to get service %s/%s: %v", namespace, f.Name, err)
return fn.DeploymentResult{}, fmt.Errorf("failed to get service %s/%s: %w", namespace, f.Name, err)
}

if err := d.ensureInterceptorBridgeService(ctx, k8sClientset, f, namespace, deployment); err != nil {
Expand Down Expand Up @@ -271,7 +271,7 @@ func (d *Deployer) ensureHTTPScaledObject(ctx context.Context, f fn.Function, na

httpScaledObjectClientset, err := NewHTTPScaledObjectClientset()
if err != nil {
return fmt.Errorf("failed to create HTTPScaledObject clientset: %v", err)
return fmt.Errorf("failed to create HTTPScaledObject clientset: %w", err)
}

existing, err := httpScaledObjectClientset.HttpV1alpha1().HTTPScaledObjects(expected.Namespace).Get(ctx, expected.Name, metav1.GetOptions{})
Expand Down
6 changes: 3 additions & 3 deletions pkg/keda/describer.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (d *Describer) Describe(ctx context.Context, name, namespace string) (fn.In

clientset, err := k8s.NewKubernetesClientset()
if err != nil {
return fn.Instance{}, fmt.Errorf("unable to create k8s client: %v", err)
return fn.Instance{}, fmt.Errorf("unable to create k8s client: %w", err)
}

serviceClient := clientset.CoreV1().Services(namespace)
Expand All @@ -68,7 +68,7 @@ func (d *Describer) Describe(ctx context.Context, name, namespace string) (fn.In

httpScaledObjectClientset, err := NewHTTPScaledObjectClientset()
if err != nil {
return fn.Instance{}, fmt.Errorf("unable to create HTTPScaledObject client: %v", err)
return fn.Instance{}, fmt.Errorf("unable to create HTTPScaledObject client: %w", err)
}

httpScaledObject, err := httpScaledObjectClientset.HttpV1alpha1().HTTPScaledObjects(namespace).Get(ctx, name, metav1.GetOptions{})
Expand Down Expand Up @@ -96,7 +96,7 @@ func (d *Describer) Describe(ctx context.Context, name, namespace string) (fn.In
deploymentClient := clientset.AppsV1().Deployments(namespace)
deployment, err := deploymentClient.Get(ctx, name, metav1.GetOptions{})
if err != nil {
return fn.Instance{}, fmt.Errorf("unable to get deployment %q: %v", name, err)
return fn.Instance{}, fmt.Errorf("unable to get deployment %q: %w", name, err)
}

// get image
Expand Down
10 changes: 5 additions & 5 deletions pkg/keda/lister.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ func NewLister(verbose bool) fn.Lister {
func (l *Lister) List(ctx context.Context, namespace string) ([]fn.ListItem, error) {
clientset, err := k8s.NewKubernetesClientset()
if err != nil {
return nil, fmt.Errorf("unable to create k8s client: %v", err)
return nil, fmt.Errorf("unable to create k8s client: %w", err)
}

httpScaledObjectClientset, err := NewHTTPScaledObjectClientset()
if err != nil {
return nil, fmt.Errorf("unable to create HTTPScaledObject client: %v", err)
return nil, fmt.Errorf("unable to create HTTPScaledObject client: %w", err)
}

serviceClient := clientset.CoreV1().Services(namespace)
Expand All @@ -40,7 +40,7 @@ func (l *Lister) List(ctx context.Context, namespace string) ([]fn.ListItem, err
LabelSelector: "function.knative.dev/name",
})
if err != nil {
return nil, fmt.Errorf("unable to list services: %v", err)
return nil, fmt.Errorf("unable to list services: %w", err)
}

listItems := make([]fn.ListItem, 0, len(services.Items))
Expand All @@ -51,7 +51,7 @@ func (l *Lister) List(ctx context.Context, namespace string) ([]fn.ListItem, err

item, err := l.get(ctx, httpScaledObjectClientset, service.Name, service.Namespace)
if err != nil {
return nil, fmt.Errorf("unable to get details about function: %v", err)
return nil, fmt.Errorf("unable to get details about function: %w", err)
}

listItems = append(listItems, item)
Expand All @@ -64,7 +64,7 @@ func (l *Lister) List(ctx context.Context, namespace string) ([]fn.ListItem, err
func (l *Lister) get(ctx context.Context, httpScaledObjectClientset *versioned.Clientset, name, namespace string) (fn.ListItem, error) {
httpScaledObject, err := httpScaledObjectClientset.HttpV1alpha1().HTTPScaledObjects(namespace).Get(ctx, name, metav1.GetOptions{})
if err != nil {
return fn.ListItem{}, fmt.Errorf("unable to get HTTPScaledObject: %v", err)
return fn.ListItem{}, fmt.Errorf("unable to get HTTPScaledObject: %w", err)
}

ready := v1.ConditionUnknown
Expand Down
4 changes: 2 additions & 2 deletions pkg/keda/remover.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ func (remover *Remover) Remove(ctx context.Context, name, ns string) error {
if apiErrors.IsNotFound(err) {
return fn.ErrFunctionNotFound
}
return fmt.Errorf("keda remover failed to delete the deployment: %v", err)
return fmt.Errorf("keda remover failed to delete the deployment: %w", err)
}

if err := k8s.WaitForServiceRemoved(ctx, clientset, ns, name, k8s.DefaultWaitingTimeout); err != nil {
return fmt.Errorf("k8s remover failed to propagate service deletion: %v", err)
return fmt.Errorf("k8s remover failed to propagate service deletion: %w", err)
}

return nil
Expand Down
8 changes: 4 additions & 4 deletions pkg/knative/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ func NewServingClient(namespace string) (clientservingv1.KnServingClient, error)

restConfig, err := k8s.GetClientConfig().ClientConfig()
if err != nil {
return nil, fmt.Errorf("failed to create new serving client: %v", err)
return nil, fmt.Errorf("failed to create new serving client: %w", err)
}

servingClient, err := servingv1.NewForConfig(restConfig)
if err != nil {
return nil, fmt.Errorf("failed to create new serving client: %v", err)
return nil, fmt.Errorf("failed to create new serving client: %w", err)
}

client := clientservingv1.NewKnServingClient(servingClient, namespace)
Expand All @@ -41,12 +41,12 @@ func NewEventingClient(namespace string) (clienteventingv1.KnEventingClient, err

restConfig, err := k8s.GetClientConfig().ClientConfig()
if err != nil {
return nil, fmt.Errorf("failed to create new serving client: %v", err)
return nil, fmt.Errorf("failed to create new serving client: %w", err)
}

eventingClient, err := eventingv1.NewForConfig(restConfig)
if err != nil {
return nil, fmt.Errorf("failed to create new eventing client: %v", err)
return nil, fmt.Errorf("failed to create new eventing client: %w", err)
}

client := clienteventingv1.NewKnEventingClient(eventingClient, namespace)
Expand Down
Loading