Merge pull request #3359 from camilamacedo86/fix-bin

k8s-ci-robot · web-flow · commit 939c60f0112b · 2023-05-01T08:38:28.000-07:00
🐛 (go/v4) fix scaffold remove bintest dir from gitignore and dockerfile since this directory is not scaffolded
diff --git a/docs/book/src/component-config-tutorial/testdata/project/.dockerignore b/docs/book/src/component-config-tutorial/testdata/project/.dockerignore
@@ -1,4 +1,3 @@
 # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
 # Ignore build and test binaries.
 bin/
-testbin/
diff --git a/docs/book/src/component-config-tutorial/testdata/project/.gitignore b/docs/book/src/component-config-tutorial/testdata/project/.gitignore
@@ -5,8 +5,7 @@
 *.dll
 *.so
 *.dylib
-bin
-testbin/*
+bin/*
 Dockerfile.cross
 
 # Test binary, build with `go test -c`
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerignore.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerignore.go
@@ -41,5 +41,4 @@ func (f *DockerIgnore) SetTemplateDefaults() error {
 const dockerignorefileTemplate = `# More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
 # Ignore build and test binaries.
 bin/
-testbin/
 `
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/gitignore.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/gitignore.go
@@ -45,8 +45,7 @@ const gitignoreTemplate = `
 *.dll
 *.so
 *.dylib
-bin
-testbin/*
+bin/*
 Dockerfile.cross
 
 # Test binary, build with ` + "`go test -c`" + `
diff --git a/testdata/project-v4-config/.dockerignore b/testdata/project-v4-config/.dockerignore
@@ -1,4 +1,3 @@
 # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
 # Ignore build and test binaries.
 bin/
-testbin/
diff --git a/testdata/project-v4-config/.gitignore b/testdata/project-v4-config/.gitignore
@@ -5,8 +5,7 @@
 *.dll
 *.so
 *.dylib
-bin
-testbin/*
+bin/*
 Dockerfile.cross
 
 # Test binary, build with `go test -c`
diff --git a/testdata/project-v4-declarative-v1/.dockerignore b/testdata/project-v4-declarative-v1/.dockerignore
@@ -1,4 +1,3 @@
 # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
 # Ignore build and test binaries.
 bin/
-testbin/
diff --git a/testdata/project-v4-declarative-v1/.gitignore b/testdata/project-v4-declarative-v1/.gitignore
@@ -5,8 +5,7 @@
 *.dll
 *.so
 *.dylib
-bin
-testbin/*
+bin/*
 Dockerfile.cross
 
 # Test binary, build with `go test -c`
diff --git a/testdata/project-v4-multigroup/.dockerignore b/testdata/project-v4-multigroup/.dockerignore
@@ -1,4 +1,3 @@
 # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
 # Ignore build and test binaries.
 bin/
-testbin/
diff --git a/testdata/project-v4-multigroup/.gitignore b/testdata/project-v4-multigroup/.gitignore
@@ -5,8 +5,7 @@
 *.dll
 *.so
 *.dylib
-bin
-testbin/*
+bin/*
 Dockerfile.cross
 
 # Test binary, build with `go test -c`
diff --git a/testdata/project-v4-with-deploy-image/.dockerignore b/testdata/project-v4-with-deploy-image/.dockerignore
@@ -1,4 +1,3 @@
 # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
 # Ignore build and test binaries.
 bin/
-testbin/
diff --git a/testdata/project-v4-with-deploy-image/.gitignore b/testdata/project-v4-with-deploy-image/.gitignore
@@ -5,8 +5,7 @@
 *.dll
 *.so
 *.dylib
-bin
-testbin/*
+bin/*
 Dockerfile.cross
 
 # Test binary, build with `go test -c`
diff --git a/testdata/project-v4-with-grafana/.dockerignore b/testdata/project-v4-with-grafana/.dockerignore
@@ -1,4 +1,3 @@
 # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
 # Ignore build and test binaries.
 bin/
-testbin/
diff --git a/testdata/project-v4-with-grafana/.gitignore b/testdata/project-v4-with-grafana/.gitignore
@@ -5,8 +5,7 @@
 *.dll
 *.so
 *.dylib
-bin
-testbin/*
+bin/*
 Dockerfile.cross
 
 # Test binary, build with `go test -c`
diff --git a/testdata/project-v4/.dockerignore b/testdata/project-v4/.dockerignore
@@ -1,4 +1,3 @@
 # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
 # Ignore build and test binaries.
 bin/
-testbin/
diff --git a/testdata/project-v4/.gitignore b/testdata/project-v4/.gitignore
@@ -5,8 +5,7 @@
 *.dll
 *.so
 *.dylib
-bin
-testbin/*
+bin/*
 Dockerfile.cross
 
 # Test binary, build with `go test -c`

Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,4 @@ func (f *DockerIgnore) SetTemplateDefaults() error {`
`41`	`41`	const dockerignorefileTemplate = `# More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
`42`	`42`	`# Ignore build and test binaries.`
`43`	`43`	`bin/`
`44`		`-testbin/`
`45`	`44`	`