Merge pull request #6 from mercedes-benz/move_login_into_interface

Move login into interface
mercedes-benz · Sep 20, 2023 · a909e49 · a909e49
2 parents a35bf35 + 028c38f
commit a909e49
Show file tree

Hide file tree

Showing 14 changed files with 160 additions and 27 deletions.
diff --git a/internal/controller/enterprise_controller.go b/internal/controller/enterprise_controller.go
@@ -62,7 +62,8 @@ func (r *EnterpriseReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, nil
 	}
 
-	scope, err := garmClient.NewEnterpriseClient(garmClient.GarmScopeParams{
+	enterpriseClient := garmClient.NewEnterpriseClient()
+	err = enterpriseClient.Login(garmClient.GarmScopeParams{
 		BaseURL:  r.BaseURL,
 		Username: r.Username,
 		Password: r.Password,
@@ -74,10 +75,10 @@ func (r *EnterpriseReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	// Handle deleted enterprises
 	if !enterprise.DeletionTimestamp.IsZero() {
-		return r.reconcileDelete(ctx, scope, enterprise)
+		return r.reconcileDelete(ctx, enterpriseClient, enterprise)
 	}
 
-	return r.reconcileNormal(ctx, scope, enterprise)
+	return r.reconcileNormal(ctx, enterpriseClient, enterprise)
 }
 
 func (r *EnterpriseReconciler) reconcileNormal(ctx context.Context, client garmClient.EnterpriseClient, enterprise *garmoperatorv1alpha1.Enterprise) (ctrl.Result, error) {

diff --git a/internal/controller/organization_controller.go b/internal/controller/organization_controller.go
@@ -61,7 +61,8 @@ func (r *OrganizationReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		return ctrl.Result{}, nil
 	}
 
-	scope, err := garmClient.NewOrganizationClient(garmClient.GarmScopeParams{
+	organizationClient := garmClient.NewOrganizationClient()
+	err = organizationClient.Login(garmClient.GarmScopeParams{
 		BaseURL:  r.BaseURL,
 		Username: r.Username,
 		Password: r.Password,
@@ -73,10 +74,10 @@ func (r *OrganizationReconciler) Reconcile(ctx context.Context, req ctrl.Request
 
 	// Handle deleted organizations
 	if !organization.DeletionTimestamp.IsZero() {
-		return r.reconcileDelete(ctx, scope, organization)
+		return r.reconcileDelete(ctx, organizationClient, organization)
 	}
 
-	return r.reconcileNormal(ctx, scope, organization)
+	return r.reconcileNormal(ctx, organizationClient, organization)
 }
 
 func (r *OrganizationReconciler) reconcileNormal(ctx context.Context, client garmClient.OrganizationClient, organization *garmoperatorv1alpha1.Organization) (ctrl.Result, error) {

diff --git a/internal/controller/pool_controller.go b/internal/controller/pool_controller.go
@@ -70,7 +70,8 @@ func (r *PoolReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 		return ctrl.Result{}, nil
 	}
 
-	poolClient, err := garmClient.NewPoolClient(garmClient.GarmScopeParams{
+	poolClient := garmClient.NewPoolClient()
+	err := poolClient.Login(garmClient.GarmScopeParams{
 		BaseURL:  r.BaseURL,
 		Username: r.Username,
 		Password: r.Password,
@@ -79,7 +80,8 @@ func (r *PoolReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 		return ctrl.Result{}, err
 	}
 
-	runnerInstanceClient, err := garmClient.NewInstanceClient(garmClient.GarmScopeParams{
+	instanceClient := garmClient.NewInstanceClient()
+	err = instanceClient.Login(garmClient.GarmScopeParams{
 		BaseURL:  r.BaseURL,
 		Username: r.Username,
 		Password: r.Password,
@@ -90,7 +92,7 @@ func (r *PoolReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 
 	// handle deletion
 	if !pool.ObjectMeta.DeletionTimestamp.IsZero() {
-		return r.reconcileDelete(ctx, poolClient, pool, runnerInstanceClient)
+		return r.reconcileDelete(ctx, poolClient, pool, instanceClient)
 	}
 
 	return r.reconcileNormal(ctx, poolClient, pool)

diff --git a/internal/controller/repository_controller.go b/internal/controller/repository_controller.go
@@ -61,7 +61,8 @@ func (r *RepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, nil
 	}
 
-	scope, err := garmClient.NewRepositoryClient(garmClient.GarmScopeParams{
+	repositoryClient := garmClient.NewRepositoryClient()
+	err = repositoryClient.Login(garmClient.GarmScopeParams{
 		BaseURL:  r.BaseURL,
 		Username: r.Username,
 		Password: r.Password,
@@ -73,10 +74,10 @@ func (r *RepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	// Handle deleted repositories
 	if !repository.DeletionTimestamp.IsZero() {
-		return r.reconcileDelete(ctx, scope, repository)
+		return r.reconcileDelete(ctx, repositoryClient, repository)
 	}
 
-	return r.reconcileNormal(ctx, scope, repository)
+	return r.reconcileNormal(ctx, repositoryClient, repository)
 }
 
 func (r *RepositoryReconciler) reconcileNormal(ctx context.Context, client garmClient.RepositoryClient, repository *garmoperatorv1alpha1.Repository) (ctrl.Result, error) {

diff --git a/pkg/client/enterprise.go b/pkg/client/enterprise.go
@@ -11,6 +11,7 @@ import (
 )
 
 type EnterpriseClient interface {
+	Login(garmParams GarmScopeParams) error
 	ListEnterprises(param *enterprises.ListEnterprisesParams) (*enterprises.ListEnterprisesOK, error)
 	CreateEnterprise(param *enterprises.CreateEnterpriseParams) (*enterprises.CreateEnterpriseOK, error)
 	GetEnterprise(param *enterprises.GetEnterpriseParams) (*enterprises.GetEnterpriseOK, error)
@@ -23,13 +24,21 @@ type enterpriseClient struct {
 	token  runtime.ClientAuthInfoWriter
 }
 
-func NewEnterpriseClient(garmParams GarmScopeParams) (EnterpriseClient, error) {
+func NewEnterpriseClient() EnterpriseClient {
+	return &enterpriseClient{}
+}
+
+func (s *enterpriseClient) Login(garmParams GarmScopeParams) error {
+	metrics.TotalGarmCalls.WithLabelValues("Login").Inc()
 	garmClient, token, err := newGarmClient(garmParams)
 	if err != nil {
-		return nil, err
+		metrics.GarmCallErrors.WithLabelValues("Login").Inc()
+		return err
 	}
+	s.client = garmClient
+	s.token = token
 
-	return &enterpriseClient{garmClient, token}, nil
+	return nil
 }
 
 func (s *enterpriseClient) ListEnterprises(param *enterprises.ListEnterprisesParams) (*enterprises.ListEnterprisesOK, error) {

diff --git a/pkg/client/instance.go b/pkg/client/instance.go
@@ -6,9 +6,12 @@ import (
 	"github.com/cloudbase/garm/client"
 	"github.com/cloudbase/garm/client/instances"
 	"github.com/go-openapi/runtime"
+
+	"github.com/mercedes-benz/garm-operator/pkg/metrics"
 )
 
 type InstanceClient interface {
+	Login(garmParams GarmScopeParams) error
 	GetInstance(params *instances.GetInstanceParams) (*instances.GetInstanceOK, error)
 	ListInstances(params *instances.ListInstancesParams) (*instances.ListInstancesOK, error)
 	ListPoolInstances(params *instances.ListPoolInstancesParams) (*instances.ListPoolInstancesOK, error)
@@ -19,34 +22,48 @@ type instanceClient struct {
 	token  runtime.ClientAuthInfoWriter
 }
 
-func NewInstanceClient(garmParams GarmScopeParams) (InstanceClient, error) {
+func NewInstanceClient() InstanceClient {
+	return &instanceClient{}
+}
+
+func (i *instanceClient) Login(garmParams GarmScopeParams) error {
+	metrics.TotalGarmCalls.WithLabelValues("Login").Inc()
 	garmClient, token, err := newGarmClient(garmParams)
 	if err != nil {
-		return nil, err
+		metrics.GarmCallErrors.WithLabelValues("Login").Inc()
+		return err
 	}
+	i.client = garmClient
+	i.token = token
 
-	return &instanceClient{garmClient, token}, nil
+	return nil
 }
 
 func (i *instanceClient) GetInstance(params *instances.GetInstanceParams) (*instances.GetInstanceOK, error) {
+	metrics.TotalGarmCalls.WithLabelValues("instances.Get").Inc()
 	instance, err := i.client.Instances.GetInstance(params, i.token)
 	if err != nil {
+		metrics.GarmCallErrors.WithLabelValues("instances.Get").Inc()
 		return nil, err
 	}
 	return instance, nil
 }
 
 func (i *instanceClient) ListInstances(params *instances.ListInstancesParams) (*instances.ListInstancesOK, error) {
+	metrics.TotalGarmCalls.WithLabelValues("instances.List").Inc()
 	instances, err := i.client.Instances.ListInstances(params, i.token)
 	if err != nil {
+		metrics.GarmCallErrors.WithLabelValues("instances.List").Inc()
 		return nil, err
 	}
 	return instances, nil
 }
 
 func (i *instanceClient) ListPoolInstances(params *instances.ListPoolInstancesParams) (*instances.ListPoolInstancesOK, error) {
+	metrics.TotalGarmCalls.WithLabelValues("instances.ListPool").Inc()
 	instances, err := i.client.Instances.ListPoolInstances(params, i.token)
 	if err != nil {
+		metrics.GarmCallErrors.WithLabelValues("instances.ListPool").Inc()
 		return nil, err
 	}
 	return instances, nil

diff --git a/pkg/client/mock/enterprise.go b/pkg/client/mock/enterprise.go
diff --git a/pkg/client/mock/instance.go b/pkg/client/mock/instance.go
diff --git a/pkg/client/mock/organization.go b/pkg/client/mock/organization.go
diff --git a/pkg/client/mock/pool.go b/pkg/client/mock/pool.go
diff --git a/pkg/client/mock/repository.go b/pkg/client/mock/repository.go
diff --git a/pkg/client/organization.go b/pkg/client/organization.go
@@ -11,6 +11,7 @@ import (
 )
 
 type OrganizationClient interface {
+	Login(garmParams GarmScopeParams) error
 	ListOrganizations(param *organizations.ListOrgsParams) (*organizations.ListOrgsOK, error)
 	CreateOrganization(param *organizations.CreateOrgParams) (*organizations.CreateOrgOK, error)
 	GetOrganization(param *organizations.GetOrgParams) (*organizations.GetOrgOK, error)
@@ -23,13 +24,21 @@ type organizationClient struct {
 	token  runtime.ClientAuthInfoWriter
 }
 
-func NewOrganizationClient(garmParams GarmScopeParams) (OrganizationClient, error) {
+func NewOrganizationClient() OrganizationClient {
+	return &organizationClient{}
+}
+
+func (s *organizationClient) Login(garmParams GarmScopeParams) error {
+	metrics.TotalGarmCalls.WithLabelValues("Login").Inc()
 	garmClient, token, err := newGarmClient(garmParams)
 	if err != nil {
-		return nil, err
+		metrics.GarmCallErrors.WithLabelValues("Login").Inc()
+		return err
 	}
+	s.client = garmClient
+	s.token = token
 
-	return &organizationClient{garmClient, token}, nil
+	return nil
 }
 
 func (s *organizationClient) ListOrganizations(param *organizations.ListOrgsParams) (*organizations.ListOrgsOK, error) {