Use integration API endpoints

Signed-off-by: Richard Wall <[email protected]>

Author: wallrj

.gitignore

@@ -14,3 +14,4 @@ predicate.json
 *.tgz
 
 _bin
+.envrc

agent.yaml

@@ -1,3 +1,3 @@
 machineHub:
-  subdomain: adb-static
+  subdomain: tlskp-test
   credentialsSecretName: machinehub-credentials

pkg/agent/run.go

@@ -31,6 +31,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/jetstack/preflight/pkg/internal/cyberark/identity"
+	"github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery"
 	"github.com/jetstack/preflight/api"
 	"github.com/jetstack/preflight/pkg/client"
 	"github.com/jetstack/preflight/pkg/clusteruid"
@@ -82,7 +83,9 @@ func Run(cmd *cobra.Command, args []string) (returnErr error) {
 
 	var caClient *client.CyberArkClient
 	{
-		identityClient, err := identity.New(ctx, cfg.MachineHub.Subdomain)
+
+		discoveryClient := servicediscovery.New(servicediscovery.WithIntegrationEndpoint())
+		identityClient, err := identity.NewWithDiscoveryClient(ctx, discoveryClient, cfg.MachineHub.Subdomain)
 		if err != nil {
 			return fmt.Errorf("while creating the CyberArk identity client: %v", err)
 		}
@@ -91,7 +94,7 @@ func Run(cmd *cobra.Command, args []string) (returnErr error) {
 		if err := identityClient.LoginUsernamePassword(ctx, username, password); err != nil {
 			return fmt.Errorf("while logging in: %v", err)
 		}
-		caClient, err = client.NewCyberArkClient(nil, cfg.MachineHub.Subdomain, identityClient.AuthenticateRequest)
+		caClient, err = client.NewCyberArkClient(nil, os.Getenv("ARK_API_URL"), identityClient.AuthenticateRequest)
 		if err != nil {
 			return fmt.Errorf("while creating the CyberArk dataupload client: %v", err)
 		}