Skip to content

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 24, 2025

Backport

The automatic backport failed, so I have manually cherry-picked the changes in this.

This PR is auto-generated from #37620 to be assessed for backporting due to the inclusion of the label 1.14-backport.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@dsa0x
This person should resolve the merge-conflict(s) by either:

  • Manually completing the cherry picks into this branch
  • Creating a new branch and manually cherry-picking all commits being backported

merge conflict error: POST https://api.github.com/repos/hashicorp/terraform/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


This PR ensures that when a list config isn't given a config block, terraform sends a non-null config to the provider RPC. Also, we want to validate the existence of the config block if any of its direct attribute or block is required.

Because we were already manually constructing a schema for the list block anyway, I updated that schema to make config required if its direct attribute are required.

Target Release

1.14.x

Rollback Plan

  • If a change needs to be reverted, we will roll out an update to the code within 7 days.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

CHANGELOG entry

  • This change is user-facing and I added a changelog entry.
  • This change is not user-facing.

Overview of commits

@github-actions github-actions bot requested a review from dsa0x September 24, 2025 07:31
@dsa0x dsa0x force-pushed the backport/sams/validate-empty-config/blatantly-exciting-porpoise branch from c99a894 to a750471 Compare September 24, 2025 07:37
Copy link
Contributor Author

github-actions bot commented Sep 24, 2025

Changelog Warning

Currently this PR would target a v1.14 release. Please add a changelog entry for in the .changes/v1.14 folder, or discuss which release you'd like to target with your reviewer. If you believe this change does not need a changelog entry, please add the 'no-changelog-needed' label.

@dsa0x dsa0x force-pushed the backport/sams/validate-empty-config/blatantly-exciting-porpoise branch from a750471 to 21cca5e Compare September 24, 2025 07:38
@dsa0x dsa0x added no-changelog-needed Add this to your PR if the change does not require a changelog entry skip-changelog-check labels Sep 24, 2025
@dsa0x dsa0x requested a review from dbanck September 24, 2025 09:47
@dsa0x dsa0x marked this pull request as ready for review September 24, 2025 10:10
@dsa0x dsa0x requested a review from a team as a code owner September 24, 2025 10:10
@dsa0x dsa0x merged commit 20ca183 into v1.14 Sep 24, 2025
16 of 17 checks passed
@dsa0x dsa0x deleted the backport/sams/validate-empty-config/blatantly-exciting-porpoise branch September 24, 2025 10:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-changelog-needed Add this to your PR if the change does not require a changelog entry skip-changelog-check
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants