use the main context when (re)creating Azure client

nais · Feb 16, 2024 · 5ddfc87 · 5ddfc87
1 parent 68802bc
commit 5ddfc87
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/internal/cmd/reconciler/main.go b/internal/cmd/reconciler/main.go
@@ -97,7 +97,7 @@ func run(ctx context.Context, cfg *Config, log logrus.FieldLogger) error {
 
 	reconcilerManager := reconcilers.NewManager(ctx, client, cfg.ReconcilersToEnable, cfg.PubSub.SubscriptionID, cfg.PubSub.ProjectID, log)
 
-	azureGroupReconciler := azure_group_reconciler.New(cfg.TenantDomain, cfg.Azure.GroupNamePrefix)
+	azureGroupReconciler := azure_group_reconciler.New(ctx, cfg.TenantDomain, cfg.Azure.GroupNamePrefix)
 
 	githubReconciler, err := github_team_reconciler.New(ctx, cfg.GitHub.Organization, cfg.GitHub.AuthEndpoint, cfg.GoogleManagementProjectID)
 	if err != nil {

diff --git a/internal/reconcilers/azure/group/reconciler.go b/internal/reconcilers/azure/group/reconciler.go
@@ -32,7 +32,8 @@ const (
 )
 
 type azureGroupReconciler struct {
-	domain string
+	mainCtx context.Context
+	domain  string
 
 	lock              sync.RWMutex
 	lastUpdated       time.Time
@@ -56,8 +57,9 @@ func WithAzureClient(client azureclient.Client) OptFunc {
 	}
 }
 
-func New(domain, azureGroupPrefix string, opts ...OptFunc) reconcilers.Reconciler {
+func New(ctx context.Context, domain, azureGroupPrefix string, opts ...OptFunc) reconcilers.Reconciler {
 	r := &azureGroupReconciler{
+		mainCtx:          ctx,
 		domain:           domain,
 		azureGroupPrefix: azureGroupPrefix,
 	}
@@ -286,7 +288,7 @@ func (r *azureGroupReconciler) updateClient(ctx context.Context, client *apiclie
 		return nil
 	}
 
-	aclient := conf.Client(ctx)
+	aclient := conf.Client(r.mainCtx)
 	aclient.Transport = otelhttp.NewTransport(aclient.Transport)
 	r.lockedAzureClient = azureclient.New(aclient)
 	r.lastConfig = conf

diff --git a/internal/reconcilers/azure/group/reconciler_test.go b/internal/reconcilers/azure/group/reconciler_test.go
@@ -112,7 +112,7 @@ func TestAzureReconciler_Reconcile(t *testing.T) {
 			Once()
 
 		err := azure_group_reconciler.
-			New(domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(mockClient)).
+			New(ctx, domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(mockClient)).
 			Reconcile(ctx, client, team, log)
 		if err != nil {
 			t.Errorf("unexpected error: %s", err)
@@ -129,7 +129,7 @@ func TestAzureReconciler_Reconcile(t *testing.T) {
 			Once()
 
 		err := azure_group_reconciler.
-			New(domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(mockClient)).
+			New(ctx, domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(mockClient)).
 			Reconcile(ctx, client, team, log)
 
 		if err == nil {
@@ -158,7 +158,7 @@ func TestAzureReconciler_Reconcile(t *testing.T) {
 			Once()
 
 		err := azure_group_reconciler.
-			New(domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(mockClient)).
+			New(ctx, domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(mockClient)).
 			Reconcile(ctx, client, team, log)
 
 		if err == nil {
@@ -192,7 +192,7 @@ func TestAzureReconciler_Reconcile(t *testing.T) {
 			Once()
 
 		err := azure_group_reconciler.
-			New(domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(mockClient)).
+			New(ctx, domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(mockClient)).
 			Reconcile(ctx, client, team, log)
 		if err != nil {
 			t.Errorf("unexpected error: %s", err)
@@ -229,7 +229,7 @@ func TestAzureReconciler_Reconcile(t *testing.T) {
 			Once()
 
 		err := azure_group_reconciler.
-			New(domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(mockClient)).
+			New(ctx, domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(mockClient)).
 			Reconcile(ctx, client, team, log)
 		if err != nil {
 			t.Errorf("unexpected error: %s", err)
@@ -256,7 +256,7 @@ func TestAzureReconciler_Delete(t *testing.T) {
 		client, _ := apiclient.NewMockClient(t)
 
 		err := azure_group_reconciler.
-			New(domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(azureClient)).
+			New(ctx, domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(azureClient)).
 			Delete(ctx, client, &protoapi.Team{Slug: "some-slug"}, log)
 		if err != nil {
 			t.Errorf("unexpected error: %s", err)
@@ -273,7 +273,7 @@ func TestAzureReconciler_Delete(t *testing.T) {
 			Once()
 
 		err := azure_group_reconciler.
-			New(domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(azureClient)).
+			New(ctx, domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(azureClient)).
 			Delete(ctx, client, team, log)
 
 		if !strings.Contains(err.Error(), "delete Azure AD group with ID") {
@@ -297,7 +297,7 @@ func TestAzureReconciler_Delete(t *testing.T) {
 			Once()
 
 		err := azure_group_reconciler.
-			New(domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(azureClient)).
+			New(ctx, domain, groupNamePrefix, azure_group_reconciler.WithAzureClient(azureClient)).
 			Delete(ctx, client, team, log)
 		if err != nil {
 			t.Errorf("unexpected error: %s", err)