Cloud Workstations - Workstation Config #7017

bschaatsbergen · 2022-12-21T15:50:14Z

The leading pull request for this is: #7005, that should be merged first. (as I've split up the PRs for this new service)

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)

google_workstations_workstation_config

modular-magician · 2022-12-21T15:50:29Z

Oops! It looks like you're using an unknown release-note type in your changelog entries:

REPLACEME

Please only use the types listed in https://github.com/GoogleCloudPlatform/magic-modules/blob/master/.ci/RELEASE_NOTES_GUIDE.md.

modular-magician · 2022-12-21T15:51:13Z

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

I've detected that you're a community contributor. @SarahFrench, 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 · 2022-12-21T15:54:18Z

Oops! It looks like you're using an unknown release-note type in your changelog entries:

REPLACEME

Please only use the types listed in https://github.com/GoogleCloudPlatform/magic-modules/blob/master/.ci/RELEASE_NOTES_GUIDE.md.

modular-magician · 2022-12-21T16:09:52Z

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

Diff report

Your PR hasn't generated any diffs, but I'll let you know if a future commit does.

modular-magician · 2022-12-21T16:55:45Z

Tests analytics

Total tests: 2367
Passed tests 2117
Skipped tests: 247
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

TestAccLoggingBucketConfigProject_cmekSettings|TestAccFirebaserulesRelease_BasicRelease|TestAccContainerCluster_withInvalidGatewayApiConfigChannel

modular-magician · 2022-12-21T16:56:58Z

Tests passed during RECORDING mode:
TestAccLoggingBucketConfigProject_cmekSettings[Debug log]
TestAccFirebaserulesRelease_BasicRelease[Debug log]
TestAccContainerCluster_withInvalidGatewayApiConfigChannel[Debug log]

All tests passed
View the build log or the debug log for each test

modular-magician · 2023-01-31T23:37:42Z

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, 375 insertions(+))
Terraform Beta: Diff ( 6 files changed, 2398 insertions(+), 2 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 4 files changed, 147 insertions(+))

modular-magician · 2023-01-31T23:38:58Z

Tests analytics

Total tests: 0
Passed tests 0
Skipped tests: 0
Failed tests: 0

Errors occurred during REPLAYING mode. Please fix them to complete your PR
View the build log

modular-magician · 2023-02-01T13:25:59Z

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, 361 insertions(+))
Terraform Beta: Diff ( 6 files changed, 2297 insertions(+), 2 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 4 files changed, 147 insertions(+))

modular-magician · 2023-02-01T13:27:15Z

Tests analytics

Total tests: 0
Passed tests 0
Skipped tests: 0
Failed tests: 0

Errors occurred during REPLAYING mode. Please fix them to complete your PR
View the build log

modular-magician · 2023-02-01T13:49:58Z

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, 361 insertions(+))
Terraform Beta: Diff ( 6 files changed, 2298 insertions(+), 2 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 4 files changed, 147 insertions(+))

bschaatsbergen · 2023-02-23T22:58:23Z

Heya @SarahFrench, I've addressed the comments :)!

SarahFrench · 2023-02-24T12:08:07Z

/gcbrun

modular-magician · 2023-02-24T12:23:51Z

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, 611 insertions(+))
Terraform Beta: Diff ( 7 files changed, 3056 insertions(+), 7 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 20 files changed, 777 insertions(+))

modular-magician · 2023-02-24T12:25:14Z

Tests analytics

Total tests: 0
Passed tests 0
Skipped tests: 0
Failed tests: 0

Errors occurred during REPLAYING mode. Please fix them to complete your PR
View the build log

bschaatsbergen · 2023-02-24T12:52:53Z

I believe that I messed something up in the test, moved the updating of the displayName field in the test through the context now. Can we re-run the checks? @SarahFrench - Does 05ef367 seems correct to you?

SarahFrench · 2023-02-24T13:02:30Z

That commit looks ok to me and should run. Mutating the value in context feels like a bad idea generally, but in this case it's a very simple test so I think it's ok.

