move main.go to be within the cmd directory structure and push all su…

…bcommands down one layer Signed-off-by: Jose R. Gonzalez <jose@flutes.dev>
redhat-openshift-ecosystem · Oct 31, 2022 · 577ab6c · 577ab6c
1 parent 6c20f8e
commit 577ab6c
Show file tree

Hide file tree

Showing 23 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ vuln.html
 *.dylib
 bin
 preflight
+!cmd/preflight
 openshift-preflight
 preflight-*
 

diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ ARCHITECTURES=amd64 arm64 ppc64le s390x
 
 .PHONY: build
 build:
-	go build -o $(BINARY) -ldflags "-X github.com/redhat-openshift-ecosystem/openshift-preflight/version.commit=$(VERSION) -X github.com/redhat-openshift-ecosystem/openshift-preflight/version.version=$(RELEASE_TAG)" main.go
+	go build -o $(BINARY) -ldflags "-X github.com/redhat-openshift-ecosystem/openshift-preflight/version.commit=$(VERSION) -X github.com/redhat-openshift-ecosystem/openshift-preflight/version.version=$(RELEASE_TAG)" cmd/preflight/main.go
 	@ls | grep -e '^preflight$$' &> /dev/null
 
 .PHONY: build-multi-arch
@@ -21,7 +21,7 @@ define ARCHITECTURE_template
 .PHONY: build-linux-$(1)
 build-linux-$(1):
 	GOOS=linux GOARCH=$(1) go build -o $(BINARY)-linux-$(1) -ldflags "-X github.com/redhat-openshift-ecosystem/openshift-preflight/version.commit=$(VERSION) \
-				-X github.com/redhat-openshift-ecosystem/openshift-preflight/version.version=$(RELEASE_TAG)" main.go
+				-X github.com/redhat-openshift-ecosystem/openshift-preflight/version.version=$(RELEASE_TAG)" cmd/preflight/main.go
 endef
 
 $(foreach arch,$(ARCHITECTURES),$(eval $(call ARCHITECTURE_template,$(arch))))

diff --git a/cmd/check.go → cmd/preflight/cmd/check.go b/cmd/check.go → cmd/preflight/cmd/check.go
diff --git a/cmd/check_container.go → cmd/preflight/cmd/check_container.go b/cmd/check_container.go → cmd/preflight/cmd/check_container.go
diff --git a/cmd/check_container_test.go → cmd/preflight/cmd/check_container_test.go b/cmd/check_container_test.go → cmd/preflight/cmd/check_container_test.go
diff --git a/cmd/check_operator.go → cmd/preflight/cmd/check_operator.go b/cmd/check_operator.go → cmd/preflight/cmd/check_operator.go
diff --git a/cmd/check_operator_test.go → cmd/preflight/cmd/check_operator_test.go b/cmd/check_operator_test.go → cmd/preflight/cmd/check_operator_test.go
diff --git a/cmd/check_test.go → cmd/preflight/cmd/check_test.go b/cmd/check_test.go → cmd/preflight/cmd/check_test.go
diff --git a/cmd/defaults.go → cmd/preflight/cmd/defaults.go b/cmd/defaults.go → cmd/preflight/cmd/defaults.go
diff --git a/cmd/list_checks.go → cmd/preflight/cmd/list_checks.go b/cmd/list_checks.go → cmd/preflight/cmd/list_checks.go
diff --git a/cmd/list_checks_test.go → cmd/preflight/cmd/list_checks_test.go b/cmd/list_checks_test.go → cmd/preflight/cmd/list_checks_test.go
diff --git a/cmd/root.go → cmd/preflight/cmd/root.go b/cmd/root.go → cmd/preflight/cmd/root.go
diff --git a/cmd/root_test.go → cmd/preflight/cmd/root_test.go b/cmd/root_test.go → cmd/preflight/cmd/root_test.go
diff --git a/cmd/runtime_assets.go → cmd/preflight/cmd/runtime_assets.go b/cmd/runtime_assets.go → cmd/preflight/cmd/runtime_assets.go
diff --git a/cmd/runtime_assets_test.go → cmd/preflight/cmd/runtime_assets_test.go b/cmd/runtime_assets_test.go → cmd/preflight/cmd/runtime_assets_test.go
diff --git a/cmd/suite_test.go → cmd/preflight/cmd/suite_test.go b/cmd/suite_test.go → cmd/preflight/cmd/suite_test.go
diff --git a/cmd/support.go → cmd/preflight/cmd/support.go b/cmd/support.go → cmd/preflight/cmd/support.go
diff --git a/cmd/support_container.go → cmd/preflight/cmd/support_container.go b/cmd/support_container.go → cmd/preflight/cmd/support_container.go
diff --git a/cmd/support_container_test.go → cmd/preflight/cmd/support_container_test.go b/cmd/support_container_test.go → cmd/preflight/cmd/support_container_test.go
diff --git a/cmd/support_operator.go → cmd/preflight/cmd/support_operator.go b/cmd/support_operator.go → cmd/preflight/cmd/support_operator.go
diff --git a/cmd/support_operator_test.go → cmd/preflight/cmd/support_operator_test.go b/cmd/support_operator_test.go → cmd/preflight/cmd/support_operator_test.go
diff --git a/cmd/support_test.go → cmd/preflight/cmd/support_test.go b/cmd/support_test.go → cmd/preflight/cmd/support_test.go
diff --git a/main.go → cmd/preflight/main.go b/main.go → cmd/preflight/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/redhat-openshift-ecosystem/openshift-preflight/cmd"
+	"github.com/redhat-openshift-ecosystem/openshift-preflight/cmd/preflight/cmd"
 )
 
 func main() {