Skip to content

Commit 0a80a6e

Browse files
juanvallejojuanvallejo
committed
add Local and Unstructured builder attributes
1 parent 874413c commit 0a80a6e

28 files changed

+59
-39
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func (o *ResourceOptions) Complete(f *clientcmd.Factory, c *cobra.Command) error
212212
break
213213
}
214214

215-
o.Builder = f.NewBuilder(true).
215+
o.Builder = f.NewBuilder().
216216
AllNamespaces(allNamespaces).
217217
FilenameParam(false, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
218218
ContinueOnError().

‎pkg/oc/admin/network/project_options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (p *ProjectOptions) Complete(f *clientcmd.Factory, c *cobra.Command, args [
5858
return err
5959
}
6060

61-
p.Builder = f.NewBuilder(true)
61+
p.Builder = f.NewBuilder()
6262
p.DefaultNamespace = defaultNamespace
6363
p.Oclient = networkClient
6464
p.Kclient = kc

‎pkg/oc/admin/node/node_options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (n *NodeOptions) Complete(f *clientcmd.Factory, c *cobra.Command, args []st
7575
}
7676
mapper, typer := f.Object()
7777

78-
n.Builder = f.NewBuilder(true)
78+
n.Builder = f.NewBuilder()
7979
n.DefaultNamespace = defaultNamespace
8080
n.ExternalKubeClient = externalkc
8181
n.KubeClient = kc

‎pkg/oc/admin/policy/review.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (o *sccReviewOptions) Complete(f *clientcmd.Factory, args []string, cmd *co
107107
return fmt.Errorf("unable to obtain client: %v", err)
108108
}
109109
o.client = securityClient.Security()
110-
o.builder = f.NewBuilder(true)
110+
o.builder = f.NewBuilder()
111111
o.RESTClientFactory = f.ClientForMapping
112112

113113
output := kcmdutil.GetFlagString(cmd, "output")

‎pkg/oc/admin/policy/subject_review.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func (o *sccSubjectReviewOptions) Complete(f *clientcmd.Factory, args []string,
108108
}
109109
o.sccSubjectReviewClient = securityClient.Security()
110110
o.sccSelfSubjectReviewClient = securityClient.Security()
111-
o.builder = f.NewBuilder(true)
111+
o.builder = f.NewBuilder()
112112
o.RESTClientFactory = f.ClientForMapping
113113

114114
output := kcmdutil.GetFlagString(cmd, "output")

‎pkg/oc/bootstrap/docker/openshift/import.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func ImportObjects(f *clientcmd.Factory, ns, location string) error {
2424
return err
2525
}
2626
glog.V(8).Infof("Importing data:\n%s\n", string(data))
27-
r := f.NewBuilder(true).
27+
r := f.NewBuilder().
2828
Schema(schema).
2929
ContinueOnError().
3030
NamespaceParam(ns).

‎pkg/oc/cli/cmd/debug.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, f *clientcmd.Factory, args [
221221
}
222222

223223
mapper, _ := f.Object()
224-
b := f.NewBuilder(true).
224+
b := f.NewBuilder().
225225
NamespaceParam(cmdNamespace).DefaultNamespace().
226226
SingleResourceType().
227227
ResourceNames("pods", resources...).

‎pkg/oc/cli/cmd/deploy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func (o *DeployOptions) Complete(f *clientcmd.Factory, args []string, out io.Wri
155155
return err
156156
}
157157

158-
o.builder = f.NewBuilder(true)
158+
o.builder = f.NewBuilder()
159159
o.out = out
160160

161161
if len(args) > 0 {

‎pkg/oc/cli/cmd/export.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,13 @@ func RunExport(f *clientcmd.Factory, exporter Exporter, in io.Reader, out io.Wri
110110
return err
111111
}
112112

113-
builder, err := f.NewUnstructuredBuilder(true)
114-
if err != nil {
115-
return err
116-
}
117-
118113
mapper, typer, err := f.UnstructuredObject()
119114
if err != nil {
120115
return err
121116
}
122117

123-
b := builder.
118+
b := f.NewBuilder().
119+
Unstructured(f.UnstructuredClientForMapping, mapper, typer).
124120
NamespaceParam(cmdNamespace).DefaultNamespace().AllNamespaces(allNamespaces).
125121
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: filenames}).
126122
SelectorParam(selector).

‎pkg/oc/cli/cmd/expose.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func validate(cmd *cobra.Command, f *clientcmd.Factory, args []string) error {
9393
return err
9494
}
9595

96-
r := f.NewBuilder(true).
96+
r := f.NewBuilder().
9797
ContinueOnError().
9898
NamespaceParam(namespace).DefaultNamespace().
9999
FilenameParam(enforceNamespace, &resource.FilenameOptions{Recursive: false, Filenames: kcmdutil.GetFlagStringSlice(cmd, "filename")}).

‎pkg/oc/cli/cmd/extract.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func (o *ExtractOptions) Complete(f *clientcmd.Factory, in io.Reader, out io.Wri
9898
return err
9999
}
100100

101-
b := f.NewBuilder(true).
101+
b := f.NewBuilder().
102102
NamespaceParam(cmdNamespace).DefaultNamespace().
103103
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
104104
ResourceNames("", args...).

‎pkg/oc/cli/cmd/idle.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (o *IdleOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args []
114114
return fmt.Errorf("resource names, selectors, and the all flag may not be be specified if a filename is specified")
115115
}
116116

117-
o.svcBuilder = f.NewBuilder(true).
117+
o.svcBuilder = f.NewBuilder().
118118
ContinueOnError().
119119
NamespaceParam(namespace).DefaultNamespace().AllNamespaces(o.allNamespaces).
120120
Flatten().

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func (o *OpenShiftLogsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command
126126

127127
podLogOptions := o.KubeLogOptions.Options.(*kapi.PodLogOptions)
128128

129-
infos, err := f.NewBuilder(true).
129+
infos, err := f.NewBuilder().
130130
NamespaceParam(o.Namespace).DefaultNamespace().
131131
ResourceNames("pods", args...).
132132
SingleResourceType().RequireObject(false).

‎pkg/oc/cli/cmd/process.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,14 @@ func RunProcess(f *clientcmd.Factory, in io.Reader, out, errout io.Writer, cmd *
221221
templateObj.CreationTimestamp = metav1.Now()
222222
infos = append(infos, &resource.Info{Object: templateObj})
223223
} else {
224-
infos, err = f.NewBuilder(!local).
225-
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: []string{filename}}).
224+
b := f.NewBuilder().
225+
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: []string{filename}})
226+
227+
if local {
228+
b = b.Local(f.ClientForMapping)
229+
}
230+
231+
infos, err = b.
226232
Do().
227233
Infos()
228234
if err != nil {

‎pkg/oc/cli/cmd/rollback.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func (o *RollbackOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg
135135

136136
// Set up client based support.
137137
o.getBuilder = func() *resource.Builder {
138-
return f.NewBuilder(true)
138+
return f.NewBuilder()
139139
}
140140

141141
kClient, err := f.ClientSet()

‎pkg/oc/cli/cmd/rollout/cancel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (o *CancelOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, out i
8989
return err
9090
}
9191

92-
r := f.NewBuilder(true).
92+
r := f.NewBuilder().
9393
NamespaceParam(cmdNamespace).DefaultNamespace().
9494
FilenameParam(enforceNamespace, &o.FilenameOptions).
9595
ResourceTypeOrNameArgs(true, args...).

‎pkg/oc/cli/cmd/rollout/latest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (o *RolloutLatestOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command
107107
o.appsClient = appsClient.Apps()
108108

109109
o.mapper, o.typer = f.Object()
110-
o.infos, err = f.NewBuilder(true).
110+
o.infos, err = f.NewBuilder().
111111
ContinueOnError().
112112
NamespaceParam(namespace).
113113
ResourceNames("deploymentconfigs", args[0]).

‎pkg/oc/cli/cmd/rollout/retry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (o *RetryOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, out io
9090
return err
9191
}
9292

93-
r := f.NewBuilder(true).
93+
r := f.NewBuilder().
9494
NamespaceParam(cmdNamespace).DefaultNamespace().
9595
FilenameParam(enforceNamespace, &o.FilenameOptions).
9696
ResourceTypeOrNameArgs(true, args...).

‎pkg/oc/cli/cmd/set/buildhook.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func (o *BuildHookOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, ar
137137
o.Cmd = cmd
138138

139139
mapper, _ := f.Object()
140-
o.Builder = f.NewBuilder(!o.Local).
140+
o.Builder = f.NewBuilder().
141141
ContinueOnError().
142142
NamespaceParam(cmdNamespace).DefaultNamespace().
143143
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -159,6 +159,8 @@ func (o *BuildHookOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, ar
159159
if len(resources) > 0 {
160160
return resource.LocalResourceError
161161
}
162+
163+
o.Builder = o.Builder.Local(f.ClientForMapping)
162164
}
163165

164166
o.Output = kcmdutil.GetFlagString(cmd, "output")

‎pkg/oc/cli/cmd/set/buildsecret.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func NewCmdBuildSecret(fullName string, f *clientcmd.Factory, out, errOut io.Wri
121121
var supportedBuildTypes = []string{"buildconfigs"}
122122

123123
func (o *BuildSecretOptions) secretFromArg(f *clientcmd.Factory, mapper meta.RESTMapper, typer runtime.ObjectTyper, namespace, arg string) (string, error) {
124-
builder := f.NewBuilder(!o.Local).
124+
builder := f.NewBuilder().
125125
NamespaceParam(namespace).DefaultNamespace().
126126
RequireObject(false).
127127
ContinueOnError().
@@ -173,7 +173,7 @@ func (o *BuildSecretOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,
173173
return err
174174
}
175175
}
176-
o.Builder = f.NewBuilder(!o.Local).
176+
o.Builder = f.NewBuilder().
177177
ContinueOnError().
178178
NamespaceParam(cmdNamespace).DefaultNamespace().
179179
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -195,6 +195,8 @@ func (o *BuildSecretOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,
195195
if len(resources) > 0 {
196196
return resource.LocalResourceError
197197
}
198+
199+
o.Builder = o.Builder.Local(f.ClientForMapping)
198200
}
199201

200202
o.Output = kcmdutil.GetFlagString(cmd, "output")

‎pkg/oc/cli/cmd/set/deploymenthook.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func (o *DeploymentHookOptions) Complete(f *clientcmd.Factory, cmd *cobra.Comman
156156
o.Cmd = cmd
157157

158158
mapper, _ := f.Object()
159-
o.Builder = f.NewBuilder(!o.Local).
159+
o.Builder = f.NewBuilder().
160160
ContinueOnError().
161161
NamespaceParam(cmdNamespace).DefaultNamespace().
162162
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -177,6 +177,8 @@ func (o *DeploymentHookOptions) Complete(f *clientcmd.Factory, cmd *cobra.Comman
177177
if len(resources) > 0 {
178178
return resource.LocalResourceError
179179
}
180+
181+
o.Builder = o.Builder.Local(f.ClientForMapping)
180182
}
181183

182184
o.Output = kcmdutil.GetFlagString(cmd, "output")

‎pkg/oc/cli/cmd/set/env.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ func (o *EnvOptions) RunEnv(f *clientcmd.Factory) error {
225225
}
226226

227227
if len(o.From) != 0 {
228-
b := f.NewBuilder(!o.Local).
228+
b := f.NewBuilder().
229229
ContinueOnError().
230230
NamespaceParam(cmdNamespace).DefaultNamespace().
231231
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -235,6 +235,8 @@ func (o *EnvOptions) RunEnv(f *clientcmd.Factory) error {
235235
b = b.
236236
SelectorParam(o.Selector).
237237
ResourceTypeOrNameArgs(o.All, o.From)
238+
} else {
239+
b = b.Local(f.ClientForMapping)
238240
}
239241

240242
one := false
@@ -287,7 +289,7 @@ func (o *EnvOptions) RunEnv(f *clientcmd.Factory) error {
287289
}
288290
}
289291

290-
b := f.NewBuilder(!o.Local).
292+
b := f.NewBuilder().
291293
ContinueOnError().
292294
NamespaceParam(cmdNamespace).DefaultNamespace().
293295
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -304,6 +306,8 @@ func (o *EnvOptions) RunEnv(f *clientcmd.Factory) error {
304306
if len(o.Resources) > 0 {
305307
return resource.LocalResourceError
306308
}
309+
310+
b = b.Local(f.ClientForMapping)
307311
}
308312

309313
one := false

‎pkg/oc/cli/cmd/set/imagelookup.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (o *ImageLookupOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,
164164
o.PrintTable = (len(args) == 0 && !o.All) || o.List
165165

166166
mapper, _ := f.Object()
167-
o.Builder = f.NewBuilder(!o.Local).
167+
o.Builder = f.NewBuilder().
168168
ContinueOnError().
169169
NamespaceParam(cmdNamespace).DefaultNamespace().
170170
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -175,7 +175,7 @@ func (o *ImageLookupOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,
175175
return kcmdutil.UsageError(cmd, "Pass files with -f when using --local")
176176
case o.Local:
177177
// perform no lookups on the server
178-
// TODO: discovery still requires a running server, doesn't fall back correctly
178+
o.Builder = o.Builder.Local(f.ClientForMapping)
179179
case len(args) == 0 && len(o.Filenames) == 0:
180180
o.Builder = o.Builder.
181181
SelectorParam(o.Selector).

‎pkg/oc/cli/cmd/set/probe.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ func (o *ProbeOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args [
181181
o.Cmd = cmd
182182

183183
mapper, _ := f.Object()
184-
o.Builder = f.NewBuilder(!o.Local).
184+
o.Builder = f.NewBuilder().
185185
ContinueOnError().
186186
NamespaceParam(cmdNamespace).DefaultNamespace().
187187
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -198,6 +198,8 @@ func (o *ProbeOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args [
198198
if len(resources) > 0 {
199199
return resource.LocalResourceError
200200
}
201+
202+
o.Builder = o.Builder.Local(f.ClientForMapping)
201203
}
202204

203205
o.Output = kcmdutil.GetFlagString(cmd, "output")

‎pkg/oc/cli/cmd/set/routebackends.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func (o *BackendsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg
161161
o.Cmd = cmd
162162

163163
mapper, _ := f.Object()
164-
o.Builder = f.NewBuilder(!o.Local).
164+
o.Builder = f.NewBuilder().
165165
ContinueOnError().
166166
NamespaceParam(cmdNamespace).DefaultNamespace().
167167
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -182,6 +182,8 @@ func (o *BackendsOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg
182182
if len(resources) > 0 {
183183
return resource.LocalResourceError
184184
}
185+
186+
o.Builder = o.Builder.Local(f.ClientForMapping)
185187
}
186188

187189
o.Output = kcmdutil.GetFlagString(cmd, "output")

‎pkg/oc/cli/cmd/set/triggers.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ func (o *TriggersOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg
220220
}
221221

222222
mapper, _ := f.Object()
223-
o.Builder = f.NewBuilder(!o.Local).
223+
o.Builder = f.NewBuilder().
224224
ContinueOnError().
225225
NamespaceParam(cmdNamespace).DefaultNamespace().
226226
FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: o.Filenames}).
@@ -237,6 +237,8 @@ func (o *TriggersOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg
237237
if len(args) > 0 {
238238
return resource.LocalResourceError
239239
}
240+
241+
o.Builder = o.Builder.Local(f.ClientForMapping)
240242
}
241243

242244
o.Output = kcmdutil.GetFlagString(cmd, "output")

‎pkg/oc/cli/cmd/set/volume.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ func (v *VolumeOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, out,
427427
}
428428

429429
func (v *VolumeOptions) RunVolume(args []string, f *clientcmd.Factory) error {
430-
b := f.NewBuilder(!v.Local).
430+
b := f.NewBuilder().
431431
ContinueOnError().
432432
NamespaceParam(v.DefaultNamespace).DefaultNamespace().
433433
FilenameParam(v.ExplicitNamespace, &resource.FilenameOptions{Recursive: false, Filenames: v.Filenames}).
@@ -444,6 +444,8 @@ func (v *VolumeOptions) RunVolume(args []string, f *clientcmd.Factory) error {
444444
if len(args) > 0 {
445445
return resource.LocalResourceError
446446
}
447+
448+
b = b.Local(f.ClientForMapping)
447449
}
448450

449451
singleItemImplied := false

‎pkg/oc/cli/secrets/options.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type SecretOptions struct {
2626

2727
Namespace string
2828

29-
BuilderFunc func(bool) *resource.Builder
29+
BuilderFunc func() *resource.Builder
3030
KubeCoreClient kcoreclient.CoreInterface
3131

3232
Out io.Writer
@@ -84,7 +84,7 @@ func (o SecretOptions) Validate() error {
8484

8585
// GetServiceAccount Retrieve the service account object specified by the command
8686
func (o SecretOptions) GetServiceAccount() (*kapi.ServiceAccount, error) {
87-
r := o.BuilderFunc(true).
87+
r := o.BuilderFunc().
8888
NamespaceParam(o.Namespace).
8989
ResourceNames("serviceaccounts", o.TargetName).
9090
SingleResourceType().
@@ -161,7 +161,7 @@ func (o SecretOptions) GetSecrets(allowNonExisting bool) ([]*kapi.Secret, bool,
161161
hasNotFound := false
162162

163163
for _, secretName := range o.SecretNames {
164-
r := o.BuilderFunc(true).
164+
r := o.BuilderFunc().
165165
NamespaceParam(o.Namespace).
166166
ResourceNames("secrets", secretName).
167167
SingleResourceType().

0 commit comments

Comments
 (0)