SarahFrench · 2023-02-24T13:02:37Z

/gcbrun

bschaatsbergen · 2023-02-24T13:03:36Z

05ef367

I felt the same, at first I was injecting the value and interpolating it in the terraform code - but I saw a lot of tests that do it on a context level. So wasn't quite sure what the standard was. Good to know for future PRs 👍🏼

modular-magician · 2023-02-24T13:17:26Z

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, 611 insertions(+))
Terraform Beta: Diff ( 7 files changed, 3058 insertions(+), 7 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 20 files changed, 777 insertions(+))

SarahFrench · 2023-02-24T13:25:55Z

wasn't quite sure what the standard was

I think for handwritten update tests the typical way is to define two separate functions (with names ending in _basic or _update) for the 'before' and 'after' config. Any updates in the _update function's config are hardcoded, e.g. display_name = "%{display_name} %{random_suffix}" in _basic versus display_name = "%{display_name} %{random_suffix}-update" in _update, and the context map stays the same.

But having said that, if you're making a very small change then making 1 reusable function instead of 2 makes sense. 🤷 In this case I think mutating context is ok but only because the test is so simple and the field being mutated isn't used for identifying resources via the API.

modular-magician · 2023-02-24T14:03:16Z

Tests analytics

Total tests: 2472
Passed tests 2215
Skipped tests: 255
Failed tests: 2

Action taken

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

TestAccWorkstationsWorkstationConfig_displayName|TestAccWorkstationsWorkstationConfig_workstationConfigEncryptionKeyExample

modular-magician · 2023-02-24T14:54:46Z

Tests passed during RECORDING mode:
TestAccWorkstationsWorkstationConfig_displayName[Debug log]
TestAccWorkstationsWorkstationConfig_workstationConfigEncryptionKeyExample[Debug log]

All tests passed
View the build log or the debug log for each test

bschaatsbergen · 2023-02-24T14:58:28Z

@SarahFrench 🥳

All tests passed

SarahFrench

Ok let's get this merged! :D

Good luck with implementing the 3rd resource for hashicorp/terraform-provider-google#12763

bschaatsbergen · 2023-02-24T16:17:16Z

Woohoo! Amazing, thanks for the extensive review @SarahFrench - on to the last resource!

* Add WorkstationConfig resource * indent correctly * add the workstationConfig * Add WorkstationConfig * Create workstation_config_basic.tf.erb * Create resource_workstations_workstation_config_test.go.erb * fix indent * remove duplicate displayName field * add `workstationClusterId` param * set host attribute block * set the `workstation_cluster_id` * fix create * use a default for the container property * add input true * set api defaults * set `host.gceInstance.bootDiskSizeGb` to be computed * fix machine_type attribute * fix typo's * lower case funcs * Update mmv1/third_party/terraform/tests/resource_workstations_workstation_config_test.go.erb Co-authored-by: Riley Karson <rileykarson@google.com> * add location * add skip test to examples * add tests to run sequentially instead of paralell * set `<% unless version == 'ga' -%>` * Remove extra tests * align google_workstations_workstation_config resource in update test * Revert "align google_workstations_workstation_config resource in update test" This reverts commit 37a4af3. * Revert "Remove extra tests" This reverts commit 1fc0744. * revert skip test * align tests and remove update label * add encryptionKey attribute * indent the description * add encryption key test * Use a static `account_id` for KMS SA * address comments on pr * set some extra defaults * add 2 new tests to test host and persistent_directories * Move back up * have a single set of unless/end * remove data google project * Remove faulty import * remove duplicate output and fmt * remove output field on displayName * add displayName update test * Fix update of display name --------- Co-authored-by: Riley Karson <rileykarson@google.com>

