Added code for Apigee environment groups #4570

priya-saxena21 · 2021-03-08T14:58:08Z

Fixes hashicorp/terraform-provider-google#8627

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_apigee_envgroup

modular-magician · 2021-03-08T14:59:15Z

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.

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

modular-magician · 2021-03-08T15:59:39Z

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

Diff report:

Terraform GA: Diff ( 6 files changed, 737 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 7 files changed, 738 insertions(+), 3 deletions(-))
TF Conversion: Diff ( 1 file changed, 64 insertions(+))

modular-magician · 2021-03-08T15:59:58Z

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=176155"

modular-magician · 2021-03-08T16:00:14Z

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

Diff report:

Terraform GA: Diff ( 6 files changed, 737 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 7 files changed, 739 insertions(+), 3 deletions(-))
TF Conversion: Diff ( 1 file changed, 64 insertions(+))

modular-magician · 2021-03-08T16:00:19Z

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=176156"

modular-magician · 2021-03-08T17:16:58Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccApiGatewayGateway_apigatewayGatewayBasicExampleUpdated You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=176157"

modular-magician · 2021-03-08T17:19:52Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccApiGatewayGateway_apigatewayGatewayBasicExampleUpdated You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=176158"

modular-magician · 2021-03-08T17:28:38Z

Tests failed during RECORDING mode: TestAccApiGatewayGateway_apigatewayGatewayBasicExampleUpdated Please fix these to complete your PR

modular-magician · 2021-03-08T17:32:28Z

Tests failed during RECORDING mode: TestAccApiGatewayGateway_apigatewayGatewayBasicExampleUpdated Please fix these to complete your PR

mmv1/products/apigee/api.yaml

slevenick · 2021-03-08T17:28:05Z

mmv1/templates/terraform/custom_import/apigee_environment_group.go.erb

+
+nameParts := strings.Split(d.Get("name").(string), "/")
+if len(nameParts) == 4 {
+	// `organizations/{{org_name}}/environments/{{name}}`


This looks like it is referring to environments rather than envgroups. Does this custom import need to exist? Have you ran into problems importing it?

Sorry it was a typo. Yes we need the custom imports. I fixed it to envgroups now in the latest commit.

slevenick · 2021-03-08T19:58:46Z

mmv1/products/apigee/terraform.yaml

+      # the resources needed for the acceptance test.
+      name: "apigee_environment_group_basic_test"
+      primary_resource_id: "apigee_environment_group"
+      test_env_vars:


I think we want to add some special handling for the service networking connection. That resource causes problems for our CI. We want to bootstrap these networks for sharing across apigee org tests. See https://github.com/GoogleCloudPlatform/magic-modules/blob/master/mmv1/products/redis/terraform.yaml#L41 for an example

The reason why we can't use a boostrapped VPC/service networking is that those need to be created on the ephemeral project where we host the parent Apigee org that owns this resource. Even if we were to have the VPC on a shared VPC on the integration host project, we'd need to set these ephemeral projects as service projects to the integration project.

So a better solution would be to create a bootstrapped Apigee Org, and not recreate the Org for every child resource we implement. We already have three: Instances, Environments and Environments groups, which should not be creating Orgs. as part of their acceptance tests as that is a complex operation as the steps show.

We discussed this briefly here but unfortunately I had no time to look into this yet. Although I still want to do it, I think this shouldn't block the envgroups functionality here, since these tests are valid, just not ideal/optimized.

mmv1/products/apigee/api.yaml

slevenick · 2021-03-09T17:43:45Z

mmv1/templates/terraform/custom_import/apigee_environment_group.go.erb

+		return nil, fmt.Errorf("Error setting name: %s", err)
+	}
+} else if len(nameParts) == 3 {
+	// `organizations/{{org_name}}/{{name}}`


Why would we expect this form? I don't think we even want to support this form, it doesn't match any of our current patterns for formats that I'm aware of

slevenick · 2021-03-09T17:47:11Z

.ci/containers/terraform-vcr-community/reverse_check_membership.sh

@@ -13,13 +13,13 @@ if $(echo $USER | fgrep -wq -e ndmckinley -e danawillow -e emilymye -e megan07 -
 	exit 0
 else
 	echo "Checking GCP org membership"
-	GCP_MEMBER=$(curl -sw '%{http_code}' -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/orgs/GoogleCloudPlatform/members/$USER -o /dev/null)
+	GCP_MEMBER=$(curl -Lsw '%{http_code}' -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/orgs/GoogleCloudPlatform/members/$USER -o /dev/null)


I'm not sure what happened here, but it looks like you've picked up changes from another branch. Can you rebase off of a current version of master to get rid of these? They are also blocking the diff generator from running

Co-authored-by: Sam Levenick <slevenick@google.com>

modular-magician · 2021-03-09T23:11:46Z

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

Diff report:

Terraform GA: Diff ( 6 files changed, 737 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 6 files changed, 737 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 1 file changed, 64 insertions(+))

modular-magician · 2021-03-09T23:12:05Z

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=176393"

modular-magician · 2021-03-10T00:28:14Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccApiGatewayGateway_apigatewayGatewayBasicExampleUpdated You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=176489"

slevenick

I'd like to change the testing structure so that it works with VCR in the future, but this should work for now

google-cla bot added the cla: yes label Mar 8, 2021

modular-magician requested a review from slevenick March 8, 2021 14:59

slevenick reviewed Mar 8, 2021

View reviewed changes

slevenick reviewed Mar 9, 2021

View reviewed changes

Priyasaxena21 and others added 17 commits March 9, 2021 22:49

Added code for Apigee Environment

3881d8d

Update api.yaml

16ca928

Update api.yaml

3a4dadb

Added code for Apigee Environment

9e812b2

Added code for Apigee environment groups

0fb83a5

Update api.yaml

f0807a4

Added code for Apigee Environment

2576422

Update api.yaml

ded1602

Update api.yaml

dacf037

Added code for Apigee Environment

739f7d5

Incorporating review comments for Apigee environment groups

f408104

Incorporating review comments for Apigee environment groups

5b94a75

Update reverse_check_membership.sh

514f00f

Update reverse_check_membership.sh

dfd3159

Update check_membership.sh

c499c9d

Update mmv1/products/apigee/api.yaml

0ee64f6

Co-authored-by: Sam Levenick <slevenick@google.com>

Added code for Apigee Environment

2167faa

priya-saxena21 and others added 18 commits March 9, 2021 22:49

Update api.yaml

3432e74

Update api.yaml

e0af3d5

Added code for Apigee Environment

bbf67fe

Update api.yaml

a2e09a7

Added code for Apigee Environment

39a0d83

Update api.yaml

76bc59b

Update api.yaml

032df6d

Added code for Apigee Environment

78b3a33

Update api.yaml

4157103

Update api.yaml

0a43f81

Added code for Apigee Environment

c8f89b1

Update api.yaml

5fc1b0a

Added code for Apigee Environment

5270824

Update api.yaml

3c46eb7

Update api.yaml

8ad09f7

Added code for Apigee Environment

fa2cf8f

Update mmv1/products/apigee/api.yaml

1884489

Co-authored-by: Sam Levenick <slevenick@google.com>

fixing .ci errors

d9672a1

priya-saxena21 force-pushed the master branch from f7ec6c0 to d9672a1 Compare March 9, 2021 23:03

slevenick self-requested a review March 10, 2021 01:09

slevenick approved these changes Mar 10, 2021

View reviewed changes

slevenick merged commit 1f1a032 into GoogleCloudPlatform:master Mar 10, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added code for Apigee environment groups #4570

Added code for Apigee environment groups #4570

priya-saxena21 commented Mar 8, 2021 •

edited by slevenick

Loading

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

slevenick Mar 8, 2021

priya-saxena21 Mar 9, 2021

slevenick Mar 8, 2021

drebes Mar 9, 2021

slevenick Mar 9, 2021

slevenick Mar 9, 2021

modular-magician commented Mar 9, 2021

modular-magician commented Mar 9, 2021

modular-magician commented Mar 10, 2021

slevenick left a comment

Added code for Apigee environment groups #4570

Added code for Apigee environment groups #4570

Conversation

priya-saxena21 commented Mar 8, 2021 • edited by slevenick Loading

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

Diff report:

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

Diff report:

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

modular-magician commented Mar 8, 2021

slevenick Mar 8, 2021

Choose a reason for hiding this comment

priya-saxena21 Mar 9, 2021

Choose a reason for hiding this comment

slevenick Mar 8, 2021

Choose a reason for hiding this comment

drebes Mar 9, 2021

Choose a reason for hiding this comment

slevenick Mar 9, 2021

Choose a reason for hiding this comment

slevenick Mar 9, 2021

Choose a reason for hiding this comment

modular-magician commented Mar 9, 2021

Diff report:

modular-magician commented Mar 9, 2021

modular-magician commented Mar 10, 2021

slevenick left a comment

Choose a reason for hiding this comment

priya-saxena21 commented Mar 8, 2021 •

edited by slevenick

Loading