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

Allow url map to handle backend service fields that can also be backend buckets. #4269

Merged

Conversation

nat-henderson
Copy link
Contributor

@nat-henderson nat-henderson commented Nov 25, 2020

Fixes hashicorp/terraform-provider-google#7886.

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)

compute: `google_compute_url_map`'s fields referring to backend services can now also refer to backend buckets.

@google-cla google-cla bot added the cla: yes label Nov 25, 2020
@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 ( 5 files changed, 70 insertions(+), 137 deletions(-))
Terraform Beta: Diff ( 5 files changed, 70 insertions(+), 137 deletions(-))
Ansible: Diff ( 4 files changed, 176 insertions(+), 218 deletions(-))
TF Conversion: Diff ( 2 files changed, 6 insertions(+), 30 deletions(-))
Inspec: Diff ( 1 file changed, 3 insertions(+), 3 deletions(-))

@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=159891"

@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 ( 1 file changed, 342 insertions(+), 13 deletions(-))
Terraform Beta: Diff ( 1 file changed, 342 insertions(+), 13 deletions(-))
TF Conversion: Diff ( 1 file changed, 342 insertions(+), 14 deletions(-))

@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=159897"

@nat-henderson nat-henderson changed the title Remove resource refs from fields that can also be buckets. Allow url map to handle backend service fields that can also be backend buckets. Nov 25, 2020
@nat-henderson
Copy link
Contributor Author

Tests pass! Do you want to see new tests for this, and if so, what would you like to see?
https://ci-oss.hashicorp.engineering/buildConfiguration/GoogleCloudBeta_ProviderGoogleCloudBetaMmUpstream/159898?buildTab=tests&status=all&pager.currentPage=1

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDataSourceSpannerInstance_basic|TestAccActiveDirectoryDomainTrust_activeDirectoryDomainTrustBasicExample|TestAccBigqueryDataTransferConfig|TestAccComposerEnvironment_withUpdateOnCreate|TestAccComputeGlobalForwardingRule_globalForwardingRuleHttpExample|TestAccComputeGlobalForwardingRule_globalForwardingRuleInternalExample|TestAccComputeManagedSslCertificate_managedSslCertificateBasicExample|TestAccComputeTargetGrpcProxy_targetGrpcProxyBasicExample|TestAccComputeTargetGrpcProxy_update|TestAccComputeTargetHttpProxy_targetHttpProxyBasicExample|TestAccComputeTargetHttpsProxy_targetHttpsProxyBasicExample|TestAccComputeUrlMap_urlMapBasicExample|TestAccComputeUrlMap_urlMapTrafficDirectorRouteExample|TestAccComputeUrlMap_urlMapTrafficDirectorRoutePartialExample|TestAccComputeUrlMap_urlMapHeaderBasedRoutingExample|TestAccComputeUrlMap_urlMapTrafficDirectorPathExample|TestAccComputeUrlMap_urlMapTrafficDirectorPathPartialExample|TestAccComputeUrlMap_urlMapParameterBasedRoutingExample|TestAccComputeUrlMap_defaultRouteActionTrafficDirectorPathUpdate|TestAccComputeUrlMap_defaultRouteActionTrafficDirectorUpdate|TestAccComputeUrlMap_trafficDirectorPathUpdate|TestAccContainerNodePool_basic|TestAccContainerNodePool_nodeLocations|TestAccContainerNodePool_withInvalidUpgradeSettings|TestAccContainerNodePool_maxPodsPerNode|TestAccContainerNodePool_withNodeConfig|TestAccContainerNodePool_withGPU|TestAccContainerNodePool_withLinuxNodeConfig|TestAccContainerNodePool_withUpgradeSettings|TestAccContainerNodePool_withKubeletConfig|TestAccContainerNodePool_withNodeConfigScopeAlias|TestAccContainerNodePool_withSandboxConfig|TestAccContainerNodePool_withWorkloadIdentityConfig|TestAccContainerNodePool_regionalAutoscaling|TestAccContainerNodePool_withManagement|TestAccContainerNodePool_autoscaling|TestAccContainerNodePool_resize|TestAccContainerNodePool_regionalClusters|TestAccContainerNodePool_shieldedInstanceConfig|TestAccContainerNodePool_012_ConfigModeAttr|TestAccContainerNodePool_EmptyGuestAccelerator|TestAccFilestoreInstance_filestoreInstanceBasicExample|TestAccFilestoreInstance_update|TestAccOSLoginSSHPublicKey_osLoginSshKeyExpiry You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=159981"

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.

I think we could refer to a backend bucket in a couple of the newly-supported fields in a test, unless there's already an example.

# See the License for the specific language governing permissions and
# limitations under the License.
-%>
func expand<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
Copy link
Member

Choose a reason for hiding this comment

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

Mind adding a comment here explaining what patterns we match on, and what values we provide if so?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

@nat-henderson
Copy link
Contributor Author

Lucky for me there was already a test - expanded it to test all the new fields also.

@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, 352 insertions(+), 41 deletions(-))
Terraform Beta: Diff ( 3 files changed, 352 insertions(+), 41 deletions(-))
TF Conversion: Diff ( 1 file changed, 342 insertions(+), 14 deletions(-))
TF OiCS: Diff ( 1 file changed, 5 insertions(+), 14 deletions(-))

@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=160862"

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.

Using a Backend Bucket with a Compute URL map Route Rule
3 participants