chore(deviceauth): moving tenantadm client to pkg

Changelog: None
Ticket: MEN-7715
Signed-off-by: Peter Grzybowski <peter@northern.tech>

backend/services/deviceauth/client/tenant/client_tenantadm.go → backend/pkg/tenant/client_tenantadm.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Northern.tech AS
+// Copyright 2024 Northern.tech AS
 //
 //	Licensed under the Apache License, Version 2.0 (the "License");
 //	you may not use this file except in compliance with the License.

backend/services/deviceauth/client/tenant/client_tenantadm_test.go → backend/pkg/tenant/client_tenantadm_test.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Northern.tech AS
+// Copyright 2024 Northern.tech AS
 //
 //	Licensed under the Apache License, Version 2.0 (the "License");
 //	you may not use this file except in compliance with the License.

backend/services/deviceauth/client/tenant/tenant.go → backend/pkg/tenant/tenant.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Northern.tech AS
+// Copyright 2024 Northern.tech AS
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.

backend/services/deviceauth/api/http/api_devauth_test.go

@@ -35,10 +35,10 @@ import (
 	"github.com/mendersoftware/mender-server/pkg/requestid"
 	"github.com/mendersoftware/mender-server/pkg/rest_utils"
 
+	"github.com/mendersoftware/mender-server/pkg/tenant"
 	mt "github.com/mendersoftware/mender-server/pkg/testing"
 
 	"github.com/mendersoftware/mender-server/services/deviceauth/cache"
-	"github.com/mendersoftware/mender-server/services/deviceauth/client/tenant"
 	"github.com/mendersoftware/mender-server/services/deviceauth/devauth"
 	"github.com/mendersoftware/mender-server/services/deviceauth/devauth/mocks"
 	"github.com/mendersoftware/mender-server/services/deviceauth/jwt"

backend/services/deviceauth/cmd/commands.go

@@ -25,10 +25,10 @@ import (
 	"github.com/mendersoftware/mender-server/pkg/log"
 	"github.com/mendersoftware/mender-server/pkg/mongo/migrate"
 	mstore "github.com/mendersoftware/mender-server/pkg/store"
+	"github.com/mendersoftware/mender-server/pkg/tenant"
 
 	cinv "github.com/mendersoftware/mender-server/services/deviceauth/client/inventory"
 	"github.com/mendersoftware/mender-server/services/deviceauth/client/orchestrator"
-	"github.com/mendersoftware/mender-server/services/deviceauth/client/tenant"
 	dconfig "github.com/mendersoftware/mender-server/services/deviceauth/config"
 	"github.com/mendersoftware/mender-server/services/deviceauth/model"
 	"github.com/mendersoftware/mender-server/services/deviceauth/store"

backend/services/deviceauth/cmd/commands_test.go

@@ -29,12 +29,12 @@ import (
 	"github.com/mendersoftware/mender-server/pkg/mongo/migrate"
 	"github.com/mendersoftware/mender-server/pkg/mongo/oid"
 	ctxstore "github.com/mendersoftware/mender-server/pkg/store"
+	"github.com/mendersoftware/mender-server/pkg/tenant"
+	mtenant "github.com/mendersoftware/mender-server/pkg/tenant/mocks"
 
 	minv "github.com/mendersoftware/mender-server/services/deviceauth/client/inventory/mocks"
 	"github.com/mendersoftware/mender-server/services/deviceauth/client/orchestrator"
 	mwflows "github.com/mendersoftware/mender-server/services/deviceauth/client/orchestrator/mocks"
-	"github.com/mendersoftware/mender-server/services/deviceauth/client/tenant"
-	mtenant "github.com/mendersoftware/mender-server/services/deviceauth/client/tenant/mocks"
 	"github.com/mendersoftware/mender-server/services/deviceauth/store"
 
 	//dconfig "github.com/mendersoftware/mender-server/services/deviceauth/config"

backend/services/deviceauth/devauth/devauth.go

@@ -30,12 +30,12 @@ import (
 	"github.com/mendersoftware/mender-server/pkg/plan"
 	"github.com/mendersoftware/mender-server/pkg/ratelimits"
 	"github.com/mendersoftware/mender-server/pkg/requestid"
+	tenant2 "github.com/mendersoftware/mender-server/pkg/tenant"
 
 	"github.com/mendersoftware/mender-server/services/deviceauth/access"
 	"github.com/mendersoftware/mender-server/services/deviceauth/cache"
 	"github.com/mendersoftware/mender-server/services/deviceauth/client/inventory"
 	"github.com/mendersoftware/mender-server/services/deviceauth/client/orchestrator"
-	"github.com/mendersoftware/mender-server/services/deviceauth/client/tenant"
 	"github.com/mendersoftware/mender-server/services/deviceauth/jwt"
 	"github.com/mendersoftware/mender-server/services/deviceauth/model"
 	"github.com/mendersoftware/mender-server/services/deviceauth/store"
@@ -118,7 +118,7 @@ type DevAuth struct {
 	db           store.DataStore
 	invClient    inventory.Client
 	cOrch        orchestrator.ClientRunner
-	cTenant      tenant.ClientRunner
+	cTenant      tenant2.ClientRunner
 	jwt          jwt.Handler
 	jwtFallback  jwt.Handler
 	verifyTenant bool
@@ -282,11 +282,11 @@ func (d *DevAuth) signToken(ctx context.Context) jwt.SignFunc {
 	}
 }
 
-func (d *DevAuth) doVerifyTenant(ctx context.Context, token string) (*tenant.Tenant, error) {
+func (d *DevAuth) doVerifyTenant(ctx context.Context, token string) (*tenant2.Tenant, error) {
 	t, err := d.cTenant.VerifyToken(ctx, token)
 
 	if err != nil {
-		if tenant.IsErrTokenVerificationFailed(err) {
+		if tenant2.IsErrTokenVerificationFailed(err) {
 			return nil, MakeErrDevAuthUnauthorized(err)
 		}
 
@@ -300,14 +300,14 @@ func (d *DevAuth) getTenantWithDefault(
 	ctx context.Context,
 	tenantToken,
 	defaultToken string,
-) (context.Context, *tenant.Tenant, error) {
+) (context.Context, *tenant2.Tenant, error) {
 	l := log.FromContext(ctx)
 
 	if tenantToken == "" && defaultToken == "" {
 		return nil, nil, MakeErrDevAuthUnauthorized(errors.New("tenant token missing"))
 	}
 
-	var t *tenant.Tenant
+	var t *tenant2.Tenant
 	var err error
 
 	// try the provided token
@@ -331,7 +331,7 @@ func (d *DevAuth) getTenantWithDefault(
 
 	// none of the tokens worked
 	if err != nil {
-		if tenant.IsErrTokenVerificationFailed(err) {
+		if tenant2.IsErrTokenVerificationFailed(err) {
 			return ctx, nil, MakeErrDevAuthUnauthorized(err)
 		}
 		return ctx, nil, err
@@ -348,7 +348,7 @@ func (d *DevAuth) getTenantWithDefault(
 func (d *DevAuth) SubmitAuthRequest(ctx context.Context, r *model.AuthReq) (string, error) {
 	l := log.FromContext(ctx)
 
-	var tenant *tenant.Tenant
+	var tenant *tenant2.Tenant
 	var err error
 
 	if d.verifyTenant {
@@ -1544,7 +1544,7 @@ func (d *DevAuth) WithJWTFallbackHandler(handler jwt.Handler) *DevAuth {
 // WithTenantVerification will force verification of tenant token with tenant
 // administrator when processing device authentication requests. Returns an
 // updated devauth.
-func (d *DevAuth) WithTenantVerification(c tenant.ClientRunner) *DevAuth {
+func (d *DevAuth) WithTenantVerification(c tenant2.ClientRunner) *DevAuth {
 	d.cTenant = c
 	d.verifyTenant = true
 	return d

backend/services/deviceauth/devauth/devauth_test.go

@@ -28,6 +28,8 @@ import (
 	"github.com/mendersoftware/mender-server/pkg/identity"
 	"github.com/mendersoftware/mender-server/pkg/mongo/oid"
 	"github.com/mendersoftware/mender-server/pkg/ratelimits"
+	"github.com/mendersoftware/mender-server/pkg/tenant"
+	mtenant "github.com/mendersoftware/mender-server/pkg/tenant/mocks"
 
 	"github.com/pkg/errors"
 
@@ -36,8 +38,6 @@ import (
 	minv "github.com/mendersoftware/mender-server/services/deviceauth/client/inventory/mocks"
 	"github.com/mendersoftware/mender-server/services/deviceauth/client/orchestrator"
 	morchestrator "github.com/mendersoftware/mender-server/services/deviceauth/client/orchestrator/mocks"
-	"github.com/mendersoftware/mender-server/services/deviceauth/client/tenant"
-	mtenant "github.com/mendersoftware/mender-server/services/deviceauth/client/tenant/mocks"
 	"github.com/mendersoftware/mender-server/services/deviceauth/jwt"
 	mjwt "github.com/mendersoftware/mender-server/services/deviceauth/jwt/mocks"
 	"github.com/mendersoftware/mender-server/services/deviceauth/model"

backend/services/deviceauth/main.go

@@ -26,11 +26,11 @@ import (
 
 	"github.com/mendersoftware/mender-server/pkg/config"
 	"github.com/mendersoftware/mender-server/pkg/log"
+	"github.com/mendersoftware/mender-server/pkg/tenant"
 	"github.com/mendersoftware/mender-server/pkg/version"
 
 	cinv "github.com/mendersoftware/mender-server/services/deviceauth/client/inventory"
 	"github.com/mendersoftware/mender-server/services/deviceauth/client/orchestrator"
-	"github.com/mendersoftware/mender-server/services/deviceauth/client/tenant"
 	"github.com/mendersoftware/mender-server/services/deviceauth/cmd"
 	dconfig "github.com/mendersoftware/mender-server/services/deviceauth/config"
 	"github.com/mendersoftware/mender-server/services/deviceauth/store/mongo"

backend/services/deviceauth/server.go

@@ -23,11 +23,11 @@ import (
 
 	"github.com/mendersoftware/mender-server/pkg/config"
 	"github.com/mendersoftware/mender-server/pkg/log"
+	"github.com/mendersoftware/mender-server/pkg/tenant"
 
 	api_http "github.com/mendersoftware/mender-server/services/deviceauth/api/http"
 	"github.com/mendersoftware/mender-server/services/deviceauth/cache"
 	"github.com/mendersoftware/mender-server/services/deviceauth/client/orchestrator"
-	"github.com/mendersoftware/mender-server/services/deviceauth/client/tenant"
 	dconfig "github.com/mendersoftware/mender-server/services/deviceauth/config"
 	"github.com/mendersoftware/mender-server/services/deviceauth/devauth"
 	"github.com/mendersoftware/mender-server/services/deviceauth/jwt"