Google Java Format

vmware · Dec 14, 2023 · 88d2b9f · 88d2b9f
1 parent 30399d4
commit 88d2b9f
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 15 deletions.
diff --git a/...gration-test/java/com/vmware/taurus/datajobs/it/TestJobImageBuilderDynamicVdkImageIT.java b/...gration-test/java/com/vmware/taurus/datajobs/it/TestJobImageBuilderDynamicVdkImageIT.java
@@ -212,9 +212,9 @@ public void testDataJobDeploymentDynamicVdkVersion() throws Exception {
                 .with(user("user"))
                 .content(getDataJobDeploymentVdkVersionRequestBody("new_vdk_version_tag"))
                 .contentType(MediaType.APPLICATION_JSON))
-        .andExpect(status().isBadRequest());
+        .andExpect(status().isAccepted());
 
-    // verify vdk version is not changed
+    // verify vdk version is changed
     mockMvc
         .perform(
             get(String.format(
@@ -223,7 +223,7 @@ public void testDataJobDeploymentDynamicVdkVersion() throws Exception {
                 .with(user("user"))
                 .contentType(MediaType.APPLICATION_JSON))
         .andExpect(status().isOk())
-        .andExpect(jsonPath("$.vdk_version", is("release")));
+        .andExpect(jsonPath("$.vdk_version", is("new_vdk_version_tag")));
 
     // Execute change python version and set corresponding vdk version for deployment
     mockMvc

diff --git a/...ines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployer.java b/...ines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployer.java
@@ -376,11 +376,15 @@ public static String getCronJobName(String jobName) {
     return jobName;
   }
 
-  private boolean isVdkVersionPassedDifferentFromOneSetByPythonVersion(JobDeployment jobDeployment) {
+  private boolean isVdkVersionPassedDifferentFromOneSetByPythonVersion(
+      JobDeployment jobDeployment) {
     var passedVdkVersion = jobDeployment.getVdkVersion();
     var vdkVersionSetByPythonVersion =
-            DockerImageName.getTag(supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion()));
+        DockerImageName.getTag(
+            supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion()));
 
-    return passedVdkVersion != null && !passedVdkVersion.isEmpty() && !passedVdkVersion.equals(vdkVersionSetByPythonVersion);
+    return passedVdkVersion != null
+        && !passedVdkVersion.isEmpty()
+        && !passedVdkVersion.equals(vdkVersionSetByPythonVersion);
   }
 }
diff --git a/...es_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java b/...es_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java
@@ -374,9 +374,9 @@ private KubernetesService.CronJob getCronJob(
             "cp -r $(python -c \"from distutils.sysconfig import get_python_lib;"
                 + " print(get_python_lib())\") /vdk/. && cp /usr/local/bin/vdk /vdk/.");
     var jobVdkImage =
-            isVdkVersionPassedDifferentFromOneSetByPythonVersion(jobDeployment)
-                    ? supportedPythonVersions.replaceVdkVersionInImage(jobDeployment.getVdkVersion())
-                    : supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion());
+        isVdkVersionPassedDifferentFromOneSetByPythonVersion(jobDeployment)
+            ? supportedPythonVersions.replaceVdkVersionInImage(jobDeployment.getVdkVersion())
+            : supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion());
     var jobInitContainer =
         KubernetesService.container(
             "vdk",
@@ -485,11 +485,15 @@ private void handleResourcesException(ParseException e) {
     log.error(errorMessage.toString(), e);
   }
 
-  private boolean isVdkVersionPassedDifferentFromOneSetByPythonVersion(DesiredDataJobDeployment jobDeployment) {
+  private boolean isVdkVersionPassedDifferentFromOneSetByPythonVersion(
+      DesiredDataJobDeployment jobDeployment) {
     var passedVdkVersion = jobDeployment.getVdkVersion();
     var vdkVersionSetByPythonVersion =
-            DockerImageName.getTag(supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion()));
+        DockerImageName.getTag(
+            supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion()));
 
-    return passedVdkVersion != null && !passedVdkVersion.isEmpty() && !passedVdkVersion.equals(vdkVersionSetByPythonVersion);
+    return passedVdkVersion != null
+        && !passedVdkVersion.isEmpty()
+        && !passedVdkVersion.equals(vdkVersionSetByPythonVersion);
   }
 }
