Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
aa454fea
Commit
aa454fea
authored
Jul 31, 2014
by
Daniel Smith
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #711 from smarterclayton/more_info_about_format_conversion_error
More verbose error on missing field
parents
b88c2a21
7ce23e43
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
3 deletions
+32
-3
converter.go
pkg/api/converter.go
+3
-3
converter_test.go
pkg/api/converter_test.go
+29
-0
No files found.
pkg/api/converter.go
View file @
aa454fea
...
@@ -141,11 +141,11 @@ func (c *Converter) convert(sv, dv reflect.Value) error {
...
@@ -141,11 +141,11 @@ func (c *Converter) convert(sv, dv reflect.Value) error {
case
reflect
.
Struct
:
case
reflect
.
Struct
:
for
i
:=
0
;
i
<
dt
.
NumField
();
i
++
{
for
i
:=
0
;
i
<
dt
.
NumField
();
i
++
{
f
:=
dv
.
Type
()
.
Field
(
i
)
f
:=
dv
.
Type
()
.
Field
(
i
)
df
:=
dv
.
FieldByName
(
f
.
Name
)
sf
:=
sv
.
FieldByName
(
f
.
Name
)
sf
:=
sv
.
FieldByName
(
f
.
Name
)
if
!
df
.
IsValid
()
||
!
sf
.
IsValid
()
{
if
!
sf
.
IsValid
()
{
return
fmt
.
Errorf
(
"%v not present in source
and dest."
,
f
.
Name
)
return
fmt
.
Errorf
(
"%v not present in source
%v for dest %v"
,
f
.
Name
,
sv
.
Type
(),
dv
.
Type
()
)
}
}
df
:=
dv
.
Field
(
i
)
if
err
:=
c
.
convert
(
sf
,
df
);
err
!=
nil
{
if
err
:=
c
.
convert
(
sf
,
df
);
err
!=
nil
{
return
err
return
err
}
}
...
...
pkg/api/converter_test.go
View file @
aa454fea
...
@@ -79,3 +79,32 @@ func TestConverter(t *testing.T) {
...
@@ -79,3 +79,32 @@ func TestConverter(t *testing.T) {
t
.
Errorf
(
"unexpected non-error"
)
t
.
Errorf
(
"unexpected non-error"
)
}
}
}
}
func
anonymousEmptyTypeNamedA
()
interface
{}
{
type
A
struct
{}
return
&
A
{}
}
func
TestCopyConvertor
(
t
*
testing
.
T
)
{
type
A
struct
{
Bar
string
}
type
B
struct
{
Bar
string
}
c
:=
NewConverter
()
err
:=
c
.
Convert
(
anonymousEmptyTypeNamedA
(),
&
A
{})
if
err
==
nil
{
t
.
Errorf
(
"unexpected non-error"
)
}
err
=
c
.
Convert
(
&
A
{},
anonymousEmptyTypeNamedA
())
if
err
!=
nil
{
t
.
Fatalf
(
"unexpected error %v"
,
err
)
}
err
=
c
.
Convert
(
&
B
{},
&
A
{})
if
err
==
nil
{
t
.
Errorf
(
"unexpected non-error"
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment