From 739bc0504fe1462a4d8d12d74fbf150f41357050 Mon Sep 17 00:00:00 2001 From: soulseen Date: Wed, 7 Aug 2019 22:55:57 +0800 Subject: [PATCH] remove func GetStrategy --- pkg/build/strategies/strategies.go | 6 ------ pkg/cmd/cli/cmd/build.go | 3 ++- pkg/cmd/cli/cmd/rebuild.go | 2 +- test/integration/docker/integration_test.go | 11 ++++++----- test/integration/dockerfile/dockerfile_test.go | 3 ++- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/pkg/build/strategies/strategies.go b/pkg/build/strategies/strategies.go index 13a919e53..9738dbc39 100644 --- a/pkg/build/strategies/strategies.go +++ b/pkg/build/strategies/strategies.go @@ -13,12 +13,6 @@ import ( utilstatus "github.com/openshift/source-to-image/pkg/util/status" ) -// GetStrategy decides what build strategy will be used for the STI build. -// TODO: deprecated, use Strategy() instead -func GetStrategy(client docker.Client, config *api.Config) (build.Builder, api.BuildInfo, error) { - return Strategy(client, config, build.Overrides{}) -} - // Strategy creates the appropriate build strategy for the provided config, using // the overrides provided. Not all strategies support all overrides. func Strategy(client docker.Client, config *api.Config, overrides build.Overrides) (build.Builder, api.BuildInfo, error) { diff --git a/pkg/cmd/cli/cmd/build.go b/pkg/cmd/cli/cmd/build.go index 7eb3672ac..ddb6b5019 100644 --- a/pkg/cmd/cli/cmd/build.go +++ b/pkg/cmd/cli/cmd/build.go @@ -11,6 +11,7 @@ import ( "github.com/openshift/source-to-image/pkg/api" "github.com/openshift/source-to-image/pkg/api/describe" "github.com/openshift/source-to-image/pkg/api/validation" + "github.com/openshift/source-to-image/pkg/build" "github.com/openshift/source-to-image/pkg/build/strategies" cmdutil "github.com/openshift/source-to-image/pkg/cmd/cli/util" "github.com/openshift/source-to-image/pkg/config" @@ -162,7 +163,7 @@ $ s2i build . centos/ruby-22-centos7 hello-world-app log.V(2).Infof("\n%s\n", describe.Config(client, cfg)) - builder, _, err := strategies.GetStrategy(client, cfg) + builder, _, err := strategies.Strategy(client, cfg, build.Overrides{}) s2ierr.CheckError(err) result, err := builder.Build(cfg) if err != nil { diff --git a/pkg/cmd/cli/cmd/rebuild.go b/pkg/cmd/cli/cmd/rebuild.go index 7c9061161..a0055626b 100644 --- a/pkg/cmd/cli/cmd/rebuild.go +++ b/pkg/cmd/cli/cmd/rebuild.go @@ -61,7 +61,7 @@ func NewCmdRebuild(cfg *api.Config) *cobra.Command { log.V(2).Infof("\n%s\n", describe.Config(client, cfg)) - builder, _, err := strategies.GetStrategy(client, cfg) + builder, _, err := strategies.Strategy(client, cfg, build.Overrides{}) s2ierr.CheckError(err) result, err := builder.Build(cfg) s2ierr.CheckError(err) diff --git a/test/integration/docker/integration_test.go b/test/integration/docker/integration_test.go index a8b4a9d8e..bba073775 100644 --- a/test/integration/docker/integration_test.go +++ b/test/integration/docker/integration_test.go @@ -22,6 +22,7 @@ import ( dockercontainer "github.com/docker/docker/api/types/container" dockerapi "github.com/docker/docker/client" "github.com/openshift/source-to-image/pkg/api" + "github.com/openshift/source-to-image/pkg/build" "github.com/openshift/source-to-image/pkg/build/strategies" "github.com/openshift/source-to-image/pkg/docker" dockerpkg "github.com/openshift/source-to-image/pkg/docker" @@ -301,7 +302,7 @@ func (i *integrationTest) exerciseCleanAllowedUIDsBuild(tag, imageName string, e ExcludeRegExp: tar.DefaultExclusionPattern.String(), } config.AllowedUIDs.Set("1-") - _, _, err := strategies.GetStrategy(engineClient, config) + _, _, err := strategies.Strategy(engineClient, config, build.Overrides{}) if err != nil && !expectError { t.Fatalf("Cannot create a new builder: %v", err) } @@ -359,7 +360,7 @@ func (i *integrationTest) exerciseCleanBuild(tag string, verifyCallback bool, im ExcludeRegExp: tar.DefaultExclusionPattern.String(), } - b, _, err := strategies.GetStrategy(engineClient, config) + b, _, err := strategies.Strategy(engineClient, config, build.Overrides{}) if err != nil { t.Fatalf("Cannot create a new builder.") } @@ -449,7 +450,7 @@ func (i *integrationTest) exerciseInjectionBuild(tag, imageName string, injectio Injections: injectionList, ExcludeRegExp: tar.DefaultExclusionPattern.String(), } - builder, _, err := strategies.GetStrategy(engineClient, config) + builder, _, err := strategies.Strategy(engineClient, config, build.Overrides{}) if err != nil { t.Fatalf("Unable to create builder: %v", err) } @@ -520,7 +521,7 @@ func (i *integrationTest) exerciseIncrementalBuild(tag, imageName string, remove ExcludeRegExp: tar.DefaultExclusionPattern.String(), } - builder, _, err := strategies.GetStrategy(engineClient, config) + builder, _, err := strategies.Strategy(engineClient, config, build.Overrides{}) if err != nil { t.Fatalf("Unable to create builder: %v", err) } @@ -545,7 +546,7 @@ func (i *integrationTest) exerciseIncrementalBuild(tag, imageName string, remove ExcludeRegExp: tar.DefaultExclusionPattern.String(), } - builder, _, err = strategies.GetStrategy(engineClient, config) + builder, _, err = strategies.Strategy(engineClient, config, build.Overrides{}) if err != nil { t.Fatalf("Unable to create incremental builder: %v", err) } diff --git a/test/integration/dockerfile/dockerfile_test.go b/test/integration/dockerfile/dockerfile_test.go index 253003f03..9178716de 100644 --- a/test/integration/dockerfile/dockerfile_test.go +++ b/test/integration/dockerfile/dockerfile_test.go @@ -13,6 +13,7 @@ import ( "github.com/docker/docker/builder/dockerfile/parser" "github.com/openshift/source-to-image/pkg/api" + "github.com/openshift/source-to-image/pkg/build" "github.com/openshift/source-to-image/pkg/build/strategies" "github.com/openshift/source-to-image/pkg/scm/git" ) @@ -1033,7 +1034,7 @@ func TestDockerfileLocalSource(t *testing.T) { func runDockerfileTest(t *testing.T, config *api.Config, expected []string, notExpected []string, expectedFiles []string, expectFailure bool) { - b, _, err := strategies.GetStrategy(nil, config) + b, _, err := strategies.Strategy(nil, config, build.Overrides{}) if err != nil { t.Fatalf("Cannot create a new builder.") }