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

VPC serverless access update version from beta to GA #5752

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/3053.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
`google_vpc_access_connector` (GA provider)
```
3 changes: 3 additions & 0 deletions google/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ type Config struct {
SQLBasePath string
StorageBasePath string
TPUBasePath string
VPCAccessBasePath string

CloudBillingBasePath string
clientBilling *cloudbilling.APIService
Expand Down Expand Up @@ -242,6 +243,7 @@ var SpannerDefaultBasePath = "https://spanner.googleapis.com/v1/"
var SQLDefaultBasePath = "https://sqladmin.googleapis.com/sql/v1beta4/"
var StorageDefaultBasePath = "https://www.googleapis.com/storage/v1/"
var TPUDefaultBasePath = "https://tpu.googleapis.com/v1/"
var VPCAccessDefaultBasePath = "https://vpcaccess.googleapis.com/v1/"

var defaultClientScopes = []string{
"https://www.googleapis.com/auth/compute",
Expand Down Expand Up @@ -720,6 +722,7 @@ func ConfigureBasePaths(c *Config) {
c.SQLBasePath = SQLDefaultBasePath
c.StorageBasePath = StorageDefaultBasePath
c.TPUBasePath = TPUDefaultBasePath
c.VPCAccessBasePath = VPCAccessDefaultBasePath

// Handwritten Products / Versioned / Atypical Entries
c.CloudBillingBasePath = CloudBillingDefaultBasePath
Expand Down
14 changes: 12 additions & 2 deletions google/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,14 @@ func Provider() terraform.ResourceProvider {
"GOOGLE_TPU_CUSTOM_ENDPOINT",
}, TPUDefaultBasePath),
},
"vpc_access_custom_endpoint": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validateCustomEndpoint,
DefaultFunc: schema.MultiEnvDefaultFunc([]string{
"GOOGLE_VPC_ACCESS_CUSTOM_ENDPOINT",
}, VPCAccessDefaultBasePath),
},

// Handwritten Products / Versioned / Atypical Entries
CloudBillingCustomEndpointEntryKey: CloudBillingCustomEndpointEntry,
Expand Down Expand Up @@ -503,9 +511,9 @@ func Provider() terraform.ResourceProvider {
return provider
}

// Generated resources: 102
// Generated resources: 103
// Generated IAM resources: 51
// Total generated resources: 153
// Total generated resources: 154
func ResourceMap() map[string]*schema.Resource {
resourceMap, _ := ResourceMapWithErrors()
return resourceMap
Expand Down Expand Up @@ -667,6 +675,7 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
"google_storage_default_object_access_control": resourceStorageDefaultObjectAccessControl(),
"google_storage_hmac_key": resourceStorageHmacKey(),
"google_tpu_node": resourceTPUNode(),
"google_vpc_access_connector": resourceVPCAccessConnector(),
},
map[string]*schema.Resource{
"google_app_engine_application": resourceAppEngineApplication(),
Expand Down Expand Up @@ -853,6 +862,7 @@ func providerConfigure(d *schema.ResourceData, p *schema.Provider, terraformVers
config.SQLBasePath = d.Get("sql_custom_endpoint").(string)
config.StorageBasePath = d.Get("storage_custom_endpoint").(string)
config.TPUBasePath = d.Get("tpu_custom_endpoint").(string)
config.VPCAccessBasePath = d.Get("vpc_access_custom_endpoint").(string)

// Handwritten Products / Versioned / Atypical Entries

Expand Down
Loading