[WOR-1368] Add back missing enum values (#170)

README.md

@@ -10,7 +10,7 @@ CRL will publish a message to the Janitor's pubsub with the cloud resource's uni
 cleanup.
 3. Once the resource has expired, the Janitor Service uses Stairway to delete the cloud resource. 
 
-## Primay & Secondary Instances
+## Primary & Secondary Instances
 The Janitor is expected to be deployed with one primary instance and 0-many secondary instances.
 The primary instance controls the lifecycle of tracked resources. Having a single primary instance
 live at a given time makes it easier to reason about concurrency. Only actions that should not be
@@ -97,7 +97,7 @@ to install Cloud SQL Proxy
 
 Go to cloud console to get the instance name you want to connect to, then start the proxy:
 ```
-./cloud_sql_proxy -instances=<INSTANCE_CONNECTION_NAME>=tcp:5432
+./cloud-sql-proxy <INSTANCE_CONNECTION_STRING> --port 5432 
 ```
 Start the client session
 ```

src/main/java/bio/terra/janitor/db/ResourceType.java

@@ -15,9 +15,14 @@ public enum ResourceType {
   GOOGLE_BUCKET,
   GOOGLE_NOTEBOOK_INSTANCE,
   GOOGLE_PROJECT,
+  AZURE_PUBLIC_IP,
+  AZURE_NETWORK,
+  AZURE_NETWORK_SECURITY_GROUP,
   AZURE_DISK,
   AZURE_VIRTUAL_MACHINE,
+  AZURE_RELAY,
   AZURE_RELAY_CONNECTION,
+  AZURE_CONTAINER_INSTANCE,
   TERRA_WORKSPACE,
   AZURE_MANAGED_IDENTITY,
   AZURE_STORAGE_CONTAINER,

src/test/java/bio/terra/janitor/db/BackwardsCompatibilityTest.java

@@ -28,10 +28,18 @@ public void resourceType() {
     assertEquals(
         ResourceType.GOOGLE_NOTEBOOK_INSTANCE, ResourceType.valueOf("GOOGLE_NOTEBOOK_INSTANCE"));
     assertEquals(ResourceType.GOOGLE_PROJECT, ResourceType.valueOf("GOOGLE_PROJECT"));
+    assertEquals(ResourceType.AZURE_PUBLIC_IP, ResourceType.valueOf("AZURE_PUBLIC_IP"));
+    assertEquals(
+            ResourceType.AZURE_NETWORK_SECURITY_GROUP,
+            ResourceType.valueOf("AZURE_NETWORK_SECURITY_GROUP"));
+    assertEquals(ResourceType.AZURE_NETWORK, ResourceType.valueOf("AZURE_NETWORK"));
     assertEquals(ResourceType.AZURE_DISK, ResourceType.valueOf("AZURE_DISK"));
     assertEquals(ResourceType.AZURE_VIRTUAL_MACHINE, ResourceType.valueOf("AZURE_VIRTUAL_MACHINE"));
+    assertEquals(ResourceType.AZURE_RELAY, ResourceType.valueOf("AZURE_RELAY"));
     assertEquals(
         ResourceType.AZURE_RELAY_CONNECTION, ResourceType.valueOf("AZURE_RELAY_CONNECTION"));
+    assertEquals(
+            ResourceType.AZURE_CONTAINER_INSTANCE, ResourceType.valueOf("AZURE_CONTAINER_INSTANCE"));
     assertEquals(ResourceType.TERRA_WORKSPACE, ResourceType.valueOf("TERRA_WORKSPACE"));
     assertEquals(ResourceType.AZURE_DATABASE, ResourceType.valueOf("AZURE_DATABASE"));
     assertEquals(

src/test/resources/application-integration.yml

@@ -20,11 +20,11 @@ janitor:
     # Reusing static MRG from https://github.com/broadinstitute/terra-github-workflows/blob/main/.github/workflows/attach-billing-project-to-landing-zone.yaml
     azure-tenant-id: fad90753-2022-4456-9b0a-c7e5b934e408
     azure-subscription-id: f557c728-871d-408c-a28b-eb6b2141a087
-    azure-managed-resource-group-name: e2e-90b7728d-dfcd-4d64-9082-58bf63031c64
-    azure-storage-account-name: lze1e654d6c6562ee363b56d
-    azure-relay-namespace: lza4d2630f51887e75b724e5a75d0634c4be23b5ad97dbedc2
-    azure-postgres-server-name: lz1e3aee11b147c43091902a440b1d0eb9c0e873ab499fb06af81b16551e0cd
-    azure-vnet-name: lzd6da2d9d8904cad604d7cf3fd092afcf75242cb8ba6aa345974876fa9f1c26
-    aks-cluster-name: lz53014f3263f862f3
-    azure-batch-account-name: lzef5360f976b846ac11a47d
+    azure-managed-resource-group-name: e2e-8n6xqg
+    azure-storage-account-name: lzc7d4c83cf0d1105da3c14e
+    azure-relay-namespace: lzd6394da0606d5327c5628030031dda04807c83e58980b2da
+    azure-postgres-server-name: lz98b99c0482ee03fc715711d8b2921b3d7b721527f3c126555e71b2e258ebc
+    azure-vnet-name: lze2850b505ff0795a57099536f1186615704d7e8b070b6cd76065de1fdf6c44
+    aks-cluster-name: lzf811925220d21fd2
+    azure-batch-account-name: lzc4ab0e46675c5ce0e01be6