Skip to content

Commit ede4258

Browse files
author
OpenShift Bot
committed
Merge pull request #2274 from smarterclayton/rename_sti_internally
Merged by openshift-bot
2 parents 2fa0193 + e4c4d40 commit ede4258

33 files changed

+159
-143
lines changed

‎pkg/api/graph/graph_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ func TestGraph(t *testing.T) {
5454
},
5555
Parameters: build.BuildParameters{
5656
Strategy: build.BuildStrategy{
57-
Type: build.STIBuildStrategyType,
58-
STIStrategy: &build.STIBuildStrategy{
57+
Type: build.SourceBuildStrategyType,
58+
SourceStrategy: &build.SourceBuildStrategy{
5959
From: &kapi.ObjectReference{Kind: "ImageStreamTag", Name: "test:base-image"},
6060
},
6161
},

‎pkg/api/serialization_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, se
7171
j.From.Kind = specs[c.Intn(len(specs))]
7272
}
7373
},
74-
func(j *build.STIBuildStrategy, c fuzz.Continue) {
74+
func(j *build.SourceBuildStrategy, c fuzz.Continue) {
7575
c.FuzzNoCustom(j)
7676
j.From.Kind = "ImageStreamTag"
7777
j.From.Name = "image:tag"

‎pkg/build/api/types.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ type BuildStrategy struct {
169169
// DockerStrategy holds the parameters to the Docker build strategy.
170170
DockerStrategy *DockerBuildStrategy `json:"dockerStrategy,omitempty"`
171171

172-
// STIStrategy holds the parameters to the STI build strategy.
173-
STIStrategy *STIBuildStrategy `json:"stiStrategy,omitempty"`
172+
// SourceStrategy holds the parameters to the STI build strategy.
173+
SourceStrategy *SourceBuildStrategy `json:"stiStrategy,omitempty"`
174174

175175
// CustomStrategy holds the parameters to the Custom build strategy.
176176
CustomStrategy *CustomBuildStrategy `json:"customStrategy,omitempty"`
@@ -184,9 +184,9 @@ const (
184184
// DockerBuildStrategyType performs builds using a Dockerfile.
185185
DockerBuildStrategyType BuildStrategyType = "Docker"
186186

187-
// STIBuildStrategyType performs builds build using Source To Images with a Git repository
187+
// SourceBuildStrategyType performs builds build using Source To Images with a Git repository
188188
// and a builder image.
189-
STIBuildStrategyType BuildStrategyType = "STI"
189+
SourceBuildStrategyType BuildStrategyType = "STI"
190190

191191
// CustomBuildStrategyType performs builds using the custom builder Docker image.
192192
CustomBuildStrategyType BuildStrategyType = "Custom"
@@ -235,8 +235,8 @@ type DockerBuildStrategy struct {
235235
PullSecretName string `json:"pullSecretName,omitempty"`
236236
}
237237

238-
// STIBuildStrategy defines input parameters specific to an STI build.
239-
type STIBuildStrategy struct {
238+
// SourceBuildStrategy defines input parameters specific to an STI build.
239+
type SourceBuildStrategy struct {
240240
// From is reference to an ImageStream, ImageStreamTag, or ImageStreamImage from which
241241
// the docker image should be pulled
242242
From *kapi.ObjectReference `json:"from,omitempty"`

‎pkg/build/api/v1beta1/conversion.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func init() {
5858
}
5959
return nil
6060
},
61-
func(in *newer.STIBuildStrategy, out *STIBuildStrategy, s conversion.Scope) error {
61+
func(in *newer.SourceBuildStrategy, out *SourceBuildStrategy, s conversion.Scope) error {
6262
if in.From != nil {
6363
switch in.From.Kind {
6464
case "ImageStreamImage":
@@ -96,7 +96,7 @@ func init() {
9696
out.Clean = !in.Incremental
9797
return s.Convert(&in.Env, &out.Env, 0)
9898
},
99-
func(in *STIBuildStrategy, out *newer.STIBuildStrategy, s conversion.Scope) error {
99+
func(in *SourceBuildStrategy, out *newer.SourceBuildStrategy, s conversion.Scope) error {
100100
out.Scripts = in.Scripts
101101
out.Incremental = !in.Clean
102102
out.PullSecretName = in.PullSecretName

‎pkg/build/api/v1beta1/conversion_test.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import (
1212

1313
var Convert = knewer.Scheme.Convert
1414

15-
func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {
16-
var actual newer.STIBuildStrategy
15+
func TestSourceBuildStrategyOldToNewConversion(t *testing.T) {
16+
var actual newer.SourceBuildStrategy
1717

18-
oldVersion := older.STIBuildStrategy{
18+
oldVersion := older.SourceBuildStrategy{
1919
BuilderImage: "testimage",
2020
}
21-
actual = newer.STIBuildStrategy{}
21+
actual = newer.SourceBuildStrategy{}
2222
err := Convert(&oldVersion, &actual)
2323
if err != nil {
2424
t.Fatalf("unexpected error: %v", err)
@@ -31,15 +31,15 @@ func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {
3131
}
3232

3333
// default (ImageStream/ImageRepository) Kind
34-
oldVersion = older.STIBuildStrategy{
34+
oldVersion = older.SourceBuildStrategy{
3535
Clean: true,
3636
From: &kolder.ObjectReference{
3737
Name: "name",
3838
Namespace: "namespace",
3939
},
4040
Tag: "tag",
4141
}
42-
actual = newer.STIBuildStrategy{}
42+
actual = newer.SourceBuildStrategy{}
4343
err = Convert(&oldVersion, &actual)
4444
if err != nil {
4545
t.Fatalf("unexpected error: %v", err)
@@ -58,15 +58,15 @@ func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {
5858
}
5959

6060
// check Kind==ImageStream
61-
oldVersion = older.STIBuildStrategy{
61+
oldVersion = older.SourceBuildStrategy{
6262
From: &kolder.ObjectReference{
6363
Kind: "ImageStream",
6464
Name: "name",
6565
Namespace: "namespace",
6666
},
6767
Tag: "tag",
6868
}
69-
actual = newer.STIBuildStrategy{}
69+
actual = newer.SourceBuildStrategy{}
7070
err = Convert(&oldVersion, &actual)
7171
if err != nil {
7272
t.Fatalf("unexpected error: %v", err)
@@ -82,15 +82,15 @@ func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {
8282
}
8383

8484
// check Kind==ImageRepository
85-
oldVersion = older.STIBuildStrategy{
85+
oldVersion = older.SourceBuildStrategy{
8686
From: &kolder.ObjectReference{
8787
Kind: "ImageRepository",
8888
Name: "name",
8989
Namespace: "namespace",
9090
},
9191
Tag: "tag",
9292
}
93-
actual = newer.STIBuildStrategy{}
93+
actual = newer.SourceBuildStrategy{}
9494
err = Convert(&oldVersion, &actual)
9595
if err != nil {
9696
t.Fatalf("unexpected error: %v", err)
@@ -106,30 +106,30 @@ func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {
106106
}
107107

108108
// check default to tag to latest
109-
oldVersion = older.STIBuildStrategy{
109+
oldVersion = older.SourceBuildStrategy{
110110
From: &kolder.ObjectReference{
111111
Name: "name",
112112
Namespace: "namespace",
113113
},
114114
}
115-
actual = newer.STIBuildStrategy{}
115+
actual = newer.SourceBuildStrategy{}
116116
err = Convert(&oldVersion, &actual)
117117
if actual.From.Name != "name:latest" {
118118
t.Errorf("expected %v, actual %v", "name:latest", actual.From.Name)
119119
}
120120
}
121121

122-
func TestSTIBuildStrategyNewToOldConversion(t *testing.T) {
123-
var actual older.STIBuildStrategy
122+
func TestSourceBuildStrategyNewToOldConversion(t *testing.T) {
123+
var actual older.SourceBuildStrategy
124124

125-
newVersion := newer.STIBuildStrategy{
125+
newVersion := newer.SourceBuildStrategy{
126126
From: &knewer.ObjectReference{
127127
Kind: "DockerImage",
128128
Name: "name",
129129
Namespace: "namespace",
130130
},
131131
}
132-
actual = older.STIBuildStrategy{}
132+
actual = older.SourceBuildStrategy{}
133133
err := Convert(&newVersion, &actual)
134134
if err != nil {
135135
t.Fatalf("unexpected error: %v", err)
@@ -145,14 +145,14 @@ func TestSTIBuildStrategyNewToOldConversion(t *testing.T) {
145145
}
146146

147147
// ImageStreamTag, convert to ImageStream+tag
148-
newVersion = newer.STIBuildStrategy{
148+
newVersion = newer.SourceBuildStrategy{
149149
From: &knewer.ObjectReference{
150150
Kind: "ImageStreamTag",
151151
Name: "name:tag",
152152
Namespace: "namespace",
153153
},
154154
}
155-
actual = older.STIBuildStrategy{}
155+
actual = older.SourceBuildStrategy{}
156156
err = Convert(&newVersion, &actual)
157157
if err != nil {
158158
t.Fatalf("unexpected error: %v", err)
@@ -171,15 +171,15 @@ func TestSTIBuildStrategyNewToOldConversion(t *testing.T) {
171171
}
172172

173173
// ImageStreamImage, convert to ImageStream+tag
174-
newVersion = newer.STIBuildStrategy{
174+
newVersion = newer.SourceBuildStrategy{
175175
From: &knewer.ObjectReference{
176176
Kind: "ImageStreamImage",
177177
Name: "name@id",
178178
Namespace: "namespace",
179179
},
180180
}
181181

182-
actual = older.STIBuildStrategy{}
182+
actual = older.SourceBuildStrategy{}
183183
err = Convert(&newVersion, &actual)
184184
if err != nil {
185185
t.Fatalf("unexpected error: %v", err)
@@ -198,14 +198,14 @@ func TestSTIBuildStrategyNewToOldConversion(t *testing.T) {
198198
}
199199

200200
// ImageStream, unchanged
201-
newVersion = newer.STIBuildStrategy{
201+
newVersion = newer.SourceBuildStrategy{
202202
From: &knewer.ObjectReference{
203203
Kind: "ImageStream",
204204
Name: "name",
205205
Namespace: "namespace",
206206
},
207207
}
208-
actual = older.STIBuildStrategy{}
208+
actual = older.SourceBuildStrategy{}
209209
err = Convert(&newVersion, &actual)
210210
if err != nil {
211211
t.Fatalf("unexpected error: %v", err)
@@ -224,13 +224,13 @@ func TestSTIBuildStrategyNewToOldConversion(t *testing.T) {
224224
}
225225

226226
// ImageStream(default), unchanged
227-
newVersion = newer.STIBuildStrategy{
227+
newVersion = newer.SourceBuildStrategy{
228228
From: &knewer.ObjectReference{
229229
Name: "name",
230230
Namespace: "namespace",
231231
},
232232
}
233-
actual = older.STIBuildStrategy{}
233+
actual = older.SourceBuildStrategy{}
234234
err = Convert(&newVersion, &actual)
235235
if err != nil {
236236
t.Fatalf("unexpected error: %v", err)

‎pkg/build/api/v1beta1/types.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ type BuildStrategy struct {
165165
// DockerStrategy holds the parameters to the Docker build strategy.
166166
DockerStrategy *DockerBuildStrategy `json:"dockerStrategy,omitempty"`
167167

168-
// STIStrategy holds the parameters to the STI build strategy.
169-
STIStrategy *STIBuildStrategy `json:"stiStrategy,omitempty"`
168+
// SourceStrategy holds the parameters to the STI build strategy.
169+
SourceStrategy *SourceBuildStrategy `json:"stiStrategy,omitempty"`
170170

171171
// CustomStrategy holds the parameters to the Custom build strategy
172172
CustomStrategy *CustomBuildStrategy `json:"customStrategy,omitempty"`
@@ -180,9 +180,9 @@ const (
180180
// DockerBuildStrategyType performs builds using a Dockerfile.
181181
DockerBuildStrategyType BuildStrategyType = "Docker"
182182

183-
// STIBuildStrategyType performs builds build using Source To Images with a Git repository
183+
// SourceBuildStrategyType performs builds build using Source To Images with a Git repository
184184
// and a builder image.
185-
STIBuildStrategyType BuildStrategyType = "STI"
185+
SourceBuildStrategyType BuildStrategyType = "STI"
186186

187187
// CustomBuildStrategyType performs builds using custom builder Docker image.
188188
CustomBuildStrategyType BuildStrategyType = "Custom"
@@ -255,8 +255,8 @@ type DockerBuildStrategy struct {
255255
PullSecretName string `json:"pullSecretName,omitempty"`
256256
}
257257

258-
// STIBuildStrategy defines input parameters specific to an STI build.
259-
type STIBuildStrategy struct {
258+
// SourceBuildStrategy defines input parameters specific to an STI build.
259+
type SourceBuildStrategy struct {
260260
// BuilderImage is the image used to execute the build.
261261
// Deprecated: will be removed in v1beta3, use Image.
262262
BuilderImage string `json:"builderImage,omitempty"`

‎pkg/build/api/v1beta3/conversion.go

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
func init() {
1515
err := kapi.Scheme.AddDefaultingFuncs(
16-
func(obj *STIBuildStrategy) {
16+
func(obj *SourceBuildStrategy) {
1717
if obj.From != nil && len(obj.From.Kind) == 0 {
1818
obj.From.Kind = "ImageStreamTag"
1919
}
@@ -121,10 +121,12 @@ func init() {
121121
},
122122

123123
func(in *newer.BuildParameters, out *BuildSpec, s conversion.Scope) error {
124-
err := s.DefaultConvert(&in.Strategy, &out.Strategy, conversion.IgnoreMissingFields)
125-
if err != nil {
124+
if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
126125
return err
127126
}
127+
if in.Strategy.Type == newer.SourceBuildStrategyType {
128+
out.Strategy.Type = SourceBuildStrategyType
129+
}
128130
if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
129131
return err
130132
}
@@ -140,10 +142,12 @@ func init() {
140142
return nil
141143
},
142144
func(in *BuildSpec, out *newer.BuildParameters, s conversion.Scope) error {
143-
err := s.DefaultConvert(&in.Strategy, &out.Strategy, conversion.IgnoreMissingFields)
144-
if err != nil {
145+
if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
145146
return err
146147
}
148+
if in.Strategy.Type == SourceBuildStrategyType {
149+
out.Strategy.Type = newer.SourceBuildStrategyType
150+
}
147151
if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
148152
return err
149153
}
@@ -160,10 +164,12 @@ func init() {
160164
},
161165

162166
func(in *newer.BuildParameters, out *BuildConfigSpec, s conversion.Scope) error {
163-
err := s.DefaultConvert(&in.Strategy, &out.Strategy, conversion.IgnoreMissingFields)
164-
if err != nil {
167+
if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
165168
return err
166169
}
170+
if in.Strategy.Type == newer.SourceBuildStrategyType {
171+
out.Strategy.Type = SourceBuildStrategyType
172+
}
167173
if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
168174
return err
169175
}
@@ -179,10 +185,12 @@ func init() {
179185
return nil
180186
},
181187
func(in *BuildConfigSpec, out *newer.BuildParameters, s conversion.Scope) error {
182-
err := s.DefaultConvert(&in.Strategy, &out.Strategy, conversion.IgnoreMissingFields)
183-
if err != nil {
188+
if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
184189
return err
185190
}
191+
if in.Strategy.Type == SourceBuildStrategyType {
192+
out.Strategy.Type = newer.SourceBuildStrategyType
193+
}
186194
if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
187195
return err
188196
}
@@ -198,7 +206,7 @@ func init() {
198206
return nil
199207
},
200208

201-
func(in *newer.STIBuildStrategy, out *STIBuildStrategy, s conversion.Scope) error {
209+
func(in *newer.SourceBuildStrategy, out *SourceBuildStrategy, s conversion.Scope) error {
202210
if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
203211
return err
204212
}
@@ -208,7 +216,7 @@ func init() {
208216
}
209217
return nil
210218
},
211-
func(in *STIBuildStrategy, out *newer.STIBuildStrategy, s conversion.Scope) error {
219+
func(in *SourceBuildStrategy, out *newer.SourceBuildStrategy, s conversion.Scope) error {
212220
if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
213221
return err
214222
}

0 commit comments

Comments
 (0)