diff --git a/cmd/assembly.go b/cmd/assembly.go index 03d700742..60f150e4c 100644 --- a/cmd/assembly.go +++ b/cmd/assembly.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/SAP/cloud-mta-build-tool/internal/artifacts" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/logs" ) diff --git a/cmd/gen_test.go b/cmd/gen_test.go index 4feb2c1fb..9ddae48a3 100644 --- a/cmd/gen_test.go +++ b/cmd/gen_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/platform" "path/filepath" ) diff --git a/cmd/module_test.go b/cmd/module_test.go index da46c2596..f9ce7ad8b 100644 --- a/cmd/module_test.go +++ b/cmd/module_test.go @@ -12,7 +12,7 @@ import ( "github.com/onsi/gomega/types" "github.com/SAP/cloud-mta-build-tool/internal/commands" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/logs" ) diff --git a/generator.go b/generator.go index 8b0aa181d..08aad66b5 100644 --- a/generator.go +++ b/generator.go @@ -1,16 +1,16 @@ package main -//go:generate go run ./internal/build-tools/embed.go -source=./configs/platform_cfg.yaml -target=./internal/platform/platform_cfg.go -name=PlatformConfig -package=platform -//go:generate go run ./internal/build-tools/embed.go -source=./configs/module_type_cfg.yaml -target=./internal/commands/module_type_cfg.go -name=ModuleTypeConfig -package=commands -//go:generate go run ./internal/build-tools/embed.go -source=./configs/content_type_cfg.yaml -target=./internal/contenttype/content_type_cfg.go -name=ContentTypeConfig -package=contenttype -//go:generate go run ./internal/build-tools/embed.go -source=./internal/tpl/manifest.txt -target=./internal/tpl/manifest.go -name=Manifest -package=tpl -//go:generate go run ./internal/build-tools/embed.go -source=./configs/builder_type_cfg.yaml -target=./internal/commands/builder_type_cfg.go -name=BuilderTypeConfig -package=commands -//go:generate go run ./internal/build-tools/embed.go -source=./internal/tpl/base_post_default.txt -target=./internal/tpl/base_post_default.go -name=basePostDefault -package=tpl -//go:generate go run ./internal/build-tools/embed.go -source=./internal/tpl/base_post_verbose.txt -target=./internal/tpl/base_post_verbose.go -name=basePostVerbose -package=tpl -//go:generate go run ./internal/build-tools/embed.go -source=./internal/tpl/base_pre_default.txt -target=./internal/tpl/base_pre_default.go -name=basePreDefault -package=tpl -//go:generate go run ./internal/build-tools/embed.go -source=./internal/tpl/base_pre_verbose.txt -target=./internal/tpl/base_pre_verbose.go -name=basePreVerbose -package=tpl -//go:generate go run ./internal/build-tools/embed.go -source=./internal/tpl/make_default.txt -target=./internal/tpl/make_default.go -name=makeDefault -package=tpl -//go:generate go run ./internal/build-tools/embed.go -source=./internal/tpl/make_deployment.txt -target=./internal/tpl/make_deployment.go -name=makeDeployment -package=tpl -//go:generate go run ./internal/build-tools/embed.go -source=./internal/tpl/make_verbose.txt -target=./internal/tpl/make_verbose.go -name=makeVerbose -package=tpl -//go:generate go run ./internal/build-tools/embed.go -source=./internal/tpl/make_verbose_dep.txt -target=./internal/tpl/make_verbose_dep.go -name=makeVerboseDep -package=tpl -//go:generate go run ./internal/build-tools/embed.go -source=./configs/version.yaml -target=./internal/version/version_cfg.go -name=VersionConfig -package=version +//go:generate go run ./internal/buildtools/embed.go -source=./configs/platform_cfg.yaml -target=./internal/platform/platform_cfg.go -name=PlatformConfig -package=platform +//go:generate go run ./internal/buildtools/embed.go -source=./configs/module_type_cfg.yaml -target=./internal/commands/module_type_cfg.go -name=ModuleTypeConfig -package=commands +//go:generate go run ./internal/buildtools/embed.go -source=./configs/content_type_cfg.yaml -target=./internal/conttype/content_type_cfg.go -name=ContentTypeConfig -package=conttype +//go:generate go run ./internal/buildtools/embed.go -source=./internal/tpl/manifest.txt -target=./internal/tpl/manifest.go -name=Manifest -package=tpl +//go:generate go run ./internal/buildtools/embed.go -source=./configs/builder_type_cfg.yaml -target=./internal/commands/builder_type_cfg.go -name=BuilderTypeConfig -package=commands +//go:generate go run ./internal/buildtools/embed.go -source=./internal/tpl/base_post_default.txt -target=./internal/tpl/base_post_default.go -name=basePostDefault -package=tpl +//go:generate go run ./internal/buildtools/embed.go -source=./internal/tpl/base_post_verbose.txt -target=./internal/tpl/base_post_verbose.go -name=basePostVerbose -package=tpl +//go:generate go run ./internal/buildtools/embed.go -source=./internal/tpl/base_pre_default.txt -target=./internal/tpl/base_pre_default.go -name=basePreDefault -package=tpl +//go:generate go run ./internal/buildtools/embed.go -source=./internal/tpl/base_pre_verbose.txt -target=./internal/tpl/base_pre_verbose.go -name=basePreVerbose -package=tpl +//go:generate go run ./internal/buildtools/embed.go -source=./internal/tpl/make_default.txt -target=./internal/tpl/make_default.go -name=makeDefault -package=tpl +//go:generate go run ./internal/buildtools/embed.go -source=./internal/tpl/make_deployment.txt -target=./internal/tpl/make_deployment.go -name=makeDeployment -package=tpl +//go:generate go run ./internal/buildtools/embed.go -source=./internal/tpl/make_verbose.txt -target=./internal/tpl/make_verbose.go -name=makeVerbose -package=tpl +//go:generate go run ./internal/buildtools/embed.go -source=./internal/tpl/make_verbose_dep.txt -target=./internal/tpl/make_verbose_dep.go -name=makeVerboseDep -package=tpl +//go:generate go run ./internal/buildtools/embed.go -source=./configs/version.yaml -target=./internal/version/version_cfg.go -name=VersionConfig -package=version diff --git a/internal/fs/fsops.go b/internal/archive/fsops.go similarity index 100% rename from internal/fs/fsops.go rename to internal/archive/fsops.go diff --git a/internal/fs/fsops_test.go b/internal/archive/fsops_test.go similarity index 100% rename from internal/fs/fsops_test.go rename to internal/archive/fsops_test.go diff --git a/internal/fs/fsys_suite_test.go b/internal/archive/fsys_suite_test.go similarity index 100% rename from internal/fs/fsys_suite_test.go rename to internal/archive/fsys_suite_test.go diff --git a/internal/fs/mta_location.go b/internal/archive/mta_location.go similarity index 100% rename from internal/fs/mta_location.go rename to internal/archive/mta_location.go diff --git a/internal/fs/mta_location_test.go b/internal/archive/mta_location_test.go similarity index 100% rename from internal/fs/mta_location_test.go rename to internal/archive/mta_location_test.go diff --git a/internal/fs/testdata/level2/level2_one.txt b/internal/archive/testdata/level2/level2_one.txt similarity index 100% rename from internal/fs/testdata/level2/level2_one.txt rename to internal/archive/testdata/level2/level2_one.txt diff --git a/internal/fs/testdata/level2/level3/level3/level3_one.txt b/internal/archive/testdata/level2/level3/level3/level3_one.txt similarity index 100% rename from internal/fs/testdata/level2/level3/level3/level3_one.txt rename to internal/archive/testdata/level2/level3/level3/level3_one.txt diff --git a/internal/fs/testdata/level2/level3/level3_one.txt b/internal/archive/testdata/level2/level3/level3_one.txt similarity index 100% rename from internal/fs/testdata/level2/level3/level3_one.txt rename to internal/archive/testdata/level2/level3/level3_one.txt diff --git a/internal/fs/testdata/level2/level3/level3_two.txt b/internal/archive/testdata/level2/level3/level3_two.txt similarity index 100% rename from internal/fs/testdata/level2/level3/level3_two.txt rename to internal/archive/testdata/level2/level3/level3_two.txt diff --git a/internal/fs/testdata/mta.yaml b/internal/archive/testdata/mta.yaml similarity index 100% rename from internal/fs/testdata/mta.yaml rename to internal/archive/testdata/mta.yaml diff --git a/internal/fs/testdata/mtahtml5/mta.sh b/internal/archive/testdata/mtahtml5/mta.sh similarity index 100% rename from internal/fs/testdata/mtahtml5/mta.sh rename to internal/archive/testdata/mtahtml5/mta.sh diff --git a/internal/fs/testdata/mtahtml5/mta.yaml b/internal/archive/testdata/mtahtml5/mta.yaml similarity index 100% rename from internal/fs/testdata/mtahtml5/mta.yaml rename to internal/archive/testdata/mtahtml5/mta.yaml diff --git a/internal/fs/testdata/mtahtml5/ui5app/Gruntfile.js b/internal/archive/testdata/mtahtml5/ui5app/Gruntfile.js similarity index 100% rename from internal/fs/testdata/mtahtml5/ui5app/Gruntfile.js rename to internal/archive/testdata/mtahtml5/ui5app/Gruntfile.js diff --git a/internal/fs/testdata/mtahtml5/ui5app/webapp/Component.js b/internal/archive/testdata/mtahtml5/ui5app/webapp/Component.js similarity index 100% rename from internal/fs/testdata/mtahtml5/ui5app/webapp/Component.js rename to internal/archive/testdata/mtahtml5/ui5app/webapp/Component.js diff --git a/internal/fs/testdata/mtahtml5/ui5app/webapp/controller/View1.controller.js b/internal/archive/testdata/mtahtml5/ui5app/webapp/controller/View1.controller.js similarity index 100% rename from internal/fs/testdata/mtahtml5/ui5app/webapp/controller/View1.controller.js rename to internal/archive/testdata/mtahtml5/ui5app/webapp/controller/View1.controller.js diff --git a/internal/fs/testdata/mtahtml5/ui5app/webapp/css/style.css b/internal/archive/testdata/mtahtml5/ui5app/webapp/css/style.css similarity index 100% rename from internal/fs/testdata/mtahtml5/ui5app/webapp/css/style.css rename to internal/archive/testdata/mtahtml5/ui5app/webapp/css/style.css diff --git a/internal/fs/testdata/mtahtml5/ui5app/webapp/i18n/i18n.properties b/internal/archive/testdata/mtahtml5/ui5app/webapp/i18n/i18n.properties similarity index 100% rename from internal/fs/testdata/mtahtml5/ui5app/webapp/i18n/i18n.properties rename to internal/archive/testdata/mtahtml5/ui5app/webapp/i18n/i18n.properties diff --git a/internal/fs/testdata/mtahtml5/ui5app/webapp/index.html b/internal/archive/testdata/mtahtml5/ui5app/webapp/index.html similarity index 100% rename from internal/fs/testdata/mtahtml5/ui5app/webapp/index.html rename to internal/archive/testdata/mtahtml5/ui5app/webapp/index.html diff --git a/internal/fs/testdata/mtahtml5/ui5app/webapp/model/models.js b/internal/archive/testdata/mtahtml5/ui5app/webapp/model/models.js similarity index 100% rename from internal/fs/testdata/mtahtml5/ui5app/webapp/model/models.js rename to internal/archive/testdata/mtahtml5/ui5app/webapp/model/models.js diff --git a/internal/fs/testdata/mtahtml5/ui5app/webapp/view/View1.view.xml b/internal/archive/testdata/mtahtml5/ui5app/webapp/view/View1.view.xml similarity index 100% rename from internal/fs/testdata/mtahtml5/ui5app/webapp/view/View1.view.xml rename to internal/archive/testdata/mtahtml5/ui5app/webapp/view/View1.view.xml diff --git a/internal/fs/testdata/testbuildparams/mta.yaml b/internal/archive/testdata/testbuildparams/mta.yaml similarity index 100% rename from internal/fs/testdata/testbuildparams/mta.yaml rename to internal/archive/testdata/testbuildparams/mta.yaml diff --git a/internal/fs/testdata/testbuildparams/ui1/webapp/Component.js b/internal/archive/testdata/testbuildparams/ui1/webapp/Component.js similarity index 100% rename from internal/fs/testdata/testbuildparams/ui1/webapp/Component.js rename to internal/archive/testdata/testbuildparams/ui1/webapp/Component.js diff --git a/internal/fs/testdata/testbuildparams/ui1/webapp/controller/View1.controller.js b/internal/archive/testdata/testbuildparams/ui1/webapp/controller/View1.controller.js similarity index 100% rename from internal/fs/testdata/testbuildparams/ui1/webapp/controller/View1.controller.js rename to internal/archive/testdata/testbuildparams/ui1/webapp/controller/View1.controller.js diff --git a/internal/fs/testdata/testbuildparams/ui1/webapp/i18n/i18n.properties b/internal/archive/testdata/testbuildparams/ui1/webapp/i18n/i18n.properties similarity index 100% rename from internal/fs/testdata/testbuildparams/ui1/webapp/i18n/i18n.properties rename to internal/archive/testdata/testbuildparams/ui1/webapp/i18n/i18n.properties diff --git a/internal/fs/testdata/testbuildparams/ui1/webapp/model/models.js b/internal/archive/testdata/testbuildparams/ui1/webapp/model/models.js similarity index 100% rename from internal/fs/testdata/testbuildparams/ui1/webapp/model/models.js rename to internal/archive/testdata/testbuildparams/ui1/webapp/model/models.js diff --git a/internal/fs/testdata/testbuildparams/ui1/webapp/view/View1.view.xml b/internal/archive/testdata/testbuildparams/ui1/webapp/view/View1.view.xml similarity index 100% rename from internal/fs/testdata/testbuildparams/ui1/webapp/view/View1.view.xml rename to internal/archive/testdata/testbuildparams/ui1/webapp/view/View1.view.xml diff --git a/internal/fs/testdata/testbuildparams/ui2/deep/folder/inui2/anotherfile.txt b/internal/archive/testdata/testbuildparams/ui2/deep/folder/inui2/anotherfile.txt similarity index 100% rename from internal/fs/testdata/testbuildparams/ui2/deep/folder/inui2/anotherfile.txt rename to internal/archive/testdata/testbuildparams/ui2/deep/folder/inui2/anotherfile.txt diff --git a/internal/fs/testdata/testbuildparams/ui2/deep/folder/inui2/anotherfile2.txt b/internal/archive/testdata/testbuildparams/ui2/deep/folder/inui2/anotherfile2.txt similarity index 100% rename from internal/fs/testdata/testbuildparams/ui2/deep/folder/inui2/anotherfile2.txt rename to internal/archive/testdata/testbuildparams/ui2/deep/folder/inui2/anotherfile2.txt diff --git a/internal/fs/testdata/testbuildparams/ui2/webapp/Component.js b/internal/archive/testdata/testbuildparams/ui2/webapp/Component.js similarity index 100% rename from internal/fs/testdata/testbuildparams/ui2/webapp/Component.js rename to internal/archive/testdata/testbuildparams/ui2/webapp/Component.js diff --git a/internal/fs/testdata/testbuildparams/ui2/webapp/controller/View1.controller.js b/internal/archive/testdata/testbuildparams/ui2/webapp/controller/View1.controller.js similarity index 100% rename from internal/fs/testdata/testbuildparams/ui2/webapp/controller/View1.controller.js rename to internal/archive/testdata/testbuildparams/ui2/webapp/controller/View1.controller.js diff --git a/internal/fs/testdata/testbuildparams/ui2/webapp/css/style.css b/internal/archive/testdata/testbuildparams/ui2/webapp/css/style.css similarity index 100% rename from internal/fs/testdata/testbuildparams/ui2/webapp/css/style.css rename to internal/archive/testdata/testbuildparams/ui2/webapp/css/style.css diff --git a/internal/fs/testdata/testbuildparams/ui2/webapp/i18n/i18n.properties b/internal/archive/testdata/testbuildparams/ui2/webapp/i18n/i18n.properties similarity index 100% rename from internal/fs/testdata/testbuildparams/ui2/webapp/i18n/i18n.properties rename to internal/archive/testdata/testbuildparams/ui2/webapp/i18n/i18n.properties diff --git a/internal/fs/testdata/testbuildparams/ui2/webapp/index.html b/internal/archive/testdata/testbuildparams/ui2/webapp/index.html similarity index 100% rename from internal/fs/testdata/testbuildparams/ui2/webapp/index.html rename to internal/archive/testdata/testbuildparams/ui2/webapp/index.html diff --git a/internal/fs/testdata/testbuildparams/ui2/webapp/model/models.js b/internal/archive/testdata/testbuildparams/ui2/webapp/model/models.js similarity index 100% rename from internal/fs/testdata/testbuildparams/ui2/webapp/model/models.js rename to internal/archive/testdata/testbuildparams/ui2/webapp/model/models.js diff --git a/internal/fs/testdata/testbuildparams/ui2/webapp/view/View1.view.xml b/internal/archive/testdata/testbuildparams/ui2/webapp/view/View1.view.xml similarity index 100% rename from internal/fs/testdata/testbuildparams/ui2/webapp/view/View1.view.xml rename to internal/archive/testdata/testbuildparams/ui2/webapp/view/View1.view.xml diff --git a/internal/fs/testdata/testproject/cf-mtaext.yaml b/internal/archive/testdata/testproject/cf-mtaext.yaml similarity index 100% rename from internal/fs/testdata/testproject/cf-mtaext.yaml rename to internal/archive/testdata/testproject/cf-mtaext.yaml diff --git a/internal/fs/testdata/testproject/mta.sh b/internal/archive/testdata/testproject/mta.sh similarity index 100% rename from internal/fs/testdata/testproject/mta.sh rename to internal/archive/testdata/testproject/mta.sh diff --git a/internal/fs/testdata/testproject/mta.yaml b/internal/archive/testdata/testproject/mta.yaml similarity index 100% rename from internal/fs/testdata/testproject/mta.yaml rename to internal/archive/testdata/testproject/mta.yaml diff --git a/internal/fs/testdata/testproject/ui5app/Gruntfile.js b/internal/archive/testdata/testproject/ui5app/Gruntfile.js similarity index 100% rename from internal/fs/testdata/testproject/ui5app/Gruntfile.js rename to internal/archive/testdata/testproject/ui5app/Gruntfile.js diff --git a/internal/fs/testdata/testproject/ui5app/webapp/Component.js b/internal/archive/testdata/testproject/ui5app/webapp/Component.js similarity index 100% rename from internal/fs/testdata/testproject/ui5app/webapp/Component.js rename to internal/archive/testdata/testproject/ui5app/webapp/Component.js diff --git a/internal/fs/testdata/testproject/ui5app/webapp/controller/View1.controller.js b/internal/archive/testdata/testproject/ui5app/webapp/controller/View1.controller.js similarity index 100% rename from internal/fs/testdata/testproject/ui5app/webapp/controller/View1.controller.js rename to internal/archive/testdata/testproject/ui5app/webapp/controller/View1.controller.js diff --git a/internal/fs/testdata/testproject/ui5app/webapp/index.html b/internal/archive/testdata/testproject/ui5app/webapp/index.html similarity index 100% rename from internal/fs/testdata/testproject/ui5app/webapp/index.html rename to internal/archive/testdata/testproject/ui5app/webapp/index.html diff --git a/internal/fs/testdata/testproject/ui5app/webapp/model/models.js b/internal/archive/testdata/testproject/ui5app/webapp/model/models.js similarity index 100% rename from internal/fs/testdata/testproject/ui5app/webapp/model/models.js rename to internal/archive/testdata/testproject/ui5app/webapp/model/models.js diff --git a/internal/fs/testdata/testproject/ui5app/webapp/view/View1.view.xml b/internal/archive/testdata/testproject/ui5app/webapp/view/View1.view.xml similarity index 100% rename from internal/fs/testdata/testproject/ui5app/webapp/view/View1.view.xml rename to internal/archive/testdata/testproject/ui5app/webapp/view/View1.view.xml diff --git a/internal/artifacts/cleanup.go b/internal/artifacts/cleanup.go index e751136fa..27967b1c2 100644 --- a/internal/artifacts/cleanup.go +++ b/internal/artifacts/cleanup.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/logs" ) diff --git a/internal/artifacts/manifest.go b/internal/artifacts/manifest.go index f7bb1ad11..940cd6b49 100644 --- a/internal/artifacts/manifest.go +++ b/internal/artifacts/manifest.go @@ -11,8 +11,8 @@ import ( "github.com/SAP/cloud-mta/mta" - "github.com/SAP/cloud-mta-build-tool/internal/contenttype" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/conttype" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/tpl" "github.com/SAP/cloud-mta-build-tool/internal/version" ) @@ -46,7 +46,7 @@ type entry struct { func setManifestDesc(ep dir.ITargetArtifacts, targetPathGetter dir.ITargetPath, mtaStr []*mta.Module, mtaResources []*mta.Resource, modules []string, onlyModules bool) error { - contentTypes, err := contenttype.GetContentTypes() + contentTypes, err := conttype.GetContentTypes() if err != nil { return errors.Wrap(err, "failed to generate the manifest file when getting the content types from the configuration") @@ -106,7 +106,7 @@ func addModuleEntry(targetPathGetter dir.ITargetPath, entries []entry, module *m } func getResourcesEntries(targetPathGetter dir.ITargetPath, resources []*mta.Resource, - contentTypes *contenttype.ContentTypes) ([]entry, error) { + contentTypes *conttype.ContentTypes) ([]entry, error) { var entries []entry for _, resource := range resources { if resource.Name == "" || resource.Parameters["path"] == nil { @@ -129,7 +129,7 @@ func getResourcesEntries(targetPathGetter dir.ITargetPath, resources []*mta.Reso } func buildEntries(targetPathGetter dir.ITargetPath, module *mta.Module, - requiredDependencies []mta.Requires, contentTypes *contenttype.ContentTypes) ([]entry, error) { + requiredDependencies []mta.Requires, contentTypes *conttype.ContentTypes) ([]entry, error) { result := make([]entry, 0) for _, requiredDependency := range requiredDependencies { contentType, err := @@ -148,7 +148,7 @@ func buildEntries(targetPathGetter dir.ITargetPath, module *mta.Module, return result, nil } -func getContentType(targetPathGetter dir.ITargetPath, path string, contentTypes *contenttype.ContentTypes) (string, error) { +func getContentType(targetPathGetter dir.ITargetPath, path string, contentTypes *conttype.ContentTypes) (string, error) { fullPath := filepath.Join(targetPathGetter.GetTargetTmpDir(), path) info, err := os.Stat(fullPath) if err != nil { @@ -160,7 +160,7 @@ func getContentType(targetPathGetter dir.ITargetPath, path string, contentTypes } extension := filepath.Ext(fullPath) - return contenttype.GetContentType(contentTypes, extension) + return conttype.GetContentType(contentTypes, extension) } func getRequiredDependencies(module *mta.Module) []mta.Requires { diff --git a/internal/artifacts/manifest_test.go b/internal/artifacts/manifest_test.go index 47ff3b089..c02650d87 100644 --- a/internal/artifacts/manifest_test.go +++ b/internal/artifacts/manifest_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/gomega" "github.com/pkg/errors" - "github.com/SAP/cloud-mta-build-tool/internal/contenttype" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/conttype" + "github.com/SAP/cloud-mta-build-tool/internal/archive" ) var _ = Describe("manifest", func() { @@ -161,7 +161,7 @@ var _ = Describe("manifest", func() { }, }, } - entries, err := buildEntries(loc, &mod, requires, &contenttype.ContentTypes{}) + entries, err := buildEntries(loc, &mod, requires, &conttype.ContentTypes{}) Ω(len(entries)).Should(Equal(1)) Ω(err).Should(Succeed()) e := entries[0] diff --git a/internal/artifacts/meta.go b/internal/artifacts/meta.go index 3723f95d7..2b50b44f1 100644 --- a/internal/artifacts/meta.go +++ b/internal/artifacts/meta.go @@ -6,7 +6,7 @@ import ( "github.com/SAP/cloud-mta/mta" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/logs" "github.com/SAP/cloud-mta-build-tool/internal/platform" ) diff --git a/internal/artifacts/meta_test.go b/internal/artifacts/meta_test.go index b426fca6c..b5db64152 100644 --- a/internal/artifacts/meta_test.go +++ b/internal/artifacts/meta_test.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/platform" "github.com/SAP/cloud-mta-build-tool/internal/version" "github.com/SAP/cloud-mta/mta" diff --git a/internal/artifacts/module_arch.go b/internal/artifacts/module_arch.go index 6d84d5d7a..882464885 100644 --- a/internal/artifacts/module_arch.go +++ b/internal/artifacts/module_arch.go @@ -12,7 +12,7 @@ import ( "github.com/SAP/cloud-mta-build-tool/internal/buildops" "github.com/SAP/cloud-mta-build-tool/internal/commands" "github.com/SAP/cloud-mta-build-tool/internal/exec" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/logs" ) diff --git a/internal/artifacts/module_arch_test.go b/internal/artifacts/module_arch_test.go index 36341685b..f57956fbc 100644 --- a/internal/artifacts/module_arch_test.go +++ b/internal/artifacts/module_arch_test.go @@ -17,7 +17,7 @@ import ( "github.com/SAP/cloud-mta-build-tool/internal/buildops" "github.com/SAP/cloud-mta-build-tool/internal/commands" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" ) var _ = Describe("ModuleArch", func() { diff --git a/internal/artifacts/mtad.go b/internal/artifacts/mtad.go index b3574655b..9446eec04 100644 --- a/internal/artifacts/mtad.go +++ b/internal/artifacts/mtad.go @@ -12,7 +12,7 @@ import ( "github.com/SAP/cloud-mta/mta" "github.com/SAP/cloud-mta-build-tool/internal/buildops" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/logs" ) diff --git a/internal/artifacts/mtad_test.go b/internal/artifacts/mtad_test.go index 5c77b5215..b8e9ad1f2 100644 --- a/internal/artifacts/mtad_test.go +++ b/internal/artifacts/mtad_test.go @@ -10,7 +10,7 @@ import ( "gopkg.in/yaml.v2" "github.com/SAP/cloud-mta-build-tool/internal/buildops" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/platform" ) diff --git a/internal/artifacts/mtar.go b/internal/artifacts/mtar.go index 96375c108..da1a6f02e 100644 --- a/internal/artifacts/mtar.go +++ b/internal/artifacts/mtar.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/logs" ) diff --git a/internal/artifacts/mtar_test.go b/internal/artifacts/mtar_test.go index 72b2fad2c..eede5cadf 100644 --- a/internal/artifacts/mtar_test.go +++ b/internal/artifacts/mtar_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" ) var _ = Describe("Mtar", func() { diff --git a/internal/artifacts/validate.go b/internal/artifacts/validate.go index 435549f37..fb149a418 100644 --- a/internal/artifacts/validate.go +++ b/internal/artifacts/validate.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/logs" "github.com/SAP/cloud-mta/validations" ) diff --git a/internal/buildops/build_params.go b/internal/buildops/build_params.go index e669faf22..fc5c4a6c9 100644 --- a/internal/buildops/build_params.go +++ b/internal/buildops/build_params.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta/mta" ) diff --git a/internal/buildops/build_params_test.go b/internal/buildops/build_params_test.go index 0ccb51904..1077d8a4b 100644 --- a/internal/buildops/build_params_test.go +++ b/internal/buildops/build_params_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta/mta" ) diff --git a/internal/buildops/modules_deps.go b/internal/buildops/modules_deps.go index cce98ae14..17e4919a4 100644 --- a/internal/buildops/modules_deps.go +++ b/internal/buildops/modules_deps.go @@ -6,7 +6,7 @@ import ( "github.com/deckarep/golang-set" "github.com/pkg/errors" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta/mta" ) diff --git a/internal/buildops/modules_deps_test.go b/internal/buildops/modules_deps_test.go index 986cc04c4..04b01aae7 100644 --- a/internal/buildops/modules_deps_test.go +++ b/internal/buildops/modules_deps_test.go @@ -12,7 +12,7 @@ import ( . "github.com/onsi/gomega" "github.com/pkg/errors" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta/mta" ) diff --git a/internal/build-tools/build_tools_suite_test.go b/internal/buildtools/build_tools_suite_test.go similarity index 100% rename from internal/build-tools/build_tools_suite_test.go rename to internal/buildtools/build_tools_suite_test.go diff --git a/internal/build-tools/config.tpl b/internal/buildtools/config.tpl similarity index 100% rename from internal/build-tools/config.tpl rename to internal/buildtools/config.tpl diff --git a/internal/build-tools/embed.go b/internal/buildtools/embed.go similarity index 94% rename from internal/build-tools/embed.go rename to internal/buildtools/embed.go index 375acbbb7..a3f63d26c 100644 --- a/internal/build-tools/embed.go +++ b/internal/buildtools/embed.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" ) type configInfo struct { @@ -19,7 +19,7 @@ type configInfo struct { Data string } -var templatePath = "./internal/build-tools" +var templatePath = "./internal/buildtools" // This code is executed during the go:generate command // Reading the config files and generate byte array diff --git a/internal/build-tools/embed_test.go b/internal/buildtools/embed_test.go similarity index 100% rename from internal/build-tools/embed_test.go rename to internal/buildtools/embed_test.go diff --git a/internal/build-tools/testdata/cfg.yaml b/internal/buildtools/testdata/cfg.yaml similarity index 100% rename from internal/build-tools/testdata/cfg.yaml rename to internal/buildtools/testdata/cfg.yaml diff --git a/internal/build-tools/testdata/goldenCfg.txt b/internal/buildtools/testdata/goldenCfg.txt similarity index 100% rename from internal/build-tools/testdata/goldenCfg.txt rename to internal/buildtools/testdata/goldenCfg.txt diff --git a/internal/commands/commands.go b/internal/commands/commands.go index bf0027827..ad284ab0e 100644 --- a/internal/commands/commands.go +++ b/internal/commands/commands.go @@ -9,7 +9,7 @@ import ( "github.com/SAP/cloud-mta/mta" "github.com/SAP/cloud-mta-build-tool/internal/buildops" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" ) // CommandList - list of command to execute diff --git a/internal/commands/commands_test.go b/internal/commands/commands_test.go index 6df940924..3b72194da 100644 --- a/internal/commands/commands_test.go +++ b/internal/commands/commands_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/gomega" "gopkg.in/yaml.v2" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta/mta" ) diff --git a/internal/contenttype/content_type_cfg.go b/internal/conttype/content_type_cfg.go similarity index 99% rename from internal/contenttype/content_type_cfg.go rename to internal/conttype/content_type_cfg.go index 5c087f256..adf99366d 100644 --- a/internal/contenttype/content_type_cfg.go +++ b/internal/conttype/content_type_cfg.go @@ -1,4 +1,4 @@ -package contenttype +package conttype // ContentTypeConfig - do not edit var ContentTypeConfig = []byte{0x23, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0x20, 0x6d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0xd, 0xa, 0x23, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x20, 0x6d, 0x61, 0x70, 0x73, 0x20, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x20, 0x74, 0x79, 0x70, 0x65, 0xd, 0xa, 0x23, 0x20, 0x69, 0x74, 0x20, 0x69, 0x73, 0x20, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x20, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x20, 0x61, 0x73, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x20, 0x65, 0x61, 0x73, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x75, 0x73, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x71, 0x75, 0x69, 0x63, 0x6b, 0x20, 0x73, 0x74, 0x61, 0x72, 0x74, 0xd, 0xa, 0x23, 0x20, 0x48, 0x6f, 0x77, 0x65, 0x76, 0x65, 0x72, 0x2c, 0x20, 0x54, 0x6f, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x61, 0x20, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x20, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x20, 0x74, 0x79, 0x70, 0x65, 0x73, 0xd, 0xa, 0x23, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x20, 0x61, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x20, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x76, 0x69, 0x61, 0x20, 0x43, 0x4c, 0x49, 0x20, 0x66, 0x6c, 0x61, 0x67, 0x73, 0xd, 0xa, 0x23, 0x20, 0x70, 0x61, 0x74, 0x68, 0x20, 0x74, 0x6f, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x77, 0x68, 0x69, 0x63, 0x68, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x69, 0x6e, 0x67, 0x20, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x20, 0x77, 0x69, 0x6e, 0x73, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x20, 0x28, 0x69, 0x2e, 0x65, 0x2e, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6f, 0x29, 0xd, 0xa, 0xd, 0xa, 0x23, 0x20, 0x4e, 0x6f, 0x74, 0x65, 0x3a, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x75, 0x74, 0x75, 0x72, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0xd, 0xa, 0xd, 0xa, 0x23, 0x20, 0x75, 0x73, 0x61, 0x67, 0x65, 0x3a, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x64, 0x64, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x2c, 0x20, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x60, 0x67, 0x6f, 0x3a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x60, 0xd, 0xa, 0x23, 0x20, 0x54, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x62, 0x65, 0x20, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x64, 0x20, 0x6f, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x6f, 0x6f, 0x74, 0x20, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x20, 0x74, 0x6f, 0x20, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x20, 0x28, 0x73, 0x65, 0x65, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x67, 0x6f, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x29, 0xd, 0xa, 0xd, 0xa, 0x23, 0x20, 0x54, 0x79, 0x70, 0x65, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x79, 0x20, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0xd, 0xa, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3a, 0xd, 0xa, 0x2d, 0x20, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x2e, 0x6a, 0x73, 0x6f, 0x6e, 0xd, 0xa, 0x20, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x22, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x22, 0xd, 0xa, 0xd, 0xa, 0x2d, 0x20, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x2e, 0x77, 0x61, 0x72, 0xd, 0xa, 0x20, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x22, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x7a, 0x69, 0x70, 0x22, 0xd, 0xa, 0xd, 0xa, 0x2d, 0x20, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x2e, 0x6a, 0x61, 0x72, 0xd, 0xa, 0x20, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x22, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x7a, 0x69, 0x70, 0x22, 0xd, 0xa, 0xd, 0xa, 0x2d, 0x20, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x2e, 0x7a, 0x69, 0x70, 0xd, 0xa, 0x20, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x22, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x7a, 0x69, 0x70, 0x22, 0xd, 0xa, 0xd, 0xa, 0x2d, 0x20, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x2e, 0x79, 0x61, 0x6d, 0x6c, 0xd, 0xa, 0x20, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x22, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x22, 0xd, 0xa} diff --git a/internal/contenttype/contenttype_suite_test.go b/internal/conttype/contenttype_suite_test.go similarity index 90% rename from internal/contenttype/contenttype_suite_test.go rename to internal/conttype/contenttype_suite_test.go index 5e2b00299..27ba9ceb7 100644 --- a/internal/contenttype/contenttype_suite_test.go +++ b/internal/conttype/contenttype_suite_test.go @@ -1,4 +1,4 @@ -package contenttype +package conttype import ( "testing" diff --git a/internal/contenttype/model.go b/internal/conttype/model.go similarity index 93% rename from internal/contenttype/model.go rename to internal/conttype/model.go index ca9f0c8b4..5a532f2a6 100644 --- a/internal/contenttype/model.go +++ b/internal/conttype/model.go @@ -1,4 +1,4 @@ -package contenttype +package conttype // ContentTypes - data structure for content types configuration type ContentTypes struct { diff --git a/internal/contenttype/process.go b/internal/conttype/process.go similarity index 97% rename from internal/contenttype/process.go rename to internal/conttype/process.go index 4e9cb1bef..b0b3f1f72 100644 --- a/internal/contenttype/process.go +++ b/internal/conttype/process.go @@ -1,4 +1,4 @@ -package contenttype +package conttype import ( "fmt" diff --git a/internal/contenttype/process_test.go b/internal/conttype/process_test.go similarity index 97% rename from internal/contenttype/process_test.go rename to internal/conttype/process_test.go index b9f5ca83e..625e23ef3 100644 --- a/internal/contenttype/process_test.go +++ b/internal/conttype/process_test.go @@ -1,4 +1,4 @@ -package contenttype +package conttype import ( . "github.com/onsi/ginkgo" diff --git a/internal/tpl/makefile.go b/internal/tpl/makefile.go index 59250393f..ab1e30755 100644 --- a/internal/tpl/makefile.go +++ b/internal/tpl/makefile.go @@ -11,7 +11,7 @@ import ( "github.com/SAP/cloud-mta/mta" "github.com/SAP/cloud-mta-build-tool/internal/commands" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/logs" "github.com/SAP/cloud-mta-build-tool/internal/proc" "github.com/SAP/cloud-mta-build-tool/internal/version" diff --git a/internal/tpl/makefile_test.go b/internal/tpl/makefile_test.go index 1557dc12a..7468dadaa 100644 --- a/internal/tpl/makefile_test.go +++ b/internal/tpl/makefile_test.go @@ -13,7 +13,7 @@ import ( . "github.com/onsi/gomega" "github.com/pkg/errors" - "github.com/SAP/cloud-mta-build-tool/internal/fs" + "github.com/SAP/cloud-mta-build-tool/internal/archive" "github.com/SAP/cloud-mta-build-tool/internal/logs" "github.com/SAP/cloud-mta-build-tool/internal/version" )