Enable service networking connections in GA #1906

emilymye · 2019-06-11T18:10:41Z

Fixes hashicorp/terraform-provider-google#3833

modular-magician · 2019-06-11T18:22:27Z

Hi! I'm the modular magician, I work on Magic Modules.
This PR seems not to have generated downstream PRs before, as of f5f4c9dae408b6d9cba5498f2b10f64c2db0a1c9.

Pull request statuses

No diff detected in terraform-google-conversion.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I built this PR into one or more new PRs on other repositories, and when those are closed, this PR will also be merged and closed.
depends: hashicorp/terraform-provider-google-beta#838
depends: hashicorp/terraform-provider-google#3834

modular-magician · 2019-06-13T00:47:07Z

Hi! I'm the modular magician, I work on Magic Modules.
I see that this PR has already had some downstream PRs generated. Any open downstreams are already updated to your most recent commit, 87c5f30.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-provider-google already has an open PR.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I built this PR into one or more new PRs on other repositories, and when those are closed, this PR will also be merged and closed.
depends: GoogleCloudPlatform/terraform-google-conversion#105

modular-magician · 2019-06-13T19:58:53Z

Hi! I'm the modular magician, I work on Magic Modules.
I see that this PR has already had some downstream PRs generated. Any open downstreams are already updated to your most recent commit, 3311bd2.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-06-13T21:15:52Z

Hi! I'm the modular magician, I work on Magic Modules.
I see that this PR has already had some downstream PRs generated. Any open downstreams are already updated to your most recent commit, f7c8d42.

Pull request statuses

terraform-provider-google-beta already has an open PR.
No diff detected in terraform-google-conversion.
terraform-provider-google already has an open PR.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I didn't open any new pull requests because of this PR.

rileykarson

Do tests pass right now? I'd expect them to fail. There's a few more steps due to custom endpoints.

The endpoint entry at

magic-modules/third_party/terraform/utils/provider_handwritten_endpoint.go.erb

Lines 223 to 232 in f7c8d42

    
           var ServiceNetworkingDefaultBasePath = "https://servicenetworking.googleapis.com/v1beta/" 
        
           var ServiceNetworkingCustomEndpointEntryKey = "service_networking_custom_endpoint" 
        
           var ServiceNetworkingCustomEndpointEntry = &schema.Schema{ 
        
           	Type:         schema.TypeString, 
        
           	Optional:     true, 
        
           	ValidateFunc: validateCustomEndpoint, 
        
           	DefaultFunc: schema.MultiEnvDefaultFunc([]string{ 
        
           		"GOOGLE_SERVICE_NETWORKING_CUSTOM_ENDPOINT", 
        
           	}, ServiceNetworkingDefaultBasePath), 
        
           }

will need to be updated to reflect that the base path of the API has changed.

magic-modules/third_party/terraform/utils/provider.go.erb

Line 405 in f7c8d42

    
           config.ServiceNetworkingBasePath = d.Get(ServiceNetworkingCustomEndpointEntryKey).(string)

and a few other references in provider.go will also need to be updated to remove GA guards.

Additionally, the entries in

The default value and the position in the docs should also now be updated: https://github.com/GoogleCloudPlatform/magic-modules/blame/f7c8d42165c97f26eb77071f870ba4ce4ee15a01/third_party/terraform/website/docs/provider_reference.html.markdown#L264

modular-magician · 2019-06-14T19:56:22Z

Hi! I'm the modular magician, I work on Magic Modules.
I see that this PR has already had some downstream PRs generated. Any open downstreams are already updated to your most recent commit, ff9fb98.

Pull request statuses

terraform-provider-google-beta already has an open PR.
No diff detected in terraform-google-conversion.
terraform-provider-google already has an open PR.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I didn't open any new pull requests because of this PR.

rileykarson

magic-modules/third_party/terraform/utils/provider.go.erb

Lines 108 to 113 in ff9fb98

    
           <% unless version == 'ga' -%> 
        
           // start beta-only products 
        
           IAPCustomEndpointEntryKey: IAPCustomEndpointEntry, 
        
           ServiceNetworkingCustomEndpointEntryKey:      ServiceNetworkingCustomEndpointEntry, 
        
           // end beta-only products 
        
           <% end -%>

magic-modules/third_party/terraform/utils/provider.go.erb

Lines 403 to 406 in ff9fb98

    
           <% unless version == 'ga' -%> 
        
           config.IAPBasePath = d.Get(IAPCustomEndpointEntryKey).(string) 
        
           config.ServiceNetworkingBasePath = d.Get(ServiceNetworkingCustomEndpointEntryKey).(string) 
        
           <% end -%>

magic-modules/third_party/terraform/utils/provider.go.erb

Lines 467 to 472 in ff9fb98

    
           <% unless version == 'ga' -%> 
        
           // start beta-only products 
        
           c.IAPBasePath = IAPDefaultBasePath 
        
           c.ServiceNetworkingBasePath = ServiceNetworkingDefaultBasePath 
        
           // end beta-only products 
        
           <% end -%>

as well I think. Once those are done this is 👍

modular-magician · 2019-06-15T00:56:10Z

Hi! I'm the modular magician, I work on Magic Modules.
I see that this PR has already had some downstream PRs generated. Any open downstreams are already updated to your most recent commit, 844a0df.

Pull request statuses

terraform-provider-google-beta already has an open PR.
No diff detected in terraform-google-conversion.
terraform-provider-google already has an open PR.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-06-15T01:18:19Z

Hi! I'm the modular magician, I work on Magic Modules.
I see that this PR has already had some downstream PRs generated. Any open downstreams are already updated to your most recent commit, 047fbbe.

Pull request statuses

terraform-provider-google-beta already has an open PR.
No diff detected in terraform-google-conversion.
terraform-provider-google already has an open PR.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I didn't open any new pull requests because of this PR.

Tracked submodules are build/terraform-beta build/terraform-mapper build/terraform build/ansible build/inspec.

googlebot added the cla: yes label Jun 11, 2019

modular-magician added downstream-generated terraform-provider-google-beta terraform-provider-google labels Jun 11, 2019

emilymye force-pushed the ga_service_networking branch from f5f4c9d to 87c5f30 Compare June 13, 2019 00:34

modular-magician added the terraform-google-conversion label Jun 13, 2019

emilymye closed this Jun 13, 2019

emilymye reopened this Jun 13, 2019

emilymye force-pushed the ga_service_networking branch from 87c5f30 to 3311bd2 Compare June 13, 2019 19:47

emilymye mentioned this pull request Jun 13, 2019

Update google.golang.apis vendor GoogleCloudPlatform/terraform-google-conversion#107

Merged

emilymye force-pushed the ga_service_networking branch from 3311bd2 to f7c8d42 Compare June 13, 2019 21:05

emilymye requested review from danawillow and rileykarson June 14, 2019 18:44

rileykarson requested changes Jun 14, 2019

View reviewed changes

emilymye force-pushed the ga_service_networking branch from f7c8d42 to ff9fb98 Compare June 14, 2019 19:46

emilymye requested a review from rileykarson June 14, 2019 21:05

rileykarson approved these changes Jun 14, 2019

View reviewed changes

modular-magician added the automerged label Jun 15, 2019

emilymye and others added 5 commits June 15, 2019 01:34

use v1 service networking and remove beta gates

7738cd6

change custom endpoint defaults/docs for servicenetworking

086784a

more remove beta flags (custom endpoints)

847a98e

more beta gating

41b938e

Update tracked submodules -> HEAD on Sat Jun 15 01:34:07 UTC 2019

ea959f3

Tracked submodules are build/terraform-beta build/terraform-mapper build/terraform build/ansible build/inspec.

modular-magician force-pushed the ga_service_networking branch from 047fbbe to ea959f3 Compare June 15, 2019 01:34

modular-magician merged commit f1a5e5a into GoogleCloudPlatform:master Jun 15, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable service networking connections in GA #1906

Enable service networking connections in GA #1906

emilymye commented Jun 11, 2019 •

edited

Loading

modular-magician commented Jun 11, 2019

modular-magician commented Jun 13, 2019

modular-magician commented Jun 13, 2019

modular-magician commented Jun 13, 2019

rileykarson left a comment •

edited

Loading

modular-magician commented Jun 14, 2019

rileykarson left a comment

modular-magician commented Jun 15, 2019

modular-magician commented Jun 15, 2019

	var ServiceNetworkingDefaultBasePath = "https://servicenetworking.googleapis.com/v1beta/"
	var ServiceNetworkingCustomEndpointEntryKey = "service_networking_custom_endpoint"
	var ServiceNetworkingCustomEndpointEntry = &schema.Schema{
	Type: schema.TypeString,
	Optional: true,
	ValidateFunc: validateCustomEndpoint,
	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
	"GOOGLE_SERVICE_NETWORKING_CUSTOM_ENDPOINT",
	}, ServiceNetworkingDefaultBasePath),
	}

	<% unless version == 'ga' -%>
	// start beta-only products
	IAPCustomEndpointEntryKey: IAPCustomEndpointEntry,
	ServiceNetworkingCustomEndpointEntryKey: ServiceNetworkingCustomEndpointEntry,
	// end beta-only products
	<% end -%>

	<% unless version == 'ga' -%>
	config.IAPBasePath = d.Get(IAPCustomEndpointEntryKey).(string)
	config.ServiceNetworkingBasePath = d.Get(ServiceNetworkingCustomEndpointEntryKey).(string)
	<% end -%>

	<% unless version == 'ga' -%>
	// start beta-only products
	c.IAPBasePath = IAPDefaultBasePath
	c.ServiceNetworkingBasePath = ServiceNetworkingDefaultBasePath
	// end beta-only products
	<% end -%>

Enable service networking connections in GA #1906

Enable service networking connections in GA #1906

Conversation

emilymye commented Jun 11, 2019 • edited Loading

modular-magician commented Jun 11, 2019

Pull request statuses

New Pull Requests

modular-magician commented Jun 13, 2019

Pull request statuses

New Pull Requests

modular-magician commented Jun 13, 2019

Pull request statuses

New Pull Requests

modular-magician commented Jun 13, 2019

Pull request statuses

New Pull Requests

rileykarson left a comment • edited Loading

Choose a reason for hiding this comment

modular-magician commented Jun 14, 2019

Pull request statuses

New Pull Requests

rileykarson left a comment

Choose a reason for hiding this comment

modular-magician commented Jun 15, 2019

Pull request statuses

New Pull Requests

modular-magician commented Jun 15, 2019

Pull request statuses

New Pull Requests

emilymye commented Jun 11, 2019 •

edited

Loading

rileykarson left a comment •

edited

Loading