simplify cli

.github/workflows/build.yml

@@ -140,17 +140,17 @@ jobs:
       - name: "[CLI] Remove developer"
         run: ./build/graal/spp-cli -v admin remove-developer test
       - name: "[CLI] Add live breakpoint"
-        run: ./build/graal/spp-cli -v developer add-live-breakpoint -h 100 spp.example.webapp.model.User 48
+        run: ./build/graal/spp-cli -v add-breakpoint -h 100 spp.example.webapp.model.User 48
       - name: "[CLI] Add live log"
-        run: ./build/graal/spp-cli -v developer add-live-log -h 100 spp.example.webapp.model.User 48 test-message
+        run: ./build/graal/spp-cli -v add-log -h 100 spp.example.webapp.model.User 48 test-message
       - name: "[CLI] Get live instruments"
-        run: ./build/graal/spp-cli -v developer get-live-instruments
+        run: ./build/graal/spp-cli -v get-instruments
       - name: "[CLI] Get live breakpoints"
-        run: ./build/graal/spp-cli -v developer get-live-breakpoints
+        run: ./build/graal/spp-cli -v get-breakpoints
       - name: "[CLI] Get live logs"
-        run: ./build/graal/spp-cli -v developer get-live-logs
+        run: ./build/graal/spp-cli -v get-logs
       - name: "[CLI] Remove live instruments"
-        run: ./build/graal/spp-cli -v developer remove-live-instruments spp.example.webapp.model.User 48
+        run: ./build/graal/spp-cli -v remove-instruments spp.example.webapp.model.User 48
 
       - name: Zip spp-cli
         run: zip spp-cli-linux64.zip -j build/graal/spp-cli

README.md

