Merge branch 'main' into AJ-1277_delete-records-capabilities

DataBiosphere · Sep 27, 2024 · 0342944 · 0342944
2 parents 977b59f + 8a7e6de
commit 0342944
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/...ice/src/main/java/org/databiosphere/workspacedataservice/controller/ControllerConfig.java b/...ice/src/main/java/org/databiosphere/workspacedataservice/controller/ControllerConfig.java
@@ -21,7 +21,7 @@ public class ControllerConfig {
    */
   @SuppressWarnings("java:S5122") // we explicitly want to allow * for origins
   @Bean
-  @Profile("local-cors")
+  @Profile({"local-cors", "control-plane"})
   public WebMvcConfigurer corsConfigurer() {
     return new WebMvcConfigurer() {
       @Override

diff --git a/service/src/main/resources/application-bee.yml b/service/src/main/resources/application-bee.yml
@@ -5,3 +5,5 @@ workspacemanagerurl: https://workspace.${beename}.bee.envs-terra.bio
 leoUrl: https://leonardo.${beename}.bee.envs-terra.bio
 rawlsUrl: https://rawls.${beename}.bee.envs-terra.bio
 
+# Enable preview of control plane apis
+controlPlanePreview: "on"
diff --git a/.../src/test/java/org/databiosphere/workspacedataservice/controller/CorsLiveMockMvcTest.java b/.../src/test/java/org/databiosphere/workspacedataservice/controller/CorsLiveMockMvcTest.java
@@ -5,8 +5,12 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.util.UUID;
+import org.databiosphere.workspacedataservice.annotations.SingleTenant;
+import org.databiosphere.workspacedataservice.shared.model.WorkspaceId;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MvcResult;
 
 /**
@@ -16,9 +20,14 @@
  *
  * <p>See also CorsLocalMockMvcTest for testing CORS behavior in the "local" Spring profile
  */
+@ActiveProfiles(
+    value = {"data-plane"},
+    inheritProfiles = false)
 class CorsLiveMockMvcTest extends MockMvcTestBase {
   private static final String versionId = "v0.2";
 
+  @MockBean @SingleTenant WorkspaceId workspaceId;
+
   @ParameterizedTest(name = "CORS response headers for non-local profile to {0} should be correct")
   @ValueSource(
       strings = {