cleanup: remove unused usage of IsLegacyLayout

kubernetes-sigs · May 20, 2024 · 74dce48 · 74dce48
1 parent 076fded
commit 74dce48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 35 deletions.
diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go
@@ -36,30 +36,15 @@ type Types struct {
 
 	// Port if informed we will create the scaffold with this spec
 	Port string
-
-	IsLegacyLayout bool
 }
 
 // SetTemplateDefaults implements file.Template
 func (f *Types) SetTemplateDefaults() error {
 	if f.Path == "" {
-
-		if f.IsLegacyLayout {
-			if f.MultiGroup {
-				if f.Resource.Group != "" {
-					f.Path = filepath.Join("apis", "%[group]", "%[version]", "%[kind]_types.go")
-				} else {
-					f.Path = filepath.Join("apis", "%[version]", "%[kind]_types.go")
-				}
-			} else {
-				f.Path = filepath.Join("api", "%[version]", "%[kind]_types.go")
-			}
+		if f.MultiGroup && f.Resource.Group != "" {
+			f.Path = filepath.Join("api", "%[group]", "%[version]", "%[kind]_types.go")
 		} else {
-			if f.MultiGroup && f.Resource.Group != "" {
-				f.Path = filepath.Join("api", "%[group]", "%[version]", "%[kind]_types.go")
-			} else {
-				f.Path = filepath.Join("api", "%[version]", "%[kind]_types.go")
-			}
+			f.Path = filepath.Join("api", "%[version]", "%[kind]_types.go")
 		}
 	}
 

diff --git a/.../golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go b/.../golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go
@@ -34,36 +34,23 @@ type ControllerTest struct {
 	machinery.BoilerplateMixin
 	machinery.ResourceMixin
 
-	Port           string
-	IsLegacyLayout bool
-	PackageName    string
+	Port        string
+	PackageName string
 }
 
 // SetTemplateDefaults implements file.Template
 func (f *ControllerTest) SetTemplateDefaults() error {
 	if f.Path == "" {
 		if f.MultiGroup && f.Resource.Group != "" {
-			if f.IsLegacyLayout {
-				f.Path = filepath.Join("controllers", "%[group]", "%[kind]_controller_test.go")
-			} else {
-				f.Path = filepath.Join("internal", "controller", "%[group]", "%[kind]_controller_test.go")
-			}
+			f.Path = filepath.Join("internal", "controller", "%[group]", "%[kind]_controller_test.go")
 		} else {
-			if f.IsLegacyLayout {
-				f.Path = filepath.Join("controllers", "%[kind]_controller_test.go")
-			} else {
-				f.Path = filepath.Join("internal", "controller", "%[kind]_controller_test.go")
-			}
+			f.Path = filepath.Join("internal", "controller", "%[kind]_controller_test.go")
 		}
 	}
 	f.Path = f.Resource.Replacer().Replace(f.Path)
 	log.Println(f.Path)
 
 	f.PackageName = "controller"
-	if f.IsLegacyLayout {
-		f.PackageName = "controllers"
-	}
-
 	f.IfExistsAction = machinery.OverwriteFile
 
 	log.Println("creating import for %", f.Resource.Path)