@@ -44,7 +44,7 @@ This project provides a command-line interface client to the [Source++](https://
   <summary>Command</summary>
 
   ```sh
-  ./spp-cli developer add-live-breakpoint com.company.Webapp 42
+  ./spp-cli add-breakpoint com.company.Webapp 42
   ```
 </details>
 

src/main/kotlin/spp/cli/Main.kt

@@ -1,8 +1,9 @@
 package spp.cli
 
 import com.github.ajalt.clikt.core.subcommands
-import spp.cli.commands.PlatformCLI
+import spp.cli.commands.Version
 import spp.cli.commands.admin.Admin
+import spp.cli.commands.admin.Reset
 import spp.cli.commands.admin.access.*
 import spp.cli.commands.admin.developer.AddDeveloper
 import spp.cli.commands.admin.developer.GetDevelopers
@@ -13,11 +14,7 @@ import spp.cli.commands.admin.permission.GetDeveloperPermissions
 import spp.cli.commands.admin.permission.GetRolePermissions
 import spp.cli.commands.admin.permission.RemoveRolePermission
 import spp.cli.commands.admin.role.*
-import spp.cli.commands.developer.Developer
-import spp.cli.commands.developer.instrument.*
-import spp.cli.commands.system.System
-import spp.cli.commands.system.etc.Reset
-import spp.cli.commands.system.etc.Version
+import spp.cli.commands.instrument.*
 
 object Main {
 
@@ -28,11 +25,7 @@ object Main {
     fun main(args: Array<String>) {
         Main.args = args
         PlatformCLI.subcommands(
-            System().subcommands(
-                //etc
-                Reset(),
-                Version()
-            ),
+            //admin
             Admin().subcommands(
                 //role
                 AddRole(),
@@ -58,19 +51,21 @@ object Main {
                 GetDeveloperAccessPermissions(),
                 GetRoleAccessPermissions(),
                 RemoveAccessPermission(),
-                RemoveRoleAccessPermission()
+                RemoveRoleAccessPermission(),
+                //etc
+                Reset()
             ),
-            Developer().subcommands(
-                //instrument
-                AddLiveBreakpoint(),
-                AddLiveLog(),
-                GetLiveBreakpoints(),
-                GetLiveInstruments(),
-                GetLiveLogs(),
-                RemoveLiveInstrument(),
-                RemoveLiveInstruments(),
-                ClearLiveInstruments()
-            )
+            //instrument
+            AddBreakpoint(),
+            AddLog(),
+            GetBreakpoints(),
+            GetInstruments(),
+            GetLogs(),
+            RemoveInstrument(),
+            RemoveInstruments(),
+            ClearInstruments(),
+            //etc
+            Version()
         ).main(args)
     }
 }

src/main/kotlin/spp/cli/commands/PlatformCLI.kt → src/main/kotlin/spp/cli/PlatformCLI.kt

@@ -1,4 +1,4 @@
-package spp.cli.commands
+package spp.cli
 
 import com.apollographql.apollo.ApolloClient
 import com.auth0.jwt.JWT

src/main/kotlin/spp/cli/commands/system/etc/Version.kt → src/main/kotlin/spp/cli/commands/Version.kt

@@ -1,4 +1,4 @@
-package spp.cli.commands.system.etc
+package spp.cli.commands
 
 import com.github.ajalt.clikt.core.CliktCommand
 import java.util.*

src/main/kotlin/spp/cli/commands/system/etc/Reset.kt → src/main/kotlin/spp/cli/commands/admin/Reset.kt

@@ -1,12 +1,12 @@
-package spp.cli.commands.system.etc
+package spp.cli.commands.admin
 
 import com.apollographql.apollo.coroutines.await
 import com.apollographql.apollo.exception.ApolloException
 import com.github.ajalt.clikt.core.CliktCommand
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import system.ResetMutation
 import kotlin.system.exitProcess
 

src/main/kotlin/spp/cli/commands/admin/access/AddAccessPermission.kt

@@ -14,7 +14,7 @@ import com.github.ajalt.clikt.parameters.types.enum
 import io.vertx.core.json.JsonObject
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
+import spp.cli.PlatformCLI
 import spp.cli.util.JsonCleaner.cleanJson
 import type.AccessType
 import kotlin.system.exitProcess

src/main/kotlin/spp/cli/commands/admin/access/AddRoleAccessPermission.kt

@@ -7,7 +7,7 @@ import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
+import spp.cli.PlatformCLI
 import kotlin.system.exitProcess
 
 class AddRoleAccessPermission : CliktCommand(printHelpOnEmptyArgs = true) {

src/main/kotlin/spp/cli/commands/admin/access/GetAccessPermissions.kt

@@ -9,7 +9,7 @@ import com.github.ajalt.clikt.core.CliktCommand
 import io.vertx.core.json.JsonObject
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
+import spp.cli.PlatformCLI
 import spp.cli.util.JsonCleaner.cleanJson
 import kotlin.system.exitProcess
 

src/main/kotlin/spp/cli/commands/admin/access/GetDeveloperAccessPermissions.kt

@@ -10,7 +10,7 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import io.vertx.core.json.JsonObject
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
+import spp.cli.PlatformCLI
 import spp.cli.util.JsonCleaner.cleanJson
 import kotlin.system.exitProcess
 

src/main/kotlin/spp/cli/commands/admin/access/GetRoleAccessPermissions.kt

@@ -10,7 +10,7 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import io.vertx.core.json.JsonObject
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
+import spp.cli.PlatformCLI
 import spp.cli.util.JsonCleaner.cleanJson
 import kotlin.system.exitProcess
 

src/main/kotlin/spp/cli/commands/admin/access/RemoveAccessPermission.kt

@@ -7,7 +7,7 @@ import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
+import spp.cli.PlatformCLI
 import kotlin.system.exitProcess
 
 class RemoveAccessPermission : CliktCommand(printHelpOnEmptyArgs = true) {

src/main/kotlin/spp/cli/commands/admin/access/RemoveRoleAccessPermission.kt

@@ -7,7 +7,7 @@ import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
+import spp.cli.PlatformCLI
 import kotlin.system.exitProcess
 
 class RemoveRoleAccessPermission : CliktCommand(printHelpOnEmptyArgs = true) {

src/main/kotlin/spp/cli/commands/admin/developer/AddDeveloper.kt

@@ -7,8 +7,8 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import developer.AddDeveloperMutation
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class AddDeveloper : CliktCommand(printHelpOnEmptyArgs = true) {

src/main/kotlin/spp/cli/commands/admin/developer/GetDevelopers.kt

@@ -6,8 +6,8 @@ import com.github.ajalt.clikt.core.CliktCommand
 import developer.GetDevelopersQuery
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class GetDevelopers : CliktCommand() {

src/main/kotlin/spp/cli/commands/admin/developer/RefreshDeveloperToken.kt

@@ -7,8 +7,8 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import developer.RefreshDeveloperTokenMutation
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class RefreshDeveloperToken : CliktCommand(printHelpOnEmptyArgs = true) {

src/main/kotlin/spp/cli/commands/admin/developer/RemoveDeveloper.kt

@@ -7,8 +7,8 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import developer.RemoveDeveloperMutation
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class RemoveDeveloper : CliktCommand(printHelpOnEmptyArgs = true) {

src/main/kotlin/spp/cli/commands/admin/permission/AddRolePermission.kt

@@ -8,8 +8,8 @@ import com.github.ajalt.clikt.parameters.types.enum
 import kotlinx.coroutines.runBlocking
 import permission.AddRolePermissionMutation
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import type.RolePermission
 import kotlin.system.exitProcess
 

src/main/kotlin/spp/cli/commands/admin/permission/GetDeveloperPermissions.kt

@@ -7,8 +7,8 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import kotlinx.coroutines.runBlocking
 import permission.GetDeveloperPermissionsQuery
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class GetDeveloperPermissions : CliktCommand() {

src/main/kotlin/spp/cli/commands/admin/permission/GetRolePermissions.kt

@@ -7,8 +7,8 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import kotlinx.coroutines.runBlocking
 import permission.GetRolePermissionsQuery
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class GetRolePermissions : CliktCommand() {

src/main/kotlin/spp/cli/commands/admin/permission/RemoveRolePermission.kt

@@ -7,8 +7,8 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import kotlinx.coroutines.runBlocking
 import permission.RemoveRolePermissionMutation
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class RemoveRolePermission : CliktCommand(printHelpOnEmptyArgs = true) {

src/main/kotlin/spp/cli/commands/admin/role/AddDeveloperRole.kt

@@ -7,8 +7,8 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import kotlinx.coroutines.runBlocking
 import role.AddDeveloperRoleMutation
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class AddDeveloperRole : CliktCommand(printHelpOnEmptyArgs = true) {

src/main/kotlin/spp/cli/commands/admin/role/AddRole.kt

@@ -7,8 +7,8 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import kotlinx.coroutines.runBlocking
 import role.AddRoleMutation
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class AddRole : CliktCommand(printHelpOnEmptyArgs = true) {

src/main/kotlin/spp/cli/commands/admin/role/GetDeveloperRoles.kt

@@ -7,8 +7,8 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import kotlinx.coroutines.runBlocking
 import role.GetDeveloperRolesQuery
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class GetDeveloperRoles : CliktCommand() {

src/main/kotlin/spp/cli/commands/admin/role/GetRoles.kt

@@ -6,8 +6,8 @@ import com.github.ajalt.clikt.core.CliktCommand
 import kotlinx.coroutines.runBlocking
 import role.GetRolesQuery
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class GetRoles : CliktCommand() {

src/main/kotlin/spp/cli/commands/admin/role/RemoveDeveloperRole.kt

@@ -7,8 +7,8 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import kotlinx.coroutines.runBlocking
 import role.RemoveDeveloperRoleMutation
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class RemoveDeveloperRole : CliktCommand(printHelpOnEmptyArgs = true) {

src/main/kotlin/spp/cli/commands/admin/role/RemoveRole.kt

@@ -7,8 +7,8 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import kotlinx.coroutines.runBlocking
 import role.RemoveRoleMutation
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import kotlin.system.exitProcess
 
 class RemoveRole : CliktCommand(printHelpOnEmptyArgs = true) {

src/main/kotlin/spp/cli/commands/developer/instrument/AddLiveBreakpoint.kt → src/main/kotlin/spp/cli/commands/instrument/AddBreakpoint.kt

@@ -1,4 +1,4 @@
-package spp.cli.commands.developer.instrument
+package spp.cli.commands.instrument
 
 import com.apollographql.apollo.api.ScalarTypeAdapters
 import com.apollographql.apollo.api.internal.SimpleResponseWriter
@@ -15,16 +15,16 @@ import instrument.AddLiveBreakpointMutation
 import io.vertx.core.json.JsonObject
 import kotlinx.coroutines.runBlocking
 import spp.cli.Main
-import spp.cli.commands.PlatformCLI
-import spp.cli.commands.PlatformCLI.apolloClient
+import spp.cli.PlatformCLI
+import spp.cli.PlatformCLI.apolloClient
 import spp.cli.util.JsonCleaner.cleanJson
 import type.InstrumentThrottleInput
 import type.LiveBreakpointInput
 import type.LiveSourceLocationInput
 import type.ThrottleStep
 import kotlin.system.exitProcess
 
-class AddLiveBreakpoint : CliktCommand() {
+class AddBreakpoint : CliktCommand() {
 
     val source by argument(help = "Qualified class name")
     val line by argument(help = "Line number").int()