Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8183057
control-service: Add python_version to Execution API
mivanov1988 Apr 11, 2023
78c3217
Google Java Format
Apr 11, 2023
1542dfc
frontend: Align code formatting in frontend projects (#1863)
gorankokin Apr 10, 2023
a29c7ba
build(deps): Bump com.amazonaws:aws-java-sdk-core from 1.11.103 to 1.…
dependabot[bot] Apr 11, 2023
cec4857
vdk-meta-jobs: exec job with arguments (#1839)
yonitoo Apr 11, 2023
5da3bfd
control-service: Add python_version to GraphQL API
mivanov1988 Apr 13, 2023
16d9743
build(deps): Bump org.apache.commons:commons-compress from 1.22 to 1.…
dependabot[bot] Apr 11, 2023
3136a10
build(deps): Bump com.amazonaws:aws-java-sdk-core from 1.12.445 to 1.…
dependabot[bot] Apr 12, 2023
24c4919
build(deps): Bump net.bytebuddy:byte-buddy
dependabot[bot] Apr 7, 2023
45b3135
build(deps): Bump org.testcontainers:testcontainers
dependabot[bot] Apr 7, 2023
937aad5
build(deps): Bump com.amazonaws:aws-java-sdk-sts from 1.11.103 to 1.1…
dependabot[bot] Apr 12, 2023
dabfdc9
build(deps): Bump com.amazonaws:aws-java-sdk-ecr from 1.11.103 to 1.1…
dependabot[bot] Apr 12, 2023
326010e
vdk-jupyter: remove react-test-renderer package from package.json (#1…
duyguHsnHsn Apr 12, 2023
f5ea3c4
build(deps): Bump io.micrometer:micrometer-registry-prometheus
dependabot[bot] Apr 12, 2023
ee16acc
control service: Dynamically set job base image in builder (#1864)
doks5 Apr 13, 2023
3c7dbf6
specs: VEP-1739 updated API section (#1882)
mivanov1988 Apr 13, 2023
32af61e
vdk-meta-jobs: improve DAGs code documentation (#1873)
yonitoo Apr 13, 2023
c81be47
build(deps): Bump com.graphql-java:graphql-java-extended-scalars from…
dependabot[bot] Apr 14, 2023
054301e
build(deps): Bump io.micrometer:micrometer-core from 1.10.5 to 1.10.6…
dependabot[bot] Apr 14, 2023
438ae91
Simplify and clarify VDK purpose in the README (#1837)
zverulacis Apr 14, 2023
6998798
build(deps): Bump com.amazonaws:aws-java-sdk-sts from 1.12.445 to 1.1…
dependabot[bot] Apr 18, 2023
200258c
Merge branch 'main' into person/miroslavi/add-python-version-to-graphql
mivanov1988 Apr 18, 2023
981f22d
Merge branch 'main' into person/miroslavi/add-python-version-to-graphql
mivanov1988 Apr 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ public static V2DataJobDeployment toV2DataJobDeployment(
v2DataJobDeployment.setId(jobDeploymentStatus.getCronJobName());
v2DataJobDeployment.setEnabled(jobDeploymentStatus.getEnabled());
v2DataJobDeployment.setJobVersion(jobDeploymentStatus.getGitCommitSha());
v2DataJobDeployment.setJobPythonVersion(jobDeploymentStatus.getPythonVersion());
v2DataJobDeployment.setMode(DataJobMode.fromValue(jobDeploymentStatus.getMode()));
v2DataJobDeployment.setResources(jobDeploymentStatus.getResources());
v2DataJobDeployment.setLastDeployedBy(jobDeploymentStatus.getLastDeployedBy());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class V2DataJobDeployment {
private String id;
private String vdkVersion;
private String jobVersion;
private String jobPythonVersion;
private DataJobMode mode;
private Boolean enabled = true;
private DataJobContacts contacts;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ type DataJobExecutionDeployment {
enabled: Boolean
contacts: DataJobContacts
jobVersion: String
jobPythonVersion: String
deployedDate: String
deployedBy: String
mode: String
Expand Down Expand Up @@ -104,6 +105,7 @@ type DataJobDeployment {
enabled: Boolean
contacts: DataJobContacts
jobVersion: String
jobPythonVersion: String
lastDeployedDate: String
lastDeployedBy: String
mode: String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ public static DataJobExecution createDataJobExecution(
.lastDeployedBy("test_user")
.lastDeployedDate(getTimeAccurateToMicroSecond())
.jobVersion("test_version")
.jobPythonVersion("3.11")
.jobSchedule("*/5 * * * *")
.opId("test_op_id")
.vdkVersion("test_vdk_version")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public void setUp() {
dataJobDeployment.enabled(true);
dataJobDeployment.setDeployedBy("test-user");
dataJobDeployment.setDeployedDate(OffsetDateTime.MAX);
dataJobDeployment.pythonVersion("3.11");

expected = new DataJobExecution();
expected.setDeployment(dataJobDeployment);
Expand Down Expand Up @@ -75,6 +76,7 @@ public void setUp() {
toConvert.setResourcesCpuRequest(1.4f);
toConvert.setResourcesMemoryRequest(100);
toConvert.setResourcesMemoryLimit(150);
toConvert.setJobPythonVersion("3.11");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,18 +164,6 @@ public void testFindDataJobExecutionsByDataJobName_existingDataJobExecution_shou
Assertions.assertTrue(actualJobExecutions.isEmpty());
}

@Test
public void
testFindDataJobExecutionsByDataJobName_existingDataJobExecution_shouldReturnResult2() {
DataJob actualDataJob = RepositoryUtil.createDataJob(jobsRepository);

String executionId = "test-execution-id";
ExecutionStatus executionStatus = ExecutionStatus.RUNNING;
DataJobExecution expectedJobExecution =
RepositoryUtil.createDataJobExecution(
jobExecutionRepository, executionId, actualDataJob, executionStatus);
}

@Test
void testFindFirstByDataJobNameOrderByStartTimeDesc_withNoExecutions_shouldReturnEmpty() {
DataJob dataJob = RepositoryUtil.createDataJob(jobsRepository);
Expand Down