Rebase fix

Author: Tomasz-Smelcerz-SAP

api/shared/zz_generated.deepcopy.go

@@ -6,6 +6,8 @@ import (
 	"github.com/kyma-project/lifecycle-manager/internal/descriptor/types"
 )
 
+type DescriptorKey string
+
 type DescriptorCache struct {
 	cache sync.Map
 }
@@ -16,7 +18,7 @@ func NewDescriptorCache() *DescriptorCache {
 	}
 }
 
-func (d *DescriptorCache) Get(key string) *types.Descriptor {
+func (d *DescriptorCache) Get(key DescriptorKey) *types.Descriptor {
 	value, ok := d.cache.Load(key)
 	if !ok {
 		return nil
@@ -29,6 +31,6 @@ func (d *DescriptorCache) Get(key string) *types.Descriptor {
 	return &types.Descriptor{ComponentDescriptor: desc.Copy()}
 }
 
-func (d *DescriptorCache) Set(key string, value *types.Descriptor) {
+func (d *DescriptorCache) Set(key DescriptorKey, value *types.Descriptor) {
 	d.cache.Store(key, value)
 }

api/v1beta1/zz_generated.deepcopy.go

@@ -15,7 +15,7 @@ func TestGet_ForCacheWithoutEntry_ReturnsNoEntry(t *testing.T) {
 	descriptorCache := cache.NewDescriptorCache()
 	key := "key 1"
 
-	actual := descriptorCache.Get(key)
+	actual := descriptorCache.Get(cache.DescriptorKey(key))
 
 	assert.Nil(t, actual)
 }
@@ -32,9 +32,9 @@ func TestGet_ForCacheWithAnEntry_ReturnsAnEntry(t *testing.T) {
 	}
 	desc1 := &types.Descriptor{ComponentDescriptor: ocmDesc1}
 
-	descriptorCache.Set(key1, desc1)
+	descriptorCache.Set(cache.DescriptorKey(key1), desc1)
 
-	assertDescriptorEqual(t, desc1, descriptorCache.Get(key1))
+	assertDescriptorEqual(t, desc1, descriptorCache.Get(cache.DescriptorKey(key1)))
 }
 
 func TestGet_ForCacheWithOverwrittenEntry_ReturnsNewEntry(t *testing.T) {
@@ -53,15 +53,15 @@ func TestGet_ForCacheWithOverwrittenEntry_ReturnsNewEntry(t *testing.T) {
 			},
 		},
 	}
-	descriptorCache.Set(originalKey, originalValue)
-	assertDescriptorNotEqual(t, newValue, descriptorCache.Get(originalKey))
-	assert.Nil(t, descriptorCache.Get(newKey))
+	descriptorCache.Set(cache.DescriptorKey(originalKey), originalValue)
+	assertDescriptorNotEqual(t, newValue, descriptorCache.Get(cache.DescriptorKey(originalKey)))
+	assert.Nil(t, descriptorCache.Get(cache.DescriptorKey(newKey)))
 
-	descriptorCache.Set(newKey, newValue)
-	descriptorCache.Set(originalKey, newValue)
+	descriptorCache.Set(cache.DescriptorKey(newKey), newValue)
+	descriptorCache.Set(cache.DescriptorKey(originalKey), newValue)
 
-	assertDescriptorEqual(t, newValue, descriptorCache.Get(newKey))
-	assertDescriptorEqual(t, newValue, descriptorCache.Get(originalKey))
+	assertDescriptorEqual(t, newValue, descriptorCache.Get(cache.DescriptorKey(newKey)))
+	assertDescriptorEqual(t, newValue, descriptorCache.Get(cache.DescriptorKey(originalKey)))
 }
 
 func assertDescriptorEqual(t *testing.T, expected, actual *types.Descriptor) {

api/v1beta2/zz_generated.deepcopy.go

@@ -6,8 +6,6 @@ import (
 	"github.com/kyma-project/lifecycle-manager/internal/descriptor/types/ocmidentity"
 )
 
-type DescriptorKey string
-
 func GenerateDescriptorKey(ocmi ocmidentity.Component) DescriptorKey {
 	return DescriptorKey(fmt.Sprintf("%s:%s", ocmi.Name(), ocmi.Version()))
 }

internal/descriptor/cache/cache.go

@@ -2,73 +2,32 @@ package cache_test
 
 import (
 	"testing"
-	//"github.com/stretchr/testify/assert"
-	//"github.com/kyma-project/lifecycle-manager/api/shared"
-	//"github.com/kyma-project/lifecycle-manager/api/v1beta2"
-	//"github.com/kyma-project/lifecycle-manager/internal/descriptor/cache"
-	//"github.com/kyma-project/lifecycle-manager/pkg/testutils"
-	//"github.com/kyma-project/lifecycle-manager/pkg/testutils/builder"
+
+	"github.com/kyma-project/lifecycle-manager/internal/descriptor/cache"
+	"github.com/kyma-project/lifecycle-manager/internal/descriptor/types/ocmidentity"
+	"github.com/stretchr/testify/assert"
 )
 
-// TODO: Refactor or remove entirely
 func TestGenerateDescriptorCacheKey(t *testing.T) {
-	/*
-		testCases := []struct {
-			name     string
-			template *v1beta2.ModuleTemplate
-			want     cache.DescriptorKey
-		}{
-			{
-				name: "ModuleVersionAnnotation is not nil and valid semver",
-				template: builder.NewModuleTemplateBuilder().
-					WithName("name").
-					WithNamespace(testutils.ControlPlaneNamespace).
-					WithAnnotation(shared.ModuleVersionAnnotation, "1.0.0").
-					WithChannel("channel").
-					WithGeneration(1).
-					Build(),
-				want: "name:channel:1:1.0.0",
-			},
-			{
-				name: "ModuleVersionAnnotation is not nil but invalid semver",
-				template: builder.NewModuleTemplateBuilder().
-					WithName("name").
-					WithNamespace(testutils.ControlPlaneNamespace).
-					WithGeneration(1).
-					WithAnnotation(shared.ModuleVersionAnnotation, "not-semver").
-					WithChannel("channel").
-					Build(),
-				want: "name:channel:1",
-			},
-			{
-				name: "ModuleVersionAnnotation is not nil but module version is empty",
-				template: builder.NewModuleTemplateBuilder().
-					WithName("name").
-					WithNamespace(testutils.ControlPlaneNamespace).
-					WithGeneration(2).
-					WithAnnotation(shared.ModuleVersionAnnotation, "").
-					WithChannel("channel").
-					Build(),
-				want: "name:channel:2",
-			},
-			{
-				name: "ModuleVersionAnnotation is nil",
-				template: builder.NewModuleTemplateBuilder().
-					WithName("name").
-					WithNamespace(testutils.ControlPlaneNamespace).
-					WithGeneration(3).
-					WithChannel("channel").
-					Build(),
-				want: "name:channel:3",
-			},
-		}
+	testCases := []struct {
+		name          string
+		moduleName    string
+		moduleVersion string
+		want          string
+	}{
+		{
+			name:          "with valid module name and version",
+			moduleName:    "name",
+			moduleVersion: "1.0.0",
+			want:          "name:1.0.0",
+		},
+	}
 
-		for i := range testCases {
-			t.Run(testCases[i].name, func(t *testing.T) {
-				got := cache.GenerateDescriptorKey(testCases[i].template)
-				assert.Equalf(t, testCases[i].want, got,
-					"GetComponentDescriptorCacheKey() = %v, want %v", got, testCases[i].want)
-			})
-		}
-	*/
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			key := ocmidentity.MustNew(tc.moduleName, tc.moduleVersion)
+			got := cache.GenerateDescriptorKey(*key)
+			assert.Equal(t, tc.want, got)
+		})
+	}
 }

internal/descriptor/cache/cache_test.go

@@ -76,7 +76,7 @@ func (c *CachedDescriptorProvider) getDescriptor(ocmi ocmidentity.Component, upd
 		return nil, fmt.Errorf("cannot get descriptor for component: %w", ErrNameOrVersionEmpty)
 	}
 	key := cache.GenerateDescriptorKey(ocmi)
-	descriptor := c.descriptorCache.Get(string(key))
+	descriptor := c.descriptorCache.Get(key)
 	if descriptor != nil {
 		return descriptor, nil
 	}
@@ -87,7 +87,7 @@ func (c *CachedDescriptorProvider) getDescriptor(ocmi ocmidentity.Component, upd
 	}
 
 	if updateCache {
-		c.descriptorCache.Set(string(key), descriptor)
+		c.descriptorCache.Set(key, descriptor)
 	}
 
 	return descriptor, nil

internal/descriptor/cache/key.go

@@ -30,51 +30,9 @@ func TestAdd_OnEmptyIdentity_ReturnsErr(t *testing.T) {
 	require.ErrorIs(t, err, provider.ErrNameOrVersionEmpty)
 }
 
-/*
-func TestGetDescriptor_OnNilTemplate_ReturnsErrTemplateNil(t *testing.T) {
-	descriptorProvider := provider.NewCachedDescriptorProvider()
-
-	_, err := descriptorProvider.GetDescriptor(nil)
-
-	require.Error(t, err)
-	require.ErrorIs(t, err, provider.ErrTemplateNil)
-}
-
-func TestGetDescriptor_OnInvalidRawDescriptor_ReturnsErrDescriptorNil(t *testing.T) {
-	descriptorProvider := provider.NewCachedDescriptorProvider()
-	template := builder.NewModuleTemplateBuilder().
-		WithRawDescriptor([]byte("invalid descriptor")).
-		WithDescriptor(nil).
-		Build()
-
-	_, err := descriptorProvider.GetDescriptor(template)
-
-	require.Error(t, err)
-	require.ErrorIs(t, err, provider.ErrDescriptorNil)
-}
-
-func TestGetDescriptor_OnEmptyCache_ReturnsParsedDescriptor(t *testing.T) {
-	descriptorProvider := provider.NewCachedDescriptorProvider()
-	template := builder.NewModuleTemplateBuilder().Build()
-
-	_, err := descriptorProvider.GetDescriptor(template)
-
-	require.NoError(t, err)
-}
-
-func TestAdd_OnInvalidRawDescriptor_ReturnsErrDecode(t *testing.T) {
-	descriptorProvider := provider.NewCachedDescriptorProvider()
-	template := builder.NewModuleTemplateBuilder().
-		WithVersion("1.0.0").
-		WithRawDescriptor([]byte("invalid descriptor")).
-		WithDescriptor(nil).
-		Build()
-
-	err := descriptorProvider.Add(template)
-*/
 func TestGetDescriptor_OnInvalidRawDescriptor_ReturnsErr(t *testing.T) {
 	descriptorProvider := provider.NewCachedDescriptorProvider(
-		(&componentdescriptor.FakeService{}).Register([]byte("invalid descriptor")))
+		componentdescriptor.NewFakeService([]byte("invalid descriptor")))
 	ocmi, err := ocmidentity.New("test", "v1")
 	require.NoError(t, err)
 	_, err = descriptorProvider.GetDescriptor(*ocmi)
@@ -83,20 +41,13 @@ func TestGetDescriptor_OnInvalidRawDescriptor_ReturnsErr(t *testing.T) {
 	require.ErrorIs(t, err, componentdescriptor.ErrDecode)
 }
 
-/*
-<<<<<<< HEAD
-func TestAdd_OnDescriptorTypeButNull_ReturnsNoError(t *testing.T) {
-	descriptorProvider := provider.NewCachedDescriptorProvider()
-	template := builder.NewModuleTemplateBuilder().WithVersion("1.0.0").WithDescriptor(&types.Descriptor{}).Build()
-=======
-*/
 func TestGetDescriptor_OnEmptyCache_ReturnsDescriptorFromService(t *testing.T) {
 	// given
 	var moduleTemplateFromFile v1beta2.ModuleTemplate
 	builder.ReadComponentDescriptorFromFile("v1beta2_template_operator_new_ocm.yaml", &moduleTemplateFromFile)
 
 	descriptorProvider := provider.NewCachedDescriptorProvider(
-		(&componentdescriptor.FakeService{}).Register(moduleTemplateFromFile.Spec.Descriptor.Raw))
+		componentdescriptor.NewFakeService(moduleTemplateFromFile.Spec.Descriptor.Raw))
 
 	ocmi, err := ocmidentity.New("kyma-project.io/module/template-operator", "1.0.0-new-ocm-format")
 	require.NoError(t, err)
@@ -115,8 +66,7 @@ func TestGetDescriptor_DoesNotUpdateCache(t *testing.T) {
 	var moduleTemplateFromFile v1beta2.ModuleTemplate
 	builder.ReadComponentDescriptorFromFile("v1beta2_template_operator_new_ocm.yaml", &moduleTemplateFromFile)
 
-	mockService := &componentdescriptor.FakeService{}
-	mockService.Register(moduleTemplateFromFile.Spec.Descriptor.Raw)
+	mockService := componentdescriptor.NewFakeService(moduleTemplateFromFile.Spec.Descriptor.Raw)
 
 	descriptorProvider := provider.NewCachedDescriptorProvider(mockService)
 
@@ -144,8 +94,7 @@ func TestGetDescriptor_ReturnsDescriptorFromCache(t *testing.T) {
 	// given
 	var moduleTemplateFromFile v1beta2.ModuleTemplate
 	builder.ReadComponentDescriptorFromFile("v1beta2_template_operator_new_ocm.yaml", &moduleTemplateFromFile)
-	mockService := &componentdescriptor.FakeService{}
-	mockService.Register(moduleTemplateFromFile.Spec.Descriptor.Raw)
+	mockService := componentdescriptor.NewFakeService(moduleTemplateFromFile.Spec.Descriptor.Raw)
 	descriptorProvider := provider.NewCachedDescriptorProvider(mockService)
 	ocmi, err := ocmidentity.New("kyma-project.io/module/template-operator", "1.0.0-new-ocm-format")
 	require.NoError(t, err)