Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve ignore_metadata_changes by adding support to OpenAPI entries #1164

Merged
merged 55 commits into from
Dec 4, 2023

Conversation

adambarreiro
Copy link
Collaborator

@adambarreiro adambarreiro commented Nov 23, 2023

Description

While PR #1018 added the new metadata_entry blocks to vcd_rde to manage OpenAPI metadata, these were not compatible with ignore_metadata_changes provider configuration block. This PR extends this compatibility by adding OpenAPI support for ignoring metadata.

Fixes

This PR also fixes a bug when conflict_action = "warn" inside a ignore_metadata_changes block, that caused that any conflict ended the operation prematurely with an error, instead of continuing and returning a mere warning at the end.

To fix this, one must consider the Diagnostics objects and append them one after the other, to return them at the end if there's any.

This PR also completes #1139 bugfix, detected by TestAccVcdRde.

Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
#
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
#
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
#
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
#
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
@adambarreiro adambarreiro marked this pull request as ready for review November 28, 2023 09:19
@adambarreiro adambarreiro changed the title WIP: Improve ignore metadata Improve ignore_metadata_changes by adding support to OpenAPI entries Nov 28, 2023
@adambarreiro adambarreiro self-assigned this Nov 28, 2023
Signed-off-by: abarreiro <[email protected]>
Signed-off-by: abarreiro <[email protected]>
Copy link
Collaborator

@lvirbalas lvirbalas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

vcd/metadata.go Outdated Show resolved Hide resolved
vcd/metadata_common_test.go Outdated Show resolved Hide resolved
vcd/resource_vcd_network_routed_v2.go Outdated Show resolved Hide resolved
vcd/resource_vcd_org.go Show resolved Hide resolved
Signed-off-by: abarreiro <[email protected]>
@Didainius Didainius merged commit 7c6064d into vmware:main Dec 4, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants