Skip to content

Commit d748c8b

Browse files
committed
fix gocyclo
1 parent f2272e2 commit d748c8b

File tree

1 file changed

+28
-15
lines changed

1 file changed

+28
-15
lines changed

pkg/manager/manager.go

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,30 +109,21 @@ func New(config *rest.Config, options Options) (Manager, error) {
109109
cm.scheme = scheme.Scheme
110110
}
111111

112-
// Create a new RESTMapper for mapping GroupVersionKinds to Resources
113-
if options.MapperProvider == nil {
114-
options.MapperProvider = apiutil.NewDiscoveryRESTMapper
115-
}
112+
// Set default values for options fields
113+
options = setOptionsDefaults(options)
114+
116115
mapper, err := options.MapperProvider(cm.config)
117116
if err != nil {
118117
log.Error(err, "Failed to get API Group-Resources")
119118
return nil, err
120119
}
121120

122-
// Allow newClient to be mocked
123-
if options.newClient == nil {
124-
options.newClient = client.New
125-
}
126121
// Create the Client for Write operations.
127122
writeObj, err := options.newClient(cm.config, client.Options{Scheme: cm.scheme, Mapper: mapper})
128123
if err != nil {
129124
return nil, err
130125
}
131126

132-
// TODO(directxman12): Figure out how to allow users to request a client without requesting a watch
133-
if options.newCache == nil {
134-
options.newCache = cache.New
135-
}
136127
cm.cache, err = options.newCache(cm.config, cache.Options{Scheme: cm.scheme, Mapper: mapper})
137128
if err != nil {
138129
return nil, err
@@ -141,9 +132,6 @@ func New(config *rest.Config, options Options) (Manager, error) {
141132
cm.fieldIndexes = cm.cache
142133
cm.client = client.DelegatingClient{Reader: cm.cache, Writer: writeObj}
143134

144-
if options.newRecorderProvider == nil {
145-
options.newRecorderProvider = internalrecorder.NewProvider
146-
}
147135
// Create the recorder provider to inject event recorders for the components.
148136
cm.recorderProvider, err = options.newRecorderProvider(cm.config, cm.scheme)
149137
if err != nil {
@@ -152,3 +140,28 @@ func New(config *rest.Config, options Options) (Manager, error) {
152140

153141
return cm, nil
154142
}
143+
144+
// setOptionsDefaults set default values for Options fields
145+
func setOptionsDefaults(options Options) Options {
146+
if options.MapperProvider == nil {
147+
options.MapperProvider = apiutil.NewDiscoveryRESTMapper
148+
}
149+
150+
// Allow newClient to be mocked
151+
if options.newClient == nil {
152+
options.newClient = client.New
153+
}
154+
155+
// Allow newCache to be mocked
156+
// TODO(directxman12): Figure out how to allow users to request a client without requesting a watch
157+
if options.newCache == nil {
158+
options.newCache = cache.New
159+
}
160+
161+
// Allow newRecorderProvider to be mocked
162+
if options.newRecorderProvider == nil {
163+
options.newRecorderProvider = internalrecorder.NewProvider
164+
}
165+
166+
return options
167+
}

0 commit comments

Comments
 (0)