fix(unit-test-coverage.yaml): Rename Package

internal/controller/istiogatewaysecret/setup.go

@@ -15,10 +15,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
 	"github.com/kyma-project/lifecycle-manager/api/shared"
+	"github.com/kyma-project/lifecycle-manager/internal/gatewaysecret"
+	"github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/cabundle"
 	gatewaysecretclient "github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/client"
-	gatewaysecrethandler "github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/handler"
-	"github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/handler/cabundle"
-	"github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/handler/legacy"
+	"github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/legacy"
 	"github.com/kyma-project/lifecycle-manager/internal/pkg/flags"
 	"github.com/kyma-project/lifecycle-manager/pkg/queue"
 )
@@ -34,7 +34,7 @@ func SetupReconciler(mgr ctrl.Manager, flagVar *flags.FlagVar, options ctrlrunti
 	options.MaxConcurrentReconciles = flagVar.MaxConcurrentWatcherReconciles
 
 	clnt := gatewaysecretclient.NewGatewaySecretRotationClient(mgr.GetConfig())
-	var parseLastModifiedFunc gatewaysecrethandler.TimeParserFunc = func(secret *apicorev1.Secret,
+	var parseLastModifiedFunc gatewaysecret.TimeParserFunc = func(secret *apicorev1.Secret,
 		annotation string,
 	) (time.Time, error) {
 		if strValue, ok := secret.Annotations[annotation]; ok {
@@ -45,7 +45,7 @@ func SetupReconciler(mgr ctrl.Manager, flagVar *flags.FlagVar, options ctrlrunti
 		return time.Time{}, fmt.Errorf("%w: %s", errCouldNotGetTimeFromAnnotation, annotation)
 	}
 
-	var handler gatewaysecrethandler.Handler
+	var handler gatewaysecret.Handler
 	if flagVar.UseLegacyStrategyForIstioGatewaySecret {
 		handler = legacy.NewGatewaySecretHandler(clnt, parseLastModifiedFunc)
 	} else {

internal/gatewaysecret/handler/cabundle/handler.go → internal/gatewaysecret/cabundle/handler.go

@@ -9,7 +9,7 @@ import (
 	apimetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/kyma-project/lifecycle-manager/api/shared"
-	gatewaysecrethandler "github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/handler"
+	"github.com/kyma-project/lifecycle-manager/internal/gatewaysecret"
 	"github.com/kyma-project/lifecycle-manager/pkg/util"
 )
 
@@ -19,12 +19,12 @@ const (
 )
 
 type Handler struct {
-	client                         gatewaysecrethandler.Client
-	parseLastModifiedTime          gatewaysecrethandler.TimeParserFunc
+	client                         gatewaysecret.Client
+	parseLastModifiedTime          gatewaysecret.TimeParserFunc
 	switchCertBeforeExpirationTime time.Duration
 }
 
-func NewGatewaySecretHandler(client gatewaysecrethandler.Client, timeParserFunc gatewaysecrethandler.TimeParserFunc,
+func NewGatewaySecretHandler(client gatewaysecret.Client, timeParserFunc gatewaysecret.TimeParserFunc,
 	switchCertBeforeExpirationTime time.Duration,
 ) *Handler {
 	return &Handler{
@@ -63,7 +63,7 @@ func (h *Handler) createGatewaySecretFromRootSecret(ctx context.Context, rootSec
 ) error {
 	newSecret := &apicorev1.Secret{
 		TypeMeta: apimetav1.TypeMeta{
-			Kind:       gatewaysecrethandler.SecretKind,
+			Kind:       gatewaysecret.SecretKind,
 			APIVersion: apicorev1.SchemeGroupVersion.String(),
 		},
 		ObjectMeta: apimetav1.ObjectMeta{
@@ -73,11 +73,11 @@ func (h *Handler) createGatewaySecretFromRootSecret(ctx context.Context, rootSec
 	}
 
 	newSecret.Data = make(map[string][]byte)
-	newSecret.Data[gatewaysecrethandler.TLSCrt] = rootSecret.Data[gatewaysecrethandler.TLSCrt]
-	newSecret.Data[gatewaysecrethandler.TLSKey] = rootSecret.Data[gatewaysecrethandler.TLSKey]
-	newSecret.Data[gatewaysecrethandler.CACrt] = rootSecret.Data[gatewaysecrethandler.CACrt]
+	newSecret.Data[gatewaysecret.TLSCrt] = rootSecret.Data[gatewaysecret.TLSCrt]
+	newSecret.Data[gatewaysecret.TLSKey] = rootSecret.Data[gatewaysecret.TLSKey]
+	newSecret.Data[gatewaysecret.CACrt] = rootSecret.Data[gatewaysecret.CACrt]
 
-	newSecret.Data[caBundleTempCertKey] = rootSecret.Data[gatewaysecrethandler.CACrt]
+	newSecret.Data[caBundleTempCertKey] = rootSecret.Data[gatewaysecret.CACrt]
 	setLastModifiedToNow(newSecret)
 	setCurrentCAExpiration(newSecret, caCert)
 
@@ -119,12 +119,12 @@ func setCurrentCAExpiration(secret *apicorev1.Secret, caCert *certmanagerv1.Cert
 
 func bundleCACrt(gatewaySecret *apicorev1.Secret, rootSecret *apicorev1.Secret) {
 	//nolint:gocritic // we need to append the new CA cert to the existing CA cert
-	gatewaySecret.Data[gatewaysecrethandler.CACrt] = append(rootSecret.Data[gatewaysecrethandler.CACrt],
+	gatewaySecret.Data[gatewaysecret.CACrt] = append(rootSecret.Data[gatewaysecret.CACrt],
 		gatewaySecret.Data[caBundleTempCertKey]...)
-	gatewaySecret.Data[caBundleTempCertKey] = rootSecret.Data[gatewaysecrethandler.CACrt]
+	gatewaySecret.Data[caBundleTempCertKey] = rootSecret.Data[gatewaysecret.CACrt]
 }
 
 func switchCertificate(gatewaySecret *apicorev1.Secret, rootSecret *apicorev1.Secret) {
-	gatewaySecret.Data[gatewaysecrethandler.TLSCrt] = rootSecret.Data[gatewaysecrethandler.TLSCrt]
-	gatewaySecret.Data[gatewaysecrethandler.TLSKey] = rootSecret.Data[gatewaysecrethandler.TLSKey]
+	gatewaySecret.Data[gatewaysecret.TLSCrt] = rootSecret.Data[gatewaysecret.TLSCrt]
+	gatewaySecret.Data[gatewaysecret.TLSKey] = rootSecret.Data[gatewaysecret.TLSKey]
 }

internal/gatewaysecret/handler/handler.go → internal/gatewaysecret/handler.go

@@ -1,4 +1,4 @@
-package gatewaysecrethandler
+package gatewaysecret
 
 import (
 	"context"

internal/gatewaysecret/handler/legacy/handler.go → internal/gatewaysecret/legacy/handler.go

@@ -9,16 +9,16 @@ import (
 	apimetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/kyma-project/lifecycle-manager/api/shared"
-	gatewaysecrethandler "github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/handler"
+	"github.com/kyma-project/lifecycle-manager/internal/gatewaysecret"
 	"github.com/kyma-project/lifecycle-manager/pkg/util"
 )
 
 type Handler struct {
-	client                gatewaysecrethandler.Client
-	parseLastModifiedTime gatewaysecrethandler.TimeParserFunc
+	client                gatewaysecret.Client
+	parseLastModifiedTime gatewaysecret.TimeParserFunc
 }
 
-func NewGatewaySecretHandler(client gatewaysecrethandler.Client, timeParserFunc gatewaysecrethandler.TimeParserFunc) *Handler {
+func NewGatewaySecretHandler(client gatewaysecret.Client, timeParserFunc gatewaysecret.TimeParserFunc) *Handler {
 	return &Handler{
 		client:                client,
 		parseLastModifiedTime: timeParserFunc,
@@ -51,7 +51,7 @@ func (h *Handler) ManageGatewaySecret(ctx context.Context, rootSecret *apicorev1
 func (h *Handler) createGatewaySecretFromRootSecret(ctx context.Context, rootSecret *apicorev1.Secret) error {
 	newSecret := &apicorev1.Secret{
 		TypeMeta: apimetav1.TypeMeta{
-			Kind:       gatewaysecrethandler.SecretKind,
+			Kind:       gatewaysecret.SecretKind,
 			APIVersion: apicorev1.SchemeGroupVersion.String(),
 		},
 		ObjectMeta: apimetav1.ObjectMeta{
@@ -88,7 +88,7 @@ func copyDataFromRootSecret(secret *apicorev1.Secret, rootSecret *apicorev1.Secr
 	if secret.Data == nil {
 		secret.Data = make(map[string][]byte)
 	}
-	secret.Data[gatewaysecrethandler.TLSCrt] = rootSecret.Data[gatewaysecrethandler.TLSCrt]
-	secret.Data[gatewaysecrethandler.TLSKey] = rootSecret.Data[gatewaysecrethandler.TLSKey]
-	secret.Data[gatewaysecrethandler.CACrt] = rootSecret.Data[gatewaysecrethandler.CACrt]
+	secret.Data[gatewaysecret.TLSCrt] = rootSecret.Data[gatewaysecret.TLSCrt]
+	secret.Data[gatewaysecret.TLSKey] = rootSecret.Data[gatewaysecret.TLSKey]
+	secret.Data[gatewaysecret.CACrt] = rootSecret.Data[gatewaysecret.CACrt]
 }

internal/gatewaysecret/handler/legacy/handler_test.go → internal/gatewaysecret/legacy/handler_test.go

@@ -14,9 +14,9 @@ import (
 	apimetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/kyma-project/lifecycle-manager/api/shared"
-	gatewaysecrethandler "github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/handler"
-	"github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/handler/legacy"
-	"github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/handler/testutils"
+	"github.com/kyma-project/lifecycle-manager/internal/gatewaysecret"
+	"github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/legacy"
+	"github.com/kyma-project/lifecycle-manager/internal/gatewaysecret/testutils"
 )
 
 func TestManageGatewaySecret_WhenGetGatewaySecretReturnsError_ReturnsError(t *testing.T) {
@@ -142,7 +142,7 @@ func TestManageGatewaySecret_WhenRequiresUpdate_UpdatesGatewaySecretWithRootSecr
 	}
 	mockClient.On("GetWatcherServingCert", mock.Anything).Return(cert, nil)
 	mockClient.On("UpdateGatewaySecret", mock.Anything, mock.Anything).Return(nil)
-	var mockFunc gatewaysecrethandler.TimeParserFunc = func(secret *apicorev1.Secret,
+	var mockFunc gatewaysecret.TimeParserFunc = func(secret *apicorev1.Secret,
 		annotation string,
 	) (time.Time, error) {
 		return time.Now(), nil
@@ -191,7 +191,7 @@ func TestManageGatewaySecret_WhenRequiresUpdate_UpdatesGatewaySecretWithUpdatedM
 	}
 	mockClient.On("GetWatcherServingCert", mock.Anything).Return(cert, nil)
 	mockClient.On("UpdateGatewaySecret", mock.Anything, mock.Anything).Return(nil)
-	var mockFunc gatewaysecrethandler.TimeParserFunc = func(secret *apicorev1.Secret,
+	var mockFunc gatewaysecret.TimeParserFunc = func(secret *apicorev1.Secret,
 		annotation string,
 	) (time.Time, error) {
 		return time.Now(), nil
@@ -230,7 +230,7 @@ func TestManageGatewaySecret_WhenRequiresUpdateAndUpdateFails_ReturnsError(t *te
 	mockClient.On("GetWatcherServingCert", mock.Anything).Return(cert, nil)
 	expectedError := errors.New("some-error")
 	mockClient.On("UpdateGatewaySecret", mock.Anything, mock.Anything).Return(expectedError)
-	var mockFunc gatewaysecrethandler.TimeParserFunc = func(secret *apicorev1.Secret,
+	var mockFunc gatewaysecret.TimeParserFunc = func(secret *apicorev1.Secret,
 		annotation string,
 	) (time.Time, error) {
 		return time.Now(), nil
@@ -260,7 +260,7 @@ func TestManageGatewaySecret_WhenRequiresUpdateIsFalse_DoesNotUpdateGatewaySecre
 	}
 	mockClient.On("GetWatcherServingCert", mock.Anything).Return(cert, nil)
 	mockClient.On("UpdateGatewaySecret", mock.Anything, mock.Anything).Return(nil)
-	var mockFunc gatewaysecrethandler.TimeParserFunc = func(secret *apicorev1.Secret,
+	var mockFunc gatewaysecret.TimeParserFunc = func(secret *apicorev1.Secret,
 		annotation string,
 	) (time.Time, error) {
 		return time.Now(), nil
@@ -288,7 +288,7 @@ func TestManageGatewaySecret_WhenTimeParserFuncReturnsError_UpdatesGatewaySecret
 	}
 	mockClient.On("GetWatcherServingCert", mock.Anything).Return(cert, nil)
 	mockClient.On("UpdateGatewaySecret", mock.Anything, mock.Anything).Return(nil)
-	var mockFunc gatewaysecrethandler.TimeParserFunc = func(secret *apicorev1.Secret,
+	var mockFunc gatewaysecret.TimeParserFunc = func(secret *apicorev1.Secret,
 		annotation string,
 	) (time.Time, error) {
 		return time.Time{}, errors.New("some-error")

unit-test-coverage.yaml

@@ -4,7 +4,7 @@ packages:
   internal/descriptor/cache: 92.3
   internal/descriptor/provider: 66.7
   internal/event: 100
-  internal/gatewaysecrethandler: 100
+  internal/gatewaysecret: 100
   internal/manifest: 15.8
   internal/manifest/statecheck: 71
   internal/manifest/filemutex: 100