From 8d673888e2490b44726f25b12ce0771d34cc196c Mon Sep 17 00:00:00 2001 From: yyy1000 <992364620@qq.com> Date: Mon, 1 May 2023 19:56:35 +0800 Subject: [PATCH 1/2] fix: scaffold when no boilerplate file --- pkg/plugins/golang/v4/scaffolds/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 pkg/plugins/golang/v4/scaffolds/api.go diff --git a/pkg/plugins/golang/v4/scaffolds/api.go b/pkg/plugins/golang/v4/scaffolds/api.go old mode 100644 new mode 100755 index 6afcb040627..00579af9435 --- a/pkg/plugins/golang/v4/scaffolds/api.go +++ b/pkg/plugins/golang/v4/scaffolds/api.go @@ -67,7 +67,7 @@ func (s *apiScaffolder) Scaffold() error { // Load the boilerplate boilerplate, err := afero.ReadFile(s.fs.FS, hack.DefaultBoilerplatePath) if err != nil { - return fmt.Errorf("error scaffolding API/controller: unable to load boilerplate: %w", err) + boilerplate = []byte("") } // Initialize the machinery.Scaffold that will write the files to disk From b952b9b6f93718648cf25234f20ee4d1d56141d6 Mon Sep 17 00:00:00 2001 From: yyy1000 <992364620@qq.com> Date: Mon, 1 May 2023 23:03:44 +0800 Subject: [PATCH 2/2] fix: only continue when fileNotFound --- pkg/plugins/golang/v4/scaffolds/api.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/plugins/golang/v4/scaffolds/api.go b/pkg/plugins/golang/v4/scaffolds/api.go index 00579af9435..6184e81419e 100755 --- a/pkg/plugins/golang/v4/scaffolds/api.go +++ b/pkg/plugins/golang/v4/scaffolds/api.go @@ -17,6 +17,7 @@ limitations under the License. package scaffolds import ( + "errors" "fmt" "github.com/spf13/afero" @@ -67,7 +68,11 @@ func (s *apiScaffolder) Scaffold() error { // Load the boilerplate boilerplate, err := afero.ReadFile(s.fs.FS, hack.DefaultBoilerplatePath) if err != nil { - boilerplate = []byte("") + if errors.Is(err, afero.ErrFileNotFound) { + boilerplate = []byte("") + } else { + return fmt.Errorf("error scaffolding API/controller: unable to load boilerplate: %w", err) + } } // Initialize the machinery.Scaffold that will write the files to disk