Skip to content

Commit

Permalink
misc: upgrade to ktlint v1.3.0 (#108)
Browse files Browse the repository at this point in the history
  • Loading branch information
lauzadis committed Jun 27, 2024
1 parent 5c6c89d commit 514f214
Show file tree
Hide file tree
Showing 44 changed files with 134 additions and 75 deletions.
5 changes: 5 additions & 0 deletions .changes/f8ec80f6-cd00-413a-b59a-5d53159c094e.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "f8ec80f6-cd00-413a-b59a-5d53159c094e",
"type": "misc",
"description": "Upgrade to ktlint v1.3.0"
}
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[*.{kt,kts}]
ktlint_code_style = intellij_idea

# ktlint rules to disable
ktlint_standard_no-wildcard-imports = disabled
ktlint_standard_filename = disabled
ktlint_standard_backing-property-naming = disabled

# enable trailing commas per JetBrains recommendation
# (https://kotlinlang.org/docs/coding-conventions.html#trailing-commas)
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Dependabot Dependency Submission

on:
push:
branches: [ main ]

permissions:
contents: write

jobs:
dependency-submission:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@v3
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@ public class CachedCredentialsProviderBuilder {
/**
* Construct a new credentials provider using a builder
*/
public fun CachedCredentialsProvider.Companion.build(block: CachedCredentialsProviderBuilder.() -> Unit):
CachedCredentialsProvider = CachedCredentialsProviderBuilder().apply(block).build()
public fun CachedCredentialsProvider.Companion.build(block: CachedCredentialsProviderBuilder.() -> Unit): CachedCredentialsProvider = CachedCredentialsProviderBuilder().apply(block).build()
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ import aws.sdk.kotlin.crt.Closeable
/**
* Represents a producer/source of AWS credentials
*/
public interface CredentialsProvider : Closeable, AsyncShutdown {
public interface CredentialsProvider :
Closeable,
AsyncShutdown {

/**
* Request credentials from the provider
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import aws.sdk.kotlin.crt.io.ClientBootstrap
*
* @return the newly-constructed credentials provider
*/
public expect class DefaultChainCredentialsProvider internal constructor(builder: DefaultChainCredentialsProviderBuilder) :
CredentialsProvider {
public expect class DefaultChainCredentialsProvider internal constructor(builder: DefaultChainCredentialsProviderBuilder) : CredentialsProvider {

public companion object
}
Expand All @@ -40,5 +39,4 @@ public class DefaultChainCredentialsProviderBuilder {
/**
* Construct a new credentials provider using a builder
*/
public fun DefaultChainCredentialsProvider.Companion.build(block: DefaultChainCredentialsProviderBuilder.() -> Unit):
DefaultChainCredentialsProvider = DefaultChainCredentialsProviderBuilder().apply(block).build()
public fun DefaultChainCredentialsProvider.Companion.build(block: DefaultChainCredentialsProviderBuilder.() -> Unit): DefaultChainCredentialsProvider = DefaultChainCredentialsProviderBuilder().apply(block).build()
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import aws.sdk.kotlin.crt.io.TlsContext
* A credentials provider that sources credentials from an ECS environment.
*/
public expect class EcsCredentialsProvider
internal constructor(builder: EcsCredentialsProviderBuilder) : CredentialsProvider {
internal constructor(
builder: EcsCredentialsProviderBuilder,
) : CredentialsProvider {
public companion object
}

Expand Down Expand Up @@ -50,5 +52,4 @@ public class EcsCredentialsProviderBuilder {
/**
* Construct a new ECS credentials provider using a builder.
*/
public fun EcsCredentialsProvider.Companion.build(block: EcsCredentialsProviderBuilder.() -> Unit):
EcsCredentialsProvider = EcsCredentialsProviderBuilder().apply(block).build()
public fun EcsCredentialsProvider.Companion.build(block: EcsCredentialsProviderBuilder.() -> Unit): EcsCredentialsProvider = EcsCredentialsProviderBuilder().apply(block).build()
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import aws.sdk.kotlin.crt.io.TlsContext
* A credentials provider that uses profile files.
*/
public expect class ProfileCredentialsProvider
internal constructor(builder: ProfileCredentialsProviderBuilder) : CredentialsProvider {
internal constructor(
builder: ProfileCredentialsProviderBuilder,
) : CredentialsProvider {
public companion object
}

Expand Down Expand Up @@ -50,5 +52,4 @@ public class ProfileCredentialsProviderBuilder {
/**
* Construct a new credentials provider using a builder.
*/
public fun ProfileCredentialsProvider.Companion.build(block: ProfileCredentialsProviderBuilder.() -> Unit):
ProfileCredentialsProvider = ProfileCredentialsProviderBuilder().apply(block).build()
public fun ProfileCredentialsProvider.Companion.build(block: ProfileCredentialsProviderBuilder.() -> Unit): ProfileCredentialsProvider = ProfileCredentialsProviderBuilder().apply(block).build()
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ public class StaticCredentialsProviderBuilder {
/**
* Construct a new credentials provider using a builder
*/
public fun StaticCredentialsProvider.Companion.build(block: StaticCredentialsProviderBuilder.() -> Unit):
StaticCredentialsProvider = StaticCredentialsProviderBuilder().apply(block).build()
public fun StaticCredentialsProvider.Companion.build(block: StaticCredentialsProviderBuilder.() -> Unit): StaticCredentialsProvider = StaticCredentialsProviderBuilder().apply(block).build()

/**
* Create provider from a set of credentials
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import aws.sdk.kotlin.crt.io.TlsContext
* Provides credentials from STS by assuming a role
*/
public expect class StsAssumeRoleCredentialsProvider
internal constructor(builder: StsAssumeRoleCredentialsProviderBuilder) : CredentialsProvider {
internal constructor(
builder: StsAssumeRoleCredentialsProviderBuilder,
) : CredentialsProvider {
public companion object
}

Expand Down Expand Up @@ -53,5 +55,4 @@ public class StsAssumeRoleCredentialsProviderBuilder {
/**
* Construct a new credentials provider using a builder.
*/
public fun StsAssumeRoleCredentialsProvider.Companion.build(block: StsAssumeRoleCredentialsProviderBuilder.() -> Unit):
StsAssumeRoleCredentialsProvider = StsAssumeRoleCredentialsProviderBuilder().apply(block).build()
public fun StsAssumeRoleCredentialsProvider.Companion.build(block: StsAssumeRoleCredentialsProviderBuilder.() -> Unit): StsAssumeRoleCredentialsProvider = StsAssumeRoleCredentialsProviderBuilder().apply(block).build()
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import aws.sdk.kotlin.crt.io.TlsContext
* authenticated in a mobile or web application with a web identity provider.
*/
public expect class StsWebIdentityCredentialsProvider
internal constructor(builder: StsWebIdentityCredentialsProviderBuilder) : CredentialsProvider {
internal constructor(
builder: StsWebIdentityCredentialsProviderBuilder,
) : CredentialsProvider {
public companion object
}

Expand All @@ -34,5 +36,4 @@ public class StsWebIdentityCredentialsProviderBuilder {
/**
* Construct a new credentials provider using a builder.
*/
public fun StsWebIdentityCredentialsProvider.Companion.build(block: StsWebIdentityCredentialsProviderBuilder.() -> Unit):
StsWebIdentityCredentialsProvider = StsWebIdentityCredentialsProviderBuilder().apply(block).build()
public fun StsWebIdentityCredentialsProvider.Companion.build(block: StsWebIdentityCredentialsProviderBuilder.() -> Unit): StsWebIdentityCredentialsProvider = StsWebIdentityCredentialsProviderBuilder().apply(block).build()
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,4 @@ public class X509CredentialsProviderBuilder {
/**
* Construct a new credentials provider using a builder
*/
public fun X509CredentialsProvider.Companion.build(block: X509CredentialsProviderBuilder.() -> Unit):
X509CredentialsProvider = X509CredentialsProviderBuilder().apply(block).build()
public fun X509CredentialsProvider.Companion.build(block: X509CredentialsProviderBuilder.() -> Unit): X509CredentialsProvider = X509CredentialsProviderBuilder().apply(block).build()
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ import aws.sdk.kotlin.crt.Closeable
* This class wraps the aws_client_bootstrap from aws-c-io to provide
* a client context for all protocol stacks in the AWS Common Runtime.
*/
public expect class ClientBootstrap(elg: EventLoopGroup, hr: HostResolver) : Closeable, AsyncShutdown
public expect class ClientBootstrap(elg: EventLoopGroup, hr: HostResolver) :
Closeable,
AsyncShutdown
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ import aws.sdk.kotlin.crt.Closeable
* Otherwise, maxThreads will be the number of event loops in the group.
* @throws [aws.sdk.kotlin.crt.CrtRuntimeException] If the system is unable to allocate space for a native event loop group
*/
public expect class EventLoopGroup(maxThreads: Int = 1) : Closeable, AsyncShutdown
public expect class EventLoopGroup(maxThreads: Int = 1) :
Closeable,
AsyncShutdown
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import aws.sdk.kotlin.crt.Closeable

internal const val DEFAULT_MAX_ENTRIES = 8

public expect class HostResolver(elg: EventLoopGroup, maxEntries: Int) : Closeable, AsyncShutdown {
public expect class HostResolver(elg: EventLoopGroup, maxEntries: Int) :
Closeable,
AsyncShutdown {
public constructor(elg: EventLoopGroup)
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ private fun String.toInsensitive(): CaseInsensitiveString =
/**
* Map of case-insensitive [String] to [Value]
*/
internal class CaseInsensitiveMap<Value>() : MutableMap<String, Value> {
internal class CaseInsensitiveMap<Value> : MutableMap<String, Value> {
private val impl: MutableMap<CaseInsensitiveString, Value> = mutableMapOf()

override val size: Int
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import aws.sdk.kotlin.crt.runSuspendTest
import kotlin.test.Test
import kotlin.test.assertEquals

class CredentialsProviderTest : CrtTest() {
private val EXPECTED_CREDENTIALS = Credentials("access_key_id", "secret_access_key", "session_token")
private val EXPECTED_CREDENTIALS = Credentials("access_key_id", "secret_access_key", "session_token")

class CredentialsProviderTest : CrtTest() {
@Test
fun testStaticProvider() = runSuspendTest {
val provider = StaticCredentialsProvider.fromCredentials(EXPECTED_CREDENTIALS)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import aws.sdk.kotlin.crt.http.headers
import aws.sdk.kotlin.crt.io.Uri
import kotlin.test.*

// ported over from crt-java
class SigningTest : CrtTest() {
private val TEST_ACCESS_KEY_ID: String = "AKIDEXAMPLE"
private val TEST_SECRET_ACCESS_KEY: String = "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY"
private val TEST_ACCESS_KEY_ID: String = "AKIDEXAMPLE"
private val TEST_SECRET_ACCESS_KEY: String = "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY"

// 2015-08-30T12:36:00Z
private val TEST_DATE_EPOCH_MILLI: Long = 1440938160000
// 2015-08-30T12:36:00Z
private val TEST_DATE_EPOCH_MILLI: Long = 1440938160000

// ported over from crt-java
class SigningTest : CrtTest() {
private fun createSimpleRequest(url: String, method: String, path: String, body: String? = null): HttpRequest = HttpRequest.build {
this.method = method
this.encodedPath = path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ data class HttpTestResponse(val statusCode: Int, val headers: Headers, val body:
if (body != null) {
if (other.body == null) return false
if (!body.contentEquals(other.body)) return false
} else if (other.body != null) return false
} else if (other.body != null) {
return false
}

return true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import software.amazon.awssdk.crt.auth.credentials.CachedCredentialsProvider as
import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as CredentialsProviderJni

public actual class CachedCredentialsProvider internal actual constructor(builder: CachedCredentialsProviderBuilder) :
CredentialsProvider, JniCredentialsProvider() {
JniCredentialsProvider(),
CredentialsProvider {
public actual companion object {}

override val jniCredentials: CredentialsProviderJni =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as Creden
import software.amazon.awssdk.crt.auth.credentials.DefaultChainCredentialsProvider as DefaultChainCredentialsProviderJni

public actual class DefaultChainCredentialsProvider internal actual constructor(builder: DefaultChainCredentialsProviderBuilder) :
CredentialsProvider, JniCredentialsProvider() {
JniCredentialsProvider(),
CredentialsProvider {
public actual companion object {}

override val jniCredentials: CredentialsProviderJni =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as Creden
import software.amazon.awssdk.crt.auth.credentials.EcsCredentialsProvider as EcsCredentialsProviderJni

public actual class EcsCredentialsProvider
internal actual constructor(builder: EcsCredentialsProviderBuilder) :
CredentialsProvider, JniCredentialsProvider() {
internal actual constructor(
builder: EcsCredentialsProviderBuilder,
) : JniCredentialsProvider(),
CredentialsProvider {
public actual companion object {}

override val jniCredentials: CredentialsProviderJni =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as Creden
/**
* Base class for proxying JNI credentials providers
*/
public abstract class JniCredentialsProvider : CredentialsProvider, Closeable, AsyncShutdown {
public abstract class JniCredentialsProvider :
CredentialsProvider,
Closeable,
AsyncShutdown {
internal abstract val jniCredentials: CredentialsProviderJni

override suspend fun getCredentials(): Credentials {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as Creden
import software.amazon.awssdk.crt.auth.credentials.ProfileCredentialsProvider as ProfileCredentialsProviderJni

public actual class ProfileCredentialsProvider
internal actual constructor(builder: ProfileCredentialsProviderBuilder) :
CredentialsProvider, JniCredentialsProvider() {
internal actual constructor(
builder: ProfileCredentialsProviderBuilder,
) : JniCredentialsProvider(),
CredentialsProvider {
public actual companion object {}

override val jniCredentials: CredentialsProviderJni =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import software.amazon.awssdk.crt.auth.credentials.StaticCredentialsProvider as
* A credentials provider for a fixed set of credentials
*/
public actual class StaticCredentialsProvider internal actual constructor(builder: StaticCredentialsProviderBuilder) :
JniCredentialsProvider(), CredentialsProvider {
JniCredentialsProvider(),
CredentialsProvider {
public actual companion object {}

override val jniCredentials = StaticCredentialsProviderJni.StaticCredentialsProviderBuilder().apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ import software.amazon.awssdk.crt.auth.credentials.StsCredentialsProvider as Sts
private const val DEFAULT_DURATION_SECONDS = 3600

public actual class StsAssumeRoleCredentialsProvider
internal actual constructor(builder: StsAssumeRoleCredentialsProviderBuilder) :
CredentialsProvider, JniCredentialsProvider() {
internal actual constructor(
builder: StsAssumeRoleCredentialsProviderBuilder,
) : JniCredentialsProvider(),
CredentialsProvider {
public actual companion object {}

override val jniCredentials: CredentialsProviderJni =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as Creden
import software.amazon.awssdk.crt.auth.credentials.StsWebIdentityCredentialsProvider as StsWebIdentityCredentialsProviderJni

public actual class StsWebIdentityCredentialsProvider
internal actual constructor(builder: StsWebIdentityCredentialsProviderBuilder) :
CredentialsProvider, JniCredentialsProvider() {
internal actual constructor(
builder: StsWebIdentityCredentialsProviderBuilder,
) : JniCredentialsProvider(),
CredentialsProvider {
public actual companion object {}

override val jniCredentials: CredentialsProviderJni =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider as Creden
import software.amazon.awssdk.crt.auth.credentials.X509CredentialsProvider as X509CredentialsProviderJni

public actual class X509CredentialsProvider internal actual constructor(builder: X509CredentialsProviderBuilder) :
CredentialsProvider, JniCredentialsProvider() {
JniCredentialsProvider(),
CredentialsProvider {

public actual companion object {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import software.amazon.awssdk.crt.io.SocketOptions as SocketOptionsJni

public actual class HttpClientConnectionManager actual constructor(
public actual val options: HttpClientConnectionManagerOptions,
) : Closeable, AsyncShutdown {
) : Closeable,
AsyncShutdown {

private val jniManager = HttpClientConnectionManagerJni.create(options.into())

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ import software.amazon.awssdk.crt.io.EventLoopGroup as EventLoopGroupJni
* Otherwise, maxThreads will be the number of event loops in the group.
* @throws [aws.sdk.kotlin.crt.CrtRuntimeException] If the system is unable to allocate space for a native event loop group
*/
public actual class EventLoopGroup actual constructor(maxThreads: Int) : Closeable, AsyncShutdown {
public actual class EventLoopGroup actual constructor(maxThreads: Int) :
Closeable,
AsyncShutdown {
internal val jniElg = EventLoopGroupJni(maxThreads)

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import org.mockserver.model.HttpRequest.request
import org.mockserver.model.HttpResponse.response
import kotlin.test.*

private val TEST_DOC_LINE = "This is a sample to prove that http downloads and uploads work."
private val TEST_DOC_SHA256 = "c7fdb5314b9742467b16bd5ea2f8012190b5e2c44a005f7984f89aab58219534"

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class HttpRequestResponseTest : HttpClientTest() {
private val TEST_DOC_LINE =
"This is a sample to prove that http downloads and uploads work. It doesn't really matter what's in here, we mainly just need to verify the downloads and uploads work."
private val TEST_DOC_SHA256 = "c7fdb5314b9742467b16bd5ea2f8012190b5e2c44a005f7984f89aab58219534"

lateinit var mockServer: MockServerClient
lateinit var url: String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

package aws.sdk.kotlin.crt.auth.credentials

public actual class CachedCredentialsProvider internal actual constructor(builder: CachedCredentialsProviderBuilder) :
CredentialsProvider {
public actual class CachedCredentialsProvider internal actual constructor(builder: CachedCredentialsProviderBuilder) : CredentialsProvider {
public actual companion object {}

override suspend fun getCredentials(): Credentials {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

package aws.sdk.kotlin.crt.auth.credentials

public actual class DefaultChainCredentialsProvider internal actual constructor(builder: DefaultChainCredentialsProviderBuilder) :
CredentialsProvider {
public actual class DefaultChainCredentialsProvider internal actual constructor(builder: DefaultChainCredentialsProviderBuilder) : CredentialsProvider {
public actual companion object {}

override suspend fun getCredentials(): Credentials {
Expand Down
Loading

0 comments on commit 514f214

Please sign in to comment.