From 6a27f268e6811eed1fbfac9f0e0d37a07409f750 Mon Sep 17 00:00:00 2001 From: Victor Agababov Date: Mon, 2 Nov 2015 16:18:39 -0800 Subject: [PATCH] Change the paths to be absolute. --- Makefile | 2 +- client/client.go | 2 +- expandybird/expander/expander.go | 3 +-- expandybird/main.go | 6 +++--- expandybird/service/service.go | 4 ++-- expandybird/service/service_test.go | 4 ++-- manager/deployments.go | 6 +++--- manager/main.go | 2 +- manager/manager/deployer.go | 3 ++- manager/manager/deployer_test.go | 2 +- manager/manager/expander_test.go | 3 ++- manager/manager/typeresolver.go | 3 ++- manager/repository/repository.go | 3 ++- manager/repository/repository_test.go | 3 ++- resourcifier/configurations.go | 4 ++-- resourcifier/configurator/configurator.go | 3 ++- resourcifier/main.go | 2 +- 17 files changed, 30 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index b5a5ed6a1..79fd02437 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ TARGETS := all build test push container clean SUBDIRS_TARGETS := \ $(foreach t,$(TARGETS),$(addsuffix $t,$(SUBDIRS))) -GO_DEPS := util/... version/... expandybird/... resourcifier/... manager/... client/... +GO_DEPS := github.com/kubernetes/deployment-manager/util/... github.com/kubernetes/deployment-manager/version/... github.com/kubernetes/deployment-manager/expandybird/... github.com/kubernetes/deployment-manager/resourcifier/... github.com/kubernetes/deployment-manager/manager/... github.com/kubernetes/deployment-manager/client/... .PHONY : all build test clean $(TARGETS) $(SUBDIRS_TARGETS) .project .docker diff --git a/client/client.go b/client/client.go index 3da071dce..9c345d902 100644 --- a/client/client.go +++ b/client/client.go @@ -14,7 +14,7 @@ limitations under the License. package main import ( - "expandybird/expander" + "github.com/kubernetes/deployment-manager/expandybird/expander" "bytes" "encoding/json" diff --git a/expandybird/expander/expander.go b/expandybird/expander/expander.go index 98316908f..5a952bfef 100644 --- a/expandybird/expander/expander.go +++ b/expandybird/expander/expander.go @@ -14,14 +14,13 @@ limitations under the License. package expander import ( - "path/filepath" - "bytes" "fmt" "io/ioutil" "log" "os/exec" "path" + "path/filepath" "github.com/ghodss/yaml" ) diff --git a/expandybird/main.go b/expandybird/main.go index 65f4d8b89..0e2e55854 100644 --- a/expandybird/main.go +++ b/expandybird/main.go @@ -14,9 +14,9 @@ limitations under the License. package main import ( - "expandybird/expander" - "expandybird/service" - "version" + "github.com/kubernetes/deployment-manager/expandybird/expander" + "github.com/kubernetes/deployment-manager/expandybird/service" + "github.com/kubernetes/deployment-manager/version" "flag" "fmt" diff --git a/expandybird/service/service.go b/expandybird/service/service.go index 2ae475352..c27aba6b8 100644 --- a/expandybird/service/service.go +++ b/expandybird/service/service.go @@ -14,8 +14,8 @@ limitations under the License. package service import ( - "expandybird/expander" - "util" + "github.com/kubernetes/deployment-manager/expandybird/expander" + "github.com/kubernetes/deployment-manager/util" "errors" "fmt" diff --git a/expandybird/service/service_test.go b/expandybird/service/service_test.go index fce56b1cd..20a54f92b 100644 --- a/expandybird/service/service_test.go +++ b/expandybird/service/service_test.go @@ -23,8 +23,8 @@ import ( "reflect" "testing" - "expandybird/expander" - "util" + "github.com/kubernetes/deployment-manager/expandybird/expander" + "github.com/kubernetes/deployment-manager/util" restful "github.com/emicklei/go-restful" ) diff --git a/manager/deployments.go b/manager/deployments.go index c79e6c3fa..e08476010 100644 --- a/manager/deployments.go +++ b/manager/deployments.go @@ -28,9 +28,9 @@ import ( "github.com/ghodss/yaml" "github.com/gorilla/mux" - "manager/manager" - "manager/repository" - "util" + "github.com/kubernetes/deployment-manager/manager/manager" + "github.com/kubernetes/deployment-manager/manager/repository" + "github.com/kubernetes/deployment-manager/util" ) var deployments = []Route{ diff --git a/manager/main.go b/manager/main.go index 9673bf037..e124e0b20 100644 --- a/manager/main.go +++ b/manager/main.go @@ -14,7 +14,7 @@ limitations under the License. package main import ( - "version" + "github.com/kubernetes/deployment-manager/version" "flag" "fmt" diff --git a/manager/manager/deployer.go b/manager/manager/deployer.go index 06d786d06..aca278557 100644 --- a/manager/manager/deployer.go +++ b/manager/manager/deployer.go @@ -16,13 +16,14 @@ package manager import ( "bytes" "fmt" - "github.com/ghodss/yaml" "io" "io/ioutil" "log" "net/http" "net/url" "strings" + + "github.com/ghodss/yaml" ) // Deployer abstracts interactions with the expander and deployer services. diff --git a/manager/manager/deployer_test.go b/manager/manager/deployer_test.go index c3cc044a0..edfe7d6de 100644 --- a/manager/manager/deployer_test.go +++ b/manager/manager/deployer_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "util" + "github.com/kubernetes/deployment-manager/util" "github.com/ghodss/yaml" ) diff --git a/manager/manager/expander_test.go b/manager/manager/expander_test.go index cb842346f..a14116f84 100644 --- a/manager/manager/expander_test.go +++ b/manager/manager/expander_test.go @@ -22,7 +22,8 @@ import ( "reflect" "strings" "testing" - "util" + + "github.com/kubernetes/deployment-manager/util" "github.com/ghodss/yaml" ) diff --git a/manager/manager/typeresolver.go b/manager/manager/typeresolver.go index 01b735d95..785b3f42a 100644 --- a/manager/manager/typeresolver.go +++ b/manager/manager/typeresolver.go @@ -17,7 +17,8 @@ import ( "fmt" "net/http" "time" - "util" + + "github.com/kubernetes/deployment-manager/util" "github.com/ghodss/yaml" ) diff --git a/manager/repository/repository.go b/manager/repository/repository.go index 7ccbc32ee..1c499fe03 100644 --- a/manager/repository/repository.go +++ b/manager/repository/repository.go @@ -19,9 +19,10 @@ package repository import ( "fmt" "log" - "manager/manager" "sync" "time" + + "github.com/kubernetes/deployment-manager/manager/manager" ) // deploymentTypeInstanceMap stores type instances mapped by deployment name. diff --git a/manager/repository/repository_test.go b/manager/repository/repository_test.go index 4a4599f11..2d6f828d5 100644 --- a/manager/repository/repository_test.go +++ b/manager/repository/repository_test.go @@ -14,7 +14,8 @@ limitations under the License. package repository import ( - "manager/manager" + "github.com/kubernetes/deployment-manager/manager/manager" + "testing" ) diff --git a/resourcifier/configurations.go b/resourcifier/configurations.go index 0f414ad93..81c21a099 100644 --- a/resourcifier/configurations.go +++ b/resourcifier/configurations.go @@ -14,8 +14,8 @@ limitations under the License. package main import ( - "resourcifier/configurator" - "util" + "github.com/kubernetes/deployment-manager/resourcifier/configurator" + "github.com/kubernetes/deployment-manager/util" "encoding/json" "errors" diff --git a/resourcifier/configurator/configurator.go b/resourcifier/configurator/configurator.go index 49845ad9c..d15929e24 100644 --- a/resourcifier/configurator/configurator.go +++ b/resourcifier/configurator/configurator.go @@ -16,10 +16,11 @@ package configurator import ( "bytes" "fmt" - "github.com/ghodss/yaml" "log" "os/exec" "strings" + + "github.com/ghodss/yaml" ) // TODO(jackgr): Define an interface and a struct type for Configurator and move initialization to the caller. diff --git a/resourcifier/main.go b/resourcifier/main.go index 8c0f48c73..db1cb309b 100644 --- a/resourcifier/main.go +++ b/resourcifier/main.go @@ -14,7 +14,7 @@ limitations under the License. package main import ( - "version" + "github.com/kubernetes/deployment-manager/version" "flag" "fmt"