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

Apigee organization #4317

Merged
merged 2 commits into from
Jan 12, 2021
Merged

Apigee organization #4317

merged 2 commits into from
Jan 12, 2021

Conversation

drebes
Copy link
Member

@drebes drebes commented Dec 15, 2020

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_organization

@google-cla google-cla bot added the cla: yes label Dec 15, 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.

@c2thorn, 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 ( 8 files changed, 1197 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 8 files changed, 1197 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 2 files changed, 112 insertions(+))

@modular-magician
Copy link
Collaborator

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

@drebes
Copy link
Member Author

drebes commented Dec 15, 2020

$ make testacc TEST=./google-beta TESTARGS='-run=TestAccApigeeOrganization_apigeeOrganization'
==> Checking source code against gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 TF_SCHEMA_PANIC_ON_ERROR=1 go test ./google-beta -v -run=TestAccApigeeOrganization_apigeeOrganization -timeout 240m -ldflags="-X=github.com/hashicorp/terraform-provider-google-beta/version.ProviderVersion=acc"
=== RUN   TestAccApigeeOrganization_apigeeOrganizationCloudBasicTestExample
=== PAUSE TestAccApigeeOrganization_apigeeOrganizationCloudBasicTestExample
=== RUN   TestAccApigeeOrganization_apigeeOrganizationCloudFullTestExample
=== PAUSE TestAccApigeeOrganization_apigeeOrganizationCloudFullTestExample
=== CONT  TestAccApigeeOrganization_apigeeOrganizationCloudBasicTestExample
=== CONT  TestAccApigeeOrganization_apigeeOrganizationCloudFullTestExample
--- PASS: TestAccApigeeOrganization_apigeeOrganizationCloudBasicTestExample (445.97s)
--- PASS: TestAccApigeeOrganization_apigeeOrganizationCloudFullTestExample (479.81s)
PASS
ok  	github.com/hashicorp/terraform-provider-google-beta/v3/google-beta	479.945s

@c2thorn
Copy link
Member

c2thorn commented Dec 15, 2020

/gcbrun

@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, 1197 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 8 files changed, 1197 insertions(+), 2 deletions(-))
TF Conversion: Diff ( 2 files changed, 112 insertions(+))

@modular-magician
Copy link
Collaborator

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

org_id: :ORG_ID
billing_account: :BILLING_ACCT
skip_docs: true
min_version: beta
Copy link
Member

Choose a reason for hiding this comment

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

MM seems to be generating this example in the GA provider (causing CI build errors), and it isn't clear to me why. The configuration here looks correct. I'm looking to see if there is a potential MM bug

Copy link
Member Author

Choose a reason for hiding this comment

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

I found the issue in the test template. Since Apigee has no beta API, and the template takes the minimum version of the API min_version and not of the example, this generates the test for the GA version of the provider. I'm not fluent enough in Ruby to fix that, but a workaround is to define a beta version of the API with the same v1 endpoint. I'll push a commit with that, but will gladly change if you can find a way to fix the test template instead.

Copy link
Member Author

Choose a reason for hiding this comment

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

I tried to open an issue in the MM repo but I can only open provider specific issues from there.

Copy link
Member

Choose a reason for hiding this comment

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

There's not a great place to file this, but I made one in the google provider repo where it will actually get monitored: hashicorp/terraform-provider-google#8174

Thanks for looking into this

@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, 1078 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 9 files changed, 1222 insertions(+), 3 deletions(-))
TF Conversion: Diff ( 2 files changed, 112 insertions(+))

@modular-magician
Copy link
Collaborator

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

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccInstanceTemplateDatasource_filter|TestAccInstanceTemplateDatasource_filter_mostRecent|TestAccDataSourceGoogleSubnetwork|TestAccDataSourceStorageBucketObjectContent_Basic|TestAccApigeeOrganization_apigeeOrganizationCloudBasicTestExample|TestAccApigeeOrganization_apigeeOrganizationCloudFullTestExample|TestAccActiveDirectoryDomainTrust_activeDirectoryDomainTrustBasicExample|TestAccContainerCluster_withConfidentialNodes|TestAccContainerCluster_withPrivateClusterConfigMissingCidrBlock|TestAccDataprocJob_Spark You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=166228"

Copy link
Member

@c2thorn c2thorn left a comment

Choose a reason for hiding this comment

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

LGTM, build and tests pass now. Thanks!

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