ONYX-14719: Refactor authn-k8s-client to be authentication flow generic

cyberark · Dec 23, 2021 · b5ff748 · b5ff748
1 parent 89545e7
commit b5ff748
Show file tree

Hide file tree

Showing 21 changed files with 1,260 additions and 1,260 deletions.
diff --git a/cmd/authenticator/main.go b/cmd/authenticator/main.go
@@ -3,13 +3,13 @@ package main
 import (
 	"context"
 	"fmt"
+	"github.com/cyberark/conjur-authn-k8s-client/pkg/authenticator"
+	"github.com/cyberark/conjur-authn-k8s-client/pkg/authenticator/config"
 	"os"
 	"time"
 
 	"github.com/cenkalti/backoff"
 
-	"github.com/cyberark/conjur-authn-k8s-client/pkg/authenticator"
-	authnConfig "github.com/cyberark/conjur-authn-k8s-client/pkg/authenticator/config"
 	"github.com/cyberark/conjur-authn-k8s-client/pkg/log"
 	"github.com/cyberark/secrets-provider-for-k8s/pkg/trace"
 )
@@ -19,7 +19,7 @@ func main() {
 
 	var err error
 
-	config, err := authnConfig.NewFromEnv()
+	config, err := config.NewConfigFromEnv()
 	if err != nil {
 		printErrorAndExit(log.CAKC018)
 	}
@@ -28,7 +28,7 @@ func main() {
 	defer tracer.Shutdown(context.Background())
 
 	// Create new Authenticator
-	authn, err := authenticator.New(*config)
+	authn, err := authenticator.NewAuthenticator(config)
 	if err != nil {
 		printErrorAndExit(log.CAKC019)
 	}
@@ -48,14 +48,14 @@ func main() {
 				return log.RecordedError(log.CAKC016)
 			}
 
-			if authn.Config.ContainerMode == "init" {
+			if config.GetContainerMode() == "init" {
 				os.Exit(0)
 			}
 
-			log.Info(log.CAKC047, authn.Config.TokenRefreshTimeout)
+			log.Info(log.CAKC047, config.GetTokenTimeout())
 
 			fmt.Println()
-			time.Sleep(authn.Config.TokenRefreshTimeout)
+			time.Sleep(config.GetTokenTimeout())
 
 			// Reset exponential backoff
 			expBackoff.Reset()