* main: (41 commits) update the test cases to resolve resourcename not found error Adds `grpc` field to `liveness_probe` and `startup_probe` to `google_cloud_run_v2_service` resource (GoogleCloudPlatform#6987) Upgrade DCL to v1.34 (GoogleCloudPlatform#7276) Add max_distance field to group placement policy (GoogleCloudPlatform#7354) Add stateful_ips to region_per_instance_config and per_instance_config (GoogleCloudPlatform#7316) Added support for workload-vulnerability-scanning and workload-config-audit (GoogleCloudPlatform#7310) datacatalog - bump Taxonomy and PolicyTag to ga (GoogleCloudPlatform#6989) Added best practices documentation for ForceNew fields (GoogleCloudPlatform#7127) Split resources in "B" products (GoogleCloudPlatform#7350) force recreate on master_config.num_instances (GoogleCloudPlatform#7349) Fix DataFusion instance versions used in tests (GoogleCloudPlatform#7343) remove duplicate word in Cluster.yaml (GoogleCloudPlatform#7347) Move more billing tests that require permissions beyond Billing User to master billing account (GoogleCloudPlatform#7344) Remove artifact repository beta URL, fixup handwritten tests (GoogleCloudPlatform#7345) Cloud Workstations - Workstation Config (GoogleCloudPlatform#7017) Add missing `type` argument to data source docs (GoogleCloudPlatform#7341) Fix caps in spanner resource schema accesses (GoogleCloudPlatform#7346) Downgrade Go to 1.18, modify comments (GoogleCloudPlatform#7339) feat: Add support for deletion_policy on shared vpc service project (GoogleCloudPlatform#7283) fixed virtual field update issues (GoogleCloudPlatform#7318) ...

* Add WorkstationConfig resource * indent correctly * add the workstationConfig * Add WorkstationConfig * Create workstation_config_basic.tf.erb * Create resource_workstations_workstation_config_test.go.erb * fix indent * remove duplicate displayName field * add `workstationClusterId` param * set host attribute block * set the `workstation_cluster_id` * fix create * use a default for the container property * add input true * set api defaults * set `host.gceInstance.bootDiskSizeGb` to be computed * fix machine_type attribute * fix typo's * lower case funcs * Update mmv1/third_party/terraform/tests/resource_workstations_workstation_config_test.go.erb Co-authored-by: Riley Karson <rileykarson@google.com> * add location * add skip test to examples * add tests to run sequentially instead of paralell * set `<% unless version == 'ga' -%>` * Remove extra tests * align google_workstations_workstation_config resource in update test * Revert "align google_workstations_workstation_config resource in update test" This reverts commit 37a4af3. * Revert "Remove extra tests" This reverts commit 1fc0744. * revert skip test * align tests and remove update label * add encryptionKey attribute * indent the description * add encryption key test * Use a static `account_id` for KMS SA * address comments on pr * set some extra defaults * add 2 new tests to test host and persistent_directories * Move back up * have a single set of unless/end * remove data google project * Remove faulty import * remove duplicate output and fmt * remove output field on displayName * add displayName update test * Fix update of display name --------- Co-authored-by: Riley Karson <rileykarson@google.com>

Add WorkstationConfig resource

b5bc460

modular-magician requested a review from SarahFrench December 21, 2022 15:51

indent correctly

5a18847

SarahFrench self-assigned this Jan 3, 2023

bschaatsbergen mentioned this pull request Jan 27, 2023

Cloud Workstations - Workstation Cluster #7005

Merged

5 tasks

Merge branch 'main' into cloud-workstations-workstation-config

7b75c6d

bschaatsbergen mentioned this pull request Jan 31, 2023

Add support for Cloud Workstations hashicorp/terraform-provider-google#12763

Closed

3 tasks

bschaatsbergen added 9 commits January 31, 2023 23:16

add the workstationConfig

9ef31d6

Add WorkstationConfig

45d5994

Create workstation_config_basic.tf.erb

5f8b3e8

Create resource_workstations_workstation_config_test.go.erb

7db8872

fix indent

71dd398

remove duplicate displayName field

9626224

add workstationClusterId param

2cd6605

set host attribute block

00564c4

set the workstation_cluster_id

2a8332e

bschaatsbergen mentioned this pull request Jan 31, 2023

Cloud Workstations - Workstation #7018

Merged

5 tasks

fix create

f888377

use a default for the container property

78ce695

bschaatsbergen added 4 commits February 23, 2023 23:04

Remove faulty import

0b9b42f

remove duplicate output and fmt

6f02e61

remove output field on displayName

c456e94

add displayName update test

a31d55d

modular-magician requested a review from SarahFrench February 24, 2023 12:09

Fix update of display name

05ef367

SarahFrench approved these changes Feb 24, 2023

View reviewed changes

SarahFrench merged commit 91d96c8 into GoogleCloudPlatform:main Feb 24, 2023

modular-magician mentioned this pull request Feb 24, 2023

Cloud Workstations - Workstation Config GoogleCloudPlatform/terraform-validator#1392

Merged

5 tasks

bschaatsbergen deleted the cloud-workstations-workstation-config branch March 2, 2023 09:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cloud Workstations - Workstation Config #7017

Cloud Workstations - Workstation Config #7017

bschaatsbergen commented Dec 21, 2022 •

edited

Loading

modular-magician commented Dec 21, 2022

modular-magician commented Dec 21, 2022

modular-magician commented Dec 21, 2022

modular-magician commented Dec 21, 2022

modular-magician commented Dec 21, 2022

modular-magician commented Dec 21, 2022

modular-magician commented Jan 31, 2023

modular-magician commented Jan 31, 2023

modular-magician commented Feb 1, 2023

modular-magician commented Feb 1, 2023

modular-magician commented Feb 1, 2023

bschaatsbergen commented Feb 23, 2023

SarahFrench commented Feb 24, 2023

modular-magician commented Feb 24, 2023

modular-magician commented Feb 24, 2023

bschaatsbergen commented Feb 24, 2023 •

edited

Loading

SarahFrench commented Feb 24, 2023

SarahFrench commented Feb 24, 2023

bschaatsbergen commented Feb 24, 2023 •

edited

Loading

modular-magician commented Feb 24, 2023

SarahFrench commented Feb 24, 2023

modular-magician commented Feb 24, 2023

modular-magician commented Feb 24, 2023

bschaatsbergen commented Feb 24, 2023

SarahFrench left a comment

bschaatsbergen commented Feb 24, 2023

Cloud Workstations - Workstation Config #7017

Cloud Workstations - Workstation Config #7017

Conversation

bschaatsbergen commented Dec 21, 2022 • edited Loading

modular-magician commented Dec 21, 2022

modular-magician commented Dec 21, 2022

modular-magician commented Dec 21, 2022

modular-magician commented Dec 21, 2022

Diff report

modular-magician commented Dec 21, 2022

Tests analytics

Action taken

modular-magician commented Dec 21, 2022

modular-magician commented Jan 31, 2023

Diff report

modular-magician commented Jan 31, 2023

Tests analytics

modular-magician commented Feb 1, 2023

Diff report

modular-magician commented Feb 1, 2023

Tests analytics

modular-magician commented Feb 1, 2023

Diff report

bschaatsbergen commented Feb 23, 2023

SarahFrench commented Feb 24, 2023

modular-magician commented Feb 24, 2023

Diff report

modular-magician commented Feb 24, 2023

Tests analytics

bschaatsbergen commented Feb 24, 2023 • edited Loading

SarahFrench commented Feb 24, 2023

SarahFrench commented Feb 24, 2023

bschaatsbergen commented Feb 24, 2023 • edited Loading

modular-magician commented Feb 24, 2023

Diff report

SarahFrench commented Feb 24, 2023

modular-magician commented Feb 24, 2023

Tests analytics

Action taken

modular-magician commented Feb 24, 2023

bschaatsbergen commented Feb 24, 2023

SarahFrench left a comment

Choose a reason for hiding this comment

bschaatsbergen commented Feb 24, 2023

bschaatsbergen commented Dec 21, 2022 •

edited

Loading

bschaatsbergen commented Feb 24, 2023 •

edited

Loading

bschaatsbergen commented Feb 24, 2023 •

edited

Loading