Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Ijaz Ahmad
ksonnet
Commits
a8222540
Unverified
Commit
a8222540
authored
Apr 10, 2018
by
bryanl
Browse files
add tests for option loaders
Signed-off-by:
bryanl
<
bryanliles@gmail.com
>
parent
72934a86
Changes
35
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
283 additions
and
155 deletions
+283
-155
actions/actions.go
actions/actions.go
+11
-11
actions/actions_test.go
actions/actions_test.go
+207
-79
actions/apply.go
actions/apply.go
+7
-7
actions/component_list.go
actions/component_list.go
+3
-3
actions/component_rm.go
actions/component_rm.go
+2
-2
actions/current_environment.go
actions/current_environment.go
+1
-1
actions/delete.go
actions/delete.go
+4
-4
actions/env_add.go
actions/env_add.go
+6
-6
actions/env_current.go
actions/env_current.go
+3
-3
actions/env_describe.go
actions/env_describe.go
+2
-2
actions/env_list.go
actions/env_list.go
+2
-2
actions/env_rm.go
actions/env_rm.go
+3
-3
actions/env_set.go
actions/env_set.go
+4
-4
actions/env_targets.go
actions/env_targets.go
+3
-3
actions/import.go
actions/import.go
+3
-3
actions/init.go
actions/init.go
+8
-8
actions/module_create.go
actions/module_create.go
+2
-2
actions/module_list.go
actions/module_list.go
+2
-2
actions/param_delete.go
actions/param_delete.go
+6
-6
actions/param_list.go
actions/param_list.go
+4
-4
No files found.
actions/actions.go
View file @
a8222540
...
...
@@ -148,7 +148,7 @@ func newOptionLoader(m map[string]interface{}) *optionLoader {
}
}
func
(
o
*
optionLoader
)
l
oadFs
(
name
string
)
afero
.
Fs
{
func
(
o
*
optionLoader
)
L
oadFs
(
name
string
)
afero
.
Fs
{
i
:=
o
.
load
(
name
)
if
i
==
nil
{
return
nil
...
...
@@ -163,7 +163,7 @@ func (o *optionLoader) loadFs(name string) afero.Fs {
return
a
}
func
(
o
*
optionLoader
)
l
oadBool
(
name
string
)
bool
{
func
(
o
*
optionLoader
)
L
oadBool
(
name
string
)
bool
{
i
:=
o
.
load
(
name
)
if
i
==
nil
{
return
false
...
...
@@ -178,7 +178,7 @@ func (o *optionLoader) loadBool(name string) bool {
return
a
}
func
(
o
*
optionLoader
)
l
oadOptionalBool
(
name
string
)
bool
{
func
(
o
*
optionLoader
)
L
oadOptionalBool
(
name
string
)
bool
{
i
:=
o
.
loadOptional
(
name
)
if
i
==
nil
{
return
false
...
...
@@ -192,7 +192,7 @@ func (o *optionLoader) loadOptionalBool(name string) bool {
return
a
}
func
(
o
*
optionLoader
)
l
oadInt
(
name
string
)
int
{
func
(
o
*
optionLoader
)
L
oadInt
(
name
string
)
int
{
i
:=
o
.
load
(
name
)
if
i
==
nil
{
return
0
...
...
@@ -207,7 +207,7 @@ func (o *optionLoader) loadInt(name string) int {
return
a
}
func
(
o
*
optionLoader
)
l
oadInt64
(
name
string
)
int64
{
func
(
o
*
optionLoader
)
L
oadInt64
(
name
string
)
int64
{
i
:=
o
.
load
(
name
)
if
i
==
nil
{
return
0
...
...
@@ -222,7 +222,7 @@ func (o *optionLoader) loadInt64(name string) int64 {
return
a
}
func
(
o
*
optionLoader
)
l
oadOptionalInt
(
name
string
)
int
{
func
(
o
*
optionLoader
)
L
oadOptionalInt
(
name
string
)
int
{
i
:=
o
.
loadOptional
(
name
)
if
i
==
nil
{
return
0
...
...
@@ -236,7 +236,7 @@ func (o *optionLoader) loadOptionalInt(name string) int {
return
a
}
func
(
o
*
optionLoader
)
l
oadString
(
name
string
)
string
{
func
(
o
*
optionLoader
)
L
oadString
(
name
string
)
string
{
i
:=
o
.
load
(
name
)
if
i
==
nil
{
return
""
...
...
@@ -251,7 +251,7 @@ func (o *optionLoader) loadString(name string) string {
return
a
}
func
(
o
*
optionLoader
)
l
oadOptionalString
(
name
string
)
string
{
func
(
o
*
optionLoader
)
L
oadOptionalString
(
name
string
)
string
{
i
:=
o
.
loadOptional
(
name
)
if
i
==
nil
{
return
""
...
...
@@ -265,7 +265,7 @@ func (o *optionLoader) loadOptionalString(name string) string {
return
a
}
func
(
o
*
optionLoader
)
l
oadStringSlice
(
name
string
)
[]
string
{
func
(
o
*
optionLoader
)
L
oadStringSlice
(
name
string
)
[]
string
{
i
:=
o
.
load
(
name
)
if
i
==
nil
{
return
nil
...
...
@@ -280,7 +280,7 @@ func (o *optionLoader) loadStringSlice(name string) []string {
return
a
}
func
(
o
*
optionLoader
)
l
oadClientConfig
()
*
client
.
Config
{
func
(
o
*
optionLoader
)
L
oadClientConfig
()
*
client
.
Config
{
i
:=
o
.
load
(
OptionClientConfig
)
if
i
==
nil
{
return
nil
...
...
@@ -295,7 +295,7 @@ func (o *optionLoader) loadClientConfig() *client.Config {
return
a
}
func
(
o
*
optionLoader
)
l
oadApp
()
app
.
App
{
func
(
o
*
optionLoader
)
L
oadApp
()
app
.
App
{
i
:=
o
.
load
(
OptionApp
)
if
i
==
nil
{
o
.
err
=
ErrNotInApp
...
...
actions/actions_test.go
View file @
a8222540
...
...
@@ -16,99 +16,227 @@
package
actions
import
(
"fmt"
"io/ioutil"
"path/filepath"
"reflect"
"testing"
"github.com/ksonnet/ksonnet/client"
cmocks
"github.com/ksonnet/ksonnet/component/mocks"
"github.com/ksonnet/ksonnet/metadata/app/mocks"
"github.com/ksonnet/ksonnet/pkg/registry"
rmocks
"github.com/ksonnet/ksonnet/pkg/registry/mocks"
"github.com/pkg/errors"
"github.com/spf13/afero"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func
Test_optionsLoader_loadApp
(
t
*
testing
.
T
)
{
withApp
(
t
,
func
(
a
*
mocks
.
App
)
{
cases
:=
[]
struct
{
name
string
m
map
[
string
]
interface
{}
isErr
bool
}{
{
name
:
"with app"
,
m
:
map
[
string
]
interface
{}{
OptionApp
:
a
,
},
},
{
name
:
"with invalid app"
,
m
:
map
[
string
]
interface
{}{
OptionApp
:
"invalid"
,
},
isErr
:
true
,
},
}
for
_
,
tc
:=
range
cases
{
t
.
Run
(
tc
.
name
,
func
(
t
*
testing
.
T
)
{
withOptionLoader
(
t
,
tc
.
m
,
func
(
a
*
mocks
.
App
,
ol
*
optionLoader
)
{
got
:=
ol
.
loadApp
()
if
tc
.
isErr
{
require
.
Error
(
t
,
ol
.
err
)
return
}
require
.
NoError
(
t
,
ol
.
err
)
assert
.
Equal
(
t
,
a
,
got
)
})
})
}
})
func
Test_optionLoader_types
(
t
*
testing
.
T
)
{
cases
:=
[]
struct
{
name
string
hasArg
bool
valid
interface
{}
invalid
interface
{}
keyName
string
}{
{
name
:
"App"
,
valid
:
&
mocks
.
App
{},
invalid
:
"invalid"
,
keyName
:
OptionApp
,
},
{
name
:
"Bool"
,
hasArg
:
true
,
valid
:
true
,
invalid
:
"invalid"
,
keyName
:
OptionSkipGc
,
},
{
name
:
"Fs"
,
hasArg
:
true
,
valid
:
afero
.
NewMemMapFs
(),
invalid
:
"invalid"
,
keyName
:
OptionFs
,
},
{
name
:
"Int"
,
hasArg
:
true
,
valid
:
0
,
invalid
:
"invalid"
,
keyName
:
OptionName
,
},
{
name
:
"Int64"
,
hasArg
:
true
,
valid
:
int64
(
0
),
invalid
:
"invalid"
,
keyName
:
OptionName
,
},
{
name
:
"String"
,
hasArg
:
true
,
valid
:
"valid"
,
invalid
:
0
,
keyName
:
OptionName
,
},
{
name
:
"StringSlice"
,
hasArg
:
true
,
valid
:
[]
string
{},
invalid
:
"invalid"
,
keyName
:
OptionName
,
},
{
name
:
"ClientConfig"
,
valid
:
&
client
.
Config
{},
invalid
:
"invalid"
,
keyName
:
OptionClientConfig
,
},
}
for
_
,
tc
:=
range
cases
{
methodName
:=
fmt
.
Sprintf
(
"Load%s"
,
tc
.
name
)
t
.
Run
(
tc
.
name
+
" valid"
,
func
(
t
*
testing
.
T
)
{
m
:=
map
[
string
]
interface
{}{
tc
.
keyName
:
tc
.
valid
,
}
ol
:=
newOptionLoader
(
m
)
loader
:=
reflect
.
ValueOf
(
ol
)
.
MethodByName
(
methodName
)
callValues
:=
make
([]
reflect
.
Value
,
0
)
if
tc
.
hasArg
{
callValues
=
append
(
callValues
,
reflect
.
ValueOf
(
tc
.
keyName
))
}
values
:=
loader
.
Call
(
callValues
)
require
.
Len
(
t
,
values
,
1
)
require
.
EqualValues
(
t
,
tc
.
valid
,
values
[
0
]
.
Interface
())
})
t
.
Run
(
tc
.
name
+
" invalid"
,
func
(
t
*
testing
.
T
)
{
m
:=
map
[
string
]
interface
{}{
tc
.
keyName
:
tc
.
invalid
,
}
ol
:=
newOptionLoader
(
m
)
loader
:=
reflect
.
ValueOf
(
ol
)
.
MethodByName
(
methodName
)
callValues
:=
make
([]
reflect
.
Value
,
0
)
if
tc
.
hasArg
{
callValues
=
append
(
callValues
,
reflect
.
ValueOf
(
tc
.
keyName
))
}
loader
.
Call
(
callValues
)
require
.
Error
(
t
,
ol
.
err
)
})
t
.
Run
(
tc
.
name
+
" previous error"
,
func
(
t
*
testing
.
T
)
{
m
:=
map
[
string
]
interface
{}{
tc
.
keyName
:
tc
.
invalid
,
}
ol
:=
newOptionLoader
(
m
)
ol
.
err
=
errors
.
New
(
"error"
)
loader
:=
reflect
.
ValueOf
(
ol
)
.
MethodByName
(
methodName
)
callValues
:=
make
([]
reflect
.
Value
,
0
)
if
tc
.
hasArg
{
callValues
=
append
(
callValues
,
reflect
.
ValueOf
(
tc
.
keyName
))
}
loader
.
Call
(
callValues
)
require
.
Error
(
t
,
ol
.
err
)
})
}
}
// func Test_optionsLoader_loadBool(t *testing.T) {
// withApp(t, func(a *mocks.App) {
// cases := []struct {
// name string
// key string
// validCase interface{}
// invalidCase interface{}
// }{
// {
// name: "bool",
// key: OptionGcTag,
// validCase: true,
// invalidCase: "invalid"
// },
// }
// for _, tc := range cases {
// t.Run(tc.name, func(t *testing.T) {
// m := map[string]interface{
// tc.key: tc.validCase,
// }
// ol := newOptionLoader(m)
// got := ol.loadApp()
// if tc.isErr {
// require.Error(t, ol.err)
// return
// }
// require.NoError(t, ol.err)
// assert.Equal(t, a, got)
// })
// }
// })
// }
func
withOptionLoader
(
t
*
testing
.
T
,
m
map
[
string
]
interface
{},
fn
func
(
*
mocks
.
App
,
*
optionLoader
))
{
withApp
(
t
,
func
(
a
*
mocks
.
App
)
{
ol
:=
newOptionLoader
(
m
)
fn
(
a
,
ol
)
})
func
Test_optionLoader_optional_types
(
t
*
testing
.
T
)
{
cases
:=
[]
struct
{
name
string
valid
interface
{}
invalid
interface
{}
expected
interface
{}
keyName
string
}{
{
name
:
"Bool"
,
valid
:
true
,
invalid
:
"invalid"
,
expected
:
false
,
keyName
:
OptionApp
,
},
{
name
:
"Int"
,
valid
:
9
,
invalid
:
"invalid"
,
expected
:
0
,
keyName
:
OptionApp
,
},
{
name
:
"String"
,
valid
:
"valid"
,
invalid
:
9
,
expected
:
""
,
keyName
:
OptionApp
,
},
}
for
_
,
tc
:=
range
cases
{
methodName
:=
fmt
.
Sprintf
(
"LoadOptional%s"
,
tc
.
name
)
t
.
Run
(
tc
.
name
+
" valid"
,
func
(
t
*
testing
.
T
)
{
m
:=
map
[
string
]
interface
{}{
tc
.
keyName
:
tc
.
valid
,
}
ol
:=
newOptionLoader
(
m
)
loader
:=
reflect
.
ValueOf
(
ol
)
.
MethodByName
(
methodName
)
callValues
:=
[]
reflect
.
Value
{
reflect
.
ValueOf
(
tc
.
keyName
)}
values
:=
loader
.
Call
(
callValues
)
require
.
Len
(
t
,
values
,
1
)
require
.
EqualValues
(
t
,
tc
.
valid
,
values
[
0
]
.
Interface
())
})
t
.
Run
(
tc
.
name
+
" invalid"
,
func
(
t
*
testing
.
T
)
{
m
:=
map
[
string
]
interface
{}{
tc
.
keyName
:
tc
.
invalid
,
}
ol
:=
newOptionLoader
(
m
)
loader
:=
reflect
.
ValueOf
(
ol
)
.
MethodByName
(
methodName
)
callValues
:=
[]
reflect
.
Value
{
reflect
.
ValueOf
(
tc
.
keyName
)}
values
:=
loader
.
Call
(
callValues
)
require
.
Len
(
t
,
values
,
1
)
require
.
EqualValues
(
t
,
tc
.
expected
,
values
[
0
]
.
Interface
())
})
t
.
Run
(
tc
.
name
+
" previous error"
,
func
(
t
*
testing
.
T
)
{
m
:=
map
[
string
]
interface
{}{
tc
.
keyName
:
tc
.
invalid
,
}
ol
:=
newOptionLoader
(
m
)
ol
.
err
=
errors
.
New
(
"error"
)
loader
:=
reflect
.
ValueOf
(
ol
)
.
MethodByName
(
methodName
)
callValues
:=
[]
reflect
.
Value
{
reflect
.
ValueOf
(
tc
.
keyName
)}
loader
.
Call
(
callValues
)
require
.
Error
(
t
,
ol
.
err
)
})
}
}
func
withApp
(
t
*
testing
.
T
,
fn
func
(
*
mocks
.
App
))
{
...
...
actions/apply.go
View file @
a8222540
...
...
@@ -54,13 +54,13 @@ func newApply(m map[string]interface{}, opts ...applyOpt) (*Apply, error) {
ol
:=
newOptionLoader
(
m
)
a
:=
&
Apply
{
app
:
ol
.
l
oadApp
(),
clientConfig
:
ol
.
l
oadClientConfig
(),
componentNames
:
ol
.
l
oadStringSlice
(
OptionComponentNames
),
create
:
ol
.
l
oadBool
(
OptionCreate
),
dryRun
:
ol
.
l
oadBool
(
OptionDryRun
),
gcTag
:
ol
.
l
oadString
(
OptionGcTag
),
skipGc
:
ol
.
l
oadBool
(
OptionSkipGc
),
app
:
ol
.
L
oadApp
(),
clientConfig
:
ol
.
L
oadClientConfig
(),
componentNames
:
ol
.
L
oadStringSlice
(
OptionComponentNames
),
create
:
ol
.
L
oadBool
(
OptionCreate
),
dryRun
:
ol
.
L
oadBool
(
OptionDryRun
),
gcTag
:
ol
.
L
oadString
(
OptionGcTag
),
skipGc
:
ol
.
L
oadBool
(
OptionSkipGc
),
runApplyFn
:
cluster
.
RunApply
,
}
...
...
actions/component_list.go
View file @
a8222540
...
...
@@ -50,9 +50,9 @@ func NewComponentList(m map[string]interface{}) (*ComponentList, error) {
ol
:=
newOptionLoader
(
m
)
cl
:=
&
ComponentList
{
app
:
ol
.
l
oadApp
(),
module
:
ol
.
l
oadString
(
OptionModule
),
output
:
ol
.
l
oadString
(
OptionOutput
),
app
:
ol
.
L
oadApp
(),
module
:
ol
.
L
oadString
(
OptionModule
),
output
:
ol
.
L
oadString
(
OptionOutput
),
cm
:
component
.
DefaultManager
,
out
:
os
.
Stdout
,
...
...
actions/component_rm.go
View file @
a8222540
...
...
@@ -43,8 +43,8 @@ func NewComponentRm(m map[string]interface{}) (*ComponentRm, error) {
ol
:=
newOptionLoader
(
m
)
cr
:=
&
ComponentRm
{
app
:
ol
.
l
oadApp
(),
name
:
ol
.
l
oadString
(
OptionComponentName
),
app
:
ol
.
L
oadApp
(),
name
:
ol
.
L
oadString
(
OptionComponentName
),
componentDeleteFn
:
component
.
Delete
,
}
...
...
actions/current_environment.go
View file @
a8222540
...
...
@@ -26,7 +26,7 @@ type currentEnver interface {
}
func
setCurrentEnv
(
em
environmentMetadata
,
ce
currentEnver
,
ol
*
optionLoader
)
error
{
envName
:=
ol
.
l
oadOptionalString
(
OptionEnvName
)
envName
:=
ol
.
L
oadOptionalString
(
OptionEnvName
)
if
envName
==
""
{
envName
=
em
.
CurrentEnvironment
()
}
...
...
actions/delete.go
View file @
a8222540
...
...
@@ -51,10 +51,10 @@ func newDelete(m map[string]interface{}, opts ...deleteOpt) (*Delete, error) {
ol
:=
newOptionLoader
(
m
)
d
:=
&
Delete
{
app
:
ol
.
l
oadApp
(),
clientConfig
:
ol
.
l
oadClientConfig
(),
componentNames
:
ol
.
l
oadStringSlice
(
OptionComponentNames
),
gracePeriod
:
ol
.
l
oadInt64
(
OptionGracePeriod
),
app
:
ol
.
L
oadApp
(),
clientConfig
:
ol
.
L
oadClientConfig
(),
componentNames
:
ol
.
L
oadStringSlice
(
OptionComponentNames
),
gracePeriod
:
ol
.
L
oadInt64
(
OptionGracePeriod
),
runDeleteFn
:
cluster
.
RunDelete
,
}
...
...
actions/env_add.go
View file @
a8222540
...
...
@@ -47,12 +47,12 @@ func NewEnvAdd(m map[string]interface{}) (*EnvAdd, error) {
ol
:=
newOptionLoader
(
m
)
ea
:=
&
EnvAdd
{
app
:
ol
.
l
oadApp
(),
envName
:
ol
.
l
oadString
(
OptionEnvName
),
server
:
ol
.
l
oadString
(
OptionServer
),
namespace
:
ol
.
l
oadString
(
OptionModule
),
k8sSpecFlag
:
ol
.
l
oadString
(
OptionSpecFlag
),
isOverride
:
ol
.
l
oadBool
(
OptionOverride
),
app
:
ol
.
L
oadApp
(),
envName
:
ol
.
L
oadString
(
OptionEnvName
),
server
:
ol
.
L
oadString
(
OptionServer
),
namespace
:
ol
.
L
oadString
(
OptionModule
),
k8sSpecFlag
:
ol
.
L
oadString
(
OptionSpecFlag
),
isOverride
:
ol
.
L
oadBool
(
OptionOverride
),
envCreateFn
:
env
.
Create
,
}
...
...
actions/env_current.go
View file @
a8222540
...
...
@@ -48,9 +48,9 @@ func newEnvCurrent(m map[string]interface{}) (*EnvCurrent, error) {
ol
:=
newOptionLoader
(
m
)
d
:=
&
EnvCurrent
{
app
:
ol
.
l
oadApp
(),
envName
:
ol
.
l
oadOptionalString
(
OptionEnvName
),
unset
:
ol
.
l
oadBool
(
OptionUnset
),
app
:
ol
.
L
oadApp
(),
envName
:
ol
.
L
oadOptionalString
(
OptionEnvName
),
unset
:
ol
.
L
oadBool
(
OptionUnset
),
out
:
os
.
Stdout
,
}
...
...
actions/env_describe.go
View file @
a8222540
...
...
@@ -46,8 +46,8 @@ func NewEnvDescribe(m map[string]interface{}) (*EnvDescribe, error) {
ol
:=
newOptionLoader
(
m
)
ed
:=
&
EnvDescribe
{
app
:
ol
.
l
oadApp
(),
envName
:
ol
.
l
oadString
(
OptionEnvName
),
app
:
ol
.
L
oadApp
(),
envName
:
ol
.
L
oadString
(
OptionEnvName
),
out
:
os
.
Stdout
,
}
...
...
actions/env_list.go
View file @
a8222540
...
...
@@ -48,8 +48,8 @@ func NewEnvList(m map[string]interface{}) (*EnvList, error) {
ol
:=
newOptionLoader
(
m
)
el
:=
&
EnvList
{
app
:
ol
.
l
oadApp
(),
outputType
:
ol
.
l
oadOptionalString
(
OptionOutput
),
app
:
ol
.
L
oadApp
(),
outputType
:
ol
.
L
oadOptionalString
(
OptionOutput
),
out
:
os
.
Stdout
,
}
...
...
actions/env_rm.go
View file @
a8222540
...
...
@@ -46,9 +46,9 @@ func NewEnvRm(m map[string]interface{}) (*EnvRm, error) {
ol
:=
newOptionLoader
(
m
)
ea
:=
&
EnvRm
{
app
:
ol
.
l
oadApp
(),
envName
:
ol
.
l
oadString
(
OptionEnvName
),
isOverride
:
ol
.
l
oadBool
(
OptionOverride
),
app
:
ol
.
L
oadApp
(),
envName
:
ol
.
L
oadString
(
OptionEnvName
),
isOverride
:
ol
.
L
oadBool
(
OptionOverride
),
envDeleteFn
:
env
.
Delete
,
}
...
...
actions/env_set.go
View file @
a8222540
...
...
@@ -64,10 +64,10 @@ func NewEnvSet(m map[string]interface{}) (*EnvSet, error) {
ol
:=
newOptionLoader
(
m
)
es
:=
&
EnvSet
{
app
:
ol
.
l
oadApp
(),
envName
:
ol
.
l
oadString
(
OptionEnvName
),
newName
:
ol
.
l
oadOptionalString
(
OptionNewEnvName
),
newNsName
:
ol
.
l
oadOptionalString
(
OptionNamespace
),
app
:
ol
.
L
oadApp
(),
envName
:
ol
.
L
oadString
(
OptionEnvName
),
newName
:
ol
.
L
oadOptionalString
(
OptionNewEnvName
),
newNsName
:
ol
.
L
oadOptionalString
(
OptionNamespace
),
envRenameFn
:
env
.
Rename
,
updateEnvFn
:
updateEnv
,
...
...
actions/env_targets.go
View file @
a8222540
...
...
@@ -43,9 +43,9 @@ func NewEnvTargets(m map[string]interface{}) (*EnvTargets, error) {
ol
:=
newOptionLoader
(
m
)
et
:=
&
EnvTargets
{
app
:
ol
.
l
oadApp
(),
envName
:
ol
.
l
oadString
(
OptionEnvName
),
modules
:
ol
.
l
oadStringSlice
(
OptionModule
),
app
:
ol
.
L
oadApp
(),
envName
:
ol
.
L
oadString
(
OptionEnvName
),
modules
:
ol
.
L
oadStringSlice
(
OptionModule
),
cm
:
component
.
DefaultManager
,
}
...
...
actions/import.go
View file @
a8222540
...
...
@@ -57,9 +57,9 @@ func NewImport(m map[string]interface{}) (*Import, error) {
ol
:=
newOptionLoader
(
m
)
i
:=
&
Import
{
app
:
ol
.
l
oadApp
(),
module
:
ol
.
l
oadString
(
OptionModule
),
path
:
ol
.
l
oadString
(
OptionPath
),
app
:
ol
.
L
oadApp
(),
module
:
ol
.
L
oadString
(
OptionModule
),
path
:
ol
.
L
oadString
(
OptionPath
),
cm
:
component
.
DefaultManager
,
}
...
...
actions/init.go
View file @
a8222540
...
...
@@ -64,14 +64,14 @@ func NewInit(m map[string]interface{}) (*Init, error) {
ol
:=
newOptionLoader
(
m
)
i
:=
&
Init
{
fs
:
ol
.
l
oadFs
(
OptionFs
),
name
:
ol
.
l
oadString
(
OptionName
),
rootPath
:
ol
.
l
oadString
(
OptionRootPath
),
envName
:
ol
.
l
oadString
(
OptionEnvName
),
k8sSpecFlag
:
ol
.
l
oadString
(
OptionSpecFlag
),
serverURI
:
ol
.
l
oadOptionalString
(
OptionServer
),
namespace
:
ol
.
l
oadString
(
OptionNamespace
),
skipDefaultRegistries
:
ol
.
l
oadBool
(
OptionSkipDefaultRegistries
),
fs
:
ol
.
L
oadFs
(
OptionFs
),
name
:
ol
.
L
oadString
(
OptionName
),
rootPath
:
ol
.
L
oadString
(
OptionRootPath
),
envName
:
ol
.
L
oadString
(
OptionEnvName
),
k8sSpecFlag
:
ol
.
L
oadString
(
OptionSpecFlag
),
serverURI
:
ol
.
L
oadOptionalString
(
OptionServer
),
namespace
:
ol
.
L
oadString
(
OptionNamespace
),
skipDefaultRegistries
:
ol
.
L
oadBool
(
OptionSkipDefaultRegistries
),