Merge pull request #7 from mcanoy/azone

Availability Zone Field

Author: jacobsee

pom.xml

@@ -8,15 +8,15 @@
   <properties>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
     <javers.core.version>6.2.2</javers.core.version>
-    <lombok.version>1.18.12</lombok.version>
+    <lombok.version>1.18.22</lombok.version>
     <maven.compiler.parameters>true</maven.compiler.parameters>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-    <quarkus.platform.version>2.3.1.Final</quarkus.platform.version>
+    <quarkus.platform.version>2.10.0.Final</quarkus.platform.version>
     <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
     <wiremock.version>2.28.1</wiremock.version>
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>

src/main/java/com/redhat/labs/lodestar/hosting/model/HostingEnvironment.java

@@ -74,6 +74,8 @@ public class HostingEnvironment extends PanacheEntityBase {
     private String ocpCloudProviderName;
     @JsonProperty("ocp_cloud_provider_region")
     private String ocpCloudProviderRegion;
+    @JsonProperty("ocp_cloud_provider_availability_zone")
+    private String ocpCloudProviderAvailabilityZone;
     @JsonProperty("ocp_persistent_storage_size")
     private String ocpPersistentStorageSize;
     @JsonProperty("ocp_sub_domain")

src/main/resources/db/migration/V2.0.1__Add_AZ.sql

@@ -0,0 +1,3 @@
+ALTER TABLE
+    HostingEnvironment
+ADD COLUMN ocpCloudProviderAvailabilityZone varchar(255);

src/test/java/com/redhat/labs/lodestar/hosting/service/HostingServiceTest.java

@@ -2,7 +2,6 @@
 
 import com.redhat.labs.lodestar.hosting.mock.ResourceLoader;
 import io.quarkus.test.junit.QuarkusTest;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -59,5 +58,4 @@ void convertLegacyJsonHostingNew() {
         String result = hostingService.createLegacyJson(legacyEngagement, hostingEnvs);
         assertEquals(expected, result);
     }
-
 }

src/test/resources/gitlab-file-hosting-13065.json

@@ -20,6 +20,7 @@
     "additional_details" : "Will probably also need to build out an OSP tenant.",
     "ocp_cloud_provider_name" : "other",
     "ocp_cloud_provider_region" : "other",
+    "ocp_cloud_provider_availability_zone" : "one",
     "ocp_persistent_storage_size" : "5000G",
     "ocp_sub_domain" : "red-1",
     "ocp_version" : "4.7.16",

src/test/resources/gitlab-file-hosting-20962.json

@@ -20,6 +20,7 @@
     "additional_details" : "Will probably also need to build out an OSP tenant2.",
     "ocp_cloud_provider_name" : "aws",
     "ocp_cloud_provider_region" : "us-west",
+    "ocp_cloud_provider_availability_zone" : "one",
     "ocp_persistent_storage_size" : "1G",
     "ocp_sub_domain" : "red-2",
     "ocp_version" : "4.9.16",

src/test/resources/hosting-env.json

@@ -4,6 +4,7 @@
     "environment_name": "env1",
     "ocp_cloud_provider_name": "ec2",
     "ocp_cloud_provider_region": "eu-north-3",
+    "ocp_cloud_provider_availability_zone" : "zone1",
     "ocp_cluster_size": "small",
     "ocp_persistent_storage_size": "50G",
     "ocp_sub_domain": "test",

src/test/resources/legacy-engagement-expected.json

@@ -21,6 +21,7 @@
       "environment_name": "env1",
       "ocp_cloud_provider_name": "ec2",
       "ocp_cloud_provider_region": "eu-north-3",
+      "ocp_cloud_provider_availability_zone": "zone1",
       "ocp_cluster_size": "small",
       "ocp_persistent_storage_size": "50G",
       "ocp_sub_domain": "test",