minor refactoring

DataBiosphere · Aug 22, 2024 · 2750a3a · 2750a3a
1 parent 65d2ec2
commit 2750a3a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/...bio/terra/landingzone/stairway/flight/create/reference/resource/step/ArmResourceType.java b/...bio/terra/landingzone/stairway/flight/create/reference/resource/step/ArmResourceType.java
@@ -4,7 +4,7 @@ public enum ArmResourceType {
   AKS("Microsoft.ContainerService/managedClusters"),
   VNET("Microsoft.Network/virtualNetworks"),
   STORAGE_ACCOUNT("Microsoft.Storage/storageAccounts"),
-  POSTGRES("Microsoft.DBforPostgreSQL/servers"),
+  POSTGRES_FLEXIBLE("Microsoft.DBforPostgreSQL/flexibleServers"),
   BATCH("Microsoft.Batch/batchAccounts"),
   APP_INSIGHTS("Microsoft.Insights/components"),
   RELAY_NAMESPACE("Microsoft.Relay/namespaces");

diff --git a/...andingzone/stairway/flight/create/reference/resource/step/BaseReferencedResourceStep.java b/...andingzone/stairway/flight/create/reference/resource/step/BaseReferencedResourceStep.java
@@ -123,7 +123,6 @@ private Map<String, String> getTagsToApply(
     return tagsToApply;
   }
 
-  @NotNull
   private Map<String, String> getLzResourceTags(
       FlightContext context, GenericResource genericResource) {
 
@@ -154,9 +153,7 @@ private Optional<GenericResource> findReferencedResourceByArmResourceType(
             .azureResourceManager()
             .genericResources()
             .listByResourceGroup(getMRGName(flightContext))) {
-      var fullResourceTypeFromResource =
-          String.format("%s/%s", resource.resourceProviderNamespace(), resource.resourceType());
-      if (fullResourceTypeFromResource.equalsIgnoreCase(getArmResourceType().toString())) {
+      if (resource.type().equalsIgnoreCase(getArmResourceType().toString())) {
         return Optional.of(resource);
       }
     }

diff --git a/...ngzone/stairway/flight/create/reference/resource/step/BaseReferencedResourceStepTest.java b/...ngzone/stairway/flight/create/reference/resource/step/BaseReferencedResourceStepTest.java
@@ -216,22 +216,25 @@ private void setUpTagsCaptor() {
   }
 
   private void setUpMocks() {
+    setUpFlightWorkingMap();
+
+    setUpMockFlightParameters();
+
+    setUpMockResourceListing();
+  }
+
+  private void setUpFlightWorkingMap() {
     workingFlightMap = new FlightMap();
     when(context.getWorkingMap()).thenReturn(workingFlightMap);
     workingFlightMap.put(
         GetManagedResourceGroupInfo.TARGET_MRG_KEY,
         new TargetManagedResourceGroup("mrg", "armregion"));
-
-    setUpMockFlightParameters();
-
-    setUpMockResourceListing();
   }
 
   private void setUpMockResourceListing() {
     lenient().when(armManagers.azureResourceManager()).thenReturn(azureResourceManager);
     lenient().when(azureResourceManager.genericResources()).thenReturn(genericResources);
-    lenient().when(resource.resourceType()).thenReturn("storageAccounts");
-    lenient().when(resource.resourceProviderNamespace()).thenReturn("Microsoft.Storage");
+    lenient().when(resource.type()).thenReturn("Microsoft.Storage/storageAccounts");
     var resources = List.of(resource);
     lenient().when(genericResourcesPage.iterator()).thenReturn(resources.iterator());
     lenient().when(genericResources.listByResourceGroup("mrg")).thenReturn(genericResourcesPage);