From ea0d8d5ce44fab52218408566efd2479f8058c18 Mon Sep 17 00:00:00 2001 From: Sam Levenick Date: Thu, 30 Jul 2020 11:27:34 -0700 Subject: [PATCH] Set context early on in LoadAndValidate to prevent NPE --- third_party/terraform/utils/config.go.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/third_party/terraform/utils/config.go.erb b/third_party/terraform/utils/config.go.erb index 49a3302c4b69..a1d3a2816173 100644 --- a/third_party/terraform/utils/config.go.erb +++ b/third_party/terraform/utils/config.go.erb @@ -208,6 +208,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 @@ -243,7 +245,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