Skip to content

Commit 6674dc7

Browse files
committed
Merge branch 'main' of https://github.com/awslabs/aws-sdk-kotlin into flexible-checksums
2 parents 779cd3a + c4d6014 commit 6674dc7

File tree

111 files changed

+93786
-9583
lines changed

Some content is hidden

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

111 files changed

+93786
-9583
lines changed

CHANGELOG.md

Lines changed: 255 additions & 48 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ AWS service clients are generated from [Smithy](https://awslabs.github.io/smithy
1616
As such the code in `aws-sdk-kotlin` is a layer on top of generic Smithy based code generation tooling.
1717

1818

19-
2. Smithy Kotlin Codegen repo ([awslabs/smithy-kotlin](https://github.com/awslabs/smithy-kotlin))
19+
2. Smithy Kotlin Codegen repo ([smithy-lang/smithy-kotlin](https://github.com/smithy-lang/smithy-kotlin))
2020

2121
The `smithy-kotlin` repository contains the generic Smithy code generation tools for Kotlin.
2222

23-
If you want to contribute by diving into the codegen machinery and helping develop the SDK please refer to the [contributing guide](https://github.com/awslabs/smithy-kotlin/blob/main/CONTRIBUTING.md) in that repo.
23+
If you want to contribute by diving into the codegen machinery and helping develop the SDK please refer to the [contributing guide](https://github.com/smithy-lang/smithy-kotlin/blob/main/CONTRIBUTING.md) in that repo.
2424

2525

2626
## Reporting Bugs/Feature Requests
@@ -78,7 +78,7 @@ following fields:
7878
| `id` | `string` | yes | | A unique identifier for this entry. We recommend you generate a UUID for this field. |
7979
| `type` | `string` | yes | `bugfix`, `feature`, `documentation`, `misc` | The type of change being made. |
8080
| `description` | `string` | yes | | A description of the change being made.<ul><li>Prefix with `**Breaking**:` if the change is breaking</li><li>Use the imperative present tense (e.g., "change" not "changed" nor "changes")</li><li>Capitalize first letter</li><li>No dot (.) at the end unless there are multiple sentences</li></ul> |
81-
| `issues` | `string[]` | no | | A list of references to any related issues in the relevant repositories. A reference can be specified in several ways:<ul><li>The issue number, if local to this repository (eg. `#12345`)</li><li>A fully-qualified issue ID (eg.`awslabs/smithy-kotlin#12345`)</li><li>A fully-qualified URL (eg. `https://issuetracker.com/12345`)</li></ul> |
81+
| `issues` | `string[]` | no | | A list of references to any related issues in the relevant repositories. A reference can be specified in several ways:<ul><li>The issue number, if local to this repository (eg. `#12345`)</li><li>A fully-qualified issue ID (eg.`smithy-lang/smithy-kotlin#12345`)</li><li>A fully-qualified URL (eg. `https://issuetracker.com/12345`)</li></ul> |
8282
| `module` | `string` | no | | The area of the code affected by your changes. If unsure, leave this value unset. |
8383
| `requiresMinorVersionBump` | `boolean` | no | | Indicates the change will require a new minor version. This is usually the case after a breaking change. Defaults to false if flag is not included. |
8484

aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/middleware/UserAgent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class UserAgent(
4444

4545
// NOTE: Due to legacy issues with processing the user agent, the original content for
4646
// x-amz-user-agent and User-Agent is swapped here. See top note in the
47-
// sdk-user-agent-header SEP and https://github.com/awslabs/smithy-kotlin/issues/373
47+
// sdk-user-agent-header SEP and https://github.com/smithy-lang/smithy-kotlin/issues/373
4848
// for further details.
4949
req.subject.headers[USER_AGENT] = requestMetadata.xAmzUserAgent
5050
req.subject.headers[X_AMZ_USER_AGENT] = requestMetadata.userAgent

bom/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ fun createBomConstraintsAndVersionCatalog() {
5454
}
5555
}
5656

57+
// Add the BOM itself to the version catalog
58+
catalogExt.versionCatalog {
59+
library("bom", "aws.sdk.kotlin:bom:$version")
60+
}
61+
5762
val ignoredSmithyKotlin = setOf(
5863
"smithy.kotlin.codegen",
5964
"smithy.kotlin.http.test",

0 commit comments

Comments
 (0)