From 22b1524a9a892ffc365959dc17039e2031cba9c4 Mon Sep 17 00:00:00 2001 From: Yauheni_Lesnikau Date: Wed, 5 May 2021 14:58:26 +0200 Subject: [PATCH 1/6] set log level to info for azure provider --- devops/azure/chart/templates/deployment.yaml | 2 ++ .../partition-azure/src/main/resources/application.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index 701ea88..9ebb5df 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -63,6 +63,8 @@ spec: value: "80" - name: ACCEPT_HTTP # TEMPORARY UNTIL HTTPS value: "true" + - name: partition_spring_logging_level + value: info - name: KEYVAULT_URI valueFrom: configMapKeyRef: diff --git a/provider/partition-azure/src/main/resources/application.properties b/provider/partition-azure/src/main/resources/application.properties index 436ee53..8dc8d85 100644 --- a/provider/partition-azure/src/main/resources/application.properties +++ b/provider/partition-azure/src/main/resources/application.properties @@ -1,6 +1,6 @@ LOG_PREFIX=partition server.servlet.contextPath=/api/partition/v1 -logging.level.org.springframework.web=DEBUG +logging.level.org.springframework.web=${partition_spring_logging_level} JAVA_OPTS=-Dserver.port=80 server.port=8080 springfox.documentation.swagger.v2.path=/api-docs -- GitLab From f43f27a42e25ea6859a57f2b62f5d9509a960009 Mon Sep 17 00:00:00 2001 From: Yauheni_Lesnikau Date: Thu, 6 May 2021 13:43:46 +0200 Subject: [PATCH 2/6] setup log level variable for integration tests --- .../provider/azure/security/AADSecurityConfigTest.java | 7 +++++++ .../provider/azure/security/WhoamiControllerTest.java | 7 +++++++ .../osdu/partition/provider/azure/utils/TestUtils.java | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java index dba07af..266b5fc 100644 --- a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java +++ b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java @@ -17,10 +17,12 @@ package org.opengroup.osdu.partition.provider.azure.security; import com.microsoft.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter; import com.microsoft.azure.spring.autoconfigure.aad.UserPrincipalManager; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.opengroup.osdu.partition.api.PartitionApi; +import org.opengroup.osdu.partition.provider.azure.utils.TestUtils; import org.opengroup.osdu.partition.swagger.HomeController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -49,6 +51,11 @@ public class AADSecurityConfigTest { @Autowired private WebApplicationContext context; + @BeforeClass + public static void setupEnv(){ + TestUtils.setupLogLevel("info"); + } + @Before public void setup() { mockMvc = MockMvcBuilders.webAppContextSetup(context).build(); diff --git a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java index 5d0bf23..4675e5e 100644 --- a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java +++ b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java @@ -15,9 +15,11 @@ package org.opengroup.osdu.partition.provider.azure.security; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; +import org.opengroup.osdu.partition.provider.azure.utils.TestUtils; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.springframework.beans.factory.annotation.Autowired; @@ -53,6 +55,11 @@ public class WhoamiControllerTest { @MockBean private UserPrincipalManager userPrincipalManager; + @BeforeClass + public static void setupEnv(){ + TestUtils.setupLogLevel("info"); + } + @Before public void setup() { mockMvc = MockMvcBuilders.webAppContextSetup(context).build(); diff --git a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/TestUtils.java b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/TestUtils.java index 3926653..cb41daa 100644 --- a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/TestUtils.java +++ b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/TestUtils.java @@ -21,4 +21,8 @@ public class TestUtils { public static String getAppId() {return appId;} public static String getAadIssuer() {return aadIssuer;} + + public static void setupLogLevel(String logLevel) { + System.setProperty("partition_spring_logging_level", logLevel); + } } -- GitLab From 1e27fb48bdbcde9599e85d882f634b8611ca0c19 Mon Sep 17 00:00:00 2001 From: Yauheni_Lesnikau Date: Mon, 10 May 2021 16:01:44 +0200 Subject: [PATCH 3/6] set default logging level for azure provider; --- devops/azure/chart/templates/deployment.yaml | 2 +- .../src/main/resources/application.properties | 2 +- .../provider/azure/security/AADSecurityConfigTest.java | 8 -------- .../provider/azure/security/WhoamiControllerTest.java | 8 -------- .../osdu/partition/provider/azure/utils/TestUtils.java | 4 ---- 5 files changed, 2 insertions(+), 22 deletions(-) diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index 9ebb5df..eccbf52 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -64,7 +64,7 @@ spec: - name: ACCEPT_HTTP # TEMPORARY UNTIL HTTPS value: "true" - name: partition_spring_logging_level - value: info + value: INFO - name: KEYVAULT_URI valueFrom: configMapKeyRef: diff --git a/provider/partition-azure/src/main/resources/application.properties b/provider/partition-azure/src/main/resources/application.properties index 8dc8d85..decff4b 100644 --- a/provider/partition-azure/src/main/resources/application.properties +++ b/provider/partition-azure/src/main/resources/application.properties @@ -1,6 +1,6 @@ LOG_PREFIX=partition server.servlet.contextPath=/api/partition/v1 -logging.level.org.springframework.web=${partition_spring_logging_level} +logging.level.org.springframework.web=${partition_spring_logging_level:INFO} JAVA_OPTS=-Dserver.port=80 server.port=8080 springfox.documentation.swagger.v2.path=/api-docs diff --git a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java index 266b5fc..e0fd53c 100644 --- a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java +++ b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java @@ -17,12 +17,9 @@ package org.opengroup.osdu.partition.provider.azure.security; import com.microsoft.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter; import com.microsoft.azure.spring.autoconfigure.aad.UserPrincipalManager; import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.opengroup.osdu.partition.api.PartitionApi; -import org.opengroup.osdu.partition.provider.azure.utils.TestUtils; import org.opengroup.osdu.partition.swagger.HomeController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -51,11 +48,6 @@ public class AADSecurityConfigTest { @Autowired private WebApplicationContext context; - @BeforeClass - public static void setupEnv(){ - TestUtils.setupLogLevel("info"); - } - @Before public void setup() { mockMvc = MockMvcBuilders.webAppContextSetup(context).build(); diff --git a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java index 4675e5e..8b2a8f9 100644 --- a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java +++ b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java @@ -15,13 +15,10 @@ package org.opengroup.osdu.partition.provider.azure.security; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.opengroup.osdu.partition.provider.azure.utils.TestUtils; import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; @@ -55,11 +52,6 @@ public class WhoamiControllerTest { @MockBean private UserPrincipalManager userPrincipalManager; - @BeforeClass - public static void setupEnv(){ - TestUtils.setupLogLevel("info"); - } - @Before public void setup() { mockMvc = MockMvcBuilders.webAppContextSetup(context).build(); diff --git a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/TestUtils.java b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/TestUtils.java index cb41daa..3926653 100644 --- a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/TestUtils.java +++ b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/utils/TestUtils.java @@ -21,8 +21,4 @@ public class TestUtils { public static String getAppId() {return appId;} public static String getAadIssuer() {return aadIssuer;} - - public static void setupLogLevel(String logLevel) { - System.setProperty("partition_spring_logging_level", logLevel); - } } -- GitLab From 6266f54bf874777e120753950b6c15cf72f24f56 Mon Sep 17 00:00:00 2001 From: Yauheni_Lesnikau Date: Mon, 10 May 2021 17:00:40 +0200 Subject: [PATCH 4/6] revert imports; --- .../partition/provider/azure/security/AADSecurityConfigTest.java | 1 + .../partition/provider/azure/security/WhoamiControllerTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java index e0fd53c..dba07af 100644 --- a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java +++ b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfigTest.java @@ -17,6 +17,7 @@ package org.opengroup.osdu.partition.provider.azure.security; import com.microsoft.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter; import com.microsoft.azure.spring.autoconfigure.aad.UserPrincipalManager; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.opengroup.osdu.partition.api.PartitionApi; diff --git a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java index 8b2a8f9..5d0bf23 100644 --- a/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java +++ b/provider/partition-azure/src/test/java/org/opengroup/osdu/partition/provider/azure/security/WhoamiControllerTest.java @@ -19,6 +19,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -- GitLab From 8c5ba840cf15a2f28274ef375b37f1dcb88125ed Mon Sep 17 00:00:00 2001 From: NThakur4 Date: Tue, 11 May 2021 15:05:28 -0500 Subject: [PATCH 5/6] fossa NOTICE --- NOTICE | 1 + 1 file changed, 1 insertion(+) diff --git a/NOTICE b/NOTICE index a5ba405..26ec8f4 100644 --- a/NOTICE +++ b/NOTICE @@ -278,6 +278,7 @@ The following software have components provided under the terms of this license: - Cobertura code coverage (from http://cobertura.sourceforge.net) - Commons Digester (from http://commons.apache.org/digester/) - Commons IO (from http://commons.apache.org/io/) +- Commons IO (from http://commons.apache.org/io/) - Commons Lang (from http://commons.apache.org/lang/) - Converter: Jackson (from ) - Doxia :: APT Module (from ) -- GitLab From 179858f0fc21de4b28c9a5331b71c702a8d2f02f Mon Sep 17 00:00:00 2001 From: Yauheni_Lesnikau Date: Thu, 13 May 2021 16:18:42 +0200 Subject: [PATCH 6/6] re-create NOTICE; --- NOTICE | 1 - 1 file changed, 1 deletion(-) diff --git a/NOTICE b/NOTICE index 26ec8f4..a5ba405 100644 --- a/NOTICE +++ b/NOTICE @@ -278,7 +278,6 @@ The following software have components provided under the terms of this license: - Cobertura code coverage (from http://cobertura.sourceforge.net) - Commons Digester (from http://commons.apache.org/digester/) - Commons IO (from http://commons.apache.org/io/) -- Commons IO (from http://commons.apache.org/io/) - Commons Lang (from http://commons.apache.org/lang/) - Converter: Jackson (from ) - Doxia :: APT Module (from ) -- GitLab