refactor: update add meter & add view commands with latest protocol

Author: BFergerson

src/main/kotlin/spp/cli/commands/developer/instrument/AddMeter.kt

@@ -46,10 +46,11 @@ class AddMeter : CliktCommand(name = "meter", help = "Add a live meter instrumen
 
     val source by argument(help = "Qualified class name")
     val line by argument(help = "Line number").int()
-    val meterName by argument(help = "Meter name")
     val meterType by argument(help = "Meter type").enum<MeterType>()
     val valueType by argument(help = "Metric value type").enum<MetricValueType>()
     val value by option("-value", "-v", help = "Metric value")
+    val meterId by option("-id", help = "Meter identifier")
+    val meterDescription by option("-desc", help = "Meter description")
     val condition by option("-condition", "-c", help = "Trigger condition")
     val expiresAt by option("-expiresAt", "-e", help = "Expiration time (epoch time [ms])").long()
     val hitLimit by option("-hitLimit", "-h", help = "Trigger hit limit").int()
@@ -59,12 +60,13 @@ class AddMeter : CliktCommand(name = "meter", help = "Add a live meter instrumen
 
     override fun run() = runBlocking {
         val input = LiveMeterInput(
-            meterName = meterName,
             meterType = spp.cli.protocol.type.MeterType.valueOf(meterType.toString()),
             metricValue = MetricValueInput(
                 valueType = spp.cli.protocol.type.MetricValueType.valueOf(valueType.toString()),
                 value = Optional.presentIfNotNull(value)
             ),
+            id = Optional.presentIfNotNull(meterId),
+            meterDescription = Optional.presentIfNotNull(meterDescription),
             location = LiveSourceLocationInput(source, line),
             condition = Optional.Present(condition),
             expiresAt = Optional.Present(expiresAt),

src/main/kotlin/spp/cli/commands/developer/view/AddView.kt

@@ -21,23 +21,34 @@ import com.apollographql.apollo3.api.json.MapJsonWriter
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.arguments.multiple
+import com.github.ajalt.clikt.parameters.options.default
+import com.github.ajalt.clikt.parameters.options.multiple
+import com.github.ajalt.clikt.parameters.options.option
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
 import spp.cli.PlatformCLI.apolloClient
 import spp.cli.PlatformCLI.echoError
+import spp.cli.protocol.type.LiveViewConfigInput
 import spp.cli.protocol.type.LiveViewInput
 import spp.cli.protocol.view.AddLiveViewMutation
 import spp.cli.protocol.view.adapter.AddLiveViewMutation_ResponseAdapter.AddLiveView
 import spp.cli.util.JsonCleaner
+import java.util.*
 import kotlin.system.exitProcess
 
 class AddView : CliktCommand(name = "view", help = "Add a live view") {
 
     val entityIds by argument(name = "Entity IDs").multiple(required = true)
+    val viewName by option("-name", "-n", help = "View name").default("cli-" + UUID.randomUUID().toString())
+    val viewMetrics by option("-metrics", "-m", help = "View metrics").multiple()
 
     override fun run() = runBlocking {
         val input = LiveViewInput(
             entityIds = entityIds.toList(),
+            viewConfig = LiveViewConfigInput(
+                viewName,
+                viewMetrics.ifEmpty { entityIds }
+            )
         )
         val response = try {
             apolloClient.mutation(AddLiveViewMutation(input)).execute()