This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 2de2c794f24df9b33f75504e5cd9a92d0db809f9
Author: Mike Dobozy <mdob...@redhat.com>
AuthorDate: Sun Apr 26 12:13:17 2020 -0400
delinting updates.
---
cmd/util/doc-gen/generators/traitmetadatagen.go | 46 ++++++++++++-------------
pkg/cmd/trait_help.go | 24 ++++++-------
2 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/cmd/util/doc-gen/generators/traitmetadatagen.go
b/cmd/util/doc-gen/generators/traitmetadatagen.go
index ca892ae..d1b48a0 100644
--- a/cmd/util/doc-gen/generators/traitmetadatagen.go
+++ b/cmd/util/doc-gen/generators/traitmetadatagen.go
@@ -19,11 +19,11 @@ package generators
import (
"fmt"
+ "gopkg.in/yaml.v2"
"io"
"os"
"path"
"reflect"
- "gopkg.in/yaml.v2"
"strings"
"k8s.io/gengo/args"
@@ -34,34 +34,34 @@ import (
// traitMetaDataGen produces YAML documentation about trait descriptions
type traitMetaDataGen struct {
generator.DefaultGen
- arguments *args.GeneratorArgs
- Root
*traitMetaDataRoot
+ arguments *args.GeneratorArgs
+ Root *traitMetaDataRoot
}
type traitMetaDataRoot struct {
- Traits []traitMetaData `yaml:traits`
+ Traits []traitMetaData `yaml:"traits"`
}
type traitMetaData struct {
- Name string
`yaml:"name"`
- Platform bool
`yaml:platform`
- Profiles []string
`yaml:profiles`
- Description string `yaml:"description"`
- Properties []traitPropertyMetaData
`yaml:"properties"`
+ Name string `yaml:"name"`
+ Platform bool `yaml:"platform"`
+ Profiles []string `yaml:"profiles"`
+ Description string `yaml:"description"`
+ Properties []traitPropertyMetaData `yaml:"properties"`
}
type traitPropertyMetaData struct {
- Name string
`yaml:"name"`
- TypeName string
`yaml:"type"`
- Description string
`yaml:"description"`
+ Name string `yaml:"name"`
+ TypeName string `yaml:"type"`
+ Description string `yaml:"description"`
}
// NewtraitMetaDataGen --
func NewtraitMetaDataGen(arguments *args.GeneratorArgs) generator.Generator {
- return &traitMetaDataGen {
+ return &traitMetaDataGen{
DefaultGen: generator.DefaultGen{},
arguments: arguments,
- Root: &traitMetaDataRoot{},
+ Root: &traitMetaDataRoot{},
}
}
@@ -82,7 +82,7 @@ func (g *traitMetaDataGen) GenerateType(context
*generator.Context, t *types.Typ
traitID := g.getTraitID(t)
td := &traitMetaData{}
g.buildDescription(t, traitID, td)
- g.buildFields(t, traitID, td)
+ g.buildFields(t, td)
g.Root.Traits = append(g.Root.Traits, *td)
return nil
}
@@ -104,10 +104,10 @@ func (g *traitMetaDataGen) Finalize(c *generator.Context,
w io.Writer) error {
defer file.Close()
data, err := yaml.Marshal(g.Root)
- if err != nil {
- fmt.Fprintf(file, "error: %v", err)
- }
- fmt.Fprintf(file, "%s", string(data))
+ if err != nil {
+ fmt.Fprintf(file, "error: %v", err)
+ }
+ fmt.Fprintf(file, "%s", string(data))
return nil
}
@@ -133,20 +133,20 @@ func (g *traitMetaDataGen) buildDescription(t
*types.Type, traitID string, td *t
td.Platform = isPlatformTrait(traitID)
}
-func (g *traitMetaDataGen) buildFields(t *types.Type, traitID string, td
*traitMetaData) {
+func (g *traitMetaDataGen) buildFields(t *types.Type, td *traitMetaData) {
if len(t.Members) > 1 {
var res = []string(nil)
- g.buildMembers(t, traitID, &res, td)
+ g.buildMembers(t, &res, td)
}
}
-func (g *traitMetaDataGen) buildMembers(t *types.Type, traitID string, content
*[]string, td *traitMetaData) {
+func (g *traitMetaDataGen) buildMembers(t *types.Type, content *[]string, td
*traitMetaData) {
for _, m := range t.Members {
res := append([]string(nil), *content...)
prop := reflect.StructTag(m.Tags).Get("property")
if prop != "" {
if strings.Contains(prop, "squash") {
- g.buildMembers(m.Type, traitID, &res, td)
+ g.buildMembers(m.Type, &res, td)
} else {
pd := traitPropertyMetaData{}
pd.Name = prop
diff --git a/pkg/cmd/trait_help.go b/pkg/cmd/trait_help.go
index 9669fb2..1df82e1 100644
--- a/pkg/cmd/trait_help.go
+++ b/pkg/cmd/trait_help.go
@@ -25,8 +25,8 @@ import (
"reflect"
"strings"
- "github.com/apache/camel-k/pkg/util/indentedwriter"
"github.com/apache/camel-k/deploy"
+ "github.com/apache/camel-k/pkg/util/indentedwriter"
"github.com/fatih/structs"
"gopkg.in/yaml.v2"
@@ -71,11 +71,11 @@ type traitHelpCommandOptions struct {
}
type traitDescription struct {
- Name trait.ID `json:"name" yaml:"name"`
- Platform bool `json:"platform"
yaml:"platform"`
- Profiles []string `json:"profiles"
yaml:"profiles"`
- Properties []traitPropertyDescription `json:"properties"
yaml:"properties"`
- Description string `json:"description"
yaml:"description"`
+ Name trait.ID `json:"name" yaml:"name"`
+ Platform bool `json:"platform" yaml:"platform"`
+ Profiles []string `json:"profiles" yaml:"profiles"`
+ Properties []traitPropertyDescription `json:"properties"
yaml:"properties"`
+ Description string `json:"description"
yaml:"description"`
}
type traitPropertyDescription struct {
@@ -86,7 +86,7 @@ type traitPropertyDescription struct {
}
type traitMetaData struct {
- Traits []traitDescription
`yaml:traits`
+ Traits []traitDescription `yaml:"traits"`
}
func (command *traitHelpCommandOptions) validate(args []string) error {
@@ -107,7 +107,7 @@ func (command *traitHelpCommandOptions) run(cmd
*cobra.Command, args []string) e
err := yaml.Unmarshal(deploy.Resource("/traits.yaml"), traitMetaData)
if err != nil {
return err
- }
+ }
res, err := yaml.Marshal(traitMetaData)
if err != nil {
return err
@@ -131,12 +131,12 @@ func (command *traitHelpCommandOptions) run(cmd
*cobra.Command, args []string) e
var targetTrait *traitDescription
for _, item := range traitMetaData.Traits {
- if item.Name == t.ID() {
+ if item.Name == t.ID() {
targetTrait = &item
td.Description =
item.Description
break
- }
- }
+ }
+ }
computeTraitProperties(structs.Fields(t),
&td.Properties, targetTrait)
traitDescriptions = append(traitDescriptions,
td)
}
@@ -224,7 +224,7 @@ func computeTraitProperties(fields []*structs.Field,
properties *[]traitProperty
}
// apply the description from metadata
- if (targetTrait != nil) {
+ if targetTrait != nil {
for _, item := range targetTrait.Properties {
if item.Name == tp.Name {
tp.Description = item.Description
