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

Add Dataplex Zone resource #6075

Merged
merged 6 commits into from
Jul 20, 2022
Merged

Add Dataplex Zone resource #6075

merged 6 commits into from
Jul 20, 2022

Conversation

saurabh-net
Copy link
Contributor

part of hashicorp/terraform-provider-google#11648

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).
  • Generated Terraform, and ran make test and make lint to ensure it passes unit and linter tests.
  • 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).
  • Ran relevant acceptance tests (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read the Release Notes Guide before writing my release note below.
`google_dataplex_zone`

@saurabh-net saurabh-net marked this pull request as ready for review May 24, 2022 22:48
@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. @melinath, 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! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

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

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2029
Passed tests 1799
Skipped tests: 226
Failed tests: 4

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests TestAccFirebaserulesRelease_BasicRelease|TestAccDataplexZone_BasicZone|TestAccBillingSubaccount_basic|TestAccBillingSubaccount_renameOnDestroy

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]

Tests failed during RECORDING mode:
TestAccDataplexZone_BasicZone[view]
TestAccBillingSubaccount_basic[view]
TestAccBillingSubaccount_renameOnDestroy[view]

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

@melinath melinath requested review from slevenick and removed request for melinath May 27, 2022 22:15
@melinath
Copy link
Member

Reassigning to someone who knows more about the DCL than I do since it's doing weird things.

A couple things to note:

Error:

provider_test.go:301: ImportStateVerify attributes not equivalent. Difference is shown below. Top is actual, bottom is expected.
        
        (map[string]string) {
        }
        
        
        (map[string]string) (len=4) {
         (string) (len=16) "discovery_spec.#": (string) (len=1) "1",
         (string) (len=18) "discovery_spec.0.%": (string) (len=1) "6",
         (string) (len=24) "discovery_spec.0.enabled": (string) (len=5) "false",
         (string) (len=25) "discovery_spec.0.schedule": (string) ""
        }

HTTP request to create the resource contains:

 "discoverySpec": {
  "enabled": false,
  "excludePatterns": [],
  "includePatterns": []
 }

Response with the created resource contains:

    "discoverySpec": {
      "csvOptions": {},
      "jsonOptions": {},
      "schedule": ""
    }

So it looks like the API isn't returning a value for enabled (which was sent) and is returning a value for schedule (which wasn't sent). This feels like it could cause issues? I think there may also be issues telling the difference between a struct that has all its values set to the "unset" value and a struct that is not set at all - but I'm not sure?

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 8 files changed, 1099 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 8 files changed, 1099 insertions(+), 2 deletions(-))
TF Validator: Diff ( 2 files changed, 5 insertions(+), 5 deletions(-))

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.

You'll need to rebase and remove serialization.go, it shouldn't be needed anymore due to a recent change

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 8 files changed, 1099 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 8 files changed, 1099 insertions(+), 2 deletions(-))
TF Validator: Diff ( 2 files changed, 5 insertions(+), 5 deletions(-))

1 similar comment
@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 8 files changed, 1099 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 8 files changed, 1099 insertions(+), 2 deletions(-))
TF Validator: Diff ( 2 files changed, 5 insertions(+), 5 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2047
Passed tests 1817
Skipped tests: 226
Failed tests: 4

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests TestAccFirebaserulesRelease_BasicRelease|TestAccDataplexZone_BasicZone|TestAccContainerCluster_withConfidentialNodes|TestAccContainerCluster_withAddons

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]
TestAccDataplexZone_BasicZone[view]

Tests failed during RECORDING mode:
TestAccContainerCluster_withAddons[view]
TestAccContainerCluster_withConfidentialNodes[view]

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

@slevenick slevenick self-requested a review June 9, 2022 18:00
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.

Issues came up during manual testing when attempting to remove the discovery_spec block. A permadiff appears as the API does not seem to remove the full object, and continues to return a somewhat empty discoverySpec object.

This will need a fix either on the API-level or in the DCL

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 7 files changed, 1096 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 7 files changed, 1096 insertions(+), 1 deletion(-))
TF Validator: Diff ( 2 files changed, 5 insertions(+), 5 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2110
Passed tests 1881
Skipped tests: 226
Failed tests: 3

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests TestAccComputeInstance_soleTenantNodeAffinities|TestAccPrivatecaCertificateAuthority_subordinateCaActivatedByFirstPartyIssuerOnCreation|TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordinateExample

@modular-magician
Copy link
Collaborator

Tests failed during RECORDING mode:
TestAccComputeInstance_soleTenantNodeAffinities[view]
TestAccPrivatecaCertificateAuthority_subordinateCaActivatedByFirstPartyIssuerOnCreation[view]
TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordinateExample[view]

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

@slevenick
Copy link
Contributor

Looks pretty good! Just a couple of notes:

resource_spec should be marked as immutable in the DCL YAML file that describes it, otherwise we don't correctly mark the field as requiring recreate to change.
discovery_spec description should match the new required behavior. Currently the description says the field is optional

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.

See my above comment

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.

Looks like you've got some conflicts, can you rebase from main and resolve them?

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 7 files changed, 1094 insertions(+), 9 deletions(-))
Terraform Beta: Diff ( 7 files changed, 1094 insertions(+), 9 deletions(-))
TF Validator: Diff ( 2 files changed, 5 insertions(+), 5 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2112
Passed tests 1879
Skipped tests: 226
Failed tests: 7

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests TestAccPrivatecaCertificateAuthority_subordinateCaActivatedByFirstPartyIssuerOnCreation|TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordinateExample|TestAccFirebaserulesRelease_BasicRelease|TestAccContainerAzureNodePool_BetaBasicHandWritten|TestAccContainerAzureNodePool_BasicHandWritten|TestAccDataplexZone_BasicZone|TestAccComputeInstance_soleTenantNodeAffinities

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]
TestAccContainerAzureNodePool_BetaBasicHandWritten[view]
TestAccDataplexZone_BasicZone[view]
TestAccContainerAzureNodePool_BasicHandWritten[view]

Tests failed during RECORDING mode:
TestAccComputeInstance_soleTenantNodeAffinities[view]
TestAccPrivatecaCertificateAuthority_subordinateCaActivatedByFirstPartyIssuerOnCreation[view]
TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordinateExample[view]

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.

Looks good, thanks!

@slevenick slevenick merged commit bf437c4 into GoogleCloudPlatform:main Jul 20, 2022
geojaz pushed a commit to geojaz/magic-modules that referenced this pull request Jul 21, 2022
* Add Dataplex Zone resource

* Fix zone name

* Update DCL to 1.10.2

* run make upgrade-dcl

* Update DCL to v1.15.1

* run make upgrade
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.

4 participants