chore: deprecate old profiletypes in favor of containerprofiles

.github/workflows/component-tests.yaml

@@ -56,7 +56,7 @@ jobs:
           # Test_05_MemoryLeak_10K_Alerts,
           Test_06_KillProcessInTheMiddle,
           Test_07_RuleBindingApplyTest,
-          Test_08_ApplicationProfilePatching,
+          Test_08_ContainerProfilePatching,
           Test_10_MalwareDetectionTest,
           Test_11_EndpointTest,
           Test_12_MergingProfilesTest,

mocks/readfiles.go

@@ -5,7 +5,6 @@ import (
 	"path"
 	"runtime"
 
-	"github.com/kubescape/storage/pkg/apis/softwarecomposition/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	k8sruntime "k8s.io/apimachinery/pkg/runtime"
 
@@ -20,8 +19,6 @@ const (
 	TestKindPod    TestKinds = "Pod"
 	TestKindRS     TestKinds = "ReplicaSet"
 	TestKindDeploy TestKinds = "Deployment"
-	TestKindAP     TestKinds = "ApplicationProfile"
-	TestKindNN     TestKinds = "NetworkNeighborhood"
 )
 
 const (
@@ -30,20 +27,14 @@ const (
 )
 
 const (
-	nginxPodBytes                 = "testdata/nginx_pod.json"
-	nginxRSBytes                  = "testdata/nginx_rs.json"
-	nginxDeploymentBytes          = "testdata/nginx_deploy.json"
-	nginxApplicationProfileBytes  = "testdata/nginx_applicationprofiles.json"
-	nginxApplicationActivityBytes = "testdata/nginx_applicationactivities.json"
-	nginxNetworkNeighborhoodBytes = "testdata/nginx_networkneighborhood.json"
+	nginxPodBytes        = "testdata/nginx_pod.json"
+	nginxRSBytes         = "testdata/nginx_rs.json"
+	nginxDeploymentBytes = "testdata/nginx_deploy.json"
 )
 const (
-	collectionPodBytes                 = "testdata/collection_pod.json"
-	collectionRSBytes                  = "testdata/collection_rs.json"
-	collectionDeploymentBytes          = "testdata/collection_deploy.json"
-	collectionApplicationProfileBytes  = "testdata/collection_applicationprofiles.json"
-	collectionApplicationActivityBytes = "testdata/collection_applicationactivities.json"
-	collectionNetworkNeighborhoodBytes = "testdata/collection_networkneighborhood.json"
+	collectionPodBytes        = "testdata/collection_pod.json"
+	collectionRSBytes         = "testdata/collection_rs.json"
+	collectionDeploymentBytes = "testdata/collection_deploy.json"
 )
 
 var NAMESPACE = ""
@@ -86,16 +77,6 @@ func UnstructuredToRuntime(u *unstructured.Unstructured) k8sruntime.Object {
 		if err := k8sruntime.DefaultUnstructuredConverter.FromUnstructured(u.Object, deploy); err == nil {
 			return deploy
 		}
-	case TestKindAP:
-		ap := &v1beta1.ApplicationProfile{}
-		if err := k8sruntime.DefaultUnstructuredConverter.FromUnstructured(u.Object, ap); err == nil {
-			return ap
-		}
-	case TestKindNN:
-		nn := &v1beta1.NetworkNeighborhood{}
-		if err := k8sruntime.DefaultUnstructuredConverter.FromUnstructured(u.Object, nn); err == nil {
-			return nn
-		}
 	}
 	return nil
 }
@@ -143,20 +124,6 @@ func GetBytes(kind TestKinds, name TestName) []byte {
 		case TestCollection:
 			return readFile(collectionDeploymentBytes)
 		}
-	case TestKindAP:
-		switch name {
-		case TestNginx:
-			return readFile(nginxApplicationProfileBytes)
-		case TestCollection:
-			return readFile(collectionApplicationProfileBytes)
-		}
-	case TestKindNN:
-		switch name {
-		case TestNginx:
-			return readFile(nginxNetworkNeighborhoodBytes)
-		case TestCollection:
-			return readFile(collectionNetworkNeighborhoodBytes)
-		}
 	}
 	return []byte{}
 }

mocks/readfiles_test.go

@@ -25,14 +25,6 @@ func TestUnstructuredToPod(t *testing.T) {
 			name: TestNginx,
 			kind: TestKindDeploy,
 		},
-		{
-			name: TestNginx,
-			kind: TestKindAP,
-		},
-		{
-			name: TestNginx,
-			kind: TestKindNN,
-		},
 		{
 			name: TestCollection,
 			kind: TestKindPod,
@@ -45,14 +37,6 @@ func TestUnstructuredToPod(t *testing.T) {
 			name: TestCollection,
 			kind: TestKindDeploy,
 		},
-		{
-			name: TestCollection,
-			kind: TestKindAP,
-		},
-		{
-			name: TestCollection,
-			kind: TestKindNN,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(fmt.Sprintf("%s/%s", tt.name, tt.kind), func(t *testing.T) {