Merge pull request #56 from sourceplusplus/dev

v0.4.7

Author: BFergerson

e2e/docker-compose.yml

@@ -5,9 +5,9 @@ services:
     container_name: spp-platform
     hostname: spp-platform
     ports:
-      - "5445:5445"
       - "5450:5450"
       - "5455:5455"
+      - "12800:12800"
     environment:
       - SPP_DISABLE_JWT=true
   skywalking-oap:

gradle.properties

@@ -1,7 +1,7 @@
 kotlin.code.style=official
 
 cliGroup=com.sourceplusplus
-projectVersion=0.4.6
+projectVersion=0.4.7
 
 vertxVersion=4.2.6
 graalVersion = 21.3.0

src/main/graphql/.graphqlconfig

@@ -4,12 +4,12 @@
   "extensions": {
     "endpoints": {
       "Default GraphQL Endpoint": {
-        "url": "https://localhost:5445/graphql",
+        "url": "https://localhost:12800/graphql",
         "headers": {
           "user-agent": "JS GraphQL"
         },
         "introspect": false
       }
     }
   }
-}
+}

src/main/graphql/schema.json

@@ -4122,13 +4122,7 @@
               "deprecationReason": null
             },
             {
-              "name": "ADD_DATA_REDACTION",
-              "description": null,
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "REMOVE_DATA_REDACTION",
+              "name": "UPDATE_DATA_REDACTION",
               "description": null,
               "isDeprecated": false,
               "deprecationReason": null
@@ -5461,4 +5455,4 @@
       ]
     }
   }
-}
+}

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

@@ -57,7 +57,7 @@ object PlatformCLI : CliktCommand(name = "spp-cli", allowMultipleSubcommands = t
     val platformHost: String by option("-p", "--platform", help = "Source++ platform host")
         .default(
             (if (System.getenv("SPP_DISABLE_TLS") != "true") "https://" else "http://")
-                    + (System.getenv("SPP_PLATFORM_HOST") ?: "localhost") + ":5445"
+                    + (System.getenv("SPP_PLATFORM_HOST") ?: "localhost") + ":12800"
         )
     private val platformCertificate by option("-c", "--certificate", help = "Source++ platform certificate").file()
         .default(File("config/spp-platform.crt"))
@@ -154,7 +154,7 @@ object PlatformCLI : CliktCommand(name = "spp-cli", allowMultipleSubcommands = t
                     )
                 }.build()
             )
-            .serverUrl("$serverUrl/graphql")
+            .serverUrl("$serverUrl/graphql/spp")
             .build()
     }