diff --git a/...ntrol_service/src/main/java/com/vmware/taurus/service/deploy/SupportedPythonVersions.java b/...ntrol_service/src/main/java/com/vmware/taurus/service/deploy/SupportedPythonVersions.java
@@ -7,7 +7,6 @@
 
 import java.util.*;
 
-import com.vmware.taurus.service.model.JobDeployment;
 import org.springframework.beans.factory.annotation.Value;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;

diff --git a/...pelines_control_service/src/test/java/com/vmware/taurus/service/JobImageDeployerTest.java b/...pelines_control_service/src/test/java/com/vmware/taurus/service/JobImageDeployerTest.java
@@ -14,6 +14,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 
 import java.time.OffsetDateTime;
@@ -83,6 +84,7 @@ public void testScheduleLabelsAnnotations() {
         .thenReturn(new KubernetesService.Resources("1.5", "200"));
     Mockito.when(kubernetesResources.dataJobInitContainerRequests())
         .thenReturn(new KubernetesService.Resources("1.5", "200"));
+    Mockito.when(supportedPythonVersions.getVdkImage("3.9")).thenReturn("release");
 
     var annotationCaptor = ArgumentCaptor.forClass(Map.class);
     var labelCaptor = ArgumentCaptor.forClass(Map.class);

diff --git a/...control_service/src/test/java/com/vmware/taurus/service/deploy/DeploymentServiceTest.java b/...control_service/src/test/java/com/vmware/taurus/service/deploy/DeploymentServiceTest.java
@@ -142,6 +142,7 @@ public void setUp() {
 
     when(kubernetesService.readCronJob(TEST_CRONJOB_NAME))
         .thenReturn(Optional.of(TestUtils.getJobDeploymentStatus()));
+    when(supportedPythonVersions.getVdkImage(any())).thenReturn("release");
   }
 
   @Test

diff --git a/..._control_service/src/test/java/com/vmware/taurus/service/deploy/JobImageDeployerTest.java b/..._control_service/src/test/java/com/vmware/taurus/service/deploy/JobImageDeployerTest.java
@@ -94,7 +94,8 @@ public void setUp() {
     when(defaultConfigurations.dataJobLimits())
         .thenReturn(new KubernetesService.Resources("2000m", "1G"));
 
-    when(supportedPythonVersions.getDefaultVdkImage()).thenReturn("release");
+    when(supportedPythonVersions.getDefaultVdkImage()).thenReturn("domain:5000/name:release");
+    when(supportedPythonVersions.getVdkImage(any())).thenReturn("domain:5000/name:release");
 
     JobConfig jobConfig = new JobConfig();
     jobConfig.setSchedule(TEST_JOB_SCHEDULE);

diff --git a/...l_service/src/test/java/com/vmware/taurus/service/deploy/SupportedPythonVersionsTest.java b/...l_service/src/test/java/com/vmware/taurus/service/deploy/SupportedPythonVersionsTest.java
@@ -5,7 +5,6 @@
 
 package com.vmware.taurus.service.deploy;
 
-import com.vmware.taurus.service.model.JobDeployment;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-Original file line number
+Diff line change
@@ Expand Up / @@ -142,6 +142,7 @@ public void setUp() { @@
         when(kubernetesService.readCronJob(TEST_CRONJOB_NAME))
             .thenReturn(Optional.of(TestUtils.getJobDeploymentStatus()));
+        when(supportedPythonVersions.getVdkImage(any())).thenReturn("release");
       }
       @Test
@@ Expand Down @@