From 8000273d0e040967778be9d2acb3f7000cc7d7ca Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Wed, 8 Nov 2023 20:12:07 +0100
Subject: [PATCH] Updated container model and test model
---
.../src/main/java/at/tuwien/api/container/ContainerDto.java | 1 -
.../main/java/at/tuwien/entities/container/Container.java | 2 +-
.../test/src/main/java/at/tuwien/test/BaseTest.java | 6 ++++++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java
index 04a8b6837e..0513dfb668 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java
@@ -4,7 +4,6 @@ import at.tuwien.api.container.image.ImageBriefDto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
index 251346ac9f..a83b425e34 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
@@ -51,7 +51,7 @@ public class Container {
@Column(nullable = false, columnDefinition = "integer default port")
private Integer uiPort;
- @Column(name = "ui_additional_flags")
+ @Column
private String uiAdditionalFlags;
@ToString.Exclude
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
index 615d13d249..e03d93e332 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -825,6 +825,9 @@ public abstract class BaseTest {
public final static String CONTAINER_1_NAME = "u01";
public final static String CONTAINER_1_INTERNALNAME = "dbrepo-userdb-u01";
public final static String CONTAINER_1_IP = "127.0.0.1";
+ public final static String CONTAINER_1_UI_HOST = "localhost";
+ public final static Integer CONTAINER_1_UI_PORT = 3306;
+ public final static String CONTAINER_1_UI_ADDITIONAL_FLAGS = "?sslMode=disable";
public final static Boolean CONTAINER_1_RUNNING = true;
public final static Integer CONTAINER_1_PORT = 3308;
public final static String CONTAINER_1_PRIVILEGED_USERNAME = "root";
@@ -840,6 +843,9 @@ public abstract class BaseTest {
.created(CONTAINER_1_CREATED)
.host(CONTAINER_1_IP)
.port(CONTAINER_1_PORT)
+ .uiHost(CONTAINER_1_UI_HOST)
+ .uiPort(CONTAINER_1_UI_PORT)
+ .uiAdditionalFlags(CONTAINER_1_UI_ADDITIONAL_FLAGS)
.privilegedUsername(CONTAINER_1_PRIVILEGED_USERNAME)
.privilegedPassword(CONTAINER_1_PRIVILEGED_PASSWORD)
.build();
--
GitLab