Skip to content

Commit 73c2f5c

Browse files
Bump org.jlleitschuh.gradle.ktlint from 12.3.0 to 13.1.0 (#322)
* Bump org.jlleitschuh.gradle.ktlint from 12.3.0 to 13.1.0 Bumps org.jlleitschuh.gradle.ktlint from 12.3.0 to 13.1.0. --- updated-dependencies: - dependency-name: org.jlleitschuh.gradle.ktlint dependency-version: 13.1.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Update StepsBuilder.kt * Update AssertionsBuilder.kt * Update StepsBuilder.kt * Update ParsingOptionsBuilder.kt * Update RequestBuilder.kt * Update SyntheticBrowserTestBuilder.kt * Fix SyntheticBrowserTestBuilder.kt * Update SyntheticMultiStepApiTestBuilder.kt * Update SyntheticTestBuilder.kt * Update AwsSecretsManagerCredentialsProvider.kt * Update BrowserTest.kt * Update ConfigCredentialsProvider.kt * Update CredentialsProvider.kt * Update SyntheticsApiClient.kt * Update ConfigurationLoader.kt * Update Variable.kt * Update SyntheticTestDsl.kt * Update Key.kt * Update LocatorType.kt * Update Modifier.kt * Update MultiLocator.kt * Update WaitParams.kt * Update ExtractValue.kt * Update DownloadedFileAssertionParams.kt * Update Location.kt * Update MonitorPriority.kt * Update RenotifyInterval.kt * Update SyntheticsDeviceID.kt * Update Timeframe.kt * Update Value.kt * Update Variable.kt * Update ApiStep.kt * Update UploadFileStep.kt * Update TargetElement.kt * Update ParsingOptionsBuilderTest.kt * Update SyntheticMultiStepApiTestBuilderTest.kt * Update AwsSecretsManagerCredentialsProviderTest.kt * Update BrowserTestConfigTest.kt * Update ApiStepTest.kt * Update ApiStepTest * Update ActionsStepTest.kt * Update SpecialActionsStepTest.kt * Fix ApiStepTest.kt --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mira Zubach <azzmiks@users.noreply.github.com>
1 parent cf252bb commit 73c2f5c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+249
-119
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
val kotlinVersion = "2.2.10"
66
id("org.jetbrains.kotlin.jvm") version kotlinVersion
77
id("org.jetbrains.dokka") version "2.0.0"
8-
id("org.jlleitschuh.gradle.ktlint") version "12.3.0"
8+
id("org.jlleitschuh.gradle.ktlint") version "13.1.0"
99
kotlin("plugin.serialization") version kotlinVersion
1010
`maven-publish`
1111
jacoco

src/main/kotlin/com/personio/synthetics/builder/AssertionsBuilder.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ import com.datadog.api.client.v1.model.SyntheticsAssertionType
1212
class AssertionsBuilder {
1313
private val assertions = mutableListOf<SyntheticsAssertion>()
1414

15-
fun build(): List<SyntheticsAssertion> {
16-
return assertions
17-
}
15+
fun build(): List<SyntheticsAssertion> = assertions
1816

1917
/**
2018
* Asserts the response status code

src/main/kotlin/com/personio/synthetics/builder/RequestBuilder.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@ class RequestBuilder {
1212
private var headers: Map<String, String> = mapOf()
1313
private var ignoreServerCertificateError = false
1414

15-
fun build(): SyntheticsTestRequest {
16-
return SyntheticsTestRequest()
15+
fun build(): SyntheticsTestRequest =
16+
SyntheticsTestRequest()
1717
.url(url)
1818
.method(method.name)
1919
.bodyType(bodyType)
2020
.body(body)
2121
.followRedirects(followRedirects)
2222
.allowInsecure(ignoreServerCertificateError)
2323
.headers(headers)
24-
}
2524

2625
/**
2726
* Appends the cookie header

src/main/kotlin/com/personio/synthetics/builder/SyntheticBrowserTestBuilder.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ class SyntheticBrowserTestBuilder(
4242
name,
4343
options,
4444
SyntheticsBrowserTestType.BROWSER,
45-
)
46-
.steps(steps)
45+
).steps(steps)
4746
.tags(parameters.tags)
4847

4948
status?.let {

src/main/kotlin/com/personio/synthetics/builder/SyntheticMultiStepApiTestBuilder.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ class SyntheticMultiStepApiTestBuilder(
3434
name,
3535
options,
3636
SyntheticsAPITestType.API,
37-
)
38-
.tags(parameters.tags)
37+
).tags(parameters.tags)
3938
.subtype(SyntheticsTestDetailsSubType.MULTI)
4039

4140
status?.let {

src/main/kotlin/com/personio/synthetics/builder/SyntheticTestBuilder.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ abstract class SyntheticTestBuilder(
5454
SyntheticsTestOptionsRetry()
5555
.count(defaults.retryCount)
5656
.interval(defaults.retryInterval),
57-
)
58-
.monitorOptions(
57+
).monitorOptions(
5958
SyntheticsTestOptionsMonitorOptions(),
6059
)
6160
}
@@ -392,19 +391,19 @@ abstract class SyntheticTestBuilder(
392391
.map { unit -> this.toLong(unit) to unit.toDatadogDurationUnit() }
393392
.firstOrNull { (scaled, _) -> scaled.absoluteValue <= limit }
394393

395-
private fun DurationUnit.toDatadogDurationUnit(): String {
396-
return when (this) {
394+
private fun DurationUnit.toDatadogDurationUnit(): String =
395+
when (this) {
397396
DurationUnit.MILLISECONDS -> "ms"
398397
DurationUnit.SECONDS -> "s"
399398
DurationUnit.MINUTES -> "m"
400399
DurationUnit.HOURS -> "h"
401400
DurationUnit.DAYS -> "d"
402401
else -> throw IllegalArgumentException("The given duration unit is not supported.")
403402
}
404-
}
405403

406404
protected fun getGlobalVariableId(variableName: String) =
407-
apiClient.listGlobalVariables()
405+
apiClient
406+
.listGlobalVariables()
408407
.variables
409408
.orEmpty()
410409
.filterNotNull()

src/main/kotlin/com/personio/synthetics/builder/api/StepsBuilder.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import com.datadog.api.client.v1.model.SyntheticsAPIStep
55
class StepsBuilder {
66
private val steps = mutableListOf<SyntheticsAPIStep>()
77

8-
fun build(): List<SyntheticsAPIStep> {
9-
return steps
10-
}
8+
fun build(): List<SyntheticsAPIStep> = steps
119

1210
/**
1311
* Appends a SyntheticsAPIStep

src/main/kotlin/com/personio/synthetics/builder/browser/StepsBuilder.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ private const val DEFAULT_TEXT_DELAY_MILLIS: Long = 25
1414
class StepsBuilder {
1515
private val steps = mutableListOf<SyntheticsStep>()
1616

17-
fun build(): List<SyntheticsStep> {
18-
return steps
19-
}
17+
fun build(): List<SyntheticsStep> = steps
2018

2119
/**
2220
* Adds a new "type text" step to the synthetic browser test

src/main/kotlin/com/personio/synthetics/builder/parsing/ParsingOptionsBuilder.kt

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ class ParsingOptionsBuilder {
4141
SyntheticsVariableParser()
4242
.type(SyntheticsGlobalVariableParserType.JSON_PATH)
4343
.value(jsonPath),
44-
)
45-
.type(SyntheticsLocalVariableParsingOptionsType.HTTP_BODY)
44+
).type(SyntheticsLocalVariableParsingOptionsType.HTTP_BODY)
4645
.secure(secure)
4746
}
4847

@@ -62,8 +61,7 @@ class ParsingOptionsBuilder {
6261
SyntheticsVariableParser()
6362
.type(SyntheticsGlobalVariableParserType.REGEX)
6463
.value(regex),
65-
)
66-
.type(SyntheticsLocalVariableParsingOptionsType.HTTP_BODY)
64+
).type(SyntheticsLocalVariableParsingOptionsType.HTTP_BODY)
6765
.secure(secure)
6866
}
6967

@@ -78,8 +76,7 @@ class ParsingOptionsBuilder {
7876
.parser(
7977
SyntheticsVariableParser()
8078
.type(SyntheticsGlobalVariableParserType.RAW),
81-
)
82-
.type(SyntheticsLocalVariableParsingOptionsType.HTTP_BODY)
79+
).type(SyntheticsLocalVariableParsingOptionsType.HTTP_BODY)
8380
.secure(secure)
8481
}
8582

@@ -99,8 +96,7 @@ class ParsingOptionsBuilder {
9996
.parser(
10097
SyntheticsVariableParser()
10198
.type(SyntheticsGlobalVariableParserType.RAW),
102-
)
103-
.type(SyntheticsLocalVariableParsingOptionsType.HTTP_HEADER)
99+
).type(SyntheticsLocalVariableParsingOptionsType.HTTP_HEADER)
104100
.secure(secure)
105101
}
106102

@@ -123,8 +119,7 @@ class ParsingOptionsBuilder {
123119
SyntheticsVariableParser()
124120
.type(SyntheticsGlobalVariableParserType.REGEX)
125121
.value(regex),
126-
)
127-
.type(SyntheticsLocalVariableParsingOptionsType.HTTP_HEADER)
122+
).type(SyntheticsLocalVariableParsingOptionsType.HTTP_HEADER)
128123
.secure(secure)
129124
}
130125
}

src/main/kotlin/com/personio/synthetics/client/AwsSecretsManagerCredentialsProvider.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@ import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueReques
1010
class AwsSecretsManagerCredentialsProvider(
1111
val credentials: Credentials,
1212
val client: SecretsManagerClient =
13-
SecretsManagerClient.builder().region(
14-
Region.of(credentials.awsRegion),
15-
).build(),
13+
SecretsManagerClient
14+
.builder()
15+
.region(
16+
Region.of(credentials.awsRegion),
17+
).build(),
1618
) : CredentialsProvider {
1719
override fun getCredentials(): ApiCredentials {
1820
val getSecretValueRequest =
19-
GetSecretValueRequest.builder()
21+
GetSecretValueRequest
22+
.builder()
2023
.secretId(credentials.datadogCredentialsAwsArn)
2124
.build()
2225

@@ -26,8 +29,7 @@ class AwsSecretsManagerCredentialsProvider(
2629
throw CredentialsProviderException(
2730
"Failed to get Datadog credentials from AWS Secrets Manager.",
2831
).initCause(it)
29-
}
30-
.secretString() ?: throw CredentialsProviderException(
32+
}.secretString() ?: throw CredentialsProviderException(
3133
"Secret obtained from AWS Secrets Manager does not contain secret string.",
3234
)
3335

0 commit comments

Comments
 (0)