Actually, expose modifyInstanceMetadata too

broadinstitute · Mar 31, 2020 · 48b0a0f · 48b0a0f
1 parent f25da8c
commit 48b0a0f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/...2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleComputeInterpreter.scala b/...2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleComputeInterpreter.scala
@@ -84,21 +84,7 @@ private[google2] class GoogleComputeInterpreter[F[_]: Async: StructuredLogger: T
     )
   }
 
-  override def addInstanceMetadata(
-    project: GoogleProject,
-    zone: ZoneName,
-    instanceName: InstanceName,
-    metadata: Map[String, String]
-  )(implicit ev: ApplicativeAsk[F, TraceId]): F[Unit] =
-    modifyInstanceMetadata(project, zone, instanceName, metadata, Set.empty)
-
-  override def removeInstanceMetadata(project: GoogleProject,
-                                      zone: ZoneName,
-                                      instanceName: InstanceName,
-                                      metadataToRemove: Set[String])(implicit ev: ApplicativeAsk[F, TraceId]): F[Unit] =
-    modifyInstanceMetadata(project, zone, instanceName, Map.empty, metadataToRemove)
-
-  private[google2] def modifyInstanceMetadata(
+  override def modifyInstanceMetadata(
     project: GoogleProject,
     zone: ZoneName,
     instanceName: InstanceName,

diff --git a/google2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleComputeService.scala b/google2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleComputeService.scala
@@ -44,11 +44,19 @@ trait GoogleComputeService[F[_]] {
   def addInstanceMetadata(project: GoogleProject,
                           zone: ZoneName,
                           instanceName: InstanceName,
-                          metadata: Map[String, String])(implicit ev: ApplicativeAsk[F, TraceId]): F[Unit]
+                          metadata: Map[String, String])(implicit ev: ApplicativeAsk[F, TraceId]): F[Unit] =
+    modifyInstanceMetadata(project, zone, instanceName, metadata, Set.empty)
 
   def removeInstanceMetadata(project: GoogleProject,
                              zone: ZoneName,
                              instanceName: InstanceName,
+                             metadataToRemove: Set[String])(implicit ev: ApplicativeAsk[F, TraceId]): F[Unit] =
+    modifyInstanceMetadata(project, zone, instanceName, Map.empty, metadataToRemove)
+
+  def modifyInstanceMetadata(project: GoogleProject,
+                             zone: ZoneName,
+                             instanceName: InstanceName,
+                             metadataToAdd: Map[String, String],
                              metadataToRemove: Set[String])(implicit ev: ApplicativeAsk[F, TraceId]): F[Unit]
 
   def addFirewallRule(project: GoogleProject, firewall: Firewall)(implicit ev: ApplicativeAsk[F, TraceId]): F[Operation]