Skip to content

Support connectivity fields for Composer 3#7023

Merged
modular-magician merged 1 commit into
hashicorp:mainfrom
modular-magician:downstream-pr-76474ecb686e095b4436de3ce17d739a2a1a4b21
Feb 26, 2024
Merged

Support connectivity fields for Composer 3#7023
modular-magician merged 1 commit into
hashicorp:mainfrom
modular-magician:downstream-pr-76474ecb686e095b4436de3ce17d739a2a1a4b21

Conversation

@modular-magician
Copy link
Copy Markdown
Collaborator

Release Note Template for Downstream PRs (will be copied)

composer: added composer_network_attachment, modified network/subnetwork to work with composer 3, modified isComposer3 function to work with multiple types
Fixes: b/304402329, b/304432955, b/304432958

Derived from GoogleCloudPlatform/magic-modules#9889

* add composer_network_attachment

* indicate conflicting configs

* commas

* no need for bidirectional conflict definition (generates double errors)

* protect nit PrivateClusterConfig

* for optimizing error messages about conflicts

* add 2 step update for composer_network_attachment

* make composer_network_attachment available in beta only

* add two step update for network and subnetwork

* corrections in 2 phase update for network/subnetwork

* remove composer3 check(CustomizeDiff will solve this), filter api error, add tests (unsetting netwok/subnetwork not working)

* added ForceNewIf fot network/subnetwork, problem with unsetting these fields remains

* add docs for composer_network_attachment

* add test for network attachment

* ignore non empty plan in network attachment test

* add networkAttachment update and conflicting fields tests

* add ComputedIf for network, change isComposer3

* minor corrections

* remove computedIf

* filter equivalent values of network/subnetwork in ForceNewIf

* simplify ResourceConditionFunc, add beta/ga version conditions

* typo

* more general comparison of network references

* use tpgresource.CompareSelfLinkRelativePaths instead of custom function

* modify isComposer3 to avoid merge conflicts later.

* removing this since documentation is handled in other PR and to avoid conflicts while merging.

* replace ExpectNonEmptyPlan with lifecycle.ignore_changes

* add testcase for changing network attachment to network and subnetwork

* add third step to TestAccComposerEnvironmentComposer3_updateWithNetworkAndSubnetwork

* modify tests to use different network for attachment

* remove unused constant

* remove ExpectNonEmptyPlan (already replaced with lifecycle.ignore_changes)

[upstream:76474ecb686e095b4436de3ce17d739a2a1a4b21]

Signed-off-by: Modular Magician <magic-modules@google.com>
@modular-magician modular-magician merged commit dbe862d into hashicorp:main Feb 26, 2024
@modular-magician modular-magician deleted the downstream-pr-76474ecb686e095b4436de3ce17d739a2a1a4b21 branch November 16, 2024 02:25
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.

1 participant