Fix validator imports and conditional code (#4237) (#2725)

modular-magician · web-flow · commit 6d9cc49d3a94 · 2020-11-17T11:13:40.000-08:00
Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/4237.txt b/.changelog/4237.txt
@@ -0,0 +1,3 @@
+```release-note:none
+Added sdk v2 imports, some unstable imports, conditional erb compile tags and changed generateUserAgentString signature
+```
diff --git a/google-beta/utils.go b/google-beta/utils.go
@@ -455,7 +455,7 @@ func changeFieldSchemaToForceNew(sch *schema.Schema) {
 	}
 }
 
-func generateUserAgentString(d *schema.ResourceData, currentUserAgent string) (string, error) {
+func generateUserAgentString(d TerraformResourceData, currentUserAgent string) (string, error) {
 	var m providerMeta
 
 	err := d.GetProviderMeta(&m)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:none
	`2`	`+Added sdk v2 imports, some unstable imports, conditional erb compile tags and changed generateUserAgentString signature`
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ func changeFieldSchemaToForceNew(sch *schema.Schema) {`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`
`458`		`-func generateUserAgentString(d *schema.ResourceData, currentUserAgent string) (string, error) {`
	`458`	`+func generateUserAgentString(d TerraformResourceData, currentUserAgent string) (string, error) {`
`459`	`459`	`var m providerMeta`
`460`	`460`
`461`	`461`	`err := d.GetProviderMeta(&m)`