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
6dd9d1ff
Commit
6dd9d1ff
authored
Jun 21, 2018
by
David Eads
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix printer check to tolerate vendoring
parent
23b4690d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
46 deletions
+50
-46
cmd_printing_test.go
pkg/kubectl/cmd/cmd_printing_test.go
+49
-45
sourcechecker.go
pkg/kubectl/genericclioptions/printers/sourcechecker.go
+1
-1
No files found.
pkg/kubectl/cmd/cmd_printing_test.go
View file @
6dd9d1ff
...
@@ -83,39 +83,41 @@ func TestIllegalPackageSourceCheckerThroughPrintFlags(t *testing.T) {
...
@@ -83,39 +83,41 @@ func TestIllegalPackageSourceCheckerThroughPrintFlags(t *testing.T) {
}
}
for
_
,
tc
:=
range
testCases
{
for
_
,
tc
:=
range
testCases
{
printFlags
:=
genericclioptions
.
NewPrintFlags
(
"succeeded"
)
.
WithTypeSetter
(
scheme
.
Scheme
)
t
.
Run
(
tc
.
name
,
func
(
t
*
testing
.
T
)
{
printFlags
.
OutputFormat
=
&
tc
.
output
printFlags
:=
genericclioptions
.
NewPrintFlags
(
"succeeded"
)
.
WithTypeSetter
(
scheme
.
Scheme
)
printFlags
.
OutputFormat
=
&
tc
.
output
printer
,
err
:=
printFlags
.
ToPrinter
()
printer
,
err
:=
printFlags
.
ToPrinter
()
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"unexpected error %v"
,
err
)
}
output
:=
bytes
.
NewBuffer
([]
byte
{})
err
=
printer
.
PrintObj
(
tc
.
obj
,
output
)
if
err
!=
nil
{
if
!
tc
.
expectInternalObjErr
{
t
.
Fatalf
(
"unexpected error %v"
,
err
)
t
.
Fatalf
(
"unexpected error %v"
,
err
)
}
}
if
!
genericprinters
.
IsInternalObjectError
(
err
)
{
output
:=
bytes
.
NewBuffer
([]
byte
{})
t
.
Fatalf
(
"unexpected error - expecting internal object printer error, got %q"
,
err
)
err
=
printer
.
PrintObj
(
tc
.
obj
,
output
)
if
err
!=
nil
{
if
!
tc
.
expectInternalObjErr
{
t
.
Fatalf
(
"unexpected error %v"
,
err
)
}
if
!
genericprinters
.
IsInternalObjectError
(
err
)
{
t
.
Fatalf
(
"unexpected error - expecting internal object printer error, got %q"
,
err
)
}
return
}
}
continue
}
if
tc
.
expectInternalObjErr
{
if
tc
.
expectInternalObjErr
{
t
.
Fatalf
(
"expected internal object printer error, but got no error"
)
t
.
Fatalf
(
"expected internal object printer error, but got no error"
)
}
}
if
len
(
tc
.
expectedOutput
)
==
0
{
if
len
(
tc
.
expectedOutput
)
==
0
{
continue
return
}
}
if
tc
.
expectedOutput
!=
output
.
String
()
{
if
tc
.
expectedOutput
!=
output
.
String
()
{
t
.
Fatalf
(
"unexpected output: expecting %q, got %q"
,
tc
.
expectedOutput
,
output
.
String
())
t
.
Fatalf
(
"unexpected output: expecting %q, got %q"
,
tc
.
expectedOutput
,
output
.
String
())
}
}
})
}
}
}
}
...
@@ -181,31 +183,33 @@ func TestIllegalPackageSourceCheckerDirectlyThroughPrinters(t *testing.T) {
...
@@ -181,31 +183,33 @@ func TestIllegalPackageSourceCheckerDirectlyThroughPrinters(t *testing.T) {
}
}
for
_
,
tc
:=
range
testCases
{
for
_
,
tc
:=
range
testCases
{
output
:=
bytes
.
NewBuffer
([]
byte
{})
t
.
Run
(
tc
.
name
,
func
(
t
*
testing
.
T
)
{
output
:=
bytes
.
NewBuffer
([]
byte
{})
err
:=
tc
.
printer
.
PrintObj
(
tc
.
obj
,
output
)
if
err
!=
nil
{
err
:=
tc
.
printer
.
PrintObj
(
tc
.
obj
,
output
)
if
!
tc
.
expectInternalObjErr
{
if
err
!=
nil
{
t
.
Fatalf
(
"unexpected error %v"
,
err
)
if
!
tc
.
expectInternalObjErr
{
t
.
Fatalf
(
"unexpected error %v"
,
err
)
}
if
!
genericprinters
.
IsInternalObjectError
(
err
)
{
t
.
Fatalf
(
"unexpected error - expecting internal object printer error, got %q"
,
err
)
}
return
}
}
if
!
genericprinters
.
IsInternalObjectError
(
err
)
{
if
tc
.
expectInternalObjErr
{
t
.
Fatalf
(
"
unexpected error - expecting internal object printer error, got %q"
,
err
)
t
.
Fatalf
(
"
expected internal object printer error, but got no error"
)
}
}
continue
}
if
tc
.
expectInternalObjErr
{
if
len
(
tc
.
expectedOutput
)
==
0
{
t
.
Fatalf
(
"expected internal object printer error, but got no error"
)
return
}
}
if
len
(
tc
.
expectedOutput
)
==
0
{
continue
}
if
tc
.
expectedOutput
!=
output
.
String
()
{
if
tc
.
expectedOutput
!=
output
.
String
()
{
t
.
Fatalf
(
"unexpected output: expecting %q, got %q"
,
tc
.
expectedOutput
,
output
.
String
())
t
.
Fatalf
(
"unexpected output: expecting %q, got %q"
,
tc
.
expectedOutput
,
output
.
String
())
}
}
})
}
}
}
}
...
...
pkg/kubectl/genericclioptions/printers/sourcechecker.go
View file @
6dd9d1ff
...
@@ -51,7 +51,7 @@ type illegalPackageSourceChecker struct {
...
@@ -51,7 +51,7 @@ type illegalPackageSourceChecker struct {
func
(
c
*
illegalPackageSourceChecker
)
IsForbidden
(
pkgPath
string
)
bool
{
func
(
c
*
illegalPackageSourceChecker
)
IsForbidden
(
pkgPath
string
)
bool
{
for
_
,
forbiddenPrefix
:=
range
c
.
disallowedPrefixes
{
for
_
,
forbiddenPrefix
:=
range
c
.
disallowedPrefixes
{
if
strings
.
HasPrefix
(
pkgPath
,
forbiddenPrefix
)
{
if
strings
.
HasPrefix
(
pkgPath
,
forbiddenPrefix
)
||
strings
.
Contains
(
pkgPath
,
"/vendor/"
+
forbiddenPrefix
)
{
return
true
return
true
}
}
}
}
...
...
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