From 0c6dc2738a713026dbb766243ad0184694344cc4 Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Tue, 10 Nov 2020 16:39:21 -0500 Subject: [PATCH 01/21] adding test code to mailer plugin config groovy --- src/main/groovy/4configureMailerPlugin.groovy | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 14bdba32..6bfd6d85 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -58,4 +58,11 @@ try { jenkins.doSafeExit(null) System.exit(1) } +catch (NullPointerException e) { + logger.severe("YO DAWG.zzzzz there was a null point=============") + logger.severe(e.toString()) + logger.severe(mailerConfig.toString()) + jenkins.doSafeExit(null) + System.exit(1) +} logger.info('Successfully configured the mailer plugin') From 1e9d77176e9e880f52e6118e6e663f58db18fe1a Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Tue, 10 Nov 2020 16:50:13 -0500 Subject: [PATCH 02/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 6bfd6d85..5132aeea 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -43,6 +43,7 @@ auth.put('smtpAuthPasswordSecret', mailerConfig.SMTP_AUTH_PASSWORD) json.put('useSMTPAuth', auth) json.put('smtpPort', mailerConfig.SMTP_PORT) json.put('useSsl', mailerConfig.USE_SSL) +json.pet('useTls', true) json.put('charset', mailerConfig.CHAR_SET) StaplerRequest stapler = null try { From b0d94c8a381c2b59a10ed5dfaaae3f4eaed7cab1 Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Tue, 10 Nov 2020 16:54:47 -0500 Subject: [PATCH 03/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 5132aeea..bd37d83c 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -34,17 +34,17 @@ def descriptor = jenkins.getDescriptorByType( hudson.tasks.Mailer.DescriptorImpl.class ) JSONObject json = new JSONObject() -json.put('smtpServer', mailerConfig.SMTP_SERVER) -json.put('replyToAddress', mailerConfig.REPLY_TO_ADDRESS) -json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) -JSONObject auth = new JSONObject() -auth.put('smtpAuthUserName', mailerConfig.SMTP_AUTH_USERNAME) -auth.put('smtpAuthPasswordSecret', mailerConfig.SMTP_AUTH_PASSWORD) -json.put('useSMTPAuth', auth) -json.put('smtpPort', mailerConfig.SMTP_PORT) -json.put('useSsl', mailerConfig.USE_SSL) -json.pet('useTls', true) -json.put('charset', mailerConfig.CHAR_SET) +// json.put('smtpServer', mailerConfig.SMTP_SERVER) +// json.put('replyToAddress', mailerConfig.REPLY_TO_ADDRESS) +// json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) +// JSONObject auth = new JSONObject() +// auth.put('smtpAuthUserName', mailerConfig.SMTP_AUTH_USERNAME) +// auth.put('smtpAuthPasswordSecret', mailerConfig.SMTP_AUTH_PASSWORD) +// json.put('useSMTPAuth', auth) +// json.put('smtpPort', mailerConfig.SMTP_PORT) +// json.put('useSsl', mailerConfig.USE_SSL) +// json.pet('useTls', true) +// json.put('charset', mailerConfig.CHAR_SET) StaplerRequest stapler = null try { descriptor.configure(stapler, json) From 9a79aac079fe856843d804f324125ba62f95e220 Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Tue, 10 Nov 2020 17:07:05 -0500 Subject: [PATCH 04/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index bd37d83c..dfdf09b5 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -34,17 +34,17 @@ def descriptor = jenkins.getDescriptorByType( hudson.tasks.Mailer.DescriptorImpl.class ) JSONObject json = new JSONObject() -// json.put('smtpServer', mailerConfig.SMTP_SERVER) -// json.put('replyToAddress', mailerConfig.REPLY_TO_ADDRESS) -// json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) -// JSONObject auth = new JSONObject() -// auth.put('smtpAuthUserName', mailerConfig.SMTP_AUTH_USERNAME) -// auth.put('smtpAuthPasswordSecret', mailerConfig.SMTP_AUTH_PASSWORD) -// json.put('useSMTPAuth', auth) -// json.put('smtpPort', mailerConfig.SMTP_PORT) -// json.put('useSsl', mailerConfig.USE_SSL) -// json.pet('useTls', true) -// json.put('charset', mailerConfig.CHAR_SET) +json.put('smtpHost', mailerConfig.SMTP_SERVER) +json.put('replyToAddress', mailerConfig.REPLY_TO_ADDRESS) +json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) +JSONObject auth = new JSONObject() +auth.put('smtpAuthUserName', mailerConfig.SMTP_AUTH_USERNAME) +auth.put('smtpAuthPasswordSecret', mailerConfig.SMTP_AUTH_PASSWORD) +json.put('useSMTPAuth', auth) +json.put('smtpPort', mailerConfig.SMTP_PORT) +json.put('useSsl', mailerConfig.USE_SSL) +//json.pet('useTls', true) +json.put('charset', mailerConfig.CHAR_SET) StaplerRequest stapler = null try { descriptor.configure(stapler, json) From cf8587643dbc90caa4c1ba6c607777871f2f56c8 Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Tue, 10 Nov 2020 17:22:27 -0500 Subject: [PATCH 05/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index dfdf09b5..c775ad1d 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -37,13 +37,19 @@ JSONObject json = new JSONObject() json.put('smtpHost', mailerConfig.SMTP_SERVER) json.put('replyToAddress', mailerConfig.REPLY_TO_ADDRESS) json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) -JSONObject auth = new JSONObject() -auth.put('smtpAuthUserName', mailerConfig.SMTP_AUTH_USERNAME) -auth.put('smtpAuthPasswordSecret', mailerConfig.SMTP_AUTH_PASSWORD) -json.put('useSMTPAuth', auth) + +// JSONObject auth = new JSONObject() +// auth.put('smtpAuthUserName', mailerConfig.SMTP_AUTH_USERNAME) +// auth.put('smtpAuthPasswordSecret', mailerConfig.SMTP_AUTH_PASSWORD) +// json.put('useSMTPAuth', auth) + +json.put('authentication', true) +json.put('username', mailerConfig.SMTP_AUTH_USERNAME) +auth.put('password', mailerConfig.SMTP_AUTH_PASSWORD) + json.put('smtpPort', mailerConfig.SMTP_PORT) json.put('useSsl', mailerConfig.USE_SSL) -//json.pet('useTls', true) +json.put('useTls', true) json.put('charset', mailerConfig.CHAR_SET) StaplerRequest stapler = null try { @@ -63,6 +69,8 @@ catch (NullPointerException e) { logger.severe("YO DAWG.zzzzz there was a null point=============") logger.severe(e.toString()) logger.severe(mailerConfig.toString()) + logger.severe(json.toString()) + //logger.severe(auth.toString()) jenkins.doSafeExit(null) System.exit(1) } From ced9c0cec333484dddf2ada08bddded918781256 Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Tue, 10 Nov 2020 17:28:14 -0500 Subject: [PATCH 06/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index c775ad1d..6dc50d4e 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -45,7 +45,7 @@ json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) json.put('authentication', true) json.put('username', mailerConfig.SMTP_AUTH_USERNAME) -auth.put('password', mailerConfig.SMTP_AUTH_PASSWORD) +json.put('password', mailerConfig.SMTP_AUTH_PASSWORD) json.put('smtpPort', mailerConfig.SMTP_PORT) json.put('useSsl', mailerConfig.USE_SSL) From e4679683b186f00ccfe384b11f612dec4bfeab84 Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Tue, 10 Nov 2020 17:52:44 -0500 Subject: [PATCH 07/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 6dc50d4e..7d5ea87f 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -51,7 +51,7 @@ json.put('smtpPort', mailerConfig.SMTP_PORT) json.put('useSsl', mailerConfig.USE_SSL) json.put('useTls', true) json.put('charset', mailerConfig.CHAR_SET) -StaplerRequest stapler = null +StaplerRequest stapler = new StaplerRequest() try { descriptor.configure(stapler, json) } catch (JSONException e) { From f9a1f1dfe3b2427e3f5e4d29d1c8afd87df172d0 Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Thu, 12 Nov 2020 10:22:12 -0500 Subject: [PATCH 08/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 7d5ea87f..87fe5e65 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -5,16 +5,19 @@ import java.util.logging.Logger import net.sf.json.JSONObject import net.sf.json.JSONException +import javax.servlet.http.HttpServletRequestWrapper import jenkins.model.* import hudson.tasks.Mailer -import org.kohsuke.stapler.StaplerRequest; +//import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.*; @Grapes([ @Grab(group='org.yaml', module='snakeyaml', version='1.17') ]) import org.yaml.snakeyaml.Yaml import org.yaml.snakeyaml.constructor.SafeConstructor +import org.mockito.Mockito Logger logger = Logger.getLogger("") Jenkins jenkins = Jenkins.getInstance() @@ -51,7 +54,16 @@ json.put('smtpPort', mailerConfig.SMTP_PORT) json.put('useSsl', mailerConfig.USE_SSL) json.put('useTls', true) json.put('charset', mailerConfig.CHAR_SET) -StaplerRequest stapler = new StaplerRequest() + +//StaplerRequest stapler = null +StaplerRequest stapler = new RequestImpl( + new Stapler(), + Mockito.mock(HttpServletRequestWrapper.class), + new ArrayList(), + new TokenList("") +) + + try { descriptor.configure(stapler, json) } catch (JSONException e) { From 4a62b050890e1e43d868ebfeed59a93359f708bd Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Thu, 12 Nov 2020 10:32:28 -0500 Subject: [PATCH 09/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 87fe5e65..4ccbd583 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -14,6 +14,7 @@ import org.kohsuke.stapler.*; @Grapes([ @Grab(group='org.yaml', module='snakeyaml', version='1.17') + @Grab(group='org.mockito', module='mockito-all', version='1.10.19') ]) import org.yaml.snakeyaml.Yaml import org.yaml.snakeyaml.constructor.SafeConstructor From 826f5505619daef836955e38327486124a01b62b Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Thu, 12 Nov 2020 10:37:34 -0500 Subject: [PATCH 10/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 4ccbd583..df85eefd 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -13,7 +13,7 @@ import hudson.tasks.Mailer import org.kohsuke.stapler.*; @Grapes([ - @Grab(group='org.yaml', module='snakeyaml', version='1.17') + @Grab(group='org.yaml', module='snakeyaml', version='1.17'), @Grab(group='org.mockito', module='mockito-all', version='1.10.19') ]) import org.yaml.snakeyaml.Yaml From 2eb89e2e13fef1b374bf3cd70287d5f4ca77bcf4 Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Thu, 12 Nov 2020 12:39:27 -0500 Subject: [PATCH 11/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index df85eefd..da6b1bcb 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -39,6 +39,17 @@ def descriptor = jenkins.getDescriptorByType( ) JSONObject json = new JSONObject() json.put('smtpHost', mailerConfig.SMTP_SERVER) +json.put('adminAddress', mailerConfig.REPLY_TO_ADDRESS) // this is deprecated as of 1.4 but adding it in for testing +json.put('authentication', true) +json.put('username', mailerConfig.SMTP_AUTH_USERNAME) +json.put('password', mailerConfig.SMTP_AUTH_PASSWORD) +json.put('useSsl', mailerConfig.USE_SSL) +json.put('useTls', true) +json.put('smtpPort', mailerConfig.SMTP_PORT) +json.put('charset', mailerConfig.CHAR_SET) +json.put('sendTestMailTo', mailerConfig.REPLY_TO_ADDRESS) // dunno what tthis should be + +// these are extra?? json.put('replyToAddress', mailerConfig.REPLY_TO_ADDRESS) json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) @@ -47,16 +58,16 @@ json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) // auth.put('smtpAuthPasswordSecret', mailerConfig.SMTP_AUTH_PASSWORD) // json.put('useSMTPAuth', auth) -json.put('authentication', true) -json.put('username', mailerConfig.SMTP_AUTH_USERNAME) -json.put('password', mailerConfig.SMTP_AUTH_PASSWORD) -json.put('smtpPort', mailerConfig.SMTP_PORT) -json.put('useSsl', mailerConfig.USE_SSL) -json.put('useTls', true) -json.put('charset', mailerConfig.CHAR_SET) + + + + +// The old way: //StaplerRequest stapler = null + +// This does not fix the issue sadly StaplerRequest stapler = new RequestImpl( new Stapler(), Mockito.mock(HttpServletRequestWrapper.class), From 67a20452a4474903f06fee1b5991cf68068facdc Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Thu, 12 Nov 2020 12:45:48 -0500 Subject: [PATCH 12/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index da6b1bcb..2654d60a 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -89,13 +89,13 @@ try { jenkins.doSafeExit(null) System.exit(1) } -catch (NullPointerException e) { - logger.severe("YO DAWG.zzzzz there was a null point=============") - logger.severe(e.toString()) - logger.severe(mailerConfig.toString()) - logger.severe(json.toString()) - //logger.severe(auth.toString()) - jenkins.doSafeExit(null) - System.exit(1) -} +// catch (NullPointerException e) { +// logger.severe("YO DAWG.zzzzz there was a null point=============") +// logger.severe(e.toString()) +// logger.severe(mailerConfig.toString()) +// logger.severe(json.toString()) +// //logger.severe(auth.toString()) +// jenkins.doSafeExit(null) +// System.exit(1) +// } logger.info('Successfully configured the mailer plugin') From 7bf0fabe2633453c9df27fc39886dff5b147733a Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Thu, 12 Nov 2020 12:49:24 -0500 Subject: [PATCH 13/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 2654d60a..87e404fc 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -51,6 +51,7 @@ json.put('sendTestMailTo', mailerConfig.REPLY_TO_ADDRESS) // dunno what tthis sh // these are extra?? json.put('replyToAddress', mailerConfig.REPLY_TO_ADDRESS) +json.put('address', mailerConfig.REPLY_TO_ADDRESS) json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) // JSONObject auth = new JSONObject() From 42e8533c41ab5d9b4aef5c4022a59696e908dd50 Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Thu, 12 Nov 2020 12:56:05 -0500 Subject: [PATCH 14/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 87e404fc..8285352e 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -66,15 +66,15 @@ json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) // The old way: -//StaplerRequest stapler = null +StaplerRequest stapler = null // This does not fix the issue sadly -StaplerRequest stapler = new RequestImpl( - new Stapler(), - Mockito.mock(HttpServletRequestWrapper.class), - new ArrayList(), - new TokenList("") -) +// StaplerRequest stapler = new RequestImpl( +// new Stapler(), +// Mockito.mock(HttpServletRequestWrapper.class), +// new ArrayList(), +// new TokenList("") +// ) try { From 49a296fdb601e8eed5510830c0544836b5f9532e Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Thu, 12 Nov 2020 13:06:11 -0500 Subject: [PATCH 15/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 8285352e..8f56cfa9 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -61,20 +61,13 @@ json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) - - - - -// The old way: -StaplerRequest stapler = null - -// This does not fix the issue sadly -// StaplerRequest stapler = new RequestImpl( -// new Stapler(), -// Mockito.mock(HttpServletRequestWrapper.class), -// new ArrayList(), -// new TokenList("") -// ) +// Changing how we creeate stapler gets us by the first nullpointerexception +StaplerRequest stapler = new RequestImpl( + new Stapler(), + Mockito.mock(HttpServletRequestWrapper.class), + new ArrayList(), + new TokenList("") +) try { From fc18a1a2cf64b021c14b39b4b17f3b859a00dabc Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Thu, 12 Nov 2020 13:43:34 -0500 Subject: [PATCH 16/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 8f56cfa9..a37b7a89 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -50,7 +50,7 @@ json.put('charset', mailerConfig.CHAR_SET) json.put('sendTestMailTo', mailerConfig.REPLY_TO_ADDRESS) // dunno what tthis should be // these are extra?? -json.put('replyToAddress', mailerConfig.REPLY_TO_ADDRESS) +//json.put('replyToAddress', mailerConfig.REPLY_TO_ADDRESS) json.put('address', mailerConfig.REPLY_TO_ADDRESS) json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) From 822ce107080ed23550d973ccc1737e565cc090de Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Fri, 13 Nov 2020 11:53:04 -0500 Subject: [PATCH 17/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index a37b7a89..3cc061a9 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -38,20 +38,20 @@ def descriptor = jenkins.getDescriptorByType( hudson.tasks.Mailer.DescriptorImpl.class ) JSONObject json = new JSONObject() -json.put('smtpHost', mailerConfig.SMTP_SERVER) -json.put('adminAddress', mailerConfig.REPLY_TO_ADDRESS) // this is deprecated as of 1.4 but adding it in for testing -json.put('authentication', true) -json.put('username', mailerConfig.SMTP_AUTH_USERNAME) -json.put('password', mailerConfig.SMTP_AUTH_PASSWORD) +// json.put('smtpHost', mailerConfig.SMTP_SERVER) +// json.put('adminAddress', mailerConfig.REPLY_TO_ADDRESS) // this is deprecated as of 1.4 but adding it in for testing +// json.put('authentication', true) +// json.put('username', mailerConfig.SMTP_AUTH_USERNAME) +// json.put('password', mailerConfig.SMTP_AUTH_PASSWORD) json.put('useSsl', mailerConfig.USE_SSL) json.put('useTls', true) json.put('smtpPort', mailerConfig.SMTP_PORT) json.put('charset', mailerConfig.CHAR_SET) -json.put('sendTestMailTo', mailerConfig.REPLY_TO_ADDRESS) // dunno what tthis should be +// json.put('sendTestMailTo', mailerConfig.REPLY_TO_ADDRESS) // dunno what tthis should be // these are extra?? //json.put('replyToAddress', mailerConfig.REPLY_TO_ADDRESS) -json.put('address', mailerConfig.REPLY_TO_ADDRESS) +// json.put('address', mailerConfig.REPLY_TO_ADDRESS) json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) // JSONObject auth = new JSONObject() From 12b00eb8d57948807e2850ba92a87a5c65546dd6 Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Fri, 13 Nov 2020 12:33:19 -0500 Subject: [PATCH 18/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 3cc061a9..7d62dfdd 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -43,16 +43,16 @@ JSONObject json = new JSONObject() // json.put('authentication', true) // json.put('username', mailerConfig.SMTP_AUTH_USERNAME) // json.put('password', mailerConfig.SMTP_AUTH_PASSWORD) -json.put('useSsl', mailerConfig.USE_SSL) -json.put('useTls', true) -json.put('smtpPort', mailerConfig.SMTP_PORT) -json.put('charset', mailerConfig.CHAR_SET) +// json.put('useSsl', mailerConfig.USE_SSL) +// json.put('useTls', true) +// json.put('smtpPort', mailerConfig.SMTP_PORT) +// json.put('charset', mailerConfig.CHAR_SET) // json.put('sendTestMailTo', mailerConfig.REPLY_TO_ADDRESS) // dunno what tthis should be // these are extra?? //json.put('replyToAddress', mailerConfig.REPLY_TO_ADDRESS) // json.put('address', mailerConfig.REPLY_TO_ADDRESS) -json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) +// json.put('defaultSuffix', mailerConfig.DEFAULT_SUFFIX) // JSONObject auth = new JSONObject() // auth.put('smtpAuthUserName', mailerConfig.SMTP_AUTH_USERNAME) From 651d268dfd60832306198da80b1c397225db184b Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Fri, 13 Nov 2020 13:06:28 -0500 Subject: [PATCH 19/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 7d62dfdd..5963e089 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -38,7 +38,7 @@ def descriptor = jenkins.getDescriptorByType( hudson.tasks.Mailer.DescriptorImpl.class ) JSONObject json = new JSONObject() -// json.put('smtpHost', mailerConfig.SMTP_SERVER) +json.put('smtpHost', mailerConfig.SMTP_SERVER) // json.put('adminAddress', mailerConfig.REPLY_TO_ADDRESS) // this is deprecated as of 1.4 but adding it in for testing // json.put('authentication', true) // json.put('username', mailerConfig.SMTP_AUTH_USERNAME) From 0a3079f68c06a18a53079918ccc519797bbd58a0 Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Fri, 13 Nov 2020 13:18:23 -0500 Subject: [PATCH 20/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index 5963e089..beb86248 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -60,7 +60,8 @@ json.put('smtpHost', mailerConfig.SMTP_SERVER) // json.put('useSMTPAuth', auth) - +logger.info("hey its chris====================") +logger.info(json.toString()) // Changing how we creeate stapler gets us by the first nullpointerexception StaplerRequest stapler = new RequestImpl( new Stapler(), @@ -83,13 +84,13 @@ try { jenkins.doSafeExit(null) System.exit(1) } -// catch (NullPointerException e) { -// logger.severe("YO DAWG.zzzzz there was a null point=============") -// logger.severe(e.toString()) -// logger.severe(mailerConfig.toString()) -// logger.severe(json.toString()) -// //logger.severe(auth.toString()) -// jenkins.doSafeExit(null) -// System.exit(1) -// } +catch (NullPointerException e) { + logger.severe("YO DAWG.zzzzz there was a null point=============") + logger.severe(e.toString()) + logger.severe(mailerConfig.toString()) + logger.severe(json.toString()) + //logger.severe(auth.toString()) + jenkins.doSafeExit(null) + System.exit(1) +} logger.info('Successfully configured the mailer plugin') From 1538712abeea6f6ce5bbe54dcbb8313db2233a6d Mon Sep 17 00:00:00 2001 From: Christopher Pappas Date: Fri, 13 Nov 2020 13:27:44 -0500 Subject: [PATCH 21/21] iterating on groovy script --- src/main/groovy/4configureMailerPlugin.groovy | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/groovy/4configureMailerPlugin.groovy b/src/main/groovy/4configureMailerPlugin.groovy index beb86248..e81d028c 100644 --- a/src/main/groovy/4configureMailerPlugin.groovy +++ b/src/main/groovy/4configureMailerPlugin.groovy @@ -84,13 +84,13 @@ try { jenkins.doSafeExit(null) System.exit(1) } -catch (NullPointerException e) { - logger.severe("YO DAWG.zzzzz there was a null point=============") - logger.severe(e.toString()) - logger.severe(mailerConfig.toString()) - logger.severe(json.toString()) - //logger.severe(auth.toString()) - jenkins.doSafeExit(null) - System.exit(1) -} +// catch (NullPointerException e) { +// logger.severe("YO DAWG.zzzzz there was a null point=============") +// logger.severe(e.toString()) +// logger.severe(mailerConfig.toString()) +// logger.severe(json.toString()) +// //logger.severe(auth.toString()) +// jenkins.doSafeExit(null) +// System.exit(1) +// } logger.info('Successfully configured the mailer plugin')