Skip to content

Commit

Permalink
chore: remove "private" prefix from control plane config (#139)
Browse files Browse the repository at this point in the history
Motivation:
Our users doesn't know about private or public control plane.

Modifications:
Remove private prefix on configuration.
  • Loading branch information
bastien-gatling authored Aug 9, 2023
1 parent 117d498 commit a654784
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/main/scala/io/gatling/sbt/GatlingKeys.scala
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ object GatlingKeys {
|$documentationReference.
|""".stripMargin)

val enterprisePrivateControlPlaneUrl =
settingKey[Option[URL]](s"""(optional) URL of a private control plane for Gatling Enterprise providing a private repository.
val enterpriseControlPlaneUrl =
settingKey[Option[URL]](s"""(optional) URL of a control plane for Gatling Enterprise providing a private repository.
|If this parameter is provided, packages will be registered as private packages and uploaded through this private control plane.
|$documentationReference.
|""".stripMargin)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ object EnterpriseClient {
def enterpriseClientTask(config: Configuration) = Def.task {
val settingUrl = (config / enterpriseUrl).value
val settingApiToken = (config / enterpriseApiToken).value
val settingPrivateControlPlaneUrl = (config / enterprisePrivateControlPlaneUrl).value
val settingControlPlaneUrl = (config / enterpriseControlPlaneUrl).value
val logger = streams.value.log

if (settingApiToken.isEmpty) {
Expand All @@ -41,7 +41,7 @@ object EnterpriseClient {
}

try {
new HttpEnterpriseClient(settingUrl, settingApiToken, BuildInfo.name, BuildInfo.version, settingPrivateControlPlaneUrl.orNull)
new HttpEnterpriseClient(settingUrl, settingApiToken, BuildInfo.name, BuildInfo.version, settingControlPlaneUrl.orNull)
} catch {
case _: UnsupportedClientException =>
logger.error(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ object EnterpriseSettings {
config / enterprisePackageId := sys.props.get("gatling.enterprise.packageId").getOrElse(""),
config / enterpriseTeamId := sys.props.get("gatling.enterprise.teamId").getOrElse(""),
config / enterpriseSimulationId := sys.props.get("gatling.enterprise.simulationId").getOrElse(""),
config / enterprisePrivateControlPlaneUrl := sys.props
.get("gatling.enterprise.privateControlPlaneUrl")
config / enterpriseControlPlaneUrl := sys.props
.get("gatling.enterprise.controlPlaneUrl")
.map(configString => new URL(configString)),
config / waitForRunEnd := jl.Boolean.getBoolean("gatling.enterprise.waitForRunEnd"),
config / enterpriseSimulationSystemProperties := Map.empty,
Expand Down

0 comments on commit a654784

Please sign in to comment.