Skip to content

Fix docs YAML generation setting "kubernetes" for "swarm" #802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 1 commit into from
Jan 11, 2018
Merged

Fix docs YAML generation setting "kubernetes" for "swarm" #802

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/yaml/yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func GenYamlCustom(cmd *cobra.Command, w io.Writer) error {
cliDoc.Kubernetes = true
}
if _, ok := curr.Annotations["swarm"]; ok && !cliDoc.Swarm {
cliDoc.Kubernetes = true
cliDoc.Swarm = true

@dnephin dnephin Jan 11, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something still looks weird here.

It shouldn't need to check !cliDoc.Swarm because if it's true, setting it to true again doesn't hurt. Is this just an unnecessary statement that can be removed?

I guess all the checks above are the same, so maybe it was just copied?

@thaJeztah thaJeztah Jan 11, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, was looking at that as well, but didn't want to change without going through the whole logic. I can look at it for a follow-up 👍

}
}

Expand Down Expand Up @@ -208,7 +208,7 @@ func genFlagResult(flags *pflag.FlagSet) []cmdOption {
opt.Kubernetes = true
}
if _, ok := flag.Annotations["swarm"]; ok {
opt.Kubernetes = true
opt.Swarm = true
}

result = append(result, opt)
Expand Down