allow alternate ec2 endpoint for region population #330

jmcampanini · 2019-01-22T02:01:19Z

We're running a jenkins instance inside of a govcloud ec2 box that does not have access to ec2.amazonaws.com. Because of that, the population of the region dropdown fails. This PR is an attempt to allow the user to configure the alternate EC2 endpoint that is used to populate the region dropdown. The value is not used anywhere else.

If there is a way to gracefully handle the manual entering of the region in the dropdown instead, that would work as well.

Related commit: e851e59

// tagging @ajlake

jvz · 2019-01-22T15:41:46Z

Would you be able to add any tests for this feature?

jmcampanini · 2019-01-22T15:56:17Z

i've never actually built a jenkins plugin or ran tests with jelly UIs, so i'm not sure how that would work. i could look at writing a test for the doFillRegionItems method, would that work?

jvz · 2019-01-22T16:31:04Z

Just any sort of test that verifies the feature exists and isn't broken by someone else.

jmcampanini · 2019-01-23T15:11:11Z

i've added a test for the URL construction. let me know if there's anything else i should do

jvz

Looks good to me, thanks for the contribution!

jvz · 2019-01-23T20:57:36Z

src/test/java/hudson/plugins/ec2/AmazonEC2CloudTest.java

@@ -58,4 +64,18 @@ public void testConfigRoundtrip() throws Exception {
        Cloud actual = r.jenkins.clouds.iterator().next();
        r.assertEqualBeans(orig, actual, "cloudName,region,useInstanceProfileForCredentials,accessId,privateKey,instanceCap,roleArn,roleSessionName");
    }
+
+    /**
+     * Unit tests related to {@link AmazonEC2Cloud}, but do not require a Jenkins instance.


You might be able to use the @WithoutJenkins annotation on the test method without having to make an inner class.

when i move the method to the outer class and add @Test and @WithoutJenkins i end up with this error:

[ERROR] Errors: [ERROR] hudson.plugins.ec2.AmazonEC2CloudTest.testEC2EndpointURLCreation(hudson.plugins.ec2.AmazonEC2CloudTest) [ERROR] Run 1: AmazonEC2CloudTest.testConfigRoundtrip:61 » NullPointer [ERROR] Run 2: AmazonEC2CloudTest.testConfigRoundtrip:61 » NullPointer [ERROR] Run 3: AmazonEC2CloudTest.testConfigRoundtrip:61 » NullPointer [ERROR] Run 4: AmazonEC2CloudTest.testConfigRoundtrip:61 » NullPointer [ERROR] Run 5: AmazonEC2CloudTest.testConfigRoundtrip:61 » NullPointer

maybe im doing something wrong there?

here's the stacktrace:

------------------------------------------------------------------------------- Test set: hudson.plugins.ec2.AmazonEC2CloudTest ------------------------------------------------------------------------------- Tests run: 5, Failures: 0, Errors: 5, Skipped: 0, Time elapsed: 0.348 s <<< FAILURE! - in hudson.plugins.ec2.AmazonEC2CloudTest testEC2EndpointURLCreation(hudson.plugins.ec2.AmazonEC2CloudTest) Time elapsed: 0.342 s <<< ERROR! java.lang.NullPointerException at jenkins.security.ConfidentialStore.get(ConfidentialStore.java:67) at jenkins.security.ConfidentialKey.load(ConfidentialKey.java:47) at jenkins.security.CryptoConfidentialKey.getKey(CryptoConfidentialKey.java:41) at jenkins.security.CryptoConfidentialKey.decrypt(CryptoConfidentialKey.java:134) at hudson.util.HistoricalSecrets.decrypt(HistoricalSecrets.java:49) at hudson.util.Secret.decrypt(Secret.java:207) at hudson.util.Secret.fromString(Secret.java:239) at hudson.plugins.ec2.EC2PrivateKey.<init>(EC2PrivateKey.java:50) at hudson.plugins.ec2.EC2Cloud.<init>(EC2Cloud.java:177) at hudson.plugins.ec2.AmazonEC2Cloud.<init>(AmazonEC2Cloud.java:74) at hudson.plugins.ec2.AmazonEC2CloudTest.testConfigRoundtrip(AmazonEC2CloudTest.java:61) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33) at org.junit.rules.RunRules.evaluate(RunRules.java:20) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268) at org.junit.runners.ParentRunner.run(ParentRunner.java:363) at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:365) at org.apache.maven.surefire.junit4.JUnit4Provider.executeWithRerun(JUnit4Provider.java:272) at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:236) at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:159) at org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:386) at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:323) at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:143)

jmcampanini · 2019-01-23T22:10:21Z

@jvz yay, thanks for reviewing it!

what's the process for getting this merged and released?

jvz · 2019-01-23T22:12:30Z

We can wait for another review from another EC2 maintainer, or we'll merge this within a few days if there's no negative feedback. Thanks again!

thoulen · 2019-01-24T10:07:16Z

I am starting to merge for the release 1.43

jmcampanini · 2019-01-25T20:05:50Z

yay! looking forward to 1.43 :)

jmcampanini · 2019-01-29T05:02:31Z

is there an ETA on the release of 1.43?

thoulen · 2019-01-29T16:38:17Z

I'd like for the beginning of the next week after the Fosdem.

…

On Tue, Jan 29, 2019 at 6:02 AM Javier Campanini ***@***.***> wrote: is there an ETA on the release of 1.43? — You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub <#330 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABD_gs_9n9tT-g4GkAsjzz_pLkYSM1kBks5vH9XrgaJpZM4aLydY> .

jmcampanini · 2019-02-06T04:41:49Z

friendly ping

jvz · 2019-02-06T15:27:14Z

@jmcampanini pings might work better in the gitter channel.

thoulen · 2019-02-06T17:06:56Z

The RC started to be tested on some system if you are able to test as well it will be high appreciated :-) https://repo.jenkins-ci.org/snapshots/org/jenkins-ci/plugins/ec2/1.43-SNAPSHOT/ I received one feedback that agent name is not visible. Br FM

…

On Wed, Feb 6, 2019 at 5:41 AM Javier Campanini ***@***.***> wrote: friendly ping — You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub <#330 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABD_gsdu2SLCBo3gxR7zWRoEgqEjxCc7ks5vKl0QgaJpZM4aLydY> .

bajacondor · 2019-03-11T20:45:45Z

@thoulen The link https://repo.jenkins-ci.org/snapshots/org/jenkins-ci/plugins/ec2/1.43-SNAPSHOT/
is 404. What's the status of this?

Thank you

thoulen · 2019-03-12T21:36:03Z

Hi, we enabled the incremental, now you can find the snapshot at : https://repo.jenkins-ci.org/incrementals/org/jenkins-ci/plugins/ec2/

…

On Mon, Mar 11, 2019 at 9:45 PM David Schile ***@***.***> wrote: @thoulen <https://github.com/thoulen> The link https://repo.jenkins-ci.org/snapshots/org/jenkins-ci/plugins/ec2/1.43-SNAPSHOT/ is 404. What's the status of this? Thank you — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#330 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABD_ghaFdcjujutFNp5H0WWliBqDPTErks5vVsB8gaJpZM4aLydY> .

jmcampanini added 2 commits January 21, 2019 20:42

add to jelly

277c66f

use alt ec2 endpoint if present

834d0d3

add a test

db4dec1

jmcampanini changed the title ~~Jc/allow alt ec2 endpoint for region pop~~ allow alt ec2 endpoint for region pop Jan 22, 2019

jmcampanini changed the title ~~allow alt ec2 endpoint for region pop~~ allow alternate ec2 endpoint for region pop Jan 22, 2019

jmcampanini changed the title ~~allow alternate ec2 endpoint for region pop~~ allow alternate ec2 endpoint for region population Jan 22, 2019

jvz approved these changes Jan 23, 2019

View reviewed changes

jvz reviewed Jan 23, 2019

View reviewed changes

thoulen merged commit 1f2de63 into jenkinsci:master Jan 24, 2019

jmcampanini deleted the jc/allow-alt-ec2-endpoint-for-region-pop branch January 24, 2019 14:42

MRamonLeon mentioned this pull request Oct 1, 2020

JENKINS-60482 Alternate Endpoint fix #439

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

allow alternate ec2 endpoint for region population #330

allow alternate ec2 endpoint for region population #330

jmcampanini commented Jan 22, 2019 •

edited

Loading

jvz commented Jan 22, 2019

jmcampanini commented Jan 22, 2019

jvz commented Jan 22, 2019

jmcampanini commented Jan 23, 2019 •

edited

Loading

jvz left a comment

jvz Jan 23, 2019

jmcampanini Jan 23, 2019

jmcampanini Jan 23, 2019

jmcampanini commented Jan 23, 2019

jvz commented Jan 23, 2019

thoulen commented Jan 24, 2019

jmcampanini commented Jan 25, 2019

jmcampanini commented Jan 29, 2019

thoulen commented Jan 29, 2019 via email

jmcampanini commented Feb 6, 2019

jvz commented Feb 6, 2019

thoulen commented Feb 6, 2019 via email

bajacondor commented Mar 11, 2019

thoulen commented Mar 12, 2019 via email

allow alternate ec2 endpoint for region population #330

allow alternate ec2 endpoint for region population #330

Conversation

jmcampanini commented Jan 22, 2019 • edited Loading

jvz commented Jan 22, 2019

jmcampanini commented Jan 22, 2019

jvz commented Jan 22, 2019

jmcampanini commented Jan 23, 2019 • edited Loading

jvz left a comment

Choose a reason for hiding this comment

jvz Jan 23, 2019

Choose a reason for hiding this comment

jmcampanini Jan 23, 2019

Choose a reason for hiding this comment

jmcampanini Jan 23, 2019

Choose a reason for hiding this comment

jmcampanini commented Jan 23, 2019

jvz commented Jan 23, 2019

thoulen commented Jan 24, 2019

jmcampanini commented Jan 25, 2019

jmcampanini commented Jan 29, 2019

thoulen commented Jan 29, 2019 via email

jmcampanini commented Feb 6, 2019

jvz commented Feb 6, 2019

thoulen commented Feb 6, 2019 via email

bajacondor commented Mar 11, 2019

thoulen commented Mar 12, 2019 via email

jmcampanini commented Jan 22, 2019 •

edited

Loading

jmcampanini commented Jan 23, 2019 •

edited

Loading