Bump instance-identity from 3.1 to 116.vf8f487400980 #6715

dependabot · 2022-06-28T16:51:25Z

Bumps instance-identity from 3.1 to 116.vf8f487400980.

Release notes

Sourced from instance-identity's releases.

116.vf8f487400980

📦 Dependency updates

Bump bom-2.346.x from 1382.v7d694476f340 to 1461.vb_3c6de28f2b_a_ (#27) @dependabot

Bump plugin from 4.40 to 4.41 (#28) @dependabot

Bump git-changelist-maven-extension from 1.2 to 1.3 (#29) @dependabot

113.vb926fdeb6c55

🚀 New features and improvements

JEP-230 - JENKINS-55582 - Set the baseline to be 2.357 where this plugin was split (#25) @jglick

✍ Other changes

Enable CD (#26) @jglick

instance-indetity-3.2

Bug Fixes

Switch from the JDK to BouncyCastle for PEM decoding. PR#23 / JENKINS-68662

Commits

See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR
@dependabot recreate will recreate this PR, overwriting any edits that have been made to it
@dependabot merge will merge this PR after your CI passes on it
@dependabot squash and merge will squash and merge this PR after your CI passes on it
@dependabot cancel merge will cancel a previously requested merge and block automerging
@dependabot reopen will reopen this PR if it is closed
@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [instance-identity](https://github.com/jenkinsci/instance-identity-plugin) from 3.1 to 116.vf8f487400980. - [Release notes](https://github.com/jenkinsci/instance-identity-plugin/releases) - [Changelog](https://github.com/jenkinsci/instance-identity-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/instance-identity-plugin/commits) --- updated-dependencies: - dependency-name: org.jenkins-ci.modules:instance-identity dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>

basil

Many test failures, seems like fallout from #6585 and/or jenkinsci/instance-identity-plugin#23

java.lang.IllegalStateException: Couldn't locate either of bouncy castle FIPS or non fips provider, available providers areSUN,SunRsaSign,SunEC,SunJSSE,SunJCE,SunJGSS,SunSASL,XMLDSig,SunPCSC,JdkLDAP,JdkSASL,SunPKCS11.
        at jenkins.bouncycastle.api.PEMEncodable.<clinit>(PEMEncodable.java:96)
Caused: java.lang.ExceptionInInitializerError
        at org.jenkinsci.main.modules.instance_identity.pem.PEMHelper.encodePEM(PEMHelper.java:72)
        at org.jenkinsci.main.modules.instance_identity.InstanceIdentity.write(InstanceIdentity.java:97)
        at org.jenkinsci.main.modules.instance_identity.InstanceIdentity.<init>(InstanceIdentity.java:67)
        at org.jenkinsci.main.modules.instance_identity.InstanceIdentity.<init>(InstanceIdentity.java:41)
        at org.jenkinsci.main.modules.instance_identity.PageDecoratorImpl.<init>(PageDecoratorImpl.java:22)
        at org.jenkinsci.main.modules.instance_identity.PageDecoratorImpl$$FastClassByGuice$$415856317.GUICE$TRAMPOLINE(<generated>)
        at org.jenkinsci.main.modules.instance_identity.PageDecoratorImpl$$FastClassByGuice$$415856317.apply(<generated>)
        at com.google.inject.internal.DefaultConstructionProxyFactory$FastClassProxy.newInstance(DefaultConstructionProxyFactory.java:82)
        at com.google.inject.internal.ConstructorInjector.provision(ConstructorInjector.java:114)
        at com.google.inject.internal.ConstructorInjector.access$000(ConstructorInjector.java:33)
        at com.google.inject.internal.ConstructorInjector$1.call(ConstructorInjector.java:98)
        at com.google.inject.internal.ProvisionListenerStackCallback$Provision.provision(ProvisionListenerStackCallback.java:109)
        at hudson.ExtensionFinder$GuiceFinder$SezpozModule.onProvision(ExtensionFinder.java:568)
        at com.google.inject.internal.ProvisionListenerStackCallback$Provision.provision(ProvisionListenerStackCallback.java:117)
        at com.google.inject.internal.ProvisionListenerStackCallback.provision(ProvisionListenerStackCallback.java:66)
        at com.google.inject.internal.ConstructorInjector.construct(ConstructorInjector.java:93)
        at com.google.inject.internal.ConstructorBindingImpl$Factory.get(ConstructorBindingImpl.java:296)
        at com.google.inject.internal.ProviderToInternalFactoryAdapter.get(ProviderToInternalFactoryAdapter.java:40)

Somehow https://github.com/jenkinsci/bouncycastle-api-plugin/blob/1588e77cf5a919f6c7c9c8afee09aad6d5948de5/src/main/java/jenkins/bouncycastle/api/SecurityProviderInitializer.java#L50= is not being invoked prior to https://github.com/jenkinsci/instance-identity-plugin/blob/f8f487400980878419c197dfc5e87c06c30d54b9/src/main/java/org/jenkinsci/main/modules/instance_identity/PageDecoratorImpl.java#L22=

CC @jglick @jmdesprez @jtnord

jtnord · 2022-06-29T19:12:25Z

I think I know what is going on here and will look at fixing this tomorrow.

I did not think we updated detached plugins unless there is a security release?

basil · 2022-06-29T19:27:00Z

I did not think we updated detached plugins unless there is a security release?

This is not an update to a detached plugin. It is an update to a plugin in test scope in the test/ module (test/pom.xml). We regularly update plugins listed in that file.

jtnord · 2022-06-30T16:05:25Z

There is nothing wrong with either the BouncyCastle or InstanceIdentity plugins. The issue is JenkinsRule and the maven-hpi-plugin. Specifically Jenkins when started by JenkinsRule in this project never calls Plugin.start() which is what conditionally registers the BC provider, because there are no plugin archives.

This is a bug in the test project setup - fix incoming.

@basil

The test environment used by the test project was not reaslistic as non of the plugins had been linked so JenkinsRule was just blicdly ignoring their existance. this means things did not happen correctly when Jenkins was starting up - not limited to PLugins being correctly started - as observed by @basil in #6715

jtnord · 2022-06-30T16:11:41Z

4601c05 should fix the failures. Was tested locally with one of the tests that failed also with the addition of the bouncycastle plugin as a dependency but that should not be needed. If it still fails then I will add that dep, but for now I expect the hpi plugin to do the right thing

supposedly addressed

jglick

OK I think.

jtnord · 2022-07-01T11:24:45Z

failures seem to be due to tests making assumptions about installed plugins which are incorrect.

now that we actually have the plugins as expected in JenkinsRule 4 tests where failing for a variety of reasons 1. loading a detached plugin would downgrade the version requiring a restart and failing the test 2. the test was checking that nothing was installed installing detached plugins has now been skipped where the plugin being installed was already available due to being a maven dependency. This also means we only have onve version of the plugin on the classpath - prior to this both the classes from the maven dependency and the classes from the plugin would have been on the uber classpath creating interesting results. tests have been updated where there are changes between the detached version of the plugin and the plugin from the maven dependency. Where the test was making invalid assumptions this has also been fixed.

jglick · 2022-07-01T14:22:30Z

test/src/test/java/hudson/PluginTest.java

-        ((TestPluginManager) r.jenkins.pluginManager).installDetachedPlugin("matrix-auth");
-        r.createWebClient().goTo("plugin/matrix-auth/images/user-disabled.png", "image/png");
-        r.createWebClient().goTo("plugin/matrix-auth/images/../images/user-disabled.png", "image/png"); // collapsed somewhere before it winds up in restOfPath
+        r.createWebClient().goTo("plugin/matrix-auth/images/select-all.svg", "image/svg+xml");


(implicitly assumes that matrix-auth is loaded)

…stance-identity-116.vf8f487400980

test/pom.xml

Co-authored-by: Basil Crow <me@basilcrow.com>

jtnord · 2022-07-05T17:02:07Z

This PR is now ready for merge. We will merge it after ~24 hours if there is no negative feedback.
Please see the merge process documentation for more information about the merge process.
Thanks!

dependabot · 2022-07-06T05:01:03Z

OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting @dependabot ignore this major version or @dependabot ignore this minor version. You can also ignore all major, minor, or patch releases for a dependency by adding an ignore condition with the desired update_types to your config file.

If you change your mind, just re-open this PR and I'll resolve any conflicts on it.

dependabot bot added dependencies Pull requests that update a dependency file java Pull requests that update Java code labels Jun 28, 2022

dependabot bot mentioned this pull request Jun 28, 2022

Bump instance-identity from 2.2 to 3.2 #6660

Closed

basil previously requested changes Jun 29, 2022

View reviewed changes

jtnord mentioned this pull request Jun 30, 2022

[JENKINS-68890] fix dual package compiler error detected by eclipse compiler #6722

Closed

12 tasks

jtnord requested review from basil and jglick June 30, 2022 16:11

jglick approved these changes Jun 30, 2022

View reviewed changes

jtnord force-pushed the dependabot/maven/org.jenkins-ci.modules-instance-identity-116.vf8f487400980 branch from ec6b759 to ec05f0d Compare July 1, 2022 12:43

timja approved these changes Jul 1, 2022

View reviewed changes

jglick approved these changes Jul 1, 2022

View reviewed changes

Merge branch 'master' into dependabot/maven/org.jenkins-ci.modules-in…

a802f83

…stance-identity-116.vf8f487400980

basil reviewed Jul 5, 2022

View reviewed changes

test/pom.xml Outdated Show resolved Hide resolved

fix indentation and change bound phase of resolve-test-dependencies

c4e79b2

Co-authored-by: Basil Crow <me@basilcrow.com>

jtnord added ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback skip-changelog Should not be shown in the changelog labels Jul 5, 2022

basil approved these changes Jul 5, 2022

View reviewed changes

basil merged commit 2b83c2e into master Jul 6, 2022

dependabot bot deleted the dependabot/maven/org.jenkins-ci.modules-instance-identity-116.vf8f487400980 branch July 6, 2022 05:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump instance-identity from 3.1 to 116.vf8f487400980 #6715

Bump instance-identity from 3.1 to 116.vf8f487400980 #6715

dependabot bot commented on behalf of github Jun 28, 2022 •

edited by gitpod-io bot

Loading

basil left a comment

jtnord commented Jun 29, 2022

basil commented Jun 29, 2022

jtnord commented Jun 30, 2022 •

edited

Loading

jtnord commented Jun 30, 2022 •

edited

Loading

jglick left a comment

jtnord commented Jul 1, 2022

jglick Jul 1, 2022

jtnord commented Jul 5, 2022

dependabot bot commented on behalf of github Jul 6, 2022

Bump instance-identity from 3.1 to 116.vf8f487400980 #6715

Bump instance-identity from 3.1 to 116.vf8f487400980 #6715

Conversation

dependabot bot commented on behalf of github Jun 28, 2022 • edited by gitpod-io bot Loading

116.vf8f487400980

📦 Dependency updates

113.vb926fdeb6c55

🚀 New features and improvements

✍ Other changes

instance-indetity-3.2

Bug Fixes

basil left a comment

Choose a reason for hiding this comment

jtnord commented Jun 29, 2022

basil commented Jun 29, 2022

jtnord commented Jun 30, 2022 • edited Loading

jtnord commented Jun 30, 2022 • edited Loading

jglick left a comment

Choose a reason for hiding this comment

jtnord commented Jul 1, 2022

jglick Jul 1, 2022

Choose a reason for hiding this comment

jtnord commented Jul 5, 2022

dependabot bot commented on behalf of github Jul 6, 2022

dependabot bot commented on behalf of github Jun 28, 2022 •

edited by gitpod-io bot

Loading

jtnord commented Jun 30, 2022 •

edited

Loading

jtnord commented Jun 30, 2022 •

edited

Loading