Merge branch 'main' into b-medialive_channel_hls_cdn_settings

.changelog/31452.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_ec2_transit_gateway_route_table_association: Add `replace_existing_association` argument
+```

.changelog/31745.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+provider: Adds `retry_mode` parameter
+```

.changelog/31802.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_finspace_kx_environment
+```

.changelog/31803.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_finspace_kx_database
+```

.changelog/31804.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_finspace_kx_user
+```

.changelog/31833.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_mwaa_environment: Consider `CREATING_SNAPSHOT` a valid pending state for resource update
+```
+
+```release-note:note
+resource/aws_mwaa_environment: Upgrading your environment to a new major version of Apache Airflow forces replacement of the resource
+```

.changelog/31842.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_lambda_function: Add support for `ruby3.2` `runtime` value
+```
+
+```release-note:enhancement
+resource/aws_lambda_layer_version: Add support for `ruby3.2` `compatible_runtimes` value
+```

.github/workflows/autoremove_labels.yml

@@ -12,23 +12,16 @@ jobs:
     secrets: inherit
 
   RemoveNeedsTriageFromMaintainers:
+    name: 'Remove needs-triage for Maintainers'
     needs: community_check
     if: github.event.action == 'opened' && needs.community_check.outputs.maintainer == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Remove needs-triage label from member's Issues
-        uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0
-        with:
-          labels: |
-            needs-triage
+    uses: ./.github/workflows/reusable-add-or-remove-labels.yml
+    with:
+      remove: needs-triage
 
   RemoveTriagingLabelsFromClosedIssueOrPR:
+    name: 'Remove Triaging Labels from Closed Items'
     if: github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Remove triaging labels from closed issues and PRs
-        uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0
-        with:
-          labels: |
-            needs-triage
-            waiting-response
+    uses: ./.github/workflows/reusable-add-or-remove-labels.yml
+    with:
+      remove: needs-triage,waiting-response

.github/workflows/issue-comment-created.yml

@@ -10,12 +10,9 @@ jobs:
     secrets: inherit
 
   issue_comment_triage:
+    name: 'Remove stale and waiting-response Labels on Response'
     needs: community_check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0
-        if: github.event_name == 'issue_comment' && needs.community_check.outputs.maintainer == 'false'
-        with:
-          labels: |
-            stale
-            waiting-response
+    if: github.event_name == 'issue_comment' && needs.community_check.outputs.maintainer == 'false'
+    uses: ./.github/workflows/reusable-add-or-remove-labels.yml
+    with:
+      remove: stale,waiting-response

.github/workflows/project-partner-label.yml

@@ -4,7 +4,7 @@ on:
     types:
       - labeled
 env:
-  DESTINATION_COLUMN_ID: 'MDEzOlByb2plY3RDb2x1bW4xMjE0MzAxNw=='
+  DESTINATION_COLUMN_ID: 'PC_lAPOAAuecM4AXZPtzgC5Sak'
   GH_TOKEN: ${{ secrets.ORGSCOPED_GITHUB_TOKEN }}
 jobs:
   tag-created:

.github/workflows/project-roadmap-label.yml

@@ -3,18 +3,21 @@ on:
   issues:
     types:
       - labeled
+      - milestoned
   pull_request:
     types:
       - labeled
 env:
   DESTINATION_COLUMN_ID: 'MDEzOlByb2plY3RDb2x1bW4xMTUxMzUyOQ=='
   GH_TOKEN: ${{ secrets.ORGSCOPED_GITHUB_TOKEN }}
+
 jobs:
   tag-created:
-    if: ${{ github.event.label.name == 'roadmap' }}
+    if: ${{ github.event.label.name == 'roadmap' || github.event.issue.milestone.title == 'Roadmap' }}
     runs-on: ubuntu-latest
     steps:
-      - name: AddIssueToWorkingBoard
+      - name: 'Add Roadmapped or Milestoned Issue to Working Board'
+        if: github.event_name == 'issues'
         run: |
           PROJCOLUMNS=$(gh api graphql -f query='
               query {
@@ -40,3 +43,31 @@ jobs:
               }
             }'
           fi
+
+      - name: 'Add Roadmapped Pull Requests to Working Board'
+        if: github.event_name == 'pull_request'
+        run: |
+          PROJCOLUMNS=$(gh api graphql -f query='
+              query {
+                repository(name: "${{ github.event.repository.name }}", owner: "${{ github.repository_owner }}") {
+                  pullRequest(number: ${{ github.event.pull_request.number }}) {
+                  projectCards {
+                    nodes {
+                      column {
+                        name
+                        id
+                      }
+                    }
+                  }
+                }
+              }
+            }')
+          INPROJECT=$(echo $PROJCOLUMNS | jq '.data.repository.pullRequest.projectCards.nodes[].column | select(.id=="${{ env.DESTINATION_COLUMN_ID }}")')
+          if [ -z "$INPROJECT" ];
+          then
+            gh api graphql -f query='mutation {
+              addProjectCard(input: {projectColumnId: "${{ env.DESTINATION_COLUMN_ID }}", contentId: "${{ github.event.pull_request.node_id }}"}) {
+                clientMutationId
+              }
+            }'
+          fi

.github/workflows/project.yml

@@ -13,10 +13,33 @@ jobs:
     needs: community_check
     runs-on: ubuntu-latest
     steps:
-      - name: Move team PRs to Review column
-        uses: alex-page/[email protected]
+      - name: 'Move team PRs to Review column'
         if: github.event.pull_request.draft == false && needs.community_check.outputs.maintainer == 'true'
-        with:
-          project: AWS Provider Working Board
-          column: Open Maintainer PR
-          repo-token: ${{ secrets.ORGSCOPED_GITHUB_TOKEN}}
+        env:
+          DESTINATION_COLUMN_ID: 'MDEzOlByb2plY3RDb2x1bW4xMTUxMzYzOA=='
+          GH_TOKEN: ${{ secrets.ORGSCOPED_GITHUB_TOKEN }}
+        run: |
+          PROJCOLUMNS=$(gh api graphql -f query='
+              query {
+                repository(name: "${{ github.event.repository.name }}", owner: "${{ github.repository_owner }}") {
+                  pullRequest(number: ${{ github.event.pull_request.number }}) {
+                  projectCards {
+                    nodes {
+                      column {
+                        name
+                        id
+                      }
+                    }
+                  }
+                }
+              }
+            }')
+          INPROJECT=$(echo $PROJCOLUMNS | jq '.data.repository.pullRequest.projectCards.nodes[].column | select(.id=="${{ env.DESTINATION_COLUMN_ID }}")')
+          if [ -z "$INPROJECT" ];
+          then
+            gh api graphql -f query='mutation {
+              addProjectCard(input: {projectColumnId: "${{ env.DESTINATION_COLUMN_ID }}", contentId: "${{ github.event.pull_request.node_id }}"}) {
+                clientMutationId
+              }
+            }'
+          fi

.github/workflows/pull_request_feed.yml

@@ -73,6 +73,6 @@ jobs:
             }
       - name: Apply Partner Label
         if: github.event.action == 'opened' && needs.community_check.outputs.partner == 'true'
-        run: |
-          gh api repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/issues/${{ github.event.pull_request.number }}/labels \
-          -f "labels[]=partner"
+        uses: ./.github/workflows/reusable-add-or-remove-labels.yml
+        with:
+          add: partner

.github/workflows/pull_requests.yml

@@ -20,15 +20,11 @@ jobs:
 
   NeedsTriageLabeler:
     needs: community_check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
-      - name: Apply needs-triage Label
-        uses: actions/labeler@v4
-        if: github.event.action == 'opened' && needs.community_check.outputs.maintainer == 'false'
-        with:
-          configuration-path: .github/labeler-pr-needs-triage.yml
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+    name: 'Apply needs-triage to New Pull Requests'
+    if: github.event.action == 'opened' && needs.community_check.outputs.maintainer == 'false'
+    uses: ./.github/workflows/reusable-add-or-remove-labels.yml
+    with:
+      add: needs-triage
 
   SizeLabeler:
     runs-on: ubuntu-latest

.github/workflows/regressions.yml

@@ -43,11 +43,63 @@ jobs:
   AddToWorkingBoard:
     name: Add regression to Working Board
     if: github.event.label.name == 'regression'
+    env:
+      DESTINATION_COLUMN_ID: 'MDEzOlByb2plY3RDb2x1bW4xMTUxMzUyOQ=='
+      GH_TOKEN: ${{ secrets.ORGSCOPED_GITHUB_TOKEN }}
     runs-on: ubuntu-latest
     steps:
-      - name: Add regressions to To Do column
-        uses: alex-page/[email protected]
-        with:
-          project: AWS Provider Working Board
-          column: To Do
-          repo-token: ${{ secrets.ORGSCOPED_GITHUB_TOKEN }}
+      - name: 'Add Regression Issues to To Do column'
+        if: github.event_name == 'issues'
+        run: |
+          PROJCOLUMNS=$(gh api graphql -f query='
+              query {
+                repository(name: "${{ github.event.repository.name }}", owner: "${{ github.repository_owner }}") {
+                  issue(number: ${{ github.event.issue.number }}) {
+                  projectCards {
+                    nodes {
+                      column {
+                        name
+                        id
+                      }
+                    }
+                  }
+                }
+              }
+            }')
+          INPROJECT=$(echo $PROJCOLUMNS | jq '.data.repository.issue.projectCards.nodes[].column | select(.id=="${{ env.DESTINATION_COLUMN_ID }}")')
+          if [ -z "$INPROJECT" ];
+          then
+            gh api graphql -f query='mutation {
+              addProjectCard(input: {projectColumnId: "${{ env.DESTINATION_COLUMN_ID }}", contentId: "${{ github.event.issue.node_id }}"}) {
+                clientMutationId
+              }
+            }'
+          fi
+
+      - name: 'Add Regression Pull Requests to To Do column'
+        if: github.event_name == 'pull_request'
+        run: |
+          PROJCOLUMNS=$(gh api graphql -f query='
+              query {
+                repository(name: "${{ github.event.repository.name }}", owner: "${{ github.repository_owner }}") {
+                  pullRequest(number: ${{ github.event.pull_request.number }}) {
+                  projectCards {
+                    nodes {
+                      column {
+                        name
+                        id
+                      }
+                    }
+                  }
+                }
+              }
+            }')
+          INPROJECT=$(echo $PROJCOLUMNS | jq '.data.repository.pullRequest.projectCards.nodes[].column | select(.id=="${{ env.DESTINATION_COLUMN_ID }}")')
+          if [ -z "$INPROJECT" ];
+          then
+            gh api graphql -f query='mutation {
+              addProjectCard(input: {projectColumnId: "${{ env.DESTINATION_COLUMN_ID }}", contentId: "${{ github.event.pull_request.node_id }}"}) {
+                clientMutationId
+              }
+            }'
+          fi

.github/workflows/reusable-add-or-remove-labels.yml

@@ -0,0 +1,42 @@
+name: 'Modify Issue or Pull Request Labels'
+
+on:
+  workflow_call:
+    inputs:
+      add:
+        description: '(Optional) The comma-separated label(s) to add to the Issue or Pull Request.'
+        required: false
+        type: string
+      remove:
+        description: '(Optional) The comma-separated label(s) to remove from the Issue or Pull Request.'
+        required: false
+        type: string
+
+env:
+  GH_TOKEN: ${{ github.token }}
+  ITEM_URL: ${{ github.event.issue.html_url || github.event.pull_request.html_url }}
+
+jobs:
+  modify-labels:
+    name: 'Modify Label(s)'
+    runs-on: ubuntu-latest
+    env:
+      ITEM_TYPE: 'issue'
+    steps:
+      - name: 'Determine if the Item is an Issue or Pull Request'
+        # The issue_comment trigger happens for issues and pull requests.
+        # The best way to determine if an issue_comment trigger is related to an issue or pull request is to check
+        # whether or not github.event.issue.pull_request is empty.
+        if: github.event.pull_request || github.event.issue.pull_request
+        run: |
+          echo 'ITEM_TYPE=pr' >> $GITHUB_ENV
+
+      - name: 'Add Label(s) to Issue or Pull Request'
+        if: inputs.add != ''
+        run: |
+          gh $ITEM_TYPE edit $ITEM_URL --add-label ${{ inputs.add }}
+
+      - name: 'Remove Label(s) From Issue or Pull Request'
+        if: inputs.remove != ''
+        run: |
+          gh $ITEM_TYPE edit $ITEM_URL --remove-label ${{ inputs.remove }}

CHANGELOG.md

@@ -1,20 +1,32 @@
 ## 5.2.0 (Unreleased)
 
+NOTES:
+
+* resource/aws_mwaa_environment: Upgrading your environment to a new major version of Apache Airflow forces replacement of the resource ([#31833](https://github.com/hashicorp/terraform-provider-aws/issues/31833))
+
 FEATURES:
 
 * **New Data Source:** `aws_budgets_budget` ([#31691](https://github.com/hashicorp/terraform-provider-aws/issues/31691))
 * **New Data Source:** `aws_ecr_pull_through_cache_rule` ([#31696](https://github.com/hashicorp/terraform-provider-aws/issues/31696))
 * **New Data Source:** `aws_guardduty_finding_ids` ([#31711](https://github.com/hashicorp/terraform-provider-aws/issues/31711))
 * **New Data Source:** `aws_iam_principal_policy_simulation` ([#25569](https://github.com/hashicorp/terraform-provider-aws/issues/25569))
 * **New Resource:** `aws_chimesdkvoice_global_settings` ([#31365](https://github.com/hashicorp/terraform-provider-aws/issues/31365))
+* **New Resource:** `aws_finspace_kx_database` ([#31803](https://github.com/hashicorp/terraform-provider-aws/issues/31803))
+* **New Resource:** `aws_finspace_kx_environment` ([#31802](https://github.com/hashicorp/terraform-provider-aws/issues/31802))
+* **New Resource:** `aws_finspace_kx_user` ([#31804](https://github.com/hashicorp/terraform-provider-aws/issues/31804))
 
 ENHANCEMENTS:
 
 * data/aws_ec2_transit_gateway_connect_peer: Add `bgp_peer_address` and `bgp_transit_gateway_addresses` attributes ([#31752](https://github.com/hashicorp/terraform-provider-aws/issues/31752))
+* provider: Adds `retry_mode` parameter ([#31745](https://github.com/hashicorp/terraform-provider-aws/issues/31745))
 * resource/aws_chime_voice_connector: Add tagging support ([#31746](https://github.com/hashicorp/terraform-provider-aws/issues/31746))
 * resource/aws_ec2_transit_gateway_connect_peer: Add `bgp_peer_address` and `bgp_transit_gateway_addresses` attributes ([#31752](https://github.com/hashicorp/terraform-provider-aws/issues/31752))
+* resource/aws_ec2_transit_gateway_route_table_association: Add `replace_existing_association` argument ([#31452](https://github.com/hashicorp/terraform-provider-aws/issues/31452))
 * resource/aws_fis_experiment_template: Add support for `Volumes` to `actions.*.target` ([#31499](https://github.com/hashicorp/terraform-provider-aws/issues/31499))
 * resource/aws_instance: Add `instance_market_options` configuration block and `instance_lifecycle` and `spot_instance_request_id` attributes ([#31495](https://github.com/hashicorp/terraform-provider-aws/issues/31495))
+* resource/aws_lambda_function: Add support for `ruby3.2` `runtime` value ([#31842](https://github.com/hashicorp/terraform-provider-aws/issues/31842))
+* resource/aws_lambda_layer_version: Add support for `ruby3.2` `compatible_runtimes` value ([#31842](https://github.com/hashicorp/terraform-provider-aws/issues/31842))
+* resource/aws_mwaa_environment: Consider `CREATING_SNAPSHOT` a valid pending state for resource update ([#31833](https://github.com/hashicorp/terraform-provider-aws/issues/31833))
 * resource/aws_networkfirewall_firewall_policy: Add `stream_exception_policy` option to `firewall_policy.stateful_engine_options` ([#31541](https://github.com/hashicorp/terraform-provider-aws/issues/31541))
 * resource/aws_redshiftserverless_workgroup: Additional supported values for `config_parameter.parameter_key` ([#31747](https://github.com/hashicorp/terraform-provider-aws/issues/31747))
 * resource/aws_sagemaker_model: Add `container.model_package_name` and `primary_container.model_package_name` arguments ([#31755](https://github.com/hashicorp/terraform-provider-aws/issues/31755))