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
c4291993
Commit
c4291993
authored
Jan 05, 2017
by
mbohlool
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Generate inlined member's OpenAPI definitions
parent
6b702115
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
15 deletions
+35
-15
openapi.go
cmd/libs/go2idl/openapi-gen/generators/openapi.go
+35
-15
No files found.
cmd/libs/go2idl/openapi-gen/generators/openapi.go
View file @
c4291993
...
...
@@ -236,6 +236,11 @@ func getReferableName(m *types.Member) string {
}
}
func
shouldInlineMembers
(
m
*
types
.
Member
)
bool
{
jsonTags
:=
getJsonTags
(
m
)
return
len
(
jsonTags
)
>
1
&&
jsonTags
[
1
]
==
"inline"
}
type
openAPITypeWriter
struct
{
*
generator
.
SnippetWriter
refTypes
map
[
string
]
*
types
.
Type
...
...
@@ -271,6 +276,33 @@ func typeShortName(t *types.Type) string {
return
filepath
.
Base
(
t
.
Name
.
Package
)
+
"."
+
t
.
Name
.
Name
}
func
(
g
openAPITypeWriter
)
generateMembers
(
t
*
types
.
Type
,
required
[]
string
)
([]
string
,
error
)
{
var
err
error
for
_
,
m
:=
range
t
.
Members
{
if
hasOpenAPITagValue
(
m
.
CommentLines
,
tagValueFalse
)
{
continue
}
if
shouldInlineMembers
(
&
m
)
{
required
,
err
=
g
.
generateMembers
(
m
.
Type
,
required
)
if
err
!=
nil
{
return
required
,
err
}
continue
}
name
:=
getReferableName
(
&
m
)
if
name
==
""
{
continue
}
if
!
hasOptionalTag
(
&
m
)
{
required
=
append
(
required
,
name
)
}
if
err
=
g
.
generateProperty
(
&
m
);
err
!=
nil
{
return
required
,
err
}
}
return
required
,
nil
}
func
(
g
openAPITypeWriter
)
generate
(
t
*
types
.
Type
)
error
{
// Only generate for struct type and ignore the rest
switch
t
.
Kind
{
...
...
@@ -284,21 +316,9 @@ func (g openAPITypeWriter) generate(t *types.Type) error {
g
.
Do
(
"{
\n
Schema: spec.Schema{
\n
SchemaProps: spec.SchemaProps{
\n
"
,
nil
)
g
.
generateDescription
(
t
.
CommentLines
)
g
.
Do
(
"Properties: map[string]$.SpecSchemaType|raw${
\n
"
,
args
)
required
:=
[]
string
{}
for
_
,
m
:=
range
t
.
Members
{
if
hasOpenAPITagValue
(
m
.
CommentLines
,
tagValueFalse
)
{
continue
}
name
:=
getReferableName
(
&
m
)
if
name
==
""
{
continue
}
if
!
hasOptionalTag
(
&
m
)
{
required
=
append
(
required
,
name
)
}
if
err
:=
g
.
generateProperty
(
&
m
);
err
!=
nil
{
return
err
}
required
,
err
:=
g
.
generateMembers
(
t
,
[]
string
{})
if
err
!=
nil
{
return
err
}
g
.
Do
(
"},
\n
"
,
nil
)
if
len
(
required
)
>
0
{
...
...
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