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

… (hashicorp#6903) Signed-off-by: Modular Magician <magic-modules@google.com>
dboshardy · Jul 31, 2020 · 230c2af · 230c2af
1 parent e6350b4
commit 230c2af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.changelog/3800.txt b/.changelog/3800.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+Fixed crash due to nil context when loading credentials
+```
diff --git a/google/config.go b/google/config.go
@@ -287,6 +287,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
@@ -318,7 +320,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