From 39b1ac4b11cbd22d07e8c7636d2bdc9483d62bd0 Mon Sep 17 00:00:00 2001 From: Sebastian Kurfuerst Date: Thu, 16 May 2024 10:15:21 +0200 Subject: [PATCH] FEATURE: make synco more resilient (now for real) --- go.mod | 4 ++-- pkg/frameworks/flowServe/flowServe.go | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 8f470af..a8e8796 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/sandstorm/synco go 1.19 require ( - atomicgo.dev/keyboard v0.2.8 filippo.io/age v1.0.0 github.com/DATA-DOG/go-sqlmock v1.5.0 github.com/charmbracelet/bubbles v0.16.1 @@ -24,10 +23,12 @@ require ( k8s.io/api v0.25.3 k8s.io/apimachinery v0.25.3 k8s.io/client-go v0.25.3 + k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed ) require ( atomicgo.dev/cursor v0.1.1 // indirect + atomicgo.dev/keyboard v0.2.8 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect @@ -98,7 +99,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/klog/v2 v2.70.1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect - k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.2.0 // indirect diff --git a/pkg/frameworks/flowServe/flowServe.go b/pkg/frameworks/flowServe/flowServe.go index b550f17..9ca0bab 100644 --- a/pkg/frameworks/flowServe/flowServe.go +++ b/pkg/frameworks/flowServe/flowServe.go @@ -304,11 +304,12 @@ func (f flowServe) extractAllResourcesFromFolder(transferSession *serve.Transfer realPath, err := filepath.EvalSymlinks(filePath) if err != nil { - return err + pterm.Error.Printfln("Could NOT evaluate symlinks (skipping): %s: %s", filePath, err) + return nil } realFileInfo, err := os.Lstat(realPath) if err != nil { - pterm.Error.Printfln("Could NOT read file (skipping): %s: %s", realPath, err) + pterm.Error.Printfln("Could NOT read file info (skipping): %s: %s", realPath, err) return nil }