Skip to content

v0.4.7 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/graphql/.graphqlconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
}
}
10 changes: 2 additions & 8 deletions src/main/graphql/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -5461,4 +5455,4 @@
]
}
}
}
}
4 changes: 2 additions & 2 deletions src/main/kotlin/spp/cli/PlatformCLI.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -154,7 +154,7 @@ object PlatformCLI : CliktCommand(name = "spp-cli", allowMultipleSubcommands = t
)
}.build()
)
.serverUrl("$serverUrl/graphql")
.serverUrl("$serverUrl/graphql/spp")
.build()
}

Expand Down