Set context early on in LoadAndValidate to prevent NPE (#3800) (#488)

Signed-off-by: Modular Magician <[email protected]>
GoogleCloudPlatform · Jul 31, 2020 · 748e331 · 748e331
1 parent 3904ae5
commit 748e331
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/google/config.go b/google/config.go
@@ -284,6 +284,8 @@ func (c *Config) LoadAndValidate(ctx context.Context) error {
 		c.Scopes = DefaultClientScopes
 	}
 
+	c.context = ctx
+
 	tokenSource, err := c.getTokenSource(c.Scopes)
 	if err != nil {
 		return err
@@ -315,7 +317,6 @@ func (c *Config) LoadAndValidate(ctx context.Context) error {
 	userAgent := fmt.Sprintf("%s %s", tfUserAgent, providerVersion)
 
 	c.client = client
-	c.context = ctx
 	c.userAgent = userAgent
 
 	// This base path and some others below need the version and possibly more of the path