Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

bug fix for JENKINS-6063: endpoint is not a valid URL when doing 'check AMI' with UEC #2

Closed
wants to merge 3 commits into from

2 participants

@wselwood
Collaborator

http://issues.jenkins-ci.org/browse/JENKINS-6063

Solved by changing the String ec2EndpointUrl to be a AwsRegion region

@kohsuke
Owner

Merged. I've also gave you the commit access.

This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 1, 2011
  1. @wselwood
  2. @wselwood

    clean up

    wselwood authored
  3. @wselwood

    more clean up

    wselwood authored
This page is out of date. Refresh to see the latest.
View
4 src/main/java/hudson/plugins/ec2/SlaveTemplate.java
@@ -186,9 +186,9 @@ public String getHelpFile(String fieldName) {
*/
public FormValidation doValidateAmi(
@QueryParameter String accessId, @QueryParameter String secretKey,
- @QueryParameter String ec2EndpointUrl,
+ @QueryParameter AwsRegion region,
final @QueryParameter String ami) throws IOException, ServletException {
- Jec2 jec2 = EC2Cloud.connect(accessId, secretKey, EC2Cloud.checkEndPoint(ec2EndpointUrl));
+ Jec2 jec2 = EC2Cloud.connect(accessId, secretKey, region.ec2Endpoint);
if(jec2!=null) {
try {
List<String> images = new LinkedList<String>();
View
2  src/main/resources/hudson/plugins/ec2/EC2Cloud/config.jelly
@@ -7,7 +7,7 @@
<f:entry title="${%AMI ID}" field="ami">
<f:textbox />
</f:entry>
- <f:validateButton title="${%Check AMI}" progress="${%Checking...}" method="validateAmi" with="secretKey,accessId,ec2EndpointUrl,ami" />
+ <f:validateButton title="${%Check AMI}" progress="${%Checking...}" method="validateAmi" with="secretKey,accessId,region,ami" />
<f:entry title="${%Instance Type}" help="/plugin/ec2/help/instanceType.html">
<f:enum field="type">${it.name()}</f:enum>
</f:entry>
Something went wrong with that request. Please try again.