resolve merge conflict

.changelog/fc171f917f984c86909e71a6eb1b9b2a.json

@@ -0,0 +1,8 @@
+{
+    "id": "fc171f91-7f98-4c86-909e-71a6eb1b9b2a",
+    "type": "dependency",
+    "description": "Drop golang.org/x/net codegen dependency.",
+    "modules": [
+        "internal/codegen"
+    ]
+}

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -5,6 +5,16 @@ title: "(short issue description)"
 labels: [bug, needs-triage]
 assignees: []
 body:
+  - type: checkboxes
+    id: ack
+    attributes:
+      label: Acknowledgements
+      options:
+        - label: I have searched (https://github.com/aws/aws-sdk/issues?q=is%3Aissue) for past instances of this issue
+          required: true
+        - 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/...`)
+          required: true
+
   - type: textarea
     id: description
     attributes:

.github/ISSUE_TEMPLATE/migration-issue.yml

@@ -0,0 +1,72 @@
+---
+name: "🔀 Migration Issue: AWS SDK Go v1 to v2"
+description: Report an issue or discrepancy encountered during migration from AWS SDK Go v1 to v2
+title: "MIGRATION ISSUE: (short issue description)"
+labels: [needs-triage, v1-v2-inconsistency]
+assignees: []
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Migration Issue from AWS SDK Go v1 to v2
+        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.
+
+  - type: checkboxes
+    attributes:
+      label: Pre-Migration Checklist
+      options:
+        - label: I've read the [Migration Guide](https://aws.github.io/aws-sdk-go-v2/docs/migrating/).
+          required: true
+        - 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.
+          required: true
+
+  - type: input
+    id: go-version
+    attributes:
+      label: Go Version Used
+      description: Please specify the version of Go you are using.
+      placeholder: e.g., Go 1.20, Go 1.21
+    validations:
+      required: true
+
+  - type: textarea
+    id: migration-issue-description
+    attributes:
+      label: Describe the Migration Issue
+      description: What specific problem or discrepancy are you encountering during migration?
+      placeholder: A clear and concise description of the issue.
+    validations:
+      required: true
+
+  - type: textarea
+    id: code-comparison
+    attributes:
+      label: Code Comparison
+      description: |
+        Provide code snippets comparing v1 and v2 implementations.
+        - V1 Code Snippet:
+        - V2 Code Snippet:
+        Please ensure to remove any sensitive information.
+    validations:
+      required: false
+
+  - type: textarea
+    id: observed-differences
+    attributes:
+      label: Observed Differences/Errors
+      description: |
+        Detail any errors, behavioral differences, or unexpected outcomes you are observing.
+        Include error messages, stack traces, and any logs relevant to the issue.
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: |
+        Provide any additional information that may be relevant to understanding your migration issue.
+        This can include dependencies, environment setup, specific AWS services involved, etc.
+    validations:
+      required: false

.github/workflows/go.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        go-version: ["1.19", "1.20", "1.21"]
+        go-version: ["1.20", "1.21", "1.22"]
     steps:
     - uses: actions/checkout@v2
 
@@ -41,13 +41,41 @@ jobs:
     - name: Test
       run: make ci-test-no-generate
 
+  x86-tests:
+    name: Unix x86 SDK tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        go-version: ["1.22"]
+    env:
+      GOARCH: "386"
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ${{ matrix.go-version }}
+
+    - name: Find smithy-go
+      env:
+        RUNNER_TMPDIR: ${{ runner.temp }}
+      run: ./ci-find-smithy-go.sh
+
+    - name: Install golint
+      run: go install golang.org/x/lint/golint@latest
+
+    - name: Test
+      run: make unit
+
   windows-tests:
     name: Windows SDK Tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [windows-latest]
-        go-version: ["1.19", "1.20", "1.21"]
+        go-version: ["1.20", "1.21", "1.22"]
     env:
       EACHMODULE_SKIP: "internal\\repotools\\changes"
     steps:

.github/workflows/snapshot.yml

@@ -0,0 +1,41 @@
+name: Middleware snapshot tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+      - 'feat-**'
+
+env:
+  EACHMODULE_CONCURRENCY: 2
+  SMITHY_GO_REPOSITORY: ${{ github.event.pull_request.head.repo.owner.login }}/smithy-go
+  GIT_PAT: ${{ secrets.CI_GIT_PAT}}
+
+jobs:
+  unix-tests:
+    name: Middleware snapshot tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        go-version: ["1.22"]
+    env:
+      EACHMODULE_SKIP: "internal"
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ${{ matrix.go-version }}
+
+    - name: Find smithy-go
+      env:
+        RUNNER_TMPDIR: ${{ runner.temp }}
+      run: ./ci-find-smithy-go.sh
+
+    - name: Test
+      run: make test-ci-check-snapshot-service