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
05a461c1
Commit
05a461c1
authored
Oct 31, 2018
by
Vikranth Thati
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for the 'kubectl explain crd --recursive' goes into an infinite loop issue
parent
03a145de
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
113 additions
and
1 deletion
+113
-1
BUILD
pkg/kubectl/explain/BUILD
+4
-1
recursive_fields_printer.go
pkg/kubectl/explain/recursive_fields_printer.go
+6
-0
recursive_fields_printer_test.go
pkg/kubectl/explain/recursive_fields_printer_test.go
+40
-0
test-recursive-swagger.json
pkg/kubectl/explain/test-recursive-swagger.json
+63
-0
No files found.
pkg/kubectl/explain/BUILD
View file @
05a461c1
...
@@ -46,7 +46,10 @@ go_test(
...
@@ -46,7 +46,10 @@ go_test(
"recursive_fields_printer_test.go",
"recursive_fields_printer_test.go",
"typename_test.go",
"typename_test.go",
],
],
data = ["test-swagger.json"],
data = [
"test-recursive-swagger.json",
"test-swagger.json",
],
embed = [":go_default_library"],
embed = [":go_default_library"],
deps = [
deps = [
"//pkg/kubectl/cmd/util/openapi/testing:go_default_library",
"//pkg/kubectl/cmd/util/openapi/testing:go_default_library",
...
...
pkg/kubectl/explain/recursive_fields_printer.go
View file @
05a461c1
...
@@ -30,6 +30,7 @@ type recursiveFieldsPrinter struct {
...
@@ -30,6 +30,7 @@ type recursiveFieldsPrinter struct {
var
_
proto
.
SchemaVisitor
=
&
recursiveFieldsPrinter
{}
var
_
proto
.
SchemaVisitor
=
&
recursiveFieldsPrinter
{}
var
_
fieldsPrinter
=
&
recursiveFieldsPrinter
{}
var
_
fieldsPrinter
=
&
recursiveFieldsPrinter
{}
var
visitedReferences
=
map
[
string
]
struct
{}{}
// VisitArray is just a passthrough.
// VisitArray is just a passthrough.
func
(
f
*
recursiveFieldsPrinter
)
VisitArray
(
a
*
proto
.
Array
)
{
func
(
f
*
recursiveFieldsPrinter
)
VisitArray
(
a
*
proto
.
Array
)
{
...
@@ -64,7 +65,12 @@ func (f *recursiveFieldsPrinter) VisitPrimitive(p *proto.Primitive) {
...
@@ -64,7 +65,12 @@ func (f *recursiveFieldsPrinter) VisitPrimitive(p *proto.Primitive) {
// VisitReference is just a passthrough.
// VisitReference is just a passthrough.
func
(
f
*
recursiveFieldsPrinter
)
VisitReference
(
r
proto
.
Reference
)
{
func
(
f
*
recursiveFieldsPrinter
)
VisitReference
(
r
proto
.
Reference
)
{
if
_
,
ok
:=
visitedReferences
[
r
.
Reference
()];
ok
{
return
}
visitedReferences
[
r
.
Reference
()]
=
struct
{}{}
r
.
SubSchema
()
.
Accept
(
f
)
r
.
SubSchema
()
.
Accept
(
f
)
delete
(
visitedReferences
,
r
.
Reference
())
}
}
// PrintFields will recursively print all the fields for the given
// PrintFields will recursively print all the fields for the given
...
...
pkg/kubectl/explain/recursive_fields_printer_test.go
View file @
05a461c1
...
@@ -21,6 +21,7 @@ import (
...
@@ -21,6 +21,7 @@ import (
"testing"
"testing"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/schema"
tst
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing"
)
)
func
TestRecursiveFields
(
t
*
testing
.
T
)
{
func
TestRecursiveFields
(
t
*
testing
.
T
)
{
...
@@ -59,3 +60,42 @@ field2 <[]map[string]string>
...
@@ -59,3 +60,42 @@ field2 <[]map[string]string>
t
.
Errorf
(
"Got:
\n
%v
\n
Want:
\n
%v
\n
"
,
buf
.
String
(),
want
)
t
.
Errorf
(
"Got:
\n
%v
\n
Want:
\n
%v
\n
"
,
buf
.
String
(),
want
)
}
}
}
}
func
TestRecursiveFieldsWithSelfReferenceObjects
(
t
*
testing
.
T
)
{
var
resources
=
tst
.
NewFakeResources
(
"test-recursive-swagger.json"
)
schema
:=
resources
.
LookupResource
(
schema
.
GroupVersionKind
{
Group
:
""
,
Version
:
"v2"
,
Kind
:
"OneKind"
,
})
if
schema
==
nil
{
t
.
Fatal
(
"Couldn't find schema v2.OneKind"
)
}
want
:=
`field1 <Object>
referencefield <Object>
referencesarray <[]Object>
field2 <Object>
reference <Object>
referencefield <Object>
referencesarray <[]Object>
string <string>
`
buf
:=
bytes
.
Buffer
{}
f
:=
Formatter
{
Writer
:
&
buf
,
Wrap
:
80
,
}
s
,
err
:=
LookupSchemaForField
(
schema
,
[]
string
{})
if
err
!=
nil
{
t
.
Fatalf
(
"Invalid path %v: %v"
,
[]
string
{},
err
)
}
if
err
:=
(
fieldsPrinterBuilder
{
Recursive
:
true
})
.
BuildFieldsPrinter
(
&
f
)
.
PrintFields
(
s
);
err
!=
nil
{
t
.
Fatalf
(
"Failed to print fields: %v"
,
err
)
}
got
:=
buf
.
String
()
if
got
!=
want
{
t
.
Errorf
(
"Got:
\n
%v
\n
Want:
\n
%v
\n
"
,
buf
.
String
(),
want
)
}
}
pkg/kubectl/explain/test-recursive-swagger.json
0 → 100644
View file @
05a461c1
{
"swagger"
:
"2.0"
,
"info"
:
{
"title"
:
"Kubernetes"
,
"version"
:
"v1.9.0"
},
"paths"
:
{},
"definitions"
:
{
"OneKind"
:
{
"description"
:
"OneKind has a short description"
,
"required"
:
[
"field1"
],
"properties"
:
{
"field1"
:
{
"description"
:
"This is first reference field"
,
"$ref"
:
"#/definitions/ReferenceKind"
},
"field2"
:
{
"description"
:
"This is other kind field with string and reference"
,
"$ref"
:
"#/definitions/OtherKind"
}
},
"x-kubernetes-group-version-kind"
:
[
{
"group"
:
""
,
"kind"
:
"OneKind"
,
"version"
:
"v2"
}
]
},
"ReferenceKind"
:
{
"description"
:
"This is reference Kind"
,
"properties"
:
{
"referencefield"
:
{
"description"
:
"This is reference to itself."
,
"$ref"
:
"#/definitions/ReferenceKind"
},
"referencesarray"
:
{
"description"
:
"This is an array of references"
,
"type"
:
"array"
,
"items"
:
{
"description"
:
"This is reference object"
,
"$ref"
:
"#/definitions/ReferenceKind"
}
}
}
},
"OtherKind"
:
{
"description"
:
"This is other kind with string and reference fields"
,
"properties"
:
{
"string"
:
{
"description"
:
"This string must be a string"
,
"type"
:
"string"
},
"reference"
:
{
"description"
:
"This is reference field."
,
"$ref"
:
"#/definitions/ReferenceKind"
}
}
}
}
}
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