From 6e465d585eaad8367c6b0cdfe3fee70e61a6fdf5 Mon Sep 17 00:00:00 2001 From: Domingo Suarez Torres Date: Fri, 8 Apr 2022 17:55:05 -0500 Subject: [PATCH 01/11] init travis --- .travis.yml | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15caea2..dff5f3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,34 +1 @@ -sudo: false -services: -- docker -before_cache: -- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock -- rm -rf $HOME/.gradle/caches/*/plugin-resolution/ -cache: - directories: - - "$HOME/.gradle/caches/" - - "$HOME/.gradle/wrapper/" language: java -jdk: -- oraclejdk11 -- openjdk11 - -env: - matrix: - - TERM=dumb WONKY_TENANTS_FILE=./orgs_ignored.yaml - global: - - secure: YynxQ8ZEPhnPo3bgAJqZ4l0gvUqHLV+D7eMS0/bmxR3PkCjVjZmW80UKJnj2a4fXOX6AI1snWp8WfbGjgV7gmoNYeFdk47Ym4UQR8yXPaAq1sf4IZXJmQ4j1cFLGDQgsdTsUbZwcIJYwPt7BN0ecOWtscr9P1ohxlGsVnKw0k51qqRi0YmpRf6SWEqwkAw/lz32ukHQH4phguUBtw9+YV2C5y+fqSMByidLFeengInwncCos5cFUPOSqDzjxbG1Q+fUN9UQrGbCs9DZV5cTQoDxo9NA6cNJo6cTmVKx1kh2vC8aQSw6TuYiZJIltH84LchL5qQ81A1/fVR/CXy+UWH2uxbWVwtQ8ttH+eu9aCCOnPjewRAu0blimgixTZHl2mfHGoN3vybFT8krwZEPeqgYile095BVai9P/0R0P2aAvsHz1tc5e3IC0axPjav8eETZv89ohELfLdbWO289FsVvTxTCkpagBHE35651RAXyP2dhctKLnqfhsfvaerwTChgf2q7Xddlp9pfmZwNeAQ/19xp+cEwdlZEq4H+LU3oecsWY5J2ie0qdpbXnoL9z2xaNP/ZScdSHadlauc1Qo8xZnPy/kFQ6vdrqW0DlxmK5SZoGpBJCuMdMUMog3VX6/W0tgNkypS+FhD8sp1MfUDnU3mInSbfp3x4rJA5ftq44= - - secure: HRwJQXRVUkGz90S7TF7TUsk1vVDMpecgmnF8V/DlBRQIgxuMrFMXk5HvlfPhy9BrJb83oviIVXtttC/Kkf2FWxPOa8ifHQDiLZC1Le74Cfl4lGiWCSj2E0NVxh64UiZjWNFy8JI+ZVH1NO34UNc67xbbcryKdIKffLlFzJKdfAbFnfOowsykJoRMPXGccyO6NipFXDy+pOsjjq61XvrsiQqW1Kfv5WcCPwIIKP0A0R0eFb1/7T6K2Fe+eeBotq3nxTMtNqzUeQzxyeeCusiO0OTzy+sS2eimFRUOdFXc39PQjqETM0ly5kj9IMzJuNuKJZq6IDOcUCInBduQXQhmkBeiThED5OSzdvbtWnPKxfTZ7069oG8M8LOUmmIODRdQWl9rvtJrKP0JodiVNzrJXeb2SG3bP5kANy7s9nEqmK3IzZtHDisFUcIqkDzL1e9lDYAbEyE/sVczDidD+gajyGPDHMC/K7aXABA15l0iCYStE0J6rZA14ztM9dNKIHjAhcFrS/sr/j6ol/pRWZahlq4uYKElDu3LhFRVMby4jaPjide1JUzZWsC8JjS6r8bcSXdiEL9ykcTbPYCCzz0g580YjpDy7R9H6/OLRYbAFlbwwiQvalZQ/nD5LLx7FTkzeCC209VVA839vXYm/xVyK/3vpxGxwQ/fy75SlYUH1CU= - - secure: VfRcsDTQyazo/zd1dzPiTjwU+NwfAMrFsemZXi8igi68ZdDOVlWYwhReJ6bX6rH1S5uFNe9ozgpU7j5+OzIRfFd94CvvFm1vGuXaIwam3BIR4coDx9f0H2+bct7zVR0bdWgtbPpSkAa3WEv1ASh1K2kYysgytEthExrXCjwwU4o/Dz5UFNEoIbPkCNf9yzyoGjr6uJHkOuf2HrIj3KUPUog/M9Cxd8h2xOBrIX4XicW7fJ4BMlfJRh9Y7pzttbJMQ4ER7hX4lCNaENduMLUmupgnNKAkkLW8HNR1ee0HbXK5olzG+YZza/NS+1XkDB/cpSaIHcdUu/3Gyn7v2Ve2X3q8rcLOoiBMQaCYWf/kA1EIEzyyh3ACCI3VwJCpFPZ2E+dmckYncG3g13Xs/Ff8rE1yaMMwes+muUdS58IrEj000nhMARc4/jnG93+4V7a/MHBNi0NhJhZJP5cF04ZkenF18yZAQFMZbQwLQG1ScVX5bw3mgmQzwDkLjWA4W5BBck704l1eyTAfkrYWbkqo7pgu1a+UumZnUMkka1nBgdPUxNT+ZZErlzbWwXOg9QUdEJGJAA3pLGOPCRZfE2pI6TBhC2Ls6we2Z9sKwrnW9uUN51r8Ahcc9I1696LLTrKZiUBWxaPthWfSUh06Il+EGvRl+W2JweiXRjETwbCAlm4= - - secure: obZaFSO6/rxUQkdvuHPCKNyzAuUr3jzrNlulY3UQeLozlmuFmG2UO9VdVyO6oCPHB7Hws3WGWHJcgRkb97z0X4K9DnGgSSN1QZzBe+zskYps/3bAHD8a0+DvNT0tlbA7tCj/0dA94ZCRkeixstIyb1L43KTxWUU3rK4JHilqbSmGDkzKwS7JW23/iMhK6RGToloUiA88Uz5wER7n4jzMvNBIqZPnO2YhN2MR/yw3cYrtDgXIuSLL4YNfNvbd2JFYVWTlPk8lySWWJCtiGgILev2Pm/uc8rKSDQPV5ZAZvUP3HfaFMs+fsNw+obWk34Y7H8S1WkEwUdf3Wb8JTlAYXLeULERba+iEhb2NCxp5jV2vvcXVcOQFzFu0ChVBSVAVgW9cR3thfw5E2VUC/EabaM4jRgMa6G78EHLhwE4z2eVNOR8GFZZH7h616KSRTxnB/8F3IWoeYQWEM6oBmDzTDW/wu0v7fTffpm2KgvcdueCO+kggfjfHz2eCQVV3liaKcDyfVtRbgNx4iPn7KNuLdYZ68JpHKgK+Rd3FtdFatQSN6x5BqEsFfEuteLnIchtFG77fGpv9lu1IV5l+3838EMUw0ZWKimEey3Owh2eOMRvT3JOu/1u9hYbLwU0T25HT85fWI5MOtMtzyJCeDSGLwPplL5wgnsgautmmq9a8ukg= -install: true -before_script: -- "./gradlew --version" -script: -#- "./gradlew jacocoTestReport pushImage --warning-mode=all" -- "./gradlew jacocoTestReport --warning-mode=all" -after_success: -- bash <(curl -s https://codecov.io/bash) -before_install: -- openssl aes-256-cbc -K $encrypted_55795232bcfe_key -iv $encrypted_55795232bcfe_iv - -in orgs_ignored.yaml.enc -out orgs_ignored.yaml -d From a9b684fcd69ad35eb05cefd96c60da5a849a5872 Mon Sep 17 00:00:00 2001 From: Domingo Suarez Torres Date: Fri, 8 Apr 2022 18:01:21 -0500 Subject: [PATCH 02/11] adds Travis caching --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index dff5f3a..704057b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,9 @@ language: java + +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ +cache: + directories: + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ From c50ec9c7f1bbf12a351208a2e6bb40e158eae9a3 Mon Sep 17 00:00:00 2001 From: Domingo Suarez Torres Date: Fri, 8 Apr 2022 18:06:52 -0500 Subject: [PATCH 03/11] uses java17 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 704057b..fbf9e15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: java +jdk: openjdk17 + before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ From 39ba3fb9bd9d87a5c2e60a90d55b357cdf4da91f Mon Sep 17 00:00:00 2001 From: Domingo Suarez Torres Date: Fri, 8 Apr 2022 18:13:09 -0500 Subject: [PATCH 04/11] adds secret file decryption --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index fbf9e15..f0b8cd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,3 +9,6 @@ cache: directories: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ +before_install: + - openssl aes-256-cbc -K $encrypted_55795232bcfe_key -iv $encrypted_55795232bcfe_iv + -in orgs_ignored.yaml.enc -out orgs_ignored.yaml -d From 6b9013bd334341d8d6c85a596968dfa43294500f Mon Sep 17 00:00:00 2001 From: Domingo Suarez Torres Date: Fri, 8 Apr 2022 18:21:39 -0500 Subject: [PATCH 05/11] adds missing env vars --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index f0b8cd4..fc48ae4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,12 @@ language: java jdk: openjdk17 +env: + - secure: YynxQ8ZEPhnPo3bgAJqZ4l0gvUqHLV+D7eMS0/bmxR3PkCjVjZmW80UKJnj2a4fXOX6AI1snWp8WfbGjgV7gmoNYeFdk47Ym4UQR8yXPaAq1sf4IZXJmQ4j1cFLGDQgsdTsUbZwcIJYwPt7BN0ecOWtscr9P1ohxlGsVnKw0k51qqRi0YmpRf6SWEqwkAw/lz32ukHQH4phguUBtw9+YV2C5y+fqSMByidLFeengInwncCos5cFUPOSqDzjxbG1Q+fUN9UQrGbCs9DZV5cTQoDxo9NA6cNJo6cTmVKx1kh2vC8aQSw6TuYiZJIltH84LchL5qQ81A1/fVR/CXy+UWH2uxbWVwtQ8ttH+eu9aCCOnPjewRAu0blimgixTZHl2mfHGoN3vybFT8krwZEPeqgYile095BVai9P/0R0P2aAvsHz1tc5e3IC0axPjav8eETZv89ohELfLdbWO289FsVvTxTCkpagBHE35651RAXyP2dhctKLnqfhsfvaerwTChgf2q7Xddlp9pfmZwNeAQ/19xp+cEwdlZEq4H+LU3oecsWY5J2ie0qdpbXnoL9z2xaNP/ZScdSHadlauc1Qo8xZnPy/kFQ6vdrqW0DlxmK5SZoGpBJCuMdMUMog3VX6/W0tgNkypS+FhD8sp1MfUDnU3mInSbfp3x4rJA5ftq44= + - secure: HRwJQXRVUkGz90S7TF7TUsk1vVDMpecgmnF8V/DlBRQIgxuMrFMXk5HvlfPhy9BrJb83oviIVXtttC/Kkf2FWxPOa8ifHQDiLZC1Le74Cfl4lGiWCSj2E0NVxh64UiZjWNFy8JI+ZVH1NO34UNc67xbbcryKdIKffLlFzJKdfAbFnfOowsykJoRMPXGccyO6NipFXDy+pOsjjq61XvrsiQqW1Kfv5WcCPwIIKP0A0R0eFb1/7T6K2Fe+eeBotq3nxTMtNqzUeQzxyeeCusiO0OTzy+sS2eimFRUOdFXc39PQjqETM0ly5kj9IMzJuNuKJZq6IDOcUCInBduQXQhmkBeiThED5OSzdvbtWnPKxfTZ7069oG8M8LOUmmIODRdQWl9rvtJrKP0JodiVNzrJXeb2SG3bP5kANy7s9nEqmK3IzZtHDisFUcIqkDzL1e9lDYAbEyE/sVczDidD+gajyGPDHMC/K7aXABA15l0iCYStE0J6rZA14ztM9dNKIHjAhcFrS/sr/j6ol/pRWZahlq4uYKElDu3LhFRVMby4jaPjide1JUzZWsC8JjS6r8bcSXdiEL9ykcTbPYCCzz0g580YjpDy7R9H6/OLRYbAFlbwwiQvalZQ/nD5LLx7FTkzeCC209VVA839vXYm/xVyK/3vpxGxwQ/fy75SlYUH1CU= + - secure: VfRcsDTQyazo/zd1dzPiTjwU+NwfAMrFsemZXi8igi68ZdDOVlWYwhReJ6bX6rH1S5uFNe9ozgpU7j5+OzIRfFd94CvvFm1vGuXaIwam3BIR4coDx9f0H2+bct7zVR0bdWgtbPpSkAa3WEv1ASh1K2kYysgytEthExrXCjwwU4o/Dz5UFNEoIbPkCNf9yzyoGjr6uJHkOuf2HrIj3KUPUog/M9Cxd8h2xOBrIX4XicW7fJ4BMlfJRh9Y7pzttbJMQ4ER7hX4lCNaENduMLUmupgnNKAkkLW8HNR1ee0HbXK5olzG+YZza/NS+1XkDB/cpSaIHcdUu/3Gyn7v2Ve2X3q8rcLOoiBMQaCYWf/kA1EIEzyyh3ACCI3VwJCpFPZ2E+dmckYncG3g13Xs/Ff8rE1yaMMwes+muUdS58IrEj000nhMARc4/jnG93+4V7a/MHBNi0NhJhZJP5cF04ZkenF18yZAQFMZbQwLQG1ScVX5bw3mgmQzwDkLjWA4W5BBck704l1eyTAfkrYWbkqo7pgu1a+UumZnUMkka1nBgdPUxNT+ZZErlzbWwXOg9QUdEJGJAA3pLGOPCRZfE2pI6TBhC2Ls6we2Z9sKwrnW9uUN51r8Ahcc9I1696LLTrKZiUBWxaPthWfSUh06Il+EGvRl+W2JweiXRjETwbCAlm4= + - secure: obZaFSO6/rxUQkdvuHPCKNyzAuUr3jzrNlulY3UQeLozlmuFmG2UO9VdVyO6oCPHB7Hws3WGWHJcgRkb97z0X4K9DnGgSSN1QZzBe+zskYps/3bAHD8a0+DvNT0tlbA7tCj/0dA94ZCRkeixstIyb1L43KTxWUU3rK4JHilqbSmGDkzKwS7JW23/iMhK6RGToloUiA88Uz5wER7n4jzMvNBIqZPnO2YhN2MR/yw3cYrtDgXIuSLL4YNfNvbd2JFYVWTlPk8lySWWJCtiGgILev2Pm/uc8rKSDQPV5ZAZvUP3HfaFMs+fsNw+obWk34Y7H8S1WkEwUdf3Wb8JTlAYXLeULERba+iEhb2NCxp5jV2vvcXVcOQFzFu0ChVBSVAVgW9cR3thfw5E2VUC/EabaM4jRgMa6G78EHLhwE4z2eVNOR8GFZZH7h616KSRTxnB/8F3IWoeYQWEM6oBmDzTDW/wu0v7fTffpm2KgvcdueCO+kggfjfHz2eCQVV3liaKcDyfVtRbgNx4iPn7KNuLdYZ68JpHKgK+Rd3FtdFatQSN6x5BqEsFfEuteLnIchtFG77fGpv9lu1IV5l+3838EMUw0ZWKimEey3Owh2eOMRvT3JOu/1u9hYbLwU0T25HT85fWI5MOtMtzyJCeDSGLwPplL5wgnsgautmmq9a8ukg= + before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ From 1a3817f290f8d39abc9980b7ab1c4b7d26af314d Mon Sep 17 00:00:00 2001 From: Domingo Suarez Torres Date: Fri, 8 Apr 2022 19:05:32 -0500 Subject: [PATCH 06/11] adds missing env var --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fc48ae4..2a25390 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: java jdk: openjdk17 env: + - WONKY_TENANTS_FILE=./orgs_ignored.yaml - secure: YynxQ8ZEPhnPo3bgAJqZ4l0gvUqHLV+D7eMS0/bmxR3PkCjVjZmW80UKJnj2a4fXOX6AI1snWp8WfbGjgV7gmoNYeFdk47Ym4UQR8yXPaAq1sf4IZXJmQ4j1cFLGDQgsdTsUbZwcIJYwPt7BN0ecOWtscr9P1ohxlGsVnKw0k51qqRi0YmpRf6SWEqwkAw/lz32ukHQH4phguUBtw9+YV2C5y+fqSMByidLFeengInwncCos5cFUPOSqDzjxbG1Q+fUN9UQrGbCs9DZV5cTQoDxo9NA6cNJo6cTmVKx1kh2vC8aQSw6TuYiZJIltH84LchL5qQ81A1/fVR/CXy+UWH2uxbWVwtQ8ttH+eu9aCCOnPjewRAu0blimgixTZHl2mfHGoN3vybFT8krwZEPeqgYile095BVai9P/0R0P2aAvsHz1tc5e3IC0axPjav8eETZv89ohELfLdbWO289FsVvTxTCkpagBHE35651RAXyP2dhctKLnqfhsfvaerwTChgf2q7Xddlp9pfmZwNeAQ/19xp+cEwdlZEq4H+LU3oecsWY5J2ie0qdpbXnoL9z2xaNP/ZScdSHadlauc1Qo8xZnPy/kFQ6vdrqW0DlxmK5SZoGpBJCuMdMUMog3VX6/W0tgNkypS+FhD8sp1MfUDnU3mInSbfp3x4rJA5ftq44= - secure: HRwJQXRVUkGz90S7TF7TUsk1vVDMpecgmnF8V/DlBRQIgxuMrFMXk5HvlfPhy9BrJb83oviIVXtttC/Kkf2FWxPOa8ifHQDiLZC1Le74Cfl4lGiWCSj2E0NVxh64UiZjWNFy8JI+ZVH1NO34UNc67xbbcryKdIKffLlFzJKdfAbFnfOowsykJoRMPXGccyO6NipFXDy+pOsjjq61XvrsiQqW1Kfv5WcCPwIIKP0A0R0eFb1/7T6K2Fe+eeBotq3nxTMtNqzUeQzxyeeCusiO0OTzy+sS2eimFRUOdFXc39PQjqETM0ly5kj9IMzJuNuKJZq6IDOcUCInBduQXQhmkBeiThED5OSzdvbtWnPKxfTZ7069oG8M8LOUmmIODRdQWl9rvtJrKP0JodiVNzrJXeb2SG3bP5kANy7s9nEqmK3IzZtHDisFUcIqkDzL1e9lDYAbEyE/sVczDidD+gajyGPDHMC/K7aXABA15l0iCYStE0J6rZA14ztM9dNKIHjAhcFrS/sr/j6ol/pRWZahlq4uYKElDu3LhFRVMby4jaPjide1JUzZWsC8JjS6r8bcSXdiEL9ykcTbPYCCzz0g580YjpDy7R9H6/OLRYbAFlbwwiQvalZQ/nD5LLx7FTkzeCC209VVA839vXYm/xVyK/3vpxGxwQ/fy75SlYUH1CU= - secure: VfRcsDTQyazo/zd1dzPiTjwU+NwfAMrFsemZXi8igi68ZdDOVlWYwhReJ6bX6rH1S5uFNe9ozgpU7j5+OzIRfFd94CvvFm1vGuXaIwam3BIR4coDx9f0H2+bct7zVR0bdWgtbPpSkAa3WEv1ASh1K2kYysgytEthExrXCjwwU4o/Dz5UFNEoIbPkCNf9yzyoGjr6uJHkOuf2HrIj3KUPUog/M9Cxd8h2xOBrIX4XicW7fJ4BMlfJRh9Y7pzttbJMQ4ER7hX4lCNaENduMLUmupgnNKAkkLW8HNR1ee0HbXK5olzG+YZza/NS+1XkDB/cpSaIHcdUu/3Gyn7v2Ve2X3q8rcLOoiBMQaCYWf/kA1EIEzyyh3ACCI3VwJCpFPZ2E+dmckYncG3g13Xs/Ff8rE1yaMMwes+muUdS58IrEj000nhMARc4/jnG93+4V7a/MHBNi0NhJhZJP5cF04ZkenF18yZAQFMZbQwLQG1ScVX5bw3mgmQzwDkLjWA4W5BBck704l1eyTAfkrYWbkqo7pgu1a+UumZnUMkka1nBgdPUxNT+ZZErlzbWwXOg9QUdEJGJAA3pLGOPCRZfE2pI6TBhC2Ls6we2Z9sKwrnW9uUN51r8Ahcc9I1696LLTrKZiUBWxaPthWfSUh06Il+EGvRl+W2JweiXRjETwbCAlm4= From 77f3ad134a2d6c8d90decf04637d090a3b1091b1 Mon Sep 17 00:00:00 2001 From: Domingo Suarez Torres Date: Fri, 8 Apr 2022 19:41:16 -0500 Subject: [PATCH 07/11] enhances test report --- build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.gradle b/build.gradle index 2d3fba3..4a4a8d1 100644 --- a/build.gradle +++ b/build.gradle @@ -48,3 +48,10 @@ micronaut { annotations("com.example.*") } } + +test { + testLogging { + events "passed", "skipped", "failed" + exceptionFormat "full" + } +} From 4ad0f501aabca272785fd8d92e3c4d5558919ad8 Mon Sep 17 00:00:00 2001 From: Domingo Suarez Torres Date: Fri, 8 Apr 2022 22:08:16 -0500 Subject: [PATCH 08/11] fixes env vars --- .travis.yml | 11 ++++++----- src/test/groovy/wonky/api/ApiControllerSpec.groovy | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a25390..44f3622 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,12 @@ language: java jdk: openjdk17 env: - - WONKY_TENANTS_FILE=./orgs_ignored.yaml - - secure: YynxQ8ZEPhnPo3bgAJqZ4l0gvUqHLV+D7eMS0/bmxR3PkCjVjZmW80UKJnj2a4fXOX6AI1snWp8WfbGjgV7gmoNYeFdk47Ym4UQR8yXPaAq1sf4IZXJmQ4j1cFLGDQgsdTsUbZwcIJYwPt7BN0ecOWtscr9P1ohxlGsVnKw0k51qqRi0YmpRf6SWEqwkAw/lz32ukHQH4phguUBtw9+YV2C5y+fqSMByidLFeengInwncCos5cFUPOSqDzjxbG1Q+fUN9UQrGbCs9DZV5cTQoDxo9NA6cNJo6cTmVKx1kh2vC8aQSw6TuYiZJIltH84LchL5qQ81A1/fVR/CXy+UWH2uxbWVwtQ8ttH+eu9aCCOnPjewRAu0blimgixTZHl2mfHGoN3vybFT8krwZEPeqgYile095BVai9P/0R0P2aAvsHz1tc5e3IC0axPjav8eETZv89ohELfLdbWO289FsVvTxTCkpagBHE35651RAXyP2dhctKLnqfhsfvaerwTChgf2q7Xddlp9pfmZwNeAQ/19xp+cEwdlZEq4H+LU3oecsWY5J2ie0qdpbXnoL9z2xaNP/ZScdSHadlauc1Qo8xZnPy/kFQ6vdrqW0DlxmK5SZoGpBJCuMdMUMog3VX6/W0tgNkypS+FhD8sp1MfUDnU3mInSbfp3x4rJA5ftq44= - - secure: HRwJQXRVUkGz90S7TF7TUsk1vVDMpecgmnF8V/DlBRQIgxuMrFMXk5HvlfPhy9BrJb83oviIVXtttC/Kkf2FWxPOa8ifHQDiLZC1Le74Cfl4lGiWCSj2E0NVxh64UiZjWNFy8JI+ZVH1NO34UNc67xbbcryKdIKffLlFzJKdfAbFnfOowsykJoRMPXGccyO6NipFXDy+pOsjjq61XvrsiQqW1Kfv5WcCPwIIKP0A0R0eFb1/7T6K2Fe+eeBotq3nxTMtNqzUeQzxyeeCusiO0OTzy+sS2eimFRUOdFXc39PQjqETM0ly5kj9IMzJuNuKJZq6IDOcUCInBduQXQhmkBeiThED5OSzdvbtWnPKxfTZ7069oG8M8LOUmmIODRdQWl9rvtJrKP0JodiVNzrJXeb2SG3bP5kANy7s9nEqmK3IzZtHDisFUcIqkDzL1e9lDYAbEyE/sVczDidD+gajyGPDHMC/K7aXABA15l0iCYStE0J6rZA14ztM9dNKIHjAhcFrS/sr/j6ol/pRWZahlq4uYKElDu3LhFRVMby4jaPjide1JUzZWsC8JjS6r8bcSXdiEL9ykcTbPYCCzz0g580YjpDy7R9H6/OLRYbAFlbwwiQvalZQ/nD5LLx7FTkzeCC209VVA839vXYm/xVyK/3vpxGxwQ/fy75SlYUH1CU= - - secure: VfRcsDTQyazo/zd1dzPiTjwU+NwfAMrFsemZXi8igi68ZdDOVlWYwhReJ6bX6rH1S5uFNe9ozgpU7j5+OzIRfFd94CvvFm1vGuXaIwam3BIR4coDx9f0H2+bct7zVR0bdWgtbPpSkAa3WEv1ASh1K2kYysgytEthExrXCjwwU4o/Dz5UFNEoIbPkCNf9yzyoGjr6uJHkOuf2HrIj3KUPUog/M9Cxd8h2xOBrIX4XicW7fJ4BMlfJRh9Y7pzttbJMQ4ER7hX4lCNaENduMLUmupgnNKAkkLW8HNR1ee0HbXK5olzG+YZza/NS+1XkDB/cpSaIHcdUu/3Gyn7v2Ve2X3q8rcLOoiBMQaCYWf/kA1EIEzyyh3ACCI3VwJCpFPZ2E+dmckYncG3g13Xs/Ff8rE1yaMMwes+muUdS58IrEj000nhMARc4/jnG93+4V7a/MHBNi0NhJhZJP5cF04ZkenF18yZAQFMZbQwLQG1ScVX5bw3mgmQzwDkLjWA4W5BBck704l1eyTAfkrYWbkqo7pgu1a+UumZnUMkka1nBgdPUxNT+ZZErlzbWwXOg9QUdEJGJAA3pLGOPCRZfE2pI6TBhC2Ls6we2Z9sKwrnW9uUN51r8Ahcc9I1696LLTrKZiUBWxaPthWfSUh06Il+EGvRl+W2JweiXRjETwbCAlm4= - - secure: obZaFSO6/rxUQkdvuHPCKNyzAuUr3jzrNlulY3UQeLozlmuFmG2UO9VdVyO6oCPHB7Hws3WGWHJcgRkb97z0X4K9DnGgSSN1QZzBe+zskYps/3bAHD8a0+DvNT0tlbA7tCj/0dA94ZCRkeixstIyb1L43KTxWUU3rK4JHilqbSmGDkzKwS7JW23/iMhK6RGToloUiA88Uz5wER7n4jzMvNBIqZPnO2YhN2MR/yw3cYrtDgXIuSLL4YNfNvbd2JFYVWTlPk8lySWWJCtiGgILev2Pm/uc8rKSDQPV5ZAZvUP3HfaFMs+fsNw+obWk34Y7H8S1WkEwUdf3Wb8JTlAYXLeULERba+iEhb2NCxp5jV2vvcXVcOQFzFu0ChVBSVAVgW9cR3thfw5E2VUC/EabaM4jRgMa6G78EHLhwE4z2eVNOR8GFZZH7h616KSRTxnB/8F3IWoeYQWEM6oBmDzTDW/wu0v7fTffpm2KgvcdueCO+kggfjfHz2eCQVV3liaKcDyfVtRbgNx4iPn7KNuLdYZ68JpHKgK+Rd3FtdFatQSN6x5BqEsFfEuteLnIchtFG77fGpv9lu1IV5l+3838EMUw0ZWKimEey3Owh2eOMRvT3JOu/1u9hYbLwU0T25HT85fWI5MOtMtzyJCeDSGLwPplL5wgnsgautmmq9a8ukg= + global: + - WONKY_TENANTS_FILE=./orgs_ignored.yaml + - secure: YynxQ8ZEPhnPo3bgAJqZ4l0gvUqHLV+D7eMS0/bmxR3PkCjVjZmW80UKJnj2a4fXOX6AI1snWp8WfbGjgV7gmoNYeFdk47Ym4UQR8yXPaAq1sf4IZXJmQ4j1cFLGDQgsdTsUbZwcIJYwPt7BN0ecOWtscr9P1ohxlGsVnKw0k51qqRi0YmpRf6SWEqwkAw/lz32ukHQH4phguUBtw9+YV2C5y+fqSMByidLFeengInwncCos5cFUPOSqDzjxbG1Q+fUN9UQrGbCs9DZV5cTQoDxo9NA6cNJo6cTmVKx1kh2vC8aQSw6TuYiZJIltH84LchL5qQ81A1/fVR/CXy+UWH2uxbWVwtQ8ttH+eu9aCCOnPjewRAu0blimgixTZHl2mfHGoN3vybFT8krwZEPeqgYile095BVai9P/0R0P2aAvsHz1tc5e3IC0axPjav8eETZv89ohELfLdbWO289FsVvTxTCkpagBHE35651RAXyP2dhctKLnqfhsfvaerwTChgf2q7Xddlp9pfmZwNeAQ/19xp+cEwdlZEq4H+LU3oecsWY5J2ie0qdpbXnoL9z2xaNP/ZScdSHadlauc1Qo8xZnPy/kFQ6vdrqW0DlxmK5SZoGpBJCuMdMUMog3VX6/W0tgNkypS+FhD8sp1MfUDnU3mInSbfp3x4rJA5ftq44= + - secure: HRwJQXRVUkGz90S7TF7TUsk1vVDMpecgmnF8V/DlBRQIgxuMrFMXk5HvlfPhy9BrJb83oviIVXtttC/Kkf2FWxPOa8ifHQDiLZC1Le74Cfl4lGiWCSj2E0NVxh64UiZjWNFy8JI+ZVH1NO34UNc67xbbcryKdIKffLlFzJKdfAbFnfOowsykJoRMPXGccyO6NipFXDy+pOsjjq61XvrsiQqW1Kfv5WcCPwIIKP0A0R0eFb1/7T6K2Fe+eeBotq3nxTMtNqzUeQzxyeeCusiO0OTzy+sS2eimFRUOdFXc39PQjqETM0ly5kj9IMzJuNuKJZq6IDOcUCInBduQXQhmkBeiThED5OSzdvbtWnPKxfTZ7069oG8M8LOUmmIODRdQWl9rvtJrKP0JodiVNzrJXeb2SG3bP5kANy7s9nEqmK3IzZtHDisFUcIqkDzL1e9lDYAbEyE/sVczDidD+gajyGPDHMC/K7aXABA15l0iCYStE0J6rZA14ztM9dNKIHjAhcFrS/sr/j6ol/pRWZahlq4uYKElDu3LhFRVMby4jaPjide1JUzZWsC8JjS6r8bcSXdiEL9ykcTbPYCCzz0g580YjpDy7R9H6/OLRYbAFlbwwiQvalZQ/nD5LLx7FTkzeCC209VVA839vXYm/xVyK/3vpxGxwQ/fy75SlYUH1CU= + - secure: VfRcsDTQyazo/zd1dzPiTjwU+NwfAMrFsemZXi8igi68ZdDOVlWYwhReJ6bX6rH1S5uFNe9ozgpU7j5+OzIRfFd94CvvFm1vGuXaIwam3BIR4coDx9f0H2+bct7zVR0bdWgtbPpSkAa3WEv1ASh1K2kYysgytEthExrXCjwwU4o/Dz5UFNEoIbPkCNf9yzyoGjr6uJHkOuf2HrIj3KUPUog/M9Cxd8h2xOBrIX4XicW7fJ4BMlfJRh9Y7pzttbJMQ4ER7hX4lCNaENduMLUmupgnNKAkkLW8HNR1ee0HbXK5olzG+YZza/NS+1XkDB/cpSaIHcdUu/3Gyn7v2Ve2X3q8rcLOoiBMQaCYWf/kA1EIEzyyh3ACCI3VwJCpFPZ2E+dmckYncG3g13Xs/Ff8rE1yaMMwes+muUdS58IrEj000nhMARc4/jnG93+4V7a/MHBNi0NhJhZJP5cF04ZkenF18yZAQFMZbQwLQG1ScVX5bw3mgmQzwDkLjWA4W5BBck704l1eyTAfkrYWbkqo7pgu1a+UumZnUMkka1nBgdPUxNT+ZZErlzbWwXOg9QUdEJGJAA3pLGOPCRZfE2pI6TBhC2Ls6we2Z9sKwrnW9uUN51r8Ahcc9I1696LLTrKZiUBWxaPthWfSUh06Il+EGvRl+W2JweiXRjETwbCAlm4= + - secure: obZaFSO6/rxUQkdvuHPCKNyzAuUr3jzrNlulY3UQeLozlmuFmG2UO9VdVyO6oCPHB7Hws3WGWHJcgRkb97z0X4K9DnGgSSN1QZzBe+zskYps/3bAHD8a0+DvNT0tlbA7tCj/0dA94ZCRkeixstIyb1L43KTxWUU3rK4JHilqbSmGDkzKwS7JW23/iMhK6RGToloUiA88Uz5wER7n4jzMvNBIqZPnO2YhN2MR/yw3cYrtDgXIuSLL4YNfNvbd2JFYVWTlPk8lySWWJCtiGgILev2Pm/uc8rKSDQPV5ZAZvUP3HfaFMs+fsNw+obWk34Y7H8S1WkEwUdf3Wb8JTlAYXLeULERba+iEhb2NCxp5jV2vvcXVcOQFzFu0ChVBSVAVgW9cR3thfw5E2VUC/EabaM4jRgMa6G78EHLhwE4z2eVNOR8GFZZH7h616KSRTxnB/8F3IWoeYQWEM6oBmDzTDW/wu0v7fTffpm2KgvcdueCO+kggfjfHz2eCQVV3liaKcDyfVtRbgNx4iPn7KNuLdYZ68JpHKgK+Rd3FtdFatQSN6x5BqEsFfEuteLnIchtFG77fGpv9lu1IV5l+3838EMUw0ZWKimEey3Owh2eOMRvT3JOu/1u9hYbLwU0T25HT85fWI5MOtMtzyJCeDSGLwPplL5wgnsgautmmq9a8ukg= before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock diff --git a/src/test/groovy/wonky/api/ApiControllerSpec.groovy b/src/test/groovy/wonky/api/ApiControllerSpec.groovy index 63c3487..e7f1721 100644 --- a/src/test/groovy/wonky/api/ApiControllerSpec.groovy +++ b/src/test/groovy/wonky/api/ApiControllerSpec.groovy @@ -26,7 +26,6 @@ import io.micronaut.http.client.exceptions.HttpClientResponseException import io.micronaut.runtime.server.EmbeddedServer import org.apache.commons.lang3.RandomStringUtils import spock.lang.AutoCleanup -import spock.lang.Ignore import spock.lang.Shared import spock.lang.Specification import wonky.json.JacksonUtil From f4a22382680cc82b7417c19e004baa1f7fff357c Mon Sep 17 00:00:00 2001 From: Domingo Suarez Torres Date: Fri, 8 Apr 2022 22:15:58 -0500 Subject: [PATCH 09/11] more enhancements --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 44f3622..360e3f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,15 +8,19 @@ env: - secure: YynxQ8ZEPhnPo3bgAJqZ4l0gvUqHLV+D7eMS0/bmxR3PkCjVjZmW80UKJnj2a4fXOX6AI1snWp8WfbGjgV7gmoNYeFdk47Ym4UQR8yXPaAq1sf4IZXJmQ4j1cFLGDQgsdTsUbZwcIJYwPt7BN0ecOWtscr9P1ohxlGsVnKw0k51qqRi0YmpRf6SWEqwkAw/lz32ukHQH4phguUBtw9+YV2C5y+fqSMByidLFeengInwncCos5cFUPOSqDzjxbG1Q+fUN9UQrGbCs9DZV5cTQoDxo9NA6cNJo6cTmVKx1kh2vC8aQSw6TuYiZJIltH84LchL5qQ81A1/fVR/CXy+UWH2uxbWVwtQ8ttH+eu9aCCOnPjewRAu0blimgixTZHl2mfHGoN3vybFT8krwZEPeqgYile095BVai9P/0R0P2aAvsHz1tc5e3IC0axPjav8eETZv89ohELfLdbWO289FsVvTxTCkpagBHE35651RAXyP2dhctKLnqfhsfvaerwTChgf2q7Xddlp9pfmZwNeAQ/19xp+cEwdlZEq4H+LU3oecsWY5J2ie0qdpbXnoL9z2xaNP/ZScdSHadlauc1Qo8xZnPy/kFQ6vdrqW0DlxmK5SZoGpBJCuMdMUMog3VX6/W0tgNkypS+FhD8sp1MfUDnU3mInSbfp3x4rJA5ftq44= - secure: HRwJQXRVUkGz90S7TF7TUsk1vVDMpecgmnF8V/DlBRQIgxuMrFMXk5HvlfPhy9BrJb83oviIVXtttC/Kkf2FWxPOa8ifHQDiLZC1Le74Cfl4lGiWCSj2E0NVxh64UiZjWNFy8JI+ZVH1NO34UNc67xbbcryKdIKffLlFzJKdfAbFnfOowsykJoRMPXGccyO6NipFXDy+pOsjjq61XvrsiQqW1Kfv5WcCPwIIKP0A0R0eFb1/7T6K2Fe+eeBotq3nxTMtNqzUeQzxyeeCusiO0OTzy+sS2eimFRUOdFXc39PQjqETM0ly5kj9IMzJuNuKJZq6IDOcUCInBduQXQhmkBeiThED5OSzdvbtWnPKxfTZ7069oG8M8LOUmmIODRdQWl9rvtJrKP0JodiVNzrJXeb2SG3bP5kANy7s9nEqmK3IzZtHDisFUcIqkDzL1e9lDYAbEyE/sVczDidD+gajyGPDHMC/K7aXABA15l0iCYStE0J6rZA14ztM9dNKIHjAhcFrS/sr/j6ol/pRWZahlq4uYKElDu3LhFRVMby4jaPjide1JUzZWsC8JjS6r8bcSXdiEL9ykcTbPYCCzz0g580YjpDy7R9H6/OLRYbAFlbwwiQvalZQ/nD5LLx7FTkzeCC209VVA839vXYm/xVyK/3vpxGxwQ/fy75SlYUH1CU= - secure: VfRcsDTQyazo/zd1dzPiTjwU+NwfAMrFsemZXi8igi68ZdDOVlWYwhReJ6bX6rH1S5uFNe9ozgpU7j5+OzIRfFd94CvvFm1vGuXaIwam3BIR4coDx9f0H2+bct7zVR0bdWgtbPpSkAa3WEv1ASh1K2kYysgytEthExrXCjwwU4o/Dz5UFNEoIbPkCNf9yzyoGjr6uJHkOuf2HrIj3KUPUog/M9Cxd8h2xOBrIX4XicW7fJ4BMlfJRh9Y7pzttbJMQ4ER7hX4lCNaENduMLUmupgnNKAkkLW8HNR1ee0HbXK5olzG+YZza/NS+1XkDB/cpSaIHcdUu/3Gyn7v2Ve2X3q8rcLOoiBMQaCYWf/kA1EIEzyyh3ACCI3VwJCpFPZ2E+dmckYncG3g13Xs/Ff8rE1yaMMwes+muUdS58IrEj000nhMARc4/jnG93+4V7a/MHBNi0NhJhZJP5cF04ZkenF18yZAQFMZbQwLQG1ScVX5bw3mgmQzwDkLjWA4W5BBck704l1eyTAfkrYWbkqo7pgu1a+UumZnUMkka1nBgdPUxNT+ZZErlzbWwXOg9QUdEJGJAA3pLGOPCRZfE2pI6TBhC2Ls6we2Z9sKwrnW9uUN51r8Ahcc9I1696LLTrKZiUBWxaPthWfSUh06Il+EGvRl+W2JweiXRjETwbCAlm4= - - secure: obZaFSO6/rxUQkdvuHPCKNyzAuUr3jzrNlulY3UQeLozlmuFmG2UO9VdVyO6oCPHB7Hws3WGWHJcgRkb97z0X4K9DnGgSSN1QZzBe+zskYps/3bAHD8a0+DvNT0tlbA7tCj/0dA94ZCRkeixstIyb1L43KTxWUU3rK4JHilqbSmGDkzKwS7JW23/iMhK6RGToloUiA88Uz5wER7n4jzMvNBIqZPnO2YhN2MR/yw3cYrtDgXIuSLL4YNfNvbd2JFYVWTlPk8lySWWJCtiGgILev2Pm/uc8rKSDQPV5ZAZvUP3HfaFMs+fsNw+obWk34Y7H8S1WkEwUdf3Wb8JTlAYXLeULERba+iEhb2NCxp5jV2vvcXVcOQFzFu0ChVBSVAVgW9cR3thfw5E2VUC/EabaM4jRgMa6G78EHLhwE4z2eVNOR8GFZZH7h616KSRTxnB/8F3IWoeYQWEM6oBmDzTDW/wu0v7fTffpm2KgvcdueCO+kggfjfHz2eCQVV3liaKcDyfVtRbgNx4iPn7KNuLdYZ68JpHKgK+Rd3FtdFatQSN6x5BqEsFfEuteLnIchtFG77fGpv9lu1IV5l+3838EMUw0ZWKimEey3Owh2eOMRvT3JOu/1u9hYbLwU0T25HT85fWI5MOtMtzyJCeDSGLwPplL5wgnsgautmmq9a8ukg= before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ + cache: directories: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ + before_install: - openssl aes-256-cbc -K $encrypted_55795232bcfe_key -iv $encrypted_55795232bcfe_iv -in orgs_ignored.yaml.enc -out orgs_ignored.yaml -d + +script: + - "./gradlew jacocoTestReport --warning-mode=all" From ad62475b31679f4209db6386bc003067b13282ee Mon Sep 17 00:00:00 2001 From: Domingo Suarez Torres Date: Fri, 8 Apr 2022 22:21:08 -0500 Subject: [PATCH 10/11] Adds some plugins --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4a4a8d1..3fa8c5e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,9 @@ plugins { id("groovy") + id("jacoco") id("com.github.johnrengelman.shadow") version "7.1.2" id("io.micronaut.application") version "3.3.2" + id 'com.github.ben-manes.versions' version '0.42.0' } version = "0.1" @@ -26,7 +28,7 @@ dependencies { implementation("io.micronaut:micronaut-validation") - implementation 'commons-io:commons-io:2.8.0' + implementation 'commons-io:commons-io:2.11.0' testImplementation 'org.apache.commons:commons-lang3:3.12.0' } From dcf8cd95c537f43acf8363c7da87ef91174cd8f3 Mon Sep 17 00:00:00 2001 From: Domingo Suarez Torres Date: Fri, 8 Apr 2022 22:33:29 -0500 Subject: [PATCH 11/11] enhances in JaCoCo configuration --- .travis.yml | 2 ++ build.gradle | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/.travis.yml b/.travis.yml index 360e3f8..baf92a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,5 +22,7 @@ before_install: - openssl aes-256-cbc -K $encrypted_55795232bcfe_key -iv $encrypted_55795232bcfe_iv -in orgs_ignored.yaml.enc -out orgs_ignored.yaml -d +install: skip + script: - "./gradlew jacocoTestReport --warning-mode=all" diff --git a/build.gradle b/build.gradle index 3fa8c5e..13a7ebd 100644 --- a/build.gradle +++ b/build.gradle @@ -56,4 +56,19 @@ test { events "passed", "skipped", "failed" exceptionFormat "full" } + finalizedBy jacocoTestReport +} + +jacocoTestReport { + dependsOn test + //We are running on Continuos Integration environment + def ci = System.getenv('CI') == "true" + reports { + xml.required = ci + html.required = !ci + } +} + +jacoco { + toolVersion = "0.8.8" }