chore: Resolve conflicts with upstream/develop#5830

Merged

mildaniel merged 13 commits intoaws:feat/terraform-v2-apifrom mildaniel:feat/terraform-v2-api

Aug 23, 2023

+319-20

Commits on Jul 4, 2023

Commits on Jul 11, 2023

Merge branch 'feat/terraform-v2-api' of https://github.com/aws/aws-sam-cli into feat/terraform-v2-api
mildaniel
committed

Commits on Jul 12, 2023

Merge branch 'feat/terraform-v2-api' of https://github.com/aws/aws-sam-cli into feat/terraform-v2-api
mildaniel
committed

Commits on Jul 26, 2023

Merge branch 'feat/terraform-v2-api' of https://github.com/aws/aws-sam-cli into feat/terraform-v2-api
mildaniel
committed

Commits on Jul 27, 2023

Commits on Aug 22, 2023

Merge branch 'feat/terraform-v2-api' of https://github.com/aws/aws-sam-cli into feat/terraform-v2-api
mildaniel
committed