ref(*): isolate go code to /cmd and /pkg

10 years ago · e43286b6f9
parent e1c35b2e9d
commit e43286b6f9
221 changed files with 81 additions and 81 deletions
--- a/cmd/dm/Dockerfile
+++ b/cmd/dm/Dockerfile
--- a/cmd/dm/Makefile
+++ b/cmd/dm/Makefile
--- a/cmd/dm/dm.go
+++ b/cmd/dm/dm.go
@ -19,8 +19,8 @@ package main
 import (
 	"github.com/ghodss/yaml"
-	"github.com/kubernetes/deployment-manager/common"
+	"github.com/kubernetes/deployment-manager/pkg/common"
-	"github.com/kubernetes/deployment-manager/util"
+	"github.com/kubernetes/deployment-manager/pkg/util"
 	"archive/tar"
 	"bytes"
--- a/cmd/expandybird/Dockerfile
+++ b/cmd/expandybird/Dockerfile
--- a/cmd/expandybird/Makefile
+++ b/cmd/expandybird/Makefile
--- a/cmd/expandybird/expander/expander.go
+++ b/cmd/expandybird/expander/expander.go
@ -24,7 +24,7 @@ import (
 	"os/exec"
 	"github.com/ghodss/yaml"
-	"github.com/kubernetes/deployment-manager/common"
+	"github.com/kubernetes/deployment-manager/pkg/common"
 )
 // Expander abstracts interactions with the expander and deployer services.
--- a/cmd/expandybird/expander/expander_test.go
+++ b/cmd/expandybird/expander/expander_test.go
@ -26,8 +26,8 @@ import (
 	"strings"
 	"testing"
-	"github.com/kubernetes/deployment-manager/common"
+	"github.com/kubernetes/deployment-manager/pkg/common"
-	"github.com/kubernetes/deployment-manager/util"
+	"github.com/kubernetes/deployment-manager/pkg/util"
 )
 var importFileNames = []string{
--- a/cmd/expandybird/expansion/expansion.py
+++ b/cmd/expandybird/expansion/expansion.py
--- a/cmd/expandybird/expansion/expansion_test.py
+++ b/cmd/expandybird/expansion/expansion_test.py
--- a/cmd/expandybird/expansion/file_expander.py
+++ b/cmd/expandybird/expansion/file_expander.py
--- a/cmd/expandybird/expansion/sandbox_loader.py
+++ b/cmd/expandybird/expansion/sandbox_loader.py
--- a/cmd/expandybird/expansion/schema_validation.py
+++ b/cmd/expandybird/expansion/schema_validation.py
--- a/cmd/expandybird/expansion/schema_validation_test.py
+++ b/cmd/expandybird/expansion/schema_validation_test.py
--- a/cmd/expandybird/expansion/schema_validation_utils.py
+++ b/cmd/expandybird/expansion/schema_validation_utils.py
--- a/cmd/expandybird/main.go
+++ b/cmd/expandybird/main.go
@ -17,9 +17,9 @@ limitations under the License.
 package main
 import (
-	"github.com/kubernetes/deployment-manager/expandybird/expander"
+	"github.com/kubernetes/deployment-manager/cmd/expandybird/expander"
-	"github.com/kubernetes/deployment-manager/expandybird/service"
+	"github.com/kubernetes/deployment-manager/cmd/expandybird/service"
-	"github.com/kubernetes/deployment-manager/version"
+	"github.com/kubernetes/deployment-manager/pkg/version"
 	"flag"
 	"fmt"
--- a/cmd/expandybird/requirements.txt
+++ b/cmd/expandybird/requirements.txt
--- a/cmd/expandybird/service/service.go
+++ b/cmd/expandybird/service/service.go
@ -17,9 +17,9 @@ limitations under the License.
 package service
 import (
-	"github.com/kubernetes/deployment-manager/common"
+	"github.com/kubernetes/deployment-manager/pkg/common"
-	"github.com/kubernetes/deployment-manager/expandybird/expander"
+	"github.com/kubernetes/deployment-manager/cmd/expandybird/expander"
-	"github.com/kubernetes/deployment-manager/util"
+	"github.com/kubernetes/deployment-manager/pkg/util"
 	"errors"
 	"fmt"
--- a/cmd/expandybird/service/service_test.go
+++ b/cmd/expandybird/service/service_test.go
@ -26,9 +26,9 @@ import (
 	"reflect"
 	"testing"
-	"github.com/kubernetes/deployment-manager/common"
+	"github.com/kubernetes/deployment-manager/pkg/common"
-	"github.com/kubernetes/deployment-manager/expandybird/expander"
+	"github.com/kubernetes/deployment-manager/cmd/expandybird/expander"
-	"github.com/kubernetes/deployment-manager/util"
+	"github.com/kubernetes/deployment-manager/pkg/util"
 	restful "github.com/emicklei/go-restful"
 )
--- a/cmd/expandybird/test/ExpectedOutput.yaml
+++ b/cmd/expandybird/test/ExpectedOutput.yaml
--- a/cmd/expandybird/test/InvalidFileName.yaml
+++ b/cmd/expandybird/test/InvalidFileName.yaml
--- a/cmd/expandybird/test/InvalidProperty.yaml
+++ b/cmd/expandybird/test/InvalidProperty.yaml
--- a/cmd/expandybird/test/InvalidTypeName.yaml
+++ b/cmd/expandybird/test/InvalidTypeName.yaml
--- a/cmd/expandybird/test/MalformedContent.yaml
+++ b/cmd/expandybird/test/MalformedContent.yaml
--- a/cmd/expandybird/test/MissingImports.yaml
+++ b/cmd/expandybird/test/MissingImports.yaml
--- a/cmd/expandybird/test/MissingResourceName.yaml
+++ b/cmd/expandybird/test/MissingResourceName.yaml
--- a/cmd/expandybird/test/MissingTypeName.yaml
+++ b/cmd/expandybird/test/MissingTypeName.yaml
--- a/cmd/expandybird/test/TestArchive.tar
+++ b/cmd/expandybird/test/TestArchive.tar
--- a/cmd/expandybird/test/ValidContent.yaml
+++ b/cmd/expandybird/test/ValidContent.yaml
--- a/cmd/expandybird/test/replicatedservice.py
+++ b/cmd/expandybird/test/replicatedservice.py
--- a/cmd/expandybird/test/schemas/bad.jinja.schema
+++ b/cmd/expandybird/test/schemas/bad.jinja.schema
--- a/cmd/expandybird/test/schemas/default_ref.jinja.schema
+++ b/cmd/expandybird/test/schemas/default_ref.jinja.schema
--- a/cmd/expandybird/test/schemas/defaults.jinja.schema
+++ b/cmd/expandybird/test/schemas/defaults.jinja.schema
--- a/cmd/expandybird/test/schemas/defaults.py.schema
+++ b/cmd/expandybird/test/schemas/defaults.py.schema
--- a/cmd/expandybird/test/schemas/invalid_default.jinja.schema
+++ b/cmd/expandybird/test/schemas/invalid_default.jinja.schema
--- a/cmd/expandybird/test/schemas/invalid_reference.py.schema
+++ b/cmd/expandybird/test/schemas/invalid_reference.py.schema
--- a/cmd/expandybird/test/schemas/invalid_reference_schema.py.schema
+++ b/cmd/expandybird/test/schemas/invalid_reference_schema.py.schema
--- a/cmd/expandybird/test/schemas/metadata.py.schema
+++ b/cmd/expandybird/test/schemas/metadata.py.schema
--- a/cmd/expandybird/test/schemas/missing_quote.py.schema
+++ b/cmd/expandybird/test/schemas/missing_quote.py.schema
--- a/cmd/expandybird/test/schemas/nested_defaults.py.schema
+++ b/cmd/expandybird/test/schemas/nested_defaults.py.schema
--- a/cmd/expandybird/test/schemas/numbers.py.schema
+++ b/cmd/expandybird/test/schemas/numbers.py.schema
--- a/cmd/expandybird/test/schemas/ref_nested_defaults.py.schema
+++ b/cmd/expandybird/test/schemas/ref_nested_defaults.py.schema
--- a/cmd/expandybird/test/schemas/reference.jinja.schema
+++ b/cmd/expandybird/test/schemas/reference.jinja.schema
--- a/cmd/expandybird/test/schemas/req_default_ref.py.schema
+++ b/cmd/expandybird/test/schemas/req_default_ref.py.schema
--- a/cmd/expandybird/test/schemas/required.jinja.schema
+++ b/cmd/expandybird/test/schemas/required.jinja.schema
--- a/cmd/expandybird/test/schemas/required_default.jinja.schema
+++ b/cmd/expandybird/test/schemas/required_default.jinja.schema
--- a/cmd/expandybird/test/templates/description_text.txt
+++ b/cmd/expandybird/test/templates/description_text.txt
--- a/cmd/expandybird/test/templates/duplicate_names.yaml
+++ b/cmd/expandybird/test/templates/duplicate_names.yaml
--- a/cmd/expandybird/test/templates/duplicate_names_B.jinja
+++ b/cmd/expandybird/test/templates/duplicate_names_B.jinja
--- a/cmd/expandybird/test/templates/duplicate_names_C.jinja
+++ b/cmd/expandybird/test/templates/duplicate_names_C.jinja
--- a/cmd/expandybird/test/templates/duplicate_names_in_subtemplates.jinja
+++ b/cmd/expandybird/test/templates/duplicate_names_in_subtemplates.jinja
--- a/cmd/expandybird/test/templates/duplicate_names_in_subtemplates.yaml
+++ b/cmd/expandybird/test/templates/duplicate_names_in_subtemplates.yaml
--- a/cmd/expandybird/test/templates/duplicate_names_mixed_level.yaml
+++ b/cmd/expandybird/test/templates/duplicate_names_mixed_level.yaml
--- a/cmd/expandybird/test/templates/duplicate_names_mixed_level_result.yaml
+++ b/cmd/expandybird/test/templates/duplicate_names_mixed_level_result.yaml
--- a/cmd/expandybird/test/templates/duplicate_names_parent_child.yaml
+++ b/cmd/expandybird/test/templates/duplicate_names_parent_child.yaml
--- a/cmd/expandybird/test/templates/duplicate_names_parent_child_result.yaml
+++ b/cmd/expandybird/test/templates/duplicate_names_parent_child_result.yaml
--- a/cmd/expandybird/test/templates/helper.jinja
+++ b/cmd/expandybird/test/templates/helper.jinja
--- a/cmd/expandybird/test/templates/helper.jinja.schema
+++ b/cmd/expandybird/test/templates/helper.jinja.schema
--- a/cmd/expandybird/test/templates/helpers/common.jinja
+++ b/cmd/expandybird/test/templates/helpers/common.jinja
--- a/cmd/expandybird/test/templates/helpers/common.py
+++ b/cmd/expandybird/test/templates/helpers/common.py
--- a/cmd/expandybird/test/templates/helpers/extra/init.py
+++ b/cmd/expandybird/test/templates/helpers/extra/init.py
--- a/cmd/expandybird/test/templates/helpers/extra/common2.py
+++ b/cmd/expandybird/test/templates/helpers/extra/common2.py
--- a/cmd/expandybird/test/templates/invalid_config.yaml
+++ b/cmd/expandybird/test/templates/invalid_config.yaml
--- a/cmd/expandybird/test/templates/jinja_defaults.jinja
+++ b/cmd/expandybird/test/templates/jinja_defaults.jinja
--- a/cmd/expandybird/test/templates/jinja_defaults.jinja.schema
+++ b/cmd/expandybird/test/templates/jinja_defaults.jinja.schema
--- a/cmd/expandybird/test/templates/jinja_defaults.yaml
+++ b/cmd/expandybird/test/templates/jinja_defaults.yaml
--- a/cmd/expandybird/test/templates/jinja_defaults_result.yaml
+++ b/cmd/expandybird/test/templates/jinja_defaults_result.yaml
--- a/cmd/expandybird/test/templates/jinja_missing_required.jinja
+++ b/cmd/expandybird/test/templates/jinja_missing_required.jinja
--- a/cmd/expandybird/test/templates/jinja_missing_required.jinja.schema
+++ b/cmd/expandybird/test/templates/jinja_missing_required.jinja.schema
--- a/cmd/expandybird/test/templates/jinja_missing_required.yaml
+++ b/cmd/expandybird/test/templates/jinja_missing_required.yaml
--- a/cmd/expandybird/test/templates/jinja_multiple_errors.jinja
+++ b/cmd/expandybird/test/templates/jinja_multiple_errors.jinja
--- a/cmd/expandybird/test/templates/jinja_multiple_errors.jinja.schema
+++ b/cmd/expandybird/test/templates/jinja_multiple_errors.jinja.schema
--- a/cmd/expandybird/test/templates/jinja_multiple_errors.yaml
+++ b/cmd/expandybird/test/templates/jinja_multiple_errors.yaml
--- a/cmd/expandybird/test/templates/jinja_noparams.jinja
+++ b/cmd/expandybird/test/templates/jinja_noparams.jinja
--- a/cmd/expandybird/test/templates/jinja_noparams.yaml
+++ b/cmd/expandybird/test/templates/jinja_noparams.yaml
--- a/cmd/expandybird/test/templates/jinja_noparams_result.yaml
+++ b/cmd/expandybird/test/templates/jinja_noparams_result.yaml
--- a/cmd/expandybird/test/templates/jinja_template.jinja
+++ b/cmd/expandybird/test/templates/jinja_template.jinja
--- a/cmd/expandybird/test/templates/jinja_template.yaml
+++ b/cmd/expandybird/test/templates/jinja_template.yaml
--- a/cmd/expandybird/test/templates/jinja_template_result.yaml
+++ b/cmd/expandybird/test/templates/jinja_template_result.yaml
--- a/cmd/expandybird/test/templates/jinja_template_with_env.jinja
+++ b/cmd/expandybird/test/templates/jinja_template_with_env.jinja
--- a/cmd/expandybird/test/templates/jinja_template_with_env.yaml
+++ b/cmd/expandybird/test/templates/jinja_template_with_env.yaml
--- a/cmd/expandybird/test/templates/jinja_template_with_env_result.yaml
+++ b/cmd/expandybird/test/templates/jinja_template_with_env_result.yaml
--- a/cmd/expandybird/test/templates/jinja_template_with_import.jinja
+++ b/cmd/expandybird/test/templates/jinja_template_with_import.jinja
--- a/cmd/expandybird/test/templates/jinja_template_with_import.yaml
+++ b/cmd/expandybird/test/templates/jinja_template_with_import.yaml
--- a/cmd/expandybird/test/templates/jinja_template_with_import_result.yaml
+++ b/cmd/expandybird/test/templates/jinja_template_with_import_result.yaml
--- a/cmd/expandybird/test/templates/jinja_template_with_inlinedfile.jinja
+++ b/cmd/expandybird/test/templates/jinja_template_with_inlinedfile.jinja
--- a/cmd/expandybird/test/templates/jinja_template_with_inlinedfile.yaml
+++ b/cmd/expandybird/test/templates/jinja_template_with_inlinedfile.yaml
--- a/cmd/expandybird/test/templates/jinja_template_with_inlinedfile_result.yaml
+++ b/cmd/expandybird/test/templates/jinja_template_with_inlinedfile_result.yaml
--- a/cmd/expandybird/test/templates/jinja_unresolved.jinja
+++ b/cmd/expandybird/test/templates/jinja_unresolved.jinja
--- a/cmd/expandybird/test/templates/jinja_unresolved.yaml
+++ b/cmd/expandybird/test/templates/jinja_unresolved.yaml
--- a/cmd/expandybird/test/templates/no_properties.py
+++ b/cmd/expandybird/test/templates/no_properties.py
--- a/cmd/expandybird/test/templates/no_properties.yaml
+++ b/cmd/expandybird/test/templates/no_properties.yaml
--- a/cmd/expandybird/test/templates/no_properties_result.yaml
+++ b/cmd/expandybird/test/templates/no_properties_result.yaml
--- a/cmd/expandybird/test/templates/no_resources.py
+++ b/cmd/expandybird/test/templates/no_resources.py
--- a/cmd/expandybird/test/templates/no_resources.yaml
+++ b/cmd/expandybird/test/templates/no_resources.yaml
--- a/cmd/expandybird/test/templates/python_and_jinja_template.jinja
+++ b/cmd/expandybird/test/templates/python_and_jinja_template.jinja
--- a/cmd/expandybird/test/templates/python_and_jinja_template.py
+++ b/cmd/expandybird/test/templates/python_and_jinja_template.py
--- a/cmd/expandybird/test/templates/python_and_jinja_template.yaml
+++ b/cmd/expandybird/test/templates/python_and_jinja_template.yaml
--- a/cmd/expandybird/test/templates/python_and_jinja_template_result.yaml
+++ b/cmd/expandybird/test/templates/python_and_jinja_template_result.yaml
--- a/cmd/expandybird/test/templates/python_bad_schema.py
+++ b/cmd/expandybird/test/templates/python_bad_schema.py
--- a/cmd/expandybird/test/templates/python_bad_schema.py.schema
+++ b/cmd/expandybird/test/templates/python_bad_schema.py.schema
--- a/Show More
+++ b/Show More