Remove plugin management #769

timja · 2019-03-05T07:57:26Z

Here is our checklist for contributors. No hard requirement here, just a reminder

Please describe what you did
Remove plugin feature
Link to issue you're working on if there's a relevant one
Related to: allowRestart flag added #766
Did you provide a test-case to demonstrate feature actually works / issue is fixed ?
Removed lots of them 😆
Please also consider adding a line to CHANGELOG.md

jetersen · 2019-03-05T08:01:45Z

I guess update sites is automatically moved to unclassified block? Which is fine, perhaps you could verify? 🤔

timja · 2019-03-05T08:05:14Z

I guess update sites is automatically moved to unclassified block? Which is fine, perhaps you could verify? 🤔
Its in a a custom configurator so I would expect not, I didn't change anything there

I can't see any test case or demo for that feature.

Since you use it, what's the config you normally use, maybe you want to add a test and demo for it 😉?

Happy enough to add later on if you can send an example though

jetersen · 2019-03-05T08:49:48Z

@timja rats 🙍‍♂️

ewelinawilkosz · 2019-03-05T10:31:30Z

@Casz sorry, but I don't understand your comment :P is it ok to merge in your opinion?

jetersen · 2019-03-05T10:48:38Z

He asked me to validate it and I would like to validate it quickly 😄 I'll merge once I can confirm that update site is possible to manage 😄 Or add a test even.

jetersen · 2019-03-05T21:04:58Z

plugin/src/main/java/io/jenkins/plugins/casc/plugins/PluginManagerConfigurator.java

-    }
-
-    private UpdateCenter configureUpdateSites(Mapping map, Jenkins jenkins, ConfigurationContext context) throws ConfiguratorException {
-        final CNode sites = map.get("sites");


Update site require some more code it seems 😄

ah damn, happy to make it work if you push a test 😉

jetersen · 2019-03-06T01:17:09Z

I rebased after the big #756 😄
Added test and configurator.

The configurator is added to jenkins root element, could not figure out how to add it to unclassified but tbh it might be better under jenkins 😄

@ndeloof @timja WDYT?

plugin/src/main/java/io/jenkins/plugins/casc/core/UpdateSiteConfigurator.java

plugin/src/test/resources/io/jenkins/plugins/casc/plugins/ProxyConfigTest.yml

timja · 2019-03-06T07:24:54Z

Thanks @Casz LGTM
just the two questions but I think this is fine to merge

ewelinawilkosz · 2019-03-06T07:36:49Z

and +1 from me, I don't see a problem with updateCenter under jenkins root element

timja · 2019-03-06T07:39:25Z

afaik all custom configurators have been put under the jenkins model

EDIT: not correct ignore me, seems fine

…onfiguration-as-code-plugin into feature/remove-plugin-management

jetersen · 2019-03-06T07:43:55Z

I would like to fix up the proxy configuration too! This way we don't depreciate all features that were in plugin management but just move them from fancy management to configuration part.

timja · 2019-03-06T07:44:47Z

I'm happy to do that part won't take long, unless you're already doing it?

jetersen · 2019-03-06T07:48:36Z

@timja I welcome you, I am on a train to work 😄

timja · 2019-03-06T07:49:03Z

same

timja · 2019-03-06T08:45:12Z

Not quite sure what to put in the describe function, the test is currently failing and the export fails:

   5.155 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting null.password = password
   5.155 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting null.port = 80
   5.155 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting null.name = proxyhost
   5.155 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting null.testUrl = http://google.com
   5.156 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting null.userName = login
   5.156 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting null.noProxyHost = externalhost
   5.156 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting hudson.model.Hudson@3b603b4b.proxy = null

proxy: "FAILED TO EXPORT hudson.model.Hudson#proxy: \ncom.google.inject.ConfigurationException:\
  \ Guice configuration errors:\n\n1) Could not find a suitable constructor in hudson.ProxyConfiguration.\
  \ Classes must have either one (and only one) constructor annotated with @Inject\
  \ or a zero-argument constructor that is not private.\n  at hudson.ProxyConfiguration.class(ProxyConfiguration.java:81)\n\
  \  while locating hudson.ProxyConfiguration\n\n1 error\n\tat com.google.inject.internal.InjectorImpl.getProvider(InjectorImpl.java:1042)\n\
  \tat com.google.inject.internal.InjectorImpl.getProvider(InjectorImpl.java:1001)\n\
  \tat com.google.inject.internal.InjectorImpl.getInstance(InjectorImpl.java:1051)\n\
  \tat jenkins.ProxyInjector.getInstance(ProxyInjector.java:98)\n\tat io.jenkins.plugins.casc.core.JenkinsConfigurator.lambda$describe$5(JenkinsConfigurator.java:74)\n\
  \tat io.jenkins.plugins.casc.Attribute.getValue(Attribute.java:174)\n\tat io.jenkins.plugins.casc.Attribute.describe(Attribute.java:184)\n\
  \tat io.jenkins.plugins.casc.core.JenkinsConfigurator.describe(JenkinsConfigurator.java:92)\n\
  \tat io.jenkins.plugins.casc.core.ProxyConfiguratorTest.describeProxyConfig(ProxyConfiguratorTest.java:46)\n\
  \tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n\
  \tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\
  \tat java.lang.reflect.Method.invoke(Method.java:498)\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)\n\
  \tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\n\
  \tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)\n\
  \tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\n\
  \tat org.jvnet.hudson.test.JenkinsRule$1.evaluate(JenkinsRule.java:553)\n\tat org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)\n\
  \tat org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)\n\
  \tat java.util.concurrent.FutureTask.run(FutureTask.java:266)\n\tat java.lang

will poke at it later today unless you know what's missing

timja · 2019-03-07T10:45:52Z

@ndeloof or @Casz either of you got time to have a quick look and see what's wrong with the configurator?
It's currently logging:

   6.305 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting null.password = password
   6.306 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting null.port = 80
   6.306 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting null.name = proxyhost
   6.306 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting null.testUrl = http://google.com
   6.307 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting null.userName = login
   6.307 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting null.noProxyHost = externalhost
   6.307 [id=13]	INFO	i.jenkins.plugins.casc.Attribute#setValue: Setting hudson.model.Hudson@2917c73d.proxy = null

the null. is the owner being null but I think that's how these work?

Just need to run the ProxyConfiguratorTest

timja · 2019-03-13T09:40:20Z

@Casz I made the proxy config work, although I couldn't get the export to work, I was getting stackoverflow errors...

Probably haven't implemented the configurator quite right, but given how the ProxyConfiguration code is structured in core it's not the easiest to make work...

I'll see if I have time to send a PR to core for improving it there

…onfiguration-as-code-plugin into feature/remove-plugin-management

jetersen · 2019-03-15T16:38:49Z

I'll give this PR a look to see if I can fix export, if not. I will go ahead and cut a release either way 😄

Does that sound like a deal @ewelinawilkosz ?

a default describe covers most scenarios for a configurator, if more complex cases are needed you would override the describe method

jetersen · 2019-03-16T22:35:03Z

plugin/src/main/java/io/jenkins/plugins/casc/Configurator.java

@@ -156,6 +157,15 @@ default Class getImplementedAPI() {
     * Only export attributes which are <b>not</b> set to default value.
     */
    @CheckForNull
-    CNode describe(T instance, ConfigurationContext context) throws Exception;
+    default CNode describe(T instance, ConfigurationContext context) throws Exception {


@ndeloof do you have anything against a default describe? This can be used for basic cases.

MavenConfigurator would need a custom but Jenkins, AdminWhitelistRuleConfigurator, UpdateCenterConfigurator, UpdateSiteConfigurator seems to settle for default case

timja · 2019-03-18T15:46:34Z

this good to go @Casz?

jetersen · 2019-03-18T19:14:10Z

I think so, but I would love a comment from the original author whether a default describe is good or bad 🗡️ ping @ndeloof 😅

jetersen · 2019-03-18T19:31:46Z

🤷‍♂️

jetersen · 2019-03-19T14:38:10Z

See [JENKINS-53767] Offer plugin management tooling
Reasoning for removing it can actually be found in this comment: #761 (comment)

tbh plugin management should be handled by Jenkins Core and provide a CLI interface and programmable java interface to manage. That's my two cents.

Then we could deprecate this whole plugin management mess located in this repo and the Jenkins docker repo with the whole install-plugin.sh 😓

timja added 2 commits March 5, 2019 07:54

Remove plugin management

1ffd371

Keep update centre support

67879af

timja mentioned this pull request Mar 5, 2019

allowRestart flag added #766

Closed

4 tasks

ndeloof approved these changes Mar 5, 2019

View reviewed changes

Shush codacy

fca7ae7

jetersen reviewed Mar 5, 2019

View reviewed changes

timja and others added 4 commits March 6, 2019 02:15

Remove plugin management

65141b6

Keep update centre support

2bf0c54

Shush codacy

c813afe

add full support for update center

6a59308

jetersen force-pushed the feature/remove-plugin-management branch from 2be0d75 to 6a59308 Compare March 6, 2019 01:15

known null

ea2a6b9

timja commented Mar 6, 2019

View reviewed changes

plugin/src/main/java/io/jenkins/plugins/casc/core/UpdateSiteConfigurator.java Show resolved Hide resolved

timja commented Mar 6, 2019

View reviewed changes

plugin/src/test/resources/io/jenkins/plugins/casc/plugins/ProxyConfigTest.yml Outdated Show resolved Hide resolved

Merge branch 'feature/remove-plugin-management' of github.com:timja/c…

3cc503e

…onfiguration-as-code-plugin into feature/remove-plugin-management

Mostly there but broken

5eda614

jetersen self-requested a review March 7, 2019 10:57

ewelinawilkosz mentioned this pull request Mar 8, 2019

Plugins installation causes stackstrace #605

Closed

Fix proxy configuration

9b5ca8e

timja force-pushed the feature/remove-plugin-management branch from bbe9c1e to 9b5ca8e Compare March 13, 2019 14:25

timja and others added 3 commits March 13, 2019 14:26

Merge branch 'master' into feature/remove-plugin-management

6671f8d

Make compatible with upstream PR

922f16c

Merge branch 'feature/remove-plugin-management' of github.com:timja/c…

f0081b0

…onfiguration-as-code-plugin into feature/remove-plugin-management

timja mentioned this pull request Mar 14, 2019

JENKINS-56553 Make proxy config compatible with JCasC without workarounds on the plugin side jenkinsci/jenkins#3935

Merged

3 tasks

add default describe

c9eafec

a default describe covers most scenarios for a configurator, if more complex cases are needed you would override the describe method

jetersen reviewed Mar 16, 2019

View reviewed changes

jetersen added 2 commits March 16, 2019 23:54

fix codacy

cb300a4

Rerun CI

9422cca

jetersen requested a review from ndeloof March 18, 2019 06:57

jetersen merged commit 6d5d625 into jenkinsci:master Mar 18, 2019

jetersen mentioned this pull request Mar 19, 2019

Allow slack to post through a proxy jenkinsci/slack-plugin#148

Closed

ewelinawilkosz mentioned this pull request Mar 20, 2019

Plugins updates result in infinite restart loop #744

Closed

timja mentioned this pull request Mar 20, 2019

Installation of Plugins Through CASC Doesn't Trigger Jenkins Restart #622

Closed

This was referenced Mar 20, 2019

Un-installing plugins #80

Closed

Introduce integration test #489

Closed

If fetching 'plugin-versions.json' from update site is interrupted, Jenkins can't recover. #652

Closed

Adding plugin specific code before CasC installs plugin kills Jenkins #625

Closed

velma mentioned this pull request Jun 6, 2019

Fix ProxyConfigurator does not resolve secrets #916

Merged

4 tasks

jetersen mentioned this pull request Jul 8, 2019

Plugins versions with casc #938

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove plugin management #769

Remove plugin management #769

timja commented Mar 5, 2019

jetersen commented Mar 5, 2019

timja commented Mar 5, 2019 •

edited

jetersen commented Mar 5, 2019

ewelinawilkosz commented Mar 5, 2019

jetersen commented Mar 5, 2019 •

edited

jetersen Mar 5, 2019

timja Mar 5, 2019 •

edited

jetersen commented Mar 6, 2019 •

edited

timja commented Mar 6, 2019

ewelinawilkosz commented Mar 6, 2019

timja commented Mar 6, 2019 •

edited

jetersen commented Mar 6, 2019

timja commented Mar 6, 2019

jetersen commented Mar 6, 2019 •

edited

timja commented Mar 6, 2019

timja commented Mar 6, 2019

timja commented Mar 7, 2019

timja commented Mar 13, 2019

jetersen commented Mar 15, 2019

jetersen Mar 16, 2019

timja commented Mar 18, 2019

jetersen commented Mar 18, 2019

jetersen commented Mar 18, 2019

jetersen commented Mar 19, 2019 •

edited

Remove plugin management #769

Remove plugin management #769

Conversation

timja commented Mar 5, 2019

jetersen commented Mar 5, 2019

timja commented Mar 5, 2019 • edited

jetersen commented Mar 5, 2019

ewelinawilkosz commented Mar 5, 2019

jetersen commented Mar 5, 2019 • edited

jetersen Mar 5, 2019

Choose a reason for hiding this comment

timja Mar 5, 2019 • edited

Choose a reason for hiding this comment

jetersen commented Mar 6, 2019 • edited

timja commented Mar 6, 2019

ewelinawilkosz commented Mar 6, 2019

timja commented Mar 6, 2019 • edited

jetersen commented Mar 6, 2019

timja commented Mar 6, 2019

jetersen commented Mar 6, 2019 • edited

timja commented Mar 6, 2019

timja commented Mar 6, 2019

timja commented Mar 7, 2019

timja commented Mar 13, 2019

jetersen commented Mar 15, 2019

jetersen Mar 16, 2019

Choose a reason for hiding this comment

timja commented Mar 18, 2019

jetersen commented Mar 18, 2019

jetersen commented Mar 18, 2019

jetersen commented Mar 19, 2019 • edited

timja commented Mar 5, 2019 •

edited

jetersen commented Mar 5, 2019 •

edited

timja Mar 5, 2019 •

edited

jetersen commented Mar 6, 2019 •

edited

timja commented Mar 6, 2019 •

edited

jetersen commented Mar 6, 2019 •

edited

jetersen commented Mar 19, 2019 •

edited