From 1bd70b3b0dd004e7b8cb4828ee569263b4df9ea2 Mon Sep 17 00:00:00 2001 From: Mateus Oliveira Date: Fri, 29 Mar 2024 16:41:51 -0300 Subject: [PATCH] :bug: fix: Remove empty line at beginning of generated files (#3815) fix: Remove empty line at beginning of generated files Signed-off-by: Mateus Oliveira --- .../src/component-config-tutorial/testdata/project/.gitignore | 1 - .../src/component-config-tutorial/testdata/project/Makefile | 1 - docs/book/src/cronjob-tutorial/testdata/project/.gitignore | 1 - docs/book/src/cronjob-tutorial/testdata/project/Makefile | 1 - docs/book/src/getting-started/testdata/project/.gitignore | 1 - docs/book/src/getting-started/testdata/project/Makefile | 1 - .../golang/v4/scaffolds/internal/templates/gitignore.go | 3 +-- pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go | 3 +-- pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go | 3 +-- testdata/project-v4-multigroup-with-deploy-image/.gitignore | 1 - testdata/project-v4-multigroup-with-deploy-image/Makefile | 1 - testdata/project-v4-multigroup/.gitignore | 1 - testdata/project-v4-multigroup/Makefile | 1 - testdata/project-v4-with-deploy-image/.gitignore | 1 - testdata/project-v4-with-deploy-image/Makefile | 1 - testdata/project-v4-with-grafana/.gitignore | 1 - testdata/project-v4-with-grafana/Makefile | 1 - testdata/project-v4/.gitignore | 1 - testdata/project-v4/Makefile | 1 - 19 files changed, 3 insertions(+), 22 deletions(-) diff --git a/docs/book/src/component-config-tutorial/testdata/project/.gitignore b/docs/book/src/component-config-tutorial/testdata/project/.gitignore index 7a7feec504..ada68ff086 100644 --- a/docs/book/src/component-config-tutorial/testdata/project/.gitignore +++ b/docs/book/src/component-config-tutorial/testdata/project/.gitignore @@ -1,4 +1,3 @@ - # Binaries for programs and plugins *.exe *.exe~ diff --git a/docs/book/src/component-config-tutorial/testdata/project/Makefile b/docs/book/src/component-config-tutorial/testdata/project/Makefile index 820e577a05..b397beb0af 100644 --- a/docs/book/src/component-config-tutorial/testdata/project/Makefile +++ b/docs/book/src/component-config-tutorial/testdata/project/Makefile @@ -1,4 +1,3 @@ - # Image URL to use all building/pushing image targets IMG ?= controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. diff --git a/docs/book/src/cronjob-tutorial/testdata/project/.gitignore b/docs/book/src/cronjob-tutorial/testdata/project/.gitignore index 7a7feec504..ada68ff086 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/.gitignore +++ b/docs/book/src/cronjob-tutorial/testdata/project/.gitignore @@ -1,4 +1,3 @@ - # Binaries for programs and plugins *.exe *.exe~ diff --git a/docs/book/src/cronjob-tutorial/testdata/project/Makefile b/docs/book/src/cronjob-tutorial/testdata/project/Makefile index 820e577a05..b397beb0af 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/Makefile +++ b/docs/book/src/cronjob-tutorial/testdata/project/Makefile @@ -1,4 +1,3 @@ - # Image URL to use all building/pushing image targets IMG ?= controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. diff --git a/docs/book/src/getting-started/testdata/project/.gitignore b/docs/book/src/getting-started/testdata/project/.gitignore index 7a7feec504..ada68ff086 100644 --- a/docs/book/src/getting-started/testdata/project/.gitignore +++ b/docs/book/src/getting-started/testdata/project/.gitignore @@ -1,4 +1,3 @@ - # Binaries for programs and plugins *.exe *.exe~ diff --git a/docs/book/src/getting-started/testdata/project/Makefile b/docs/book/src/getting-started/testdata/project/Makefile index 820e577a05..b397beb0af 100644 --- a/docs/book/src/getting-started/testdata/project/Makefile +++ b/docs/book/src/getting-started/testdata/project/Makefile @@ -1,4 +1,3 @@ - # Image URL to use all building/pushing image targets IMG ?= controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/gitignore.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/gitignore.go index c830e2b564..a2d7ad8c78 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/gitignore.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/gitignore.go @@ -38,8 +38,7 @@ func (f *GitIgnore) SetTemplateDefaults() error { return nil } -const gitignoreTemplate = ` -# Binaries for programs and plugins +const gitignoreTemplate = `# Binaries for programs and plugins *.exe *.exe~ *.dll diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go index c1860c1a9f..9ef1d5e0ab 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go @@ -43,8 +43,7 @@ func (f *GoMod) SetTemplateDefaults() error { return nil } -const goModTemplate = ` -module {{ .Repo }} +const goModTemplate = `module {{ .Repo }} go 1.21 diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go index 13d79558f1..f61feef765 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go @@ -72,8 +72,7 @@ func (f *Makefile) SetTemplateDefaults() error { } //nolint:lll -const makefileTemplate = ` -# Image URL to use all building/pushing image targets +const makefileTemplate = `# Image URL to use all building/pushing image targets IMG ?= {{ .Image }} # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.29.0 diff --git a/testdata/project-v4-multigroup-with-deploy-image/.gitignore b/testdata/project-v4-multigroup-with-deploy-image/.gitignore index 7a7feec504..ada68ff086 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/.gitignore +++ b/testdata/project-v4-multigroup-with-deploy-image/.gitignore @@ -1,4 +1,3 @@ - # Binaries for programs and plugins *.exe *.exe~ diff --git a/testdata/project-v4-multigroup-with-deploy-image/Makefile b/testdata/project-v4-multigroup-with-deploy-image/Makefile index 820e577a05..b397beb0af 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/Makefile +++ b/testdata/project-v4-multigroup-with-deploy-image/Makefile @@ -1,4 +1,3 @@ - # Image URL to use all building/pushing image targets IMG ?= controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. diff --git a/testdata/project-v4-multigroup/.gitignore b/testdata/project-v4-multigroup/.gitignore index 7a7feec504..ada68ff086 100644 --- a/testdata/project-v4-multigroup/.gitignore +++ b/testdata/project-v4-multigroup/.gitignore @@ -1,4 +1,3 @@ - # Binaries for programs and plugins *.exe *.exe~ diff --git a/testdata/project-v4-multigroup/Makefile b/testdata/project-v4-multigroup/Makefile index 820e577a05..b397beb0af 100644 --- a/testdata/project-v4-multigroup/Makefile +++ b/testdata/project-v4-multigroup/Makefile @@ -1,4 +1,3 @@ - # Image URL to use all building/pushing image targets IMG ?= controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. diff --git a/testdata/project-v4-with-deploy-image/.gitignore b/testdata/project-v4-with-deploy-image/.gitignore index 7a7feec504..ada68ff086 100644 --- a/testdata/project-v4-with-deploy-image/.gitignore +++ b/testdata/project-v4-with-deploy-image/.gitignore @@ -1,4 +1,3 @@ - # Binaries for programs and plugins *.exe *.exe~ diff --git a/testdata/project-v4-with-deploy-image/Makefile b/testdata/project-v4-with-deploy-image/Makefile index 820e577a05..b397beb0af 100644 --- a/testdata/project-v4-with-deploy-image/Makefile +++ b/testdata/project-v4-with-deploy-image/Makefile @@ -1,4 +1,3 @@ - # Image URL to use all building/pushing image targets IMG ?= controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. diff --git a/testdata/project-v4-with-grafana/.gitignore b/testdata/project-v4-with-grafana/.gitignore index 7a7feec504..ada68ff086 100644 --- a/testdata/project-v4-with-grafana/.gitignore +++ b/testdata/project-v4-with-grafana/.gitignore @@ -1,4 +1,3 @@ - # Binaries for programs and plugins *.exe *.exe~ diff --git a/testdata/project-v4-with-grafana/Makefile b/testdata/project-v4-with-grafana/Makefile index 820e577a05..b397beb0af 100644 --- a/testdata/project-v4-with-grafana/Makefile +++ b/testdata/project-v4-with-grafana/Makefile @@ -1,4 +1,3 @@ - # Image URL to use all building/pushing image targets IMG ?= controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. diff --git a/testdata/project-v4/.gitignore b/testdata/project-v4/.gitignore index 7a7feec504..ada68ff086 100644 --- a/testdata/project-v4/.gitignore +++ b/testdata/project-v4/.gitignore @@ -1,4 +1,3 @@ - # Binaries for programs and plugins *.exe *.exe~ diff --git a/testdata/project-v4/Makefile b/testdata/project-v4/Makefile index 820e577a05..b397beb0af 100644 --- a/testdata/project-v4/Makefile +++ b/testdata/project-v4/Makefile @@ -1,4 +1,3 @@ - # Image URL to use all building/pushing image targets IMG ?= controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.