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 DatabaseConfig and WebServerConfig to Cloud Composer's EnvironmentConfig #3863

Merged
merged 1 commit into from
Aug 25, 2020

Conversation

anitakar
Copy link
Contributor

@anitakar anitakar commented Aug 13, 2020

Adds new sections to Cloud Composer's EnvironmentConfig used for environment creation and updating

See: https://cloud.google.com/composer/docs/reference/rest/v1beta1/projects.locations.environments#EnvironmentConfig

fixes {https://github.com/hashicorp/terraform-provider-google/issues/6916}

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.

Release Note Template for Downstream PRs (will be copied)

composer: added `database_config` and `web_server_config` to `google_composer_environment` resource (TPGB only)

@google-cla google-cla bot added the cla: yes label Aug 13, 2020
@modular-magician
Copy link
Collaborator

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

I have detected that you are a community contributor, so your PR will be assigned to someone with a commit-bit on this repo for initial review.

Thanks for your contribution! A human will be with you soon.

@rileykarson, please review this PR or find an appropriate assignee.

@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 ( 2 files changed, 49 insertions(+))
Terraform Beta: Diff ( 3 files changed, 153 insertions(+))

Copy link
Member

@rileykarson rileykarson left a comment

Choose a reason for hiding this comment

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

@anitakar: I see you've marked this as WIP- let me know if you'd like me to make a review pass or if you'd prefer to wait.

Also, if you're removing the WIP marking do you mind commenting? I'm not sure I'll get notified for a push or rename, so that's the most reliable method to make sure I see that the status has changed.

@anitakar
Copy link
Contributor Author

anitakar commented Aug 13, 2020

@anitakar: I see you've marked this as WIP- let me know if you'd like me to make a review pass or if you'd prefer to wait.

Also, if you're removing the WIP marking do you mind commenting? I'm not sure I'll get notified for a push or rename, so that's the most reliable method to make sure I see that the status has changed.

Sure, I will comment when the PR is ready for review. I was not sure whether some internal work has not started, so I created PR to avoid double work on the issue.
I am sure I will learn a lot while testing, so maybe let's wait with the review until after I have written and run tests.

@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 ( 2 files changed, 49 insertions(+))
Terraform Beta: Diff ( 3 files changed, 277 insertions(+))

@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 ( 2 files changed, 49 insertions(+))
Terraform Beta: Diff ( 3 files changed, 277 insertions(+))

@anitakar anitakar changed the title [WIP] Add DatabaseConfig and WebServerConfig to Cloud Composer's EnvironmentConfig Add DatabaseConfig and WebServerConfig to Cloud Composer's EnvironmentConfig Aug 19, 2020
@anitakar anitakar force-pushed the machine_types branch 2 times, most recently from cdefe99 to 3850316 Compare August 19, 2020 19:42
@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 ( 2 files changed, 26 insertions(+))
Terraform Beta: Diff ( 3 files changed, 371 insertions(+))

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 ( 2 files changed, 26 insertions(+))
Terraform Beta: Diff ( 3 files changed, 371 insertions(+))

@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 ( 2 files changed, 26 insertions(+))
Terraform Beta: Diff ( 3 files changed, 375 insertions(+))

@anitakar
Copy link
Contributor Author

Acceptance tests have passed successfully.

Copy link
Member

@rileykarson rileykarson left a comment

Choose a reason for hiding this comment

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

Generally looks good! I left a few comments about how we can guard against some unintuitive behaviours Terraform has with configs where fields in a block are left unspecified & a handful of places where spaces and tabs got messed up. (We haven't found a good solution for linting templated go files for this kind of stuff, sadly)

I started a test run in our CI as well, but it'll take a while (1-2 hours) to get back to me, so I'm responding before that's done.

@anitakar anitakar force-pushed the machine_types branch 2 times, most recently from 7c7049c to dc6443d Compare August 21, 2020 09:30
@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 ( 3 files changed, 159 insertions(+), 133 deletions(-))
Terraform Beta: Diff ( 3 files changed, 584 insertions(+), 207 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 ( 3 files changed, 159 insertions(+), 133 deletions(-))
Terraform Beta: Diff ( 3 files changed, 584 insertions(+), 207 deletions(-))

@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 ( 3 files changed, 159 insertions(+), 133 deletions(-))
Terraform Beta: Diff ( 3 files changed, 582 insertions(+), 207 deletions(-))

@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 ( 3 files changed, 159 insertions(+), 133 deletions(-))
Terraform Beta: Diff ( 3 files changed, 566 insertions(+), 206 deletions(-))

Copy link
Member

@rileykarson rileykarson left a comment

Choose a reason for hiding this comment

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

Looking great- just a few small documentation changes to reflect the fact that the subfields are required & can't be left unspecified.

@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 ( 3 files changed, 157 insertions(+), 133 deletions(-))
Terraform Beta: Diff ( 3 files changed, 564 insertions(+), 206 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 ( 3 files changed, 157 insertions(+), 133 deletions(-))
Terraform Beta: Diff ( 3 files changed, 564 insertions(+), 206 deletions(-))

@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 ( 3 files changed, 157 insertions(+), 133 deletions(-))
Terraform Beta: Diff ( 3 files changed, 564 insertions(+), 206 deletions(-))

@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 ( 3 files changed, 157 insertions(+), 133 deletions(-))
Terraform Beta: Diff ( 3 files changed, 564 insertions(+), 206 deletions(-))

Copy link
Member

@rileykarson rileykarson left a comment

Choose a reason for hiding this comment

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

LGTM- sorry for the delay in getting back! Busy end of last week.

I had some composer tests fail in CI, but I think they're flaky and I don't believe it was due to this PR. I'll veryify them- they take a while to run, so it might just take me a bit between LGTM-ing this and clicking merge.

@rileykarson
Copy link
Member

We're good- all tests passed, it was just an API flake before.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants