fix conflicts

Axway · Nov 14, 2023 · 09ceff8 · 09ceff8
1 parent 0ed3c0c
commit 09ceff8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/pkg/kong/provisioning.go b/pkg/kong/provisioning.go
@@ -122,7 +122,8 @@ func (k KongClient) CreateAuthKey(ctx context.Context, consumerID string, keyAut
 		return nil, err
 	}
 	return keyAuth, nil
-
+}
+
 func (k KongClient) AddRouteACL(ctx context.Context, routeID, allowedID string) error {
 	log := k.logger.WithField("consumerID", allowedID).WithField("routeID", routeID)
 	plugins, err := k.Plugins.ListAll(ctx)

diff --git a/pkg/subscription/provision.go b/pkg/subscription/provision.go
@@ -2,16 +2,13 @@ package subscription
 
 import (
 	"context"
-	"fmt"
 
 	klib "github.com/kong/go-kong/kong"
-	"github.com/sirupsen/logrus"
 
 	"github.com/Axway/agent-sdk/pkg/agent"
 	"github.com/Axway/agent-sdk/pkg/apic/provisioning"
 	"github.com/Axway/agent-sdk/pkg/util/log"
 
-	"github.com/Axway/agents-kong/pkg/common"
 	"github.com/Axway/agents-kong/pkg/kong"
 	"github.com/Axway/agents-kong/pkg/subscription/access"
 	"github.com/Axway/agents-kong/pkg/subscription/application"