Skip to content
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.

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

Clarify new-app messages #11220

Merged
merged 1 commit into from
Oct 19, 2016
Merged

Conversation

jim-minter
Copy link
Contributor

fixes #10462

Suggested message change to:

Deploying template "[openshift/]logging-deployer-template" in project MY_CURRENT_PROJECT

Copy link
Contributor

@csrwng csrwng left a comment

Choose a reason for hiding this comment

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

Just one small change ... we should let go fmt handle the quotes.

if len(meta.Namespace) == 0 || namespace == meta.Namespace {
return meta.Name
if len(meta.Namespace) == 0 {
return fmt.Sprintf(`"%s"`, meta.Name)
Copy link
Contributor

Choose a reason for hiding this comment

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

just return the string without the quotes

}
return fmt.Sprintf("%q in project %q", meta.Name, meta.Namespace)
return fmt.Sprintf(`"%s/%s"`, meta.Namespace, meta.Name)
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

} else {
fmt.Fprintf(out, "--> Deploying template %s\n", qualifiedName)
fmt.Fprintf(out, "--> Deploying template %s to project %s\n", qualifiedName, baseNamespace)
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

@@ -50,9 +50,9 @@ func TransformTemplate(tpl *templateapi.Template, client client.TemplateConfigsN
func DescribeGeneratedTemplate(out io.Writer, input string, result *templateapi.Template, baseNamespace string) {
qualifiedName := localOrRemoteName(result.ObjectMeta, baseNamespace)
if len(input) > 0 && result.ObjectMeta.Name != input {
fmt.Fprintf(out, "--> Deploying template %s for %q\n", qualifiedName, input)
fmt.Fprintf(out, "--> Deploying template %s for %q to project %s\n", qualifiedName, input, baseNamespace)
Copy link
Contributor

Choose a reason for hiding this comment

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

quote here:
Deploying template %q for ...

@jim-minter
Copy link
Contributor Author

OK, done.

@csrwng
Copy link
Contributor

csrwng commented Oct 11, 2016

thx, LGTM
[test]

@jim-minter
Copy link
Contributor Author

jim-minter commented Oct 12, 2016

flake #8571
[test]

@csrwng
Copy link
Contributor

csrwng commented Oct 12, 2016

[merge]

@jim-minter
Copy link
Contributor Author

rebased and squashed
[test]

@jim-minter
Copy link
Contributor Author

flake #11240
flake #10487

@csrwng
Copy link
Contributor

csrwng commented Oct 17, 2016

[merge]

@csrwng
Copy link
Contributor

csrwng commented Oct 18, 2016

flake #11240
flake #10487
[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 76dd1c4

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10165/) (Base Commit: 3ed3b35)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 76dd1c4

@openshift-bot
Copy link
Contributor

openshift-bot commented Oct 19, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10223/) (Base Commit: e3a2814) (Image: devenv-rhel7_5200)

@openshift-bot openshift-bot merged commit 852f1fe into openshift:master Oct 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

new-app template message is misleading
3 participants