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

Adding Cloud Composer Support For Resilience Mode Updates #8263

Merged
merged 8 commits into from
Jul 20, 2023

Conversation

Khaledmohamedrefaat
Copy link
Contributor

@Khaledmohamedrefaat Khaledmohamedrefaat commented Jul 4, 2023

Adding Cloud Composer Support For Resilience Mode Updates

If this PR is for Terraform, I acknowledge that I have:

  • Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
  • Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
  • Generated Terraform providers, and ran make test and make lint in the generated providers to ensure it passes unit and linter tests.
  • Ran relevant acceptance tests using my own Google Cloud project and credentials (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read Write release notes before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

composer: added support for updating `resilience_mode` in `google_composer_environment`

@modular-magician
Copy link
Collaborator

Hello! I am a robot who works on Magic Modules PRs.

I've detected that you're a community contributor. @slevenick, a repository maintainer, has been assigned to assist you and help review your changes.

❓ First time contributing? Click here for more details

Your assigned reviewer will help review your code by:

  • Ensuring it's backwards compatible, covers common error cases, etc.
  • Summarizing the change into a user-facing changelog note.
  • Passes tests, either our "VCR" suite, a set of presubmit tests, or with manual test runs.

You can help make sure that review is quick by running local tests and ensuring they're passing in between each push you make to your PR's branch. Also, try to leave a comment with each push you make, as pushes generally don't generate emails.

If your reviewer doesn't get back to you within a week after your most recent change, please feel free to leave a comment on the issue asking them to take a look! In the absence of a dedicated review dashboard most maintainers manage their pending reviews through email, and those will sometimes get lost in their inbox.


@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 114 insertions(+), 4 deletions(-))
Terraform Beta: Diff ( 3 files changed, 114 insertions(+), 4 deletions(-))
TF Conversion: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2837
Passed tests 2540
Skipped tests: 295
Affected tests: 2

Action taken

Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccComputeFirewallPolicyRule_multipleRules|TestAccComposerEnvironment_UpdateComposerV2ResilienceMode

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

Tests failed during RECORDING mode:
TestAccComputeFirewallPolicyRule_multipleRules[Error message] [Debug log]
TestAccComposerEnvironment_UpdateComposerV2ResilienceMode[Error message] [Debug log]

Please fix these to complete your PR
View the build log or the debug log for each test

Copy link
Contributor

@slevenick slevenick left a comment

Choose a reason for hiding this comment

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

Test is failing with:
Error: Error waiting to create Environment: Error waiting for Creating Environment: Error code 9, message: Failed to create environment, but no error was surfaced. This can be caused by a lack of proper permissions.

@Khaledmohamedrefaat
Copy link
Contributor Author

@slevenick removed the test and added to another PR as resilience_mode update is not yet live in production and still in the process of getting live, those terraform changes needs to be there when it's live so it's better to have the test in another PR that should be merged after launch.

Second PR link: #8285

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 2 files changed, 15 insertions(+), 4 deletions(-))
Terraform Beta: Diff ( 2 files changed, 15 insertions(+), 4 deletions(-))
TF Conversion: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2843
Passed tests 2502
Skipped tests: 295
Affected tests: 46

Action taken

Found 46 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccComputeRegionInstanceTemplate_minCpuPlatform|TestAccComputeRegionInstanceTemplate_guestAcceleratorSkip|TestAccComputeRegionInstanceTemplate_guestAccelerator|TestAccComputeRegionInstanceTemplate_secondaryAliasIpRange|TestAccComputeRegionInstanceTemplate_primaryAliasIpRange|TestAccComputeRegionInstanceTemplate_metadata_startup_script|TestAccComputeInstanceTemplate_with18TbScratchDisk|TestAccComputeInstanceTemplate_withScratchDisk|TestAccComputeInstanceTemplate_disks|TestAccComputeInstanceFromTemplate_012_removableFields|TestAccComputeInstanceFromTemplate_overrideScratchDisk|TestAccComputeRegionInstanceTemplate_subnet_custom|TestAccComputeRegionInstanceTemplate_subnet_auto|TestAccComputeRegionInstanceTemplate_regionDisks|TestAccComputeInstanceFromTemplate_overrideAttachedDisk|TestAccComputeRegionAutoscaler_regionAutoscalerBasicExample|TestAccComputeInstanceFromTemplate_overrideBootDisk|TestAccComputeInstanceFromRegionTemplate_basic|TestAccComputeInstanceFromTemplate_self_link_unique|TestAccComputeInstanceTemplate_guestAcceleratorSkip|TestAccComputeInstanceTemplate_guestAccelerator|TestAccComputeInstanceTemplate_minCpuPlatform|TestAccComputeInstanceTemplate_secondaryAliasIpRange|TestAccComputeInstanceTemplate_primaryAliasIpRange|TestAccComputeInstanceFromTemplate_basic|TestAccComputeInstanceTemplate_metadata_startup_script|TestAccComputeInstanceTemplate_subnet_auto|TestAccComputeInstanceTemplate_subnet_custom|TestAccComputeInstanceTemplate_regionDisks|TestAccComputeFirewallPolicyRule_multipleRules|TestAccComputeInstanceTemplate_NetworkAttachment|TestAccComputeRegionInstanceTemplate_withScratchDisk|TestAccClouddeployDeliveryPipeline_DeliveryPipeline|TestAccComputeRegionInstanceTemplate_with18TbScratchDisk|TestAccContainerAwsNodePool_BetaBasicHandWritten|TestAccClouddeployDeliveryPipeline_CanaryrunDeliveryPipeline|TestAccContainerAwsNodePool_BasicHandWritten|TestAccClouddeployDeliveryPipeline_CanaryServiceNetworkingDeliveryPipeline|TestAccContainerAwsCluster_BetaBasicHandWritten|TestAccCloudbuildv2Connection_GlePrivUpdateConnection|TestAccClouddeployDeliveryPipeline_CanaryDeliveryPipeline|TestAccCloudbuildv2Connection_GlePrivConnection|TestAccCloudbuildv2Connection_GleConnection|TestAccContainerAwsCluster_BasicHandWritten|TestAccCloudbuildv2Connection_GitlabConnection|TestAccCloudbuildv2Connection_GleOldConnection

Get to know how VCR tests work

@Khaledmohamedrefaat
Copy link
Contributor Author

@slevenick Also I'd like to mention that this forceNew field is mistakenly set to true and needs to be changed to false so that the update is working successfully and we are in a hurry to make this change.

Thanks in advance for your understanding and cooperation.

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccComputeInstanceFromTemplate_overrideBootDisk[Debug log]
TestAccComputeInstanceFromRegionTemplate_basic[Debug log]
TestAccComputeInstanceFromTemplate_self_link_unique[Debug log]
TestAccComputeInstanceTemplate_guestAcceleratorSkip[Debug log]
TestAccComputeInstanceTemplate_guestAccelerator[Debug log]
TestAccClouddeployDeliveryPipeline_DeliveryPipeline[Debug log]
TestAccClouddeployDeliveryPipeline_CanaryServiceNetworkingDeliveryPipeline[Debug log]
TestAccClouddeployDeliveryPipeline_CanaryDeliveryPipeline[Debug log]
TestAccContainerAwsCluster_BasicHandWritten[Debug log]
TestAccCloudbuildv2Connection_GitlabConnection[Debug log]
TestAccCloudbuildv2Connection_GleOldConnection[Debug log]

Rerun these tests in REPLAYING mode to catch issues

All tests passed after rerunning REPLAYING mode.


Tests failed during RECORDING mode:
TestAccComputeRegionInstanceTemplate_secondaryAliasIpRange[Error message] [Debug log]
TestAccComputeRegionInstanceTemplate_withScratchDisk[Error message] [Debug log]

Several tests got terminated during RECORDING mode.
Please fix these to complete your PR
View the build log or the debug log for each test

Copy link
Contributor

@slevenick slevenick left a comment

Choose a reason for hiding this comment

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

Can you add a test that updates the resilience mode?

@Khaledmohamedrefaat
Copy link
Contributor Author

@slevenick Resilience mode is still not live and the API will always block the update request with resilience_mode so the test should be added once the feature is launched.

Also as mentioned, this forceNew field is mistakenly set to true and needs to be changed to false so that the update is working successfully and we are in a hurry to make this change.

I've prepared a PR with the test to submit it right away after the launch #8285.

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 128 insertions(+), 6 deletions(-))
Terraform Beta: Diff ( 3 files changed, 128 insertions(+), 6 deletions(-))
TF Conversion: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2854
Passed tests 2551
Skipped tests: 297
Affected tests: 6

Action taken

Found 6 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccContainerAwsNodePool_BetaBasicHandWritten|TestAccVertexAIIndex_updated|TestAccComposerEnvironment_UpdateComposerV2ResilienceMode|TestAccVertexAIIndex_vertexAiIndexExample|TestAccVertexAIIndex_vertexAiIndexStreamingExample|TestAccComputeFirewallPolicyRule_multipleRules

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccVertexAIIndex_updated[Debug log]
TestAccVertexAIIndex_vertexAiIndexExample[Debug log]
TestAccVertexAIIndex_vertexAiIndexStreamingExample[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$


$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]
TestAccComposerEnvironment_UpdateComposerV2ResilienceMode[Error message] [Debug log]
TestAccComputeFirewallPolicyRule_multipleRules[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

Copy link
Contributor

@slevenick slevenick left a comment

Choose a reason for hiding this comment

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

The test is continuing to fail with:
vcr_utils.go:152: Step 2/4 error: After applying this test step, the plan was not empty.
~ config {
+ resilience_mode = "STANDARD_RESILIENCE"
# (5 unchanged attributes hidden)

                # (7 unchanged blocks hidden)
            }

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 128 insertions(+), 6 deletions(-))
Terraform Beta: Diff ( 3 files changed, 128 insertions(+), 6 deletions(-))
TF Conversion: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2862
Passed tests 2560
Skipped tests: 299
Affected tests: 3

Action taken

Found 3 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccContainerAwsNodePool_BetaBasicHandWritten|TestAccComposerEnvironment_UpdateComposerV2ResilienceMode|TestAccComputeFirewallPolicyRule_multipleRules

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]
TestAccComposerEnvironment_UpdateComposerV2ResilienceMode[Error message] [Debug log]
TestAccComputeFirewallPolicyRule_multipleRules[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 128 insertions(+), 6 deletions(-))
Terraform Beta: Diff ( 3 files changed, 128 insertions(+), 6 deletions(-))
TF Conversion: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2865
Passed tests 2562
Skipped tests: 299
Affected tests: 4

Action taken

Found 4 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccContainerAwsNodePool_BetaBasicHandWritten|TestAccComputeInstance_minCpuPlatform|TestAccComposerEnvironment_UpdateComposerV2ResilienceMode|TestAccComputeFirewallPolicyRule_multipleRules

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccComputeInstance_minCpuPlatform[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$


$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]
TestAccComposerEnvironment_UpdateComposerV2ResilienceMode[Error message] [Debug log]
TestAccComputeFirewallPolicyRule_multipleRules[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 128 insertions(+), 6 deletions(-))
Terraform Beta: Diff ( 3 files changed, 128 insertions(+), 6 deletions(-))
TF Conversion: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2873
Passed tests 2571
Skipped tests: 299
Affected tests: 3

Action taken

Found 3 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccComposerEnvironment_UpdateComposerV2ResilienceMode|TestAccComputeFirewallPolicyRule_multipleRules|TestAccContainerAwsNodePool_BetaBasicHandWritten

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccComposerEnvironment_UpdateComposerV2ResilienceMode[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$


$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccComputeFirewallPolicyRule_multipleRules[Error message] [Debug log]
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

@slevenick slevenick merged commit 3cb954e into GoogleCloudPlatform:main Jul 20, 2023
8 checks passed
melinath pushed a commit that referenced this pull request Jul 20, 2023
* Adding Support For resilience_mode field

* Adding new field RESILIENCE_MODE_UNSPECIFIED

* Added RESILIENCE_MODE_UNSPECIFIED in the docs

* Removing the resilience mode test as the API is not yet launched

* Adding test for high resilience and adding  mapping

* Fixing docs and flatten logic

* Fixing expand method

* Fixing flatten to accept empty Resilience_mode field

---------

Co-authored-by: Khaled Hassan <hkhaled@google.com>
ericayyliu pushed a commit to ericayyliu/magic-modules that referenced this pull request Jul 26, 2023
…dPlatform#8263)

* Adding Support For resilience_mode field

* Adding new field RESILIENCE_MODE_UNSPECIFIED

* Added RESILIENCE_MODE_UNSPECIFIED in the docs

* Removing the resilience mode test as the API is not yet launched

* Adding test for high resilience and adding  mapping

* Fixing docs and flatten logic

* Fixing expand method

* Fixing flatten to accept empty Resilience_mode field

---------

Co-authored-by: Khaled Hassan <hkhaled@google.com>
NickElliot pushed a commit to NickElliot/magic-modules that referenced this pull request Jul 31, 2023
…dPlatform#8263)

* Adding Support For resilience_mode field

* Adding new field RESILIENCE_MODE_UNSPECIFIED

* Added RESILIENCE_MODE_UNSPECIFIED in the docs

* Removing the resilience mode test as the API is not yet launched

* Adding test for high resilience and adding  mapping

* Fixing docs and flatten logic

* Fixing expand method

* Fixing flatten to accept empty Resilience_mode field

---------

Co-authored-by: Khaled Hassan <hkhaled@google.com>
DanielRieske pushed a commit to bschaatsbergen/magic-modules that referenced this pull request Aug 2, 2023
…dPlatform#8263)

* Adding Support For resilience_mode field

* Adding new field RESILIENCE_MODE_UNSPECIFIED

* Added RESILIENCE_MODE_UNSPECIFIED in the docs

* Removing the resilience mode test as the API is not yet launched

* Adding test for high resilience and adding  mapping

* Fixing docs and flatten logic

* Fixing expand method

* Fixing flatten to accept empty Resilience_mode field

---------

Co-authored-by: Khaled Hassan <hkhaled@google.com>
shuyama1 pushed a commit that referenced this pull request Aug 3, 2023
* Adding Support For resilience_mode field

* Adding new field RESILIENCE_MODE_UNSPECIFIED

* Added RESILIENCE_MODE_UNSPECIFIED in the docs

* Removing the resilience mode test as the API is not yet launched

* Adding test for high resilience and adding  mapping

* Fixing docs and flatten logic

* Fixing expand method

* Fixing flatten to accept empty Resilience_mode field

---------

Co-authored-by: Khaled Hassan <hkhaled@google.com>
hao-nan-li pushed a commit to hao-nan-li/magic-modules that referenced this pull request Aug 9, 2023
…dPlatform#8263)

* Adding Support For resilience_mode field

* Adding new field RESILIENCE_MODE_UNSPECIFIED

* Added RESILIENCE_MODE_UNSPECIFIED in the docs

* Removing the resilience mode test as the API is not yet launched

* Adding test for high resilience and adding  mapping

* Fixing docs and flatten logic

* Fixing expand method

* Fixing flatten to accept empty Resilience_mode field

---------

Co-authored-by: Khaled Hassan <hkhaled@google.com>
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.

3 participants