-
Notifications
You must be signed in to change notification settings - Fork 24.3k
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
Add cloudId builder to the HLRC #47868
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -56,6 +56,7 @@ | |||||
import java.net.URISyntaxException; | ||||||
import java.util.ArrayList; | ||||||
import java.util.Arrays; | ||||||
import java.util.Base64; | ||||||
import java.util.Collection; | ||||||
import java.util.Collections; | ||||||
import java.util.HashMap; | ||||||
|
@@ -119,6 +120,32 @@ public class RestClient implements Closeable { | |||||
setNodes(nodes); | ||||||
} | ||||||
|
||||||
/** | ||||||
* Returns a new {@link RestClientBuilder} to help with {@link RestClient} creation. | ||||||
* Creates a new builder instance and sets the nodes that the client will send requests to. | ||||||
* | ||||||
* @param cloudId a valid elastic cloud cloudId that will route to a cluster | ||||||
*/ | ||||||
public static RestClientBuilder builder(String cloudId) { | ||||||
// there is an optional first portion of the cloudId that is a human readable string, but it is not used. | ||||||
if (cloudId.contains(":")) { | ||||||
if (cloudId.indexOf(":") == cloudId.length() - 1) { | ||||||
throw new IllegalStateException("cloudId " + cloudId + " is invalid"); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
} | ||||||
cloudId = cloudId.substring(cloudId.indexOf(":") + 1); | ||||||
} | ||||||
|
||||||
String decoded = new String(Base64.getDecoder().decode(cloudId)); | ||||||
// once decoded the parts are separated by a $ character | ||||||
String[] decodedParts = decoded.split("\\$"); | ||||||
if (decodedParts.length != 3) { | ||||||
throw new IllegalStateException("cloudId " + cloudId + " did not contain the correct number of parts"); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This error will be really confusing for users who have no idea that cloudIds contain multiple parts, or that they are even encoded at all. Maybe we can change it to something like: "clouldId ... is invalid and does not decode to a cluster identifier correctly" There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. well the cloudID is masked for the user. It would be a copy/paste issue since these are generated and displayed in the UI for a user. But i can change it for sure. |
||||||
} | ||||||
|
||||||
String url = decodedParts[1] + "." + decodedParts[0]; | ||||||
return builder(new HttpHost(url, 443, "https")); | ||||||
} | ||||||
|
||||||
/** | ||||||
* Returns a new {@link RestClientBuilder} to help with {@link RestClient} creation. | ||||||
* Creates a new builder instance and sets the hosts that the client will send requests to. | ||||||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think adding an example of what a cloudId looks like to the javadoc would help for people who don't know what that is.