From 565a0c4d7b46ec80cbfbe3f9059e30a7d6d66c9a Mon Sep 17 00:00:00 2001 From: Sergiu Ghitea <28300158+sergiught@users.noreply.github.com> Date: Fri, 23 Jun 2023 19:12:24 +0200 Subject: [PATCH] Reset context when getting token --- internal/config/config.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/config/config.go b/internal/config/config.go index d28cc16a9..6b2a80643 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -56,7 +56,7 @@ func ConfigureProvider(terraformVersion *string) schema.ConfigureContextFunc { debug := data.Get("debug").(bool) apiClient, err := management.New(domain, - authenticationOption(ctx, clientID, clientSecret, apiToken, audience), + authenticationOption(clientID, clientSecret, apiToken, audience), management.WithDebug(debug), management.WithUserAgent(userAgent(terraformVersion)), management.WithAuth0ClientEnvEntry(providerName, version), @@ -88,7 +88,9 @@ func userAgent(terraformVersion *string) string { } // authenticationOption computes the desired authentication option for the *management.Management client. -func authenticationOption(ctx context.Context, clientID, clientSecret, apiToken, audience string) management.Option { +func authenticationOption(clientID, clientSecret, apiToken, audience string) management.Option { + ctx := context.Background() + if apiToken != "" { return management.WithStaticToken(apiToken) }