🐛 Ignore the errors if the project layout is already on same type

kubernetes-sigs · Nov 2, 2020 · f1fe273 · f1fe273
1 parent 70108bf
commit f1fe273
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/pkg/plugin/v2/scaffolds/edit.go b/pkg/plugin/v2/scaffolds/edit.go
@@ -21,6 +21,7 @@ import (
 	"io/ioutil"
 	"strings"
 
+	internalconfig "sigs.k8s.io/kubebuilder/internal/config"
 	"sigs.k8s.io/kubebuilder/pkg/model/config"
 	"sigs.k8s.io/kubebuilder/pkg/plugin/scaffold"
 )
@@ -42,6 +43,10 @@ func NewEditScaffolder(config *config.Config, multigroup bool) scaffold.Scaffold
 
 // Scaffold implements Scaffolder
 func (s *editScaffolder) Scaffold() error {
+	config, err := internalconfig.Load()
+	if err != nil {
+		return err
+	}
 	s.config.MultiGroup = s.multigroup
 	filename := "Dockerfile"
 	bs, err := ioutil.ReadFile(filename)
@@ -56,21 +61,26 @@ func (s *editScaffolder) Scaffold() error {
 			str,
 			"COPY api/ api/",
 			`COPY apis/ apis/`)
-		if err != nil {
+		if err != nil && s.multigroup != config.MultiGroup {
 			return err
 		}
 	} else {
 		str, err = ensureExistAndReplace(
 			str,
 			"COPY apis/ apis/",
 			`COPY api/ api/`)
-		if err != nil {
+		if err != nil && s.multigroup != config.MultiGroup {
 			return err
 		}
 	}
-	// false positive
-	// nolint:gosec
-	return ioutil.WriteFile(filename, []byte(str), 0644)
+
+	if s.multigroup != config.MultiGroup {
+		// false positive
+		// nolint:gosec
+		return ioutil.WriteFile(filename, []byte(str), 0644)
+	}
+
+	return nil
 }
 
 func ensureExistAndReplace(input, match, replace string) (string, error) {

diff --git a/pkg/plugin/v3/scaffolds/edit.go b/pkg/plugin/v3/scaffolds/edit.go
@@ -21,6 +21,7 @@ import (
 	"io/ioutil"
 	"strings"
 
+	internalconfig "sigs.k8s.io/kubebuilder/internal/config"
 	"sigs.k8s.io/kubebuilder/pkg/model/config"
 	"sigs.k8s.io/kubebuilder/pkg/plugin/scaffold"
 )
@@ -42,6 +43,10 @@ func NewEditScaffolder(config *config.Config, multigroup bool) scaffold.Scaffold
 
 // Scaffold implements Scaffolder
 func (s *editScaffolder) Scaffold() error {
+	config, err := internalconfig.Load()
+	if err != nil {
+		return err
+	}
 	s.config.MultiGroup = s.multigroup
 	filename := "Dockerfile"
 	bs, err := ioutil.ReadFile(filename)
@@ -56,21 +61,26 @@ func (s *editScaffolder) Scaffold() error {
 			str,
 			"COPY api/ api/",
 			`COPY apis/ apis/`)
-		if err != nil {
+		if err != nil && s.multigroup != config.MultiGroup {
 			return err
 		}
 	} else {
 		str, err = ensureExistAndReplace(
 			str,
 			"COPY apis/ apis/",
 			`COPY api/ api/`)
-		if err != nil {
+		if err != nil && s.multigroup != config.MultiGroup {
 			return err
 		}
 	}
-	// false positive
-	// nolint:gosec
-	return ioutil.WriteFile(filename, []byte(str), 0644)
+
+	if s.multigroup != config.MultiGroup {
+		// false positive
+		// nolint:gosec
+		return ioutil.WriteFile(filename, []byte(str), 0644)
+	}
+
+	return nil
 }
 
 func ensureExistAndReplace(input, match, replace string) (string, error) {