Add basepath generation (#4745)

GoogleCloudPlatform · May 6, 2021 · 10696c5 · 10696c5
1 parent f83e41d
commit 10696c5
Show file tree

Hide file tree

Showing 11 changed files with 251 additions and 142 deletions.
diff --git a/mmv1/third_party/terraform/utils/config.go.erb b/mmv1/third_party/terraform/utils/config.go.erb
@@ -120,8 +120,10 @@ type Config struct {
 	requestBatcherIam          *RequestBatcher
 
 	// start DCL clients
-	clientDataprocDCL *dataprocDcl.Client
-	clientEventarcDCL *eventarcDcl.Client
+	// dataprocBasePath is implemented in mm
+	clientDataprocDCL      *dataprocDcl.Client
+	EventarcBasePath string
+	clientEventarcDCL      *eventarcDcl.Client
 }
 
 // Generated product base paths
@@ -190,8 +192,8 @@ func (c *Config) LoadAndValidate(ctx context.Context) error {
 	dclLoggerOptions := dcl.WithLogger(dclLogger{})
 	// each product needs it own client currently since basepath can only be specified at
 	// the config level.
-	c.clientDataprocDCL = dataprocDcl.NewClient(dcl.NewConfig(dclClientOptions, dclUserAgentOptions, dclLoggerOptions))
-	c.clientEventarcDCL = eventarcDcl.NewClient(dcl.NewConfig(dclClientOptions, dclUserAgentOptions, dclLoggerOptions))
+	c.clientDataprocDCL = dataprocDcl.NewClient(dcl.NewConfig(dclClientOptions, dclUserAgentOptions,dclLoggerOptions, dcl.WithBasePath(c.DataprocBasePath)))
+	c.clientEventarcDCL = eventarcDcl.NewClient(dcl.NewConfig(dclClientOptions, dclUserAgentOptions,dclLoggerOptions, dcl.WithBasePath(c.EventarcBasePath)))
 
 	return nil
 }

diff --git a/mmv1/third_party/terraform/utils/provider.go.erb b/mmv1/third_party/terraform/utils/provider.go.erb
@@ -156,7 +156,6 @@ func Provider() *schema.Provider {
 			BigtableAdminCustomEndpointEntryKey:          BigtableAdminCustomEndpointEntry,
 
 			// dcl
-			DataprocEndpointEntryKey:               DataprocEndpointEntry,
 			EventarcEndpointEntryKey:               EventarcEndpointEntry,
 },
 
@@ -573,8 +572,7 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 	config.BigtableAdminBasePath = d.Get(BigtableAdminCustomEndpointEntryKey).(string)
 
 	// dcl
-	// config.clientDataprocDCL.Config.BasePath = d.Get(DataprocEndpointEntryKey).(string)
-	// config.clientEventarcDCL.Config.BasePath = d.Get(EventarcEndpointEntryKey).(string)
+	config.EventarcBasePath = d.Get(EventarcEndpointEntryKey).(string)
 
 	stopCtx, ok := schema.StopContext(ctx)
 	if !ok {

diff --git a/tpgtools/go.mod b/tpgtools/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/magic-modules/tpgtools
 
-go 1.13
+go 1.16
 
 require (
 	bitbucket.org/creachadair/stringset v0.0.9

diff --git a/tpgtools/handwritten.go b/tpgtools/handwritten.go
@@ -1,11 +1,11 @@
 // Copyright 2021 Google LLC. All Rights Reserved.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,6 +30,8 @@ func copyHandwrittenFiles(inPath string, outPath string) {
 		return
 	}
 
+	glog.Info("copying handwritten files")
+
 	_, err := os.Stat(outPath)
 	if os.IsNotExist(err) {
 		errDir := os.MkdirAll(outPath, 0755)