This repository has been archived by the owner on Mar 22, 2023. It is now read-only.
Support multiple hostnames #154
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shamsimam
reviewed
Oct 10, 2017
waiter/src/waiter/core.clj
Outdated
| hostnames (if (sequential? hostname) | ||
| (clojure.set/union (set hostname) | ||
| #{waiter-router-hostname waiter-router-ip}) | ||
| (set [hostname waiter-router-hostname waiter-router-ip]))] |
There was a problem hiding this comment.
Nitpick: Can we use the set literal here?
waiter/src/waiter/core.clj
Outdated
| (waiter-request?-factory (set [hostname waiter-router-hostname waiter-router-ip])))) | ||
| waiter-router-ip (.getHostAddress local-router) | ||
| hostnames (if (sequential? hostname) | ||
| (clojure.set/union (set hostname) |
There was a problem hiding this comment.
clojure.set is already imported, we can just do set/union
| waiter-router-ip (.getHostAddress local-router)] | ||
| (waiter-request?-factory (set [hostname waiter-router-hostname waiter-router-ip])))) | ||
| waiter-router-ip (.getHostAddress local-router) | ||
| hostnames (if (sequential? hostname) |
There was a problem hiding this comment.
+1 on use of sequential?
| @@ -1099,3 +1099,14 @@ | |||
|
|
|||
| (testing "require-authentication" | |||
| (is (= {:source :spnego-handler} (request-handler {:headers {}}))))))) | |||
|
|
|||
| (deftest test-waiter-request?-fn | |||
There was a problem hiding this comment.
The test should also include negative scenarios, e.g. (is (not (waiter-request?-fn {:headers {"host" "waiter-host-1"}}))) in the first testing block.
waiter/test/waiter/core_test.clj
Outdated
| (let [config {:settings {:hostname "waiter-host"}} | ||
| waiter-request?-fn ((:waiter-request?-fn routines) config)] | ||
| (is (waiter-request?-fn {:headers {"host" "waiter-host"}})))) | ||
| (testing "list hostname config" |
There was a problem hiding this comment.
Nitpick: separate these two testing blocks with a whitepsace.
shamsimam
approved these changes
Oct 10, 2017
shamsimam
approved these changes
Oct 10, 2017
|
Why did we merge before a passing build? |
sradack
reviewed
Oct 11, 2017
| @@ -700,8 +700,12 @@ | |||
| :waiter-request?-fn (pc/fnk [[:settings hostname]] | |||
There was a problem hiding this comment.
This isn't the only place hostname is used.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.