Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

server.rb: fixes incorrect error output and additional input validation #707

Merged
merged 1 commit into from
Oct 26, 2015

Conversation

thrasher-redhat
Copy link
Contributor

Bug 1155003
Bugzilla link https://bugzilla.redhat.com/show_bug.cgi?id=1155003
Changes usage messages to include --ssl-client-key-file option, which was previously missing.

The rhc server add command also requires all three of --ssl-ca-file, --ssl-client-cert-file, and ssl-client-key-file and will now raise an error if only 1 or 2 of the 3 are present.

@tiwillia
Copy link
Member

[test]

@openshift-bot
Copy link

@tiwillia
Copy link
Member

It looks like the test failures here are also unrelated and due to the same gherkin3 issue as #708

Gem::InstallError: gherkin3 requires Ruby version >= 1.9.3.

An error occurred while installing gherkin3 (3.1.2), and Bundler cannot

continue.

Make sure that `gem install gherkin3 -v '3.1.2'` succeeds before bundling.

A requirement of a gem likely added the requirement of gherkin3. I beleive gherkin2 was used previously, which worked fine with ruby-1.8.7

Bug 1155003
Bugzilla link https://bugzilla.redhat.com/show_bug.cgi?id=1155003
Changes usage messages to include --ssl-client-key-file option, which was previously missing.

The rhc server add command also requires all three of --ssl-ca-file, --ssl-client-cert-file, and ssl-client-key-file and will now raise an error if only 1 or 2 of the 3 are present.  Adds corresponding spec test.
@openshift-bot
Copy link

Evaluated for online test up to 04fd726

@tiwillia
Copy link
Member

This should be good to [merge]

@Miciah
Copy link
Contributor

Miciah commented Oct 22, 2015

openshift-bot, please [merge]!

@openshift-bot
Copy link

Online Merge Results: SUCCESS (https://ci.dev.openshift.redhat.com/jenkins/job/merge_pull_requests/6596/) (Image: devenv_5683)

@openshift-bot
Copy link

Evaluated for online merge up to 04fd726

openshift-bot pushed a commit that referenced this pull request Oct 26, 2015
@openshift-bot openshift-bot merged commit 69a2fce into openshift:master Oct 26, 2015
@thrasher-redhat thrasher-redhat deleted the bug1155003 branch October 26, 2015 20:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants