Skip to content

Commit b55c044

Browse files
mfojtikmfojtik
committed
api groups boring changes
1 parent b6a4304 commit b55c044

File tree

26 files changed

+98
-82
lines changed

26 files changed

+98
-82
lines changed

‎pkg/authorization/admission/restrictusers/restrictusers.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ func objectReferenceDelta(elementsToIgnore, elements []kapi.ObjectReference) []k
8585
// in the namespace.
8686
func (q *restrictUsersAdmission) Admit(a admission.Attributes) (err error) {
8787
// We only care about rolebindings and policybindings; ignore anything else.
88-
switch a.GetResource().GroupResource() {
89-
case authorizationapi.Resource("rolebindings"):
90-
case authorizationapi.Resource("policybindings"):
88+
gr := a.GetResource().GroupResource()
89+
switch {
90+
case authorizationapi.IsResourceOrLegacy("policybindings", gr), authorizationapi.IsResourceOrLegacy("rolebindings", gr):
9191
default:
9292
return nil
9393
}
@@ -106,8 +106,8 @@ func (q *restrictUsersAdmission) Admit(a admission.Attributes) (err error) {
106106
var subjects, oldSubjects []kapi.ObjectReference
107107

108108
obj, oldObj := a.GetObject(), a.GetOldObject()
109-
switch a.GetResource().GroupResource() {
110-
case authorizationapi.Resource("rolebindings"):
109+
switch {
110+
case authorizationapi.IsResourceOrLegacy("rolebindings", gr):
111111
rolebinding, ok := obj.(*authorizationapi.RoleBinding)
112112
if !ok {
113113
return admission.NewForbidden(a,
@@ -132,7 +132,7 @@ func (q *restrictUsersAdmission) Admit(a admission.Attributes) (err error) {
132132
glog.V(4).Infof("Handling rolebinding %s/%s",
133133
rolebinding.Namespace, rolebinding.Name)
134134

135-
case authorizationapi.Resource("policybindings"):
135+
case authorizationapi.IsResourceOrLegacy("policybindings", gr):
136136
policybinding, ok := obj.(*authorizationapi.PolicyBinding)
137137
if !ok {
138138
return admission.NewForbidden(a,

‎pkg/authorization/authorizer/scope/converter.go

+28-10
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
authorizationapi "github.com/openshift/origin/pkg/authorization/api"
1717
"github.com/openshift/origin/pkg/authorization/authorizer"
1818
"github.com/openshift/origin/pkg/client"
19+
imageapi "github.com/openshift/origin/pkg/image/api"
1920
oauthapi "github.com/openshift/origin/pkg/oauth/api"
2021
projectapi "github.com/openshift/origin/pkg/project/api"
2122
userapi "github.com/openshift/origin/pkg/user/api"
@@ -171,21 +172,21 @@ func (userEvaluator) ResolveRules(scope, namespace string, clusterPolicyGetter c
171172
switch scope {
172173
case UserInfo:
173174
return []authorizationapi.PolicyRule{
174-
{Verbs: sets.NewString("get"), APIGroups: []string{userapi.GroupName}, Resources: sets.NewString("users"), ResourceNames: sets.NewString("~")},
175+
{Verbs: sets.NewString("get"), APIGroups: []string{userapi.GroupName, userapi.LegacyGroupName}, Resources: sets.NewString("users"), ResourceNames: sets.NewString("~")},
175176
}, nil
176177
case UserAccessCheck:
177178
return []authorizationapi.PolicyRule{
178-
{Verbs: sets.NewString("create"), APIGroups: []string{authorizationapi.GroupName}, Resources: sets.NewString("subjectaccessreviews", "localsubjectaccessreviews"), AttributeRestrictions: &authorizationapi.IsPersonalSubjectAccessReview{}},
179179
authorizationapi.NewRule("create").Groups(kauthorizationapi.GroupName).Resources("selfsubjectaccessreviews").RuleOrDie(),
180-
authorizationapi.NewRule("create").Groups(authorizationapi.GroupName).Resources("selfsubjectrulesreviews").RuleOrDie(),
180+
{Verbs: sets.NewString("create"), APIGroups: []string{authorizationapi.GroupName, authorizationapi.LegacyGroupName}, Resources: sets.NewString("subjectaccessreviews", "localsubjectaccessreviews"), AttributeRestrictions: &authorizationapi.IsPersonalSubjectAccessReview{}},
181+
authorizationapi.NewRule("create").Groups(authorizationapi.GroupName, authorizationapi.LegacyGroupName).Resources("selfsubjectrulesreviews").RuleOrDie(),
181182
}, nil
182183
case UserListScopedProjects:
183184
return []authorizationapi.PolicyRule{
184-
{Verbs: sets.NewString("list", "watch"), APIGroups: []string{projectapi.GroupName}, Resources: sets.NewString("projects")},
185+
{Verbs: sets.NewString("list", "watch"), APIGroups: []string{projectapi.GroupName, projectapi.LegacyGroupName}, Resources: sets.NewString("projects")},
185186
}, nil
186187
case UserListAllProjects:
187188
return []authorizationapi.PolicyRule{
188-
{Verbs: sets.NewString("list", "watch"), APIGroups: []string{projectapi.GroupName}, Resources: sets.NewString("projects")},
189+
{Verbs: sets.NewString("list", "watch"), APIGroups: []string{projectapi.GroupName, projectapi.LegacyGroupName}, Resources: sets.NewString("projects")},
189190
{Verbs: sets.NewString("get"), APIGroups: []string{kapi.GroupName}, Resources: sets.NewString("namespaces")},
190191
}, nil
191192
case UserFull:
@@ -210,10 +211,27 @@ func (userEvaluator) ResolveGettableNamespaces(scope string, clusterPolicyGetter
210211
// escalatingScopeResources are resources that are considered escalating for scope evaluation
211212
var escalatingScopeResources = []unversioned.GroupResource{
212213
{Group: kapi.GroupName, Resource: "secrets"},
213-
/*imageapi.GroupName*/ {Group: "", Resource: "imagestreams/secrets"},
214-
/*oauthapi.GroupName*/ {Group: "", Resource: "oauthauthorizetokens"}, {Group: "", Resource: "oauthaccesstokens"},
215-
/*authorizationapi.GroupName*/ {Group: "", Resource: "roles"}, {Group: "", Resource: "rolebindings"},
216-
/*authorizationapi.GroupName*/ {Group: "", Resource: "clusterroles"}, {Group: "", Resource: "clusterrolebindings"},
214+
215+
{Group: imageapi.GroupName, Resource: "imagestreams/secrets"},
216+
{Group: imageapi.LegacyGroupName, Resource: "imagestreams/secrets"},
217+
218+
{Group: oauthapi.GroupName, Resource: "oauthauthorizetokens"},
219+
{Group: oauthapi.LegacyGroupName, Resource: "oauthauthorizetokens"},
220+
221+
{Group: oauthapi.GroupName, Resource: "oauthaccesstokens"},
222+
{Group: oauthapi.LegacyGroupName, Resource: "oauthaccesstokens"},
223+
224+
{Group: authorizationapi.GroupName, Resource: "roles"},
225+
{Group: authorizationapi.LegacyGroupName, Resource: "roles"},
226+
227+
{Group: authorizationapi.GroupName, Resource: "rolebindings"},
228+
{Group: authorizationapi.LegacyGroupName, Resource: "rolebindings"},
229+
230+
{Group: authorizationapi.GroupName, Resource: "clusterroles"},
231+
{Group: authorizationapi.LegacyGroupName, Resource: "clusterroles"},
232+
233+
{Group: authorizationapi.GroupName, Resource: "clusterrolebindings"},
234+
{Group: authorizationapi.LegacyGroupName, Resource: "clusterrolebindings"},
217235
}
218236

219237
// role:<clusterrole name>:<namespace to allow the cluster role, * means all>
@@ -318,7 +336,7 @@ func (e clusterRoleEvaluator) resolveRules(scope string, clusterPolicyGetter cli
318336
}
319337
role, exists := policy.Roles[roleName]
320338
if !exists {
321-
return nil, kapierrors.NewNotFound(authorizationapi.Resource("clusterrole"), roleName)
339+
return nil, kapierrors.NewNotFound(authorizationapi.LegacyResource("clusterrole"), roleName)
322340
}
323341

324342
rules := []authorizationapi.PolicyRule{}

‎pkg/build/admission/jenkinsbootstrapper/admission.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ func (a *jenkinsBootstrapper) Admit(attributes admission.Attributes) error {
6464
if len(attributes.GetSubresource()) != 0 {
6565
return nil
6666
}
67-
if attributes.GetResource().GroupResource() != buildapi.Resource("buildconfigs") && attributes.GetResource().GroupResource() != buildapi.Resource("builds") {
67+
gr := attributes.GetResource().GroupResource()
68+
if !buildapi.IsResourceOrLegacy("buildconfigs", gr) && !buildapi.IsResourceOrLegacy("builds", gr) {
6869
return nil
6970
}
7071
if !needsJenkinsTemplate(attributes.GetObject()) {

‎pkg/build/admission/strategyrestrictions/admission_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func TestBuildAdmission(t *testing.T) {
8686
name: "allowed build config",
8787
object: testBuildConfig(buildapi.BuildStrategy{DockerStrategy: &buildapi.DockerBuildStrategy{}}),
8888
kind: buildapi.Kind("BuildConfig"),
89-
resource: buildConfigsResource,
89+
resource: buildapi.Resource("buildconfigs"),
9090
reviewResponse: reviewResponse(true, ""),
9191
expectAccept: true,
9292
expectedResource: authorizationapi.DockerBuildResource,
@@ -96,7 +96,7 @@ func TestBuildAdmission(t *testing.T) {
9696
responseObject: testBuildConfig(buildapi.BuildStrategy{DockerStrategy: &buildapi.DockerBuildStrategy{}}),
9797
object: testBuildRequest("buildname"),
9898
kind: buildapi.Kind("Build"),
99-
resource: buildConfigsResource,
99+
resource: buildapi.Resource("buildconfigs"),
100100
subResource: "instantiate",
101101
reviewResponse: reviewResponse(true, ""),
102102
expectAccept: true,
@@ -106,7 +106,7 @@ func TestBuildAdmission(t *testing.T) {
106106
name: "forbidden build config",
107107
object: testBuildConfig(buildapi.BuildStrategy{CustomStrategy: &buildapi.CustomBuildStrategy{}}),
108108
kind: buildapi.Kind("Build"),
109-
resource: buildConfigsResource,
109+
resource: buildapi.Resource("buildconfigs"),
110110
reviewResponse: reviewResponse(false, ""),
111111
expectAccept: false,
112112
expectedResource: authorizationapi.CustomBuildResource,
@@ -116,7 +116,7 @@ func TestBuildAdmission(t *testing.T) {
116116
responseObject: testBuildConfig(buildapi.BuildStrategy{CustomStrategy: &buildapi.CustomBuildStrategy{}}),
117117
object: testBuildRequest("buildname"),
118118
kind: buildapi.Kind("Build"),
119-
resource: buildConfigsResource,
119+
resource: buildapi.Resource("buildconfigs"),
120120
subResource: "instantiate",
121121
reviewResponse: reviewResponse(false, ""),
122122
expectAccept: false,
@@ -126,7 +126,7 @@ func TestBuildAdmission(t *testing.T) {
126126
name: "unrecognized request object",
127127
object: &fakeObject{},
128128
kind: buildapi.Kind("BuildConfig"),
129-
resource: buildConfigsResource,
129+
resource: buildapi.Resource("buildconfigs"),
130130
reviewResponse: reviewResponse(true, ""),
131131
expectAccept: false,
132132
expectedError: "Internal error occurred: [Unrecognized request object &admission.fakeObject{}, couldn't find ObjectMeta field in admission.fakeObject{}]",

‎pkg/build/api/validation/validation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func ValidateBuildUpdate(build *buildapi.Build, older *buildapi.Build) field.Err
8282
}
8383

8484
func diffBuildSpec(newer buildapi.BuildSpec, older buildapi.BuildSpec) (string, error) {
85-
codec := kapi.Codecs.LegacyCodec(v1.SchemeGroupVersion)
85+
codec := kapi.Codecs.LegacyCodec(v1.LegacySchemeGroupVersion)
8686
newerObj := &buildapi.Build{Spec: newer}
8787
olderObj := &buildapi.Build{Spec: older}
8888

‎pkg/build/registry/buildconfig/webhook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (w *WebHook) ServeHTTP(writer http.ResponseWriter, req *http.Request, ctx k
4040

4141
plugin, ok := w.plugins[hookType]
4242
if !ok {
43-
return errors.NewNotFound(buildapi.Resource("buildconfighook"), hookType)
43+
return errors.NewNotFound(buildapi.LegacyResource("buildconfighook"), hookType)
4444
}
4545

4646
config, err := w.registry.GetBuildConfig(ctx, name)

‎pkg/client/testclient/fake_buildconfigs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (c *FakeBuildConfigs) WebHookURL(name string, trigger *buildapi.BuildTrigge
8080
}
8181

8282
func (c *FakeBuildConfigs) Instantiate(request *buildapi.BuildRequest) (result *buildapi.Build, err error) {
83-
action := core.NewCreateAction(buildapi.SchemeGroupVersion.WithResource("builds"), c.Namespace, request)
83+
action := core.NewCreateAction(buildapi.LegacySchemeGroupVersion.WithResource("builds"), c.Namespace, request)
8484
action.Subresource = "instantiate"
8585
obj, err := c.Fake.Invokes(action, &buildapi.Build{})
8686
if obj == nil {
@@ -91,7 +91,7 @@ func (c *FakeBuildConfigs) Instantiate(request *buildapi.BuildRequest) (result *
9191
}
9292

9393
func (c *FakeBuildConfigs) InstantiateBinary(request *buildapi.BinaryBuildRequestOptions, r io.Reader) (result *buildapi.Build, err error) {
94-
action := core.NewCreateAction(buildapi.SchemeGroupVersion.WithResource("builds"), c.Namespace, request)
94+
action := core.NewCreateAction(buildapi.LegacySchemeGroupVersion.WithResource("builds"), c.Namespace, request)
9595
action.Subresource = "instantiatebinary"
9696
obj, err := c.Fake.Invokes(action, &buildapi.Build{})
9797
if obj == nil {

‎pkg/client/testclient/fake_builds.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (c *FakeBuilds) Clone(request *buildapi.BuildRequest) (result *buildapi.Bui
7575
}
7676

7777
func (c *FakeBuilds) UpdateDetails(inObj *buildapi.Build) (*buildapi.Build, error) {
78-
obj, err := c.Fake.Invokes(core.NewUpdateAction(buildapi.SchemeGroupVersion.WithResource("builds/details"), c.Namespace, inObj), inObj)
78+
obj, err := c.Fake.Invokes(core.NewUpdateAction(buildapi.LegacySchemeGroupVersion.WithResource("builds/details"), c.Namespace, inObj), inObj)
7979
if obj == nil {
8080
return nil, err
8181
}

‎pkg/client/testclient/fake_deploymentconfigs.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (c *FakeDeploymentConfigs) Watch(opts kapi.ListOptions) (watch.Interface, e
6565
}
6666

6767
func (c *FakeDeploymentConfigs) Generate(name string) (*deployapi.DeploymentConfig, error) {
68-
obj, err := c.Fake.Invokes(core.NewGetAction(deployapi.SchemeGroupVersion.WithResource("generatedeploymentconfigs"), c.Namespace, name), &deployapi.DeploymentConfig{})
68+
obj, err := c.Fake.Invokes(core.NewGetAction(deployapi.LegacySchemeGroupVersion.WithResource("generatedeploymentconfigs"), c.Namespace, name), &deployapi.DeploymentConfig{})
6969
if obj == nil {
7070
return nil, err
7171
}
@@ -74,7 +74,7 @@ func (c *FakeDeploymentConfigs) Generate(name string) (*deployapi.DeploymentConf
7474
}
7575

7676
func (c *FakeDeploymentConfigs) Rollback(inObj *deployapi.DeploymentConfigRollback) (result *deployapi.DeploymentConfig, err error) {
77-
obj, err := c.Fake.Invokes(core.NewCreateAction(deployapi.SchemeGroupVersion.WithResource("deploymentconfigs/rollback"), c.Namespace, inObj), inObj)
77+
obj, err := c.Fake.Invokes(core.NewCreateAction(deployapi.LegacySchemeGroupVersion.WithResource("deploymentconfigs/rollback"), c.Namespace, inObj), inObj)
7878
if obj == nil {
7979
return nil, err
8080
}
@@ -83,7 +83,7 @@ func (c *FakeDeploymentConfigs) Rollback(inObj *deployapi.DeploymentConfigRollba
8383
}
8484

8585
func (c *FakeDeploymentConfigs) RollbackDeprecated(inObj *deployapi.DeploymentConfigRollback) (result *deployapi.DeploymentConfig, err error) {
86-
obj, err := c.Fake.Invokes(core.NewCreateAction(deployapi.SchemeGroupVersion.WithResource("deploymentconfigrollbacks"), c.Namespace, inObj), inObj)
86+
obj, err := c.Fake.Invokes(core.NewCreateAction(deployapi.LegacySchemeGroupVersion.WithResource("deploymentconfigrollbacks"), c.Namespace, inObj), inObj)
8787
if obj == nil {
8888
return nil, err
8989
}
@@ -92,7 +92,7 @@ func (c *FakeDeploymentConfigs) RollbackDeprecated(inObj *deployapi.DeploymentCo
9292
}
9393

9494
func (c *FakeDeploymentConfigs) GetScale(name string) (*extensions.Scale, error) {
95-
obj, err := c.Fake.Invokes(core.NewGetAction(deployapi.SchemeGroupVersion.WithResource("deploymentconfigs/scale"), c.Namespace, name), &extensions.Scale{})
95+
obj, err := c.Fake.Invokes(core.NewGetAction(deployapi.LegacySchemeGroupVersion.WithResource("deploymentconfigs/scale"), c.Namespace, name), &extensions.Scale{})
9696
if obj == nil {
9797
return nil, err
9898
}
@@ -101,7 +101,7 @@ func (c *FakeDeploymentConfigs) GetScale(name string) (*extensions.Scale, error)
101101
}
102102

103103
func (c *FakeDeploymentConfigs) UpdateScale(inObj *extensions.Scale) (*extensions.Scale, error) {
104-
obj, err := c.Fake.Invokes(core.NewUpdateAction(deployapi.SchemeGroupVersion.WithResource("deploymentconfigs/scale"), c.Namespace, inObj), inObj)
104+
obj, err := c.Fake.Invokes(core.NewUpdateAction(deployapi.LegacySchemeGroupVersion.WithResource("deploymentconfigs/scale"), c.Namespace, inObj), inObj)
105105
if obj == nil {
106106
return nil, err
107107
}
@@ -110,7 +110,7 @@ func (c *FakeDeploymentConfigs) UpdateScale(inObj *extensions.Scale) (*extension
110110
}
111111

112112
func (c *FakeDeploymentConfigs) UpdateStatus(inObj *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error) {
113-
obj, err := c.Fake.Invokes(core.NewUpdateAction(deployapi.SchemeGroupVersion.WithResource("deploymentconfigs/status"), c.Namespace, inObj), inObj)
113+
obj, err := c.Fake.Invokes(core.NewUpdateAction(deployapi.LegacySchemeGroupVersion.WithResource("deploymentconfigs/status"), c.Namespace, inObj), inObj)
114114
if obj == nil {
115115
return nil, err
116116
}
@@ -120,7 +120,7 @@ func (c *FakeDeploymentConfigs) UpdateStatus(inObj *deployapi.DeploymentConfig)
120120

121121
func (c *FakeDeploymentConfigs) Instantiate(inObj *deployapi.DeploymentRequest) (*deployapi.DeploymentConfig, error) {
122122
deployment := &deployapi.DeploymentConfig{ObjectMeta: kapi.ObjectMeta{Name: inObj.Name}}
123-
obj, err := c.Fake.Invokes(core.NewUpdateAction(deployapi.SchemeGroupVersion.WithResource("deploymentconfigs/instantiate"), c.Namespace, deployment), deployment)
123+
obj, err := c.Fake.Invokes(core.NewUpdateAction(deployapi.LegacySchemeGroupVersion.WithResource("deploymentconfigs/instantiate"), c.Namespace, deployment), deployment)
124124
if obj == nil {
125125
return nil, err
126126
}

‎pkg/cmd/admin/migrate/migrator.go

-3
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@ func (o *ResourceOptions) Complete(f *clientcmd.Factory, c *cobra.Command) error
182182
if !others.Has(k) {
183183
continue
184184
}
185-
// TODO: the order here is not deterministic, due to the fact that StringSet is
186-
// using map under the covers, so you may end up with a different resource being
187-
// used each time
188185
reduce = others.List()[0]
189186
break
190187
}

‎pkg/cmd/admin/policy/reconcile_clusterroles.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func (o *ReconcileClusterRolesOptions) Complete(cmd *cobra.Command, f *clientcmd
124124
if err != nil {
125125
return err
126126
}
127-
if resource != authorizationapi.Resource("clusterroles") {
127+
if !authorizationapi.IsResourceOrLegacy("clusterroles", resource) {
128128
return fmt.Errorf("%v is not a valid resource type for this command", resource)
129129
}
130130
if len(name) == 0 {

‎pkg/cmd/cli/cmd/cancelbuild.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,16 @@ func (o *CancelBuildOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,
139139
return err
140140
}
141141

142-
switch resource {
143-
case buildapi.Resource("buildconfigs"):
142+
switch {
143+
case buildapi.IsResourceOrLegacy("buildconfigs", resource):
144144
list, err := buildutil.BuildConfigBuilds(o.BuildLister, o.Namespace, name, nil)
145145
if err != nil {
146146
return err
147147
}
148148
for _, b := range list.Items {
149149
o.BuildNames = append(o.BuildNames, b.Name)
150150
}
151-
case buildapi.Resource("builds"):
151+
case buildapi.IsResourceOrLegacy("builds", resource):
152152
o.BuildNames = append(o.BuildNames, strings.TrimSpace(name))
153153
default:
154154
return fmt.Errorf("invalid resource provided: %v", resource)

‎pkg/cmd/cli/cmd/logs.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ func (o *OpenShiftLogsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command
119119

120120
version := kcmdutil.GetFlagInt64(cmd, "version")
121121
_, resource := meta.KindToResource(infos[0].Mapping.GroupVersionKind)
122-
122+
gr := resource.GroupResource()
123123
// TODO: podLogOptions should be included in our own logOptions objects.
124-
switch resource.GroupResource() {
125-
case buildapi.Resource("build"), buildapi.Resource("buildconfig"):
124+
switch {
125+
case buildapi.IsResourceOrLegacy("build", gr), buildapi.IsResourceOrLegacy("buildconfig", gr):
126126
bopts := &buildapi.BuildLogOptions{
127127
Follow: podLogOptions.Follow,
128128
Previous: podLogOptions.Previous,
@@ -136,7 +136,8 @@ func (o *OpenShiftLogsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command
136136
bopts.Version = &version
137137
}
138138
o.Options = bopts
139-
case deployapi.Resource("deploymentconfig"):
139+
140+
case deployapi.IsResourceOrLegacy("deploymentconfig", gr):
140141
dopts := &deployapi.DeploymentLogOptions{
141142
Follow: podLogOptions.Follow,
142143
Previous: podLogOptions.Previous,

‎pkg/cmd/cli/cmd/newapp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ func retryBuildConfig(info *resource.Info, err error) runtime.Object {
597597
buildapi.GenericWebHookBuildTriggerType: {},
598598
buildapi.ImageChangeBuildTriggerType: {},
599599
}
600-
if info.Mapping.GroupVersionKind.GroupKind() == buildapi.Kind("BuildConfig") && isInvalidTriggerError(err) {
600+
if buildapi.IsKindOrLegacy("BuildConfig", info.Mapping.GroupVersionKind.GroupKind()) && isInvalidTriggerError(err) {
601601
bc, ok := info.Object.(*buildapi.BuildConfig)
602602
if !ok {
603603
return nil

‎pkg/cmd/cli/cmd/startbuild.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@ func (o *StartBuildOptions) Complete(f *clientcmd.Factory, in io.Reader, out, er
237237
if err != nil {
238238
return err
239239
}
240-
switch resource {
241-
case buildapi.Resource("buildconfigs"):
240+
switch {
241+
case buildapi.IsResourceOrLegacy("buildconfigs", resource):
242242
// no special handling required
243-
case buildapi.Resource("builds"):
243+
case buildapi.IsResourceOrLegacy("builds", resource):
244244
if len(o.ListWebhooks) == 0 {
245245
return fmt.Errorf("use --from-build to rerun your builds")
246246
}
@@ -250,7 +250,7 @@ func (o *StartBuildOptions) Complete(f *clientcmd.Factory, in io.Reader, out, er
250250
}
251251

252252
// when listing webhooks, allow --from-build to lookup a build config
253-
if resource == buildapi.Resource("builds") && len(o.ListWebhooks) > 0 {
253+
if buildapi.IsResourceOrLegacy("builds", resource) && len(o.ListWebhooks) > 0 {
254254
build, err := client.Builds(namespace).Get(name)
255255
if err != nil {
256256
return err

‎pkg/cmd/experimental/buildchain/buildchain.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ func (o *BuildChainOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, a
103103
return err
104104
}
105105

106-
switch resource {
107-
case imageapi.Resource("imagestreamtags"):
106+
switch {
107+
case imageapi.IsResourceOrLegacy("imagestreamtags", resource):
108108
o.name = imageapi.NormalizeImageStreamTag(o.name)
109109
glog.V(4).Infof("Using %q as the image stream tag to look dependencies for", o.name)
110110
default:

0 commit comments

Comments
 (0)