Skip to content

Commit 677113d

Browse files
authored
misc: upgrade to ktlint v1.3.0 (#1340)
1 parent 112b307 commit 677113d

File tree

42 files changed

+158
-112
lines changed

Some content is hidden

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

42 files changed

+158
-112
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "dc908f70-28c1-4d4a-ab8e-b50ea00172af",
3+
"type": "misc",
4+
"description": "Upgrade to ktlint v1.3.0"
5+
}

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
[*.{kt,kts}]
2+
ktlint_code_style = intellij_idea
3+
24
# ktlint rules to disable
35
ktlint_standard_no-wildcard-imports = disabled
46
ktlint_standard_filename = disabled
7+
ktlint_standard_backing-property-naming = disabled
58

69
# enable trailing commas per JetBrains recommendation
710
# (https://kotlinlang.org/docs/coding-conventions.html#trailing-commas)

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ local.properties
1616
services/*/generated-src
1717
services/*/build.gradle.kts
1818
.kotest/
19+
*.klib

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/Exceptions.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import aws.sdk.kotlin.runtime.ConfigurationException
1111
/**
1212
* No credentials were available from this [CredentialsProvider]
1313
*/
14-
public class CredentialsNotLoadedException(message: String?, cause: Throwable? = null) :
15-
ClientException(message ?: "The provider could not provide credentials or required configuration was not set", cause)
14+
public class CredentialsNotLoadedException(message: String?, cause: Throwable? = null) : ClientException(message ?: "The provider could not provide credentials or required configuration was not set", cause)
1615

1716
/**
1817
* The [CredentialsProvider] was given an invalid configuration (e.g. invalid aws configuration file, invalid IMDS endpoint, etc)

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/JsonCredentialsDeserializer.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ internal sealed class JsonCredentialsResponse {
7373
* }
7474
* ```
7575
*/
76+
@Suppress("ktlint:standard:property-naming")
7677
internal suspend fun deserializeJsonCredentials(deserializer: Deserializer): JsonCredentialsResponse {
7778
val CODE_DESCRIPTOR = SdkFieldDescriptor(SerialKind.String, JsonSerialName("Code"))
7879
val ACCESS_KEY_ID_DESCRIPTOR = SdkFieldDescriptor(SerialKind.String, JsonSerialName("AccessKeyId"))
@@ -140,6 +141,7 @@ internal suspend fun deserializeJsonCredentials(deserializer: Deserializer): Jso
140141
* The difference between this and [deserializeJsonCredentials] is that process credentials _must_ provide a version field,
141142
* the session token field is called `SessionToken` instead of `Token`, and the expiration field is optional.
142143
*/
144+
@Suppress("ktlint:standard:property-naming")
143145
internal fun deserializeJsonProcessCredentials(deserializer: Deserializer): JsonCredentialsResponse {
144146
val ACCESS_KEY_ID_DESCRIPTOR = SdkFieldDescriptor(SerialKind.String, JsonSerialName("AccessKeyId"))
145147
val SECRET_ACCESS_KEY_ID_DESCRIPTOR = SdkFieldDescriptor(SerialKind.String, JsonSerialName("SecretAccessKey"))

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/SsoTokenProvider.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ public class SsoTokenProvider(
118118
}
119119
}
120120

121-
private fun throwTokenExpired(cause: Throwable? = null): Nothing {
122-
throw InvalidSsoTokenException("SSO token for sso-session: $ssoSessionName is expired", cause)
123-
}
121+
private fun throwTokenExpired(cause: Throwable? = null): Nothing = throw InvalidSsoTokenException("SSO token for sso-session: $ssoSessionName is expired", cause)
124122

125123
private suspend fun refreshToken(oldToken: SsoToken): SsoToken {
126124
val telemetry = coroutineContext.telemetryProvider

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/StsAssumeRoleCredentialsProvider.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,12 @@ public class AssumeRoleParameters(
188188
public val sourceIdentity: String? = null,
189189
) {
190190
internal val convertedPolicyArns = policyArns?.map { PolicyDescriptorType { arn = it } }
191-
internal val convertedTags = tags?.map { Tag { key = it.key; value = it.value } }
191+
internal val convertedTags = tags?.map {
192+
Tag {
193+
key = it.key
194+
value = it.value
195+
}
196+
}
192197
}
193198

194199
// role session name must be provided to assume a role, when the user doesn't provide one we choose a name for them

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/internal/ManagedBearerTokenProvider.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import aws.smithy.kotlin.runtime.io.SdkManagedCloseable
1212

1313
private class ManagedTokenProvider(
1414
private val delegate: CloseableBearerTokenProvider,
15-
) : SdkManagedCloseable(delegate), CloseableBearerTokenProvider by delegate
15+
) : SdkManagedCloseable(delegate),
16+
CloseableBearerTokenProvider by delegate
1617

1718
/**
1819
* Wraps a [TokenProvider] for internal runtime management by the SDK.

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/internal/ManagedCredentialsProvider.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import aws.smithy.kotlin.runtime.io.SdkManagedCloseable
1111

1212
private class ManagedCredentialsProvider(
1313
private val delegate: CloseableCredentialsProvider,
14-
) : SdkManagedCloseable(delegate), CloseableCredentialsProvider by delegate
14+
) : SdkManagedCloseable(delegate),
15+
CloseableCredentialsProvider by delegate
1516

1617
/**
1718
* Wraps a [CredentialsProvider] for internal runtime management by the SDK.

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/profile/AwsConfigValue.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public sealed class AwsConfigValue {
1919

2020
@InternalSdkApi
2121
public data class Map(public val value: kotlin.collections.Map<kotlin.String, kotlin.String>) :
22-
AwsConfigValue(), kotlin.collections.Map<kotlin.String, kotlin.String> by value {
22+
AwsConfigValue(),
23+
kotlin.collections.Map<kotlin.String, kotlin.String> by value {
2324
override fun toString(): kotlin.String = value.toString()
2425
}
2526
}

0 commit comments

Comments
 (0)