openshift/source-to-image
1
0
Fork 0
mirror of https://github.com/openshift/source-to-image.git synced 2026-02-05 12:44:54 +01:00
Code Issues Releases Activity

Merge pull request #988 from soulseen/getstrategy

Browse Source 
remove func GetStrategy
This commit is contained in:
OpenShift Merge Robot
2019-09-24 20:51:45 +02:00
committed by GitHub
parent 2a579ecd66 739bc0504f
commit 0b950e4c21
5 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/build/strategies/strategies.go
View File

@@ -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) {

3
pkg/cmd/cli/cmd/build.go
View File

@@ -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 {

2
pkg/cmd/cli/cmd/rebuild.go
View File

@@ -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)

11
test/integration/docker/integration_test.go
View File

@@ -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)
}

3
test/integration/dockerfile/dockerfile_test.go
View File

@@ -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.")
}