Skip to content

Commit b0e0b9f

Browse files
author
Tianyi Wang
committed
resolve merge conflict
2 parents eb7effc + aa796dc commit b0e0b9f

File tree

38,203 files changed

+2176146
-579543
lines changed

Some content is hidden

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

38,203 files changed

+2176146
-579543
lines changed

‎.changelog/fc171f917f984c86909e71a6eb1b9b2a.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"id": "fc171f91-7f98-4c86-909e-71a6eb1b9b2a",
3+
"type": "dependency",
4+
"description": "Drop golang.org/x/net codegen dependency.",
5+
"modules": [
6+
"internal/codegen"
7+
]
8+
}

‎.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ title: "(short issue description)"
55
labels: [bug, needs-triage]
66
assignees: []
77
body:
8+
- type: checkboxes
9+
id: ack
10+
attributes:
11+
label: Acknowledgements
12+
options:
13+
- label: I have searched (https://github.com/aws/aws-sdk/issues?q=is%3Aissue) for past instances of this issue
14+
required: true
15+
- label: I have verified all of my SDK modules are up-to-date (you can perform a bulk update with `go get -u github.com/aws/aws-sdk-go-v2/...`)
16+
required: true
17+
818
- type: textarea
919
id: description
1020
attributes:

‎.github/ISSUE_TEMPLATE/migration-issue.yml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
---
2+
name: "🔀 Migration Issue: AWS SDK Go v1 to v2"
3+
description: Report an issue or discrepancy encountered during migration from AWS SDK Go v1 to v2
4+
title: "MIGRATION ISSUE: (short issue description)"
5+
labels: [needs-triage, v1-v2-inconsistency]
6+
assignees: []
7+
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: |
12+
## Migration Issue from AWS SDK Go v1 to v2
13+
Thank you for taking the time to report your migration issue. To help us address your concerns effectively, please provide as much detail as possible.
14+
15+
- type: checkboxes
16+
attributes:
17+
label: Pre-Migration Checklist
18+
options:
19+
- label: I've read the [Migration Guide](https://aws.github.io/aws-sdk-go-v2/docs/migrating/).
20+
required: true
21+
- label: I've checked [AWS Forums](https://forums.aws.amazon.com) and [StackOverflow](https://stackoverflow.com/questions/tagged/aws-sdk-go) for similar migration issues.
22+
required: true
23+
24+
- type: input
25+
id: go-version
26+
attributes:
27+
label: Go Version Used
28+
description: Please specify the version of Go you are using.
29+
placeholder: e.g., Go 1.20, Go 1.21
30+
validations:
31+
required: true
32+
33+
- type: textarea
34+
id: migration-issue-description
35+
attributes:
36+
label: Describe the Migration Issue
37+
description: What specific problem or discrepancy are you encountering during migration?
38+
placeholder: A clear and concise description of the issue.
39+
validations:
40+
required: true
41+
42+
- type: textarea
43+
id: code-comparison
44+
attributes:
45+
label: Code Comparison
46+
description: |
47+
Provide code snippets comparing v1 and v2 implementations.
48+
- V1 Code Snippet:
49+
- V2 Code Snippet:
50+
Please ensure to remove any sensitive information.
51+
validations:
52+
required: false
53+
54+
- type: textarea
55+
id: observed-differences
56+
attributes:
57+
label: Observed Differences/Errors
58+
description: |
59+
Detail any errors, behavioral differences, or unexpected outcomes you are observing.
60+
Include error messages, stack traces, and any logs relevant to the issue.
61+
validations:
62+
required: true
63+
64+
- type: textarea
65+
id: additional-context
66+
attributes:
67+
label: Additional Context
68+
description: |
69+
Provide any additional information that may be relevant to understanding your migration issue.
70+
This can include dependencies, environment setup, specific AWS services involved, etc.
71+
validations:
72+
required: false

‎.github/workflows/go.yml

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
matrix:
2323
os: [ubuntu-latest, macos-latest]
24-
go-version: ["1.19", "1.20", "1.21"]
24+
go-version: ["1.20", "1.21", "1.22"]
2525
steps:
2626
- uses: actions/checkout@v2
2727

@@ -41,13 +41,41 @@ jobs:
4141
- name: Test
4242
run: make ci-test-no-generate
4343

44+
x86-tests:
45+
name: Unix x86 SDK tests
46+
runs-on: ${{ matrix.os }}
47+
strategy:
48+
matrix:
49+
os: [ubuntu-latest]
50+
go-version: ["1.22"]
51+
env:
52+
GOARCH: "386"
53+
steps:
54+
- uses: actions/checkout@v2
55+
56+
- name: Set up Go
57+
uses: actions/setup-go@v2
58+
with:
59+
go-version: ${{ matrix.go-version }}
60+
61+
- name: Find smithy-go
62+
env:
63+
RUNNER_TMPDIR: ${{ runner.temp }}
64+
run: ./ci-find-smithy-go.sh
65+
66+
- name: Install golint
67+
run: go install golang.org/x/lint/golint@latest
68+
69+
- name: Test
70+
run: make unit
71+
4472
windows-tests:
4573
name: Windows SDK Tests
4674
runs-on: ${{ matrix.os }}
4775
strategy:
4876
matrix:
4977
os: [windows-latest]
50-
go-version: ["1.19", "1.20", "1.21"]
78+
go-version: ["1.20", "1.21", "1.22"]
5179
env:
5280
EACHMODULE_SKIP: "internal\\repotools\\changes"
5381
steps:

‎.github/workflows/golangci-lint.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎.github/workflows/snapshot.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Middleware snapshot tests
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
- 'feat-**'
11+
12+
env:
13+
EACHMODULE_CONCURRENCY: 2
14+
SMITHY_GO_REPOSITORY: ${{ github.event.pull_request.head.repo.owner.login }}/smithy-go
15+
GIT_PAT: ${{ secrets.CI_GIT_PAT}}
16+
17+
jobs:
18+
unix-tests:
19+
name: Middleware snapshot tests
20+
runs-on: ${{ matrix.os }}
21+
strategy:
22+
matrix:
23+
os: [ubuntu-latest]
24+
go-version: ["1.22"]
25+
env:
26+
EACHMODULE_SKIP: "internal"
27+
steps:
28+
- uses: actions/checkout@v2
29+
30+
- name: Set up Go
31+
uses: actions/setup-go@v2
32+
with:
33+
go-version: ${{ matrix.go-version }}
34+
35+
- name: Find smithy-go
36+
env:
37+
RUNNER_TMPDIR: ${{ runner.temp }}
38+
run: ./ci-find-smithy-go.sh
39+
40+
- name: Test
41+
run: make test-ci-check-snapshot-service

0 commit comments

Comments
 (0)