code restructuring as per typical golang projects (#397)

* code restructuring as per typical golang projects

* fix link in docs

Author: murali-reddy

Makefile

@@ -41,19 +41,19 @@ ifeq "$(BUILD_IN_DOCKER)" "true"
 	$(DOCKER) run -v $(PWD):/go/src/github.com/cloudnativelabs/kube-router -w /go/src/github.com/cloudnativelabs/kube-router $(DOCKER_BUILD_IMAGE) \
 	    sh -c ' \
 	    GOARCH=$(GOARCH) CGO_ENABLED=0 go build \
-		-ldflags "-X github.com/cloudnativelabs/kube-router/app.version=$(GIT_COMMIT) -X github.com/cloudnativelabs/kube-router/app.buildDate=$(BUILD_DATE)" \
-		-o kube-router kube-router.go'
+		-ldflags "-X github.com/cloudnativelabs/kube-router/pkg/cmd.version=$(GIT_COMMIT) -X github.com/cloudnativelabs/kube-router/pkg/cmd.buildDate=$(BUILD_DATE)" \
+		-o kube-router cmd/kube-router/kube-router.go'
 	@echo Finished kube-router binary build.
 else
-	GOARCH=$(GOARCH) CGO_ENABLED=0 go build -ldflags '-X github.com/cloudnativelabs/kube-router/app.version=$(GIT_COMMIT) -X github.com/cloudnativelabs/kube-router/app.buildDate=$(BUILD_DATE)' -o kube-router kube-router.go
+	GOARCH=$(GOARCH) CGO_ENABLED=0 go build -ldflags '-X github.com/cloudnativelabs/kube-router/pkg/cmd.version=$(GIT_COMMIT) -X github.com/cloudnativelabs/kube-router/pkg/cmd.buildDate=$(BUILD_DATE)' -o kube-router cmd/kube-router/kube-router.go
 endif
 
 test: gofmt gomoqs ## Runs code quality pipelines (gofmt, tests, coverage, lint, etc)
 ifeq "$(BUILD_IN_DOCKER)" "true"
 	$(DOCKER) run -v $(PWD):/go/src/github.com/cloudnativelabs/kube-router -w /go/src/github.com/cloudnativelabs/kube-router $(DOCKER_BUILD_IMAGE) \
 	    sh -c 'go test github.com/cloudnativelabs/kube-router github.com/cloudnativelabs/kube-router/app/... github.com/cloudnativelabs/kube-router/utils/'
 else
-		go test github.com/cloudnativelabs/kube-router github.com/cloudnativelabs/kube-router/app/... github.com/cloudnativelabs/kube-router/utils/
+		go test github.com/cloudnativelabs/kube-router/cmd/kube-router/ github.com/cloudnativelabs/kube-router/pkg/...
 endif
 
 vagrant-up: export docker=$(DOCKER)
@@ -144,7 +144,7 @@ gofmt-fix: ## Fixes files that need to be gofmt'd.
 
 # List of all file_moq.go files which would need to be regenerated
 # from file.go if changed
-gomoqs: ./app/controllers/network_services_controller_moq.go
+gomoqs: ./pkg/controllers/network_services_controller_moq.go
 
 # file_moq.go file is generated from file.go "//go:generate moq ..." in-file
 # annotation, as it needs to know which interfaces to create mock stubs for

README.md

@@ -8,8 +8,8 @@ import (
 
 	_ "net/http/pprof"
 
-	"github.com/cloudnativelabs/kube-router/app"
-	"github.com/cloudnativelabs/kube-router/app/options"
+	"github.com/cloudnativelabs/kube-router/pkg/cmd"
+	"github.com/cloudnativelabs/kube-router/pkg/options"
 	"github.com/spf13/pflag"
 )
 
@@ -39,7 +39,7 @@ func Main() error {
 	}
 
 	if config.Version {
-		app.PrintVersion(false)
+		cmd.PrintVersion(false)
 		return nil
 	}
 
@@ -48,11 +48,11 @@ func Main() error {
 	}
 
 	if config.CleanupConfig {
-		app.CleanupConfigAndExit()
+		cmd.CleanupConfigAndExit()
 		return nil
 	}
 
-	kubeRouter, err := app.NewKubeRouterDefault(config)
+	kubeRouter, err := cmd.NewKubeRouterDefault(config)
 	if err != nil {
 		return fmt.Errorf("Failed to parse kube-router config: %v", err)
 	}

kube-router.go renamed to cmd/kube-router/kube-router.go

@@ -32,9 +32,9 @@ func TestMainHelp(t *testing.T) {
 	stderrW.Close()
 	wg.Wait()
 
-	docF, err := os.Open("Documentation/README.md")
+	docF, err := os.Open("../../docs/README.md")
 	if err != nil {
-		t.Fatalf("could not open Documentation/README.md: %s\n", err)
+		t.Fatalf("could not open docs/README.md: %s\n", err)
 	}
 	docBuf := bytes.NewBuffer(nil)
 	docBuf.ReadFrom(docF)
@@ -44,6 +44,6 @@ func TestMainHelp(t *testing.T) {
 	exp = append(exp, []byte("```\n")...)
 
 	if !bytes.Contains(docBuf.Bytes(), exp) {
-		t.Errorf("Documentation/README.md 'command line options' section does not match `kube-router --help`.\nExpected:\n%s", exp)
+		t.Errorf("docs/README.md 'command line options' section does not match `kube-router --help`.\nExpected:\n%s", exp)
 	}
 }