refactor instanceidhandler with unique container type

Signed-off-by: Matthias Bertschy <[email protected]>

.github/workflows/pr.yaml

@@ -18,5 +18,5 @@ jobs:
       security-events: write
     uses: kubescape/workflows/.github/workflows/go-basic-tests.yaml@main
     with:
-      GO_VERSION: '1.21'
+      GO_VERSION: '1.22'
     secrets: inherit

.github/workflows/release.yaml

@@ -1,7 +1,7 @@
 name: Release-Tag
 on:
   push:
-    branches: [ master, main ] 
+    branches: [ master, main ]
     paths-ignore:
       - '**.md' ### Ignore running when .md files change
       - '**.yaml' ### Ignore running when .yaml files change
@@ -17,7 +17,7 @@ jobs:
       security-events: write
     uses: kubescape/workflows/.github/workflows/go-basic-tests.yaml@main
     with:
-      GO_VERSION: '1.21'
+      GO_VERSION: '1.22'
     secrets: inherit
   release:
     needs: test
@@ -29,4 +29,3 @@ jobs:
     - uses: rickstaa/action-create-tag@v1
       with:
         tag: "v0.0.${{ github.run_number }}"
-

go.mod

@@ -1,8 +1,6 @@
 module github.com/kubescape/k8s-interface
 
-go 1.21
-
-toolchain go1.21.6
+go 1.22.5
 
 require (
 	cloud.google.com/go/container v1.24.0

instanceidhandler/interface.go

@@ -1,24 +1,9 @@
 package instanceidhandler
 
-import "github.com/kubescape/k8s-interface/instanceidhandler/v1/helpers"
-
 type IInstanceID interface {
-	// GetInstanceType returns the type of the instance ID
-	GetInstanceType() helpers.InstanceType
-
-	GetAPIVersion() string
-	GetNamespace() string
-	GetKind() string
-	GetName() string
-	GetContainerName() string
-	SetAPIVersion(string)
-	SetNamespace(string)
-	SetKind(string)
-	SetName(string)
-	SetContainerName(string)
 	GetStringFormatted() string
 	GetHashed() string
 	GetLabels() map[string]string
 	// GetSlug returns a string with a human-friendly and Kubernetes-compatible name
-	GetSlug() (string, error)
+	GetSlug(noContainer bool) (string, error)
 }

instanceidhandler/v1/containerinstance/helpers.go

@@ -3,54 +3,57 @@ package containerinstance
 import (
 	"fmt"
 
-	"github.com/kubescape/k8s-interface/instanceidhandler"
 	"github.com/kubescape/k8s-interface/instanceidhandler/v1/helpers"
 	core1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func validateInstanceID(instanceID instanceidhandler.IInstanceID) error {
-	if instanceID.GetAPIVersion() == "" {
+func validateInstanceID(instanceID *InstanceID) error {
+	if instanceID.ApiVersion == "" {
 		return fmt.Errorf("invalid instanceID: apiVersion cannot be empty")
 	}
-	if instanceID.GetNamespace() == "" {
+	if instanceID.Namespace == "" {
 		return fmt.Errorf("invalid instanceID: namespace cannot be empty")
 	}
-	if instanceID.GetKind() == "" {
+	if instanceID.Kind == "" {
 		return fmt.Errorf("invalid instanceID: kind cannot be empty")
 	}
-	if instanceID.GetName() == "" {
+	if instanceID.Name == "" {
 		return fmt.Errorf("invalid instanceID: name cannot be empty")
 	}
-	if instanceID.GetContainerName() == "" {
+	if instanceID.ContainerName == "" {
 		return fmt.Errorf("invalid instanceID: containerName cannot be empty")
 	}
+	if instanceID.ContainerType == "" {
+		return fmt.Errorf("invalid instanceID: ContainerType cannot be empty")
+	}
 	return nil
 }
 
-func listInstanceIDs(ownerReferences []metav1.OwnerReference, containers []core1.Container, apiVersion, namespace, kind, name string) ([]InstanceID, error) {
+func ListInstanceIDs(ownerReference *metav1.OwnerReference, containers []core1.Container, containerType, apiVersion, namespace, kind, name, alternateName string) ([]InstanceID, error) {
+	instanceIDs := make([]InstanceID, 0)
 
 	if len(containers) == 0 {
-		return nil, fmt.Errorf("failed to validate instance ID: missing containers")
+		return instanceIDs, nil
 	}
 
-	instanceIDs := make([]InstanceID, 0)
-
 	parentApiVersion, parentKind, parentName := apiVersion, kind, name
 
-	if len(ownerReferences) != 0 && !helpers.IgnoreOwnerReference(ownerReferences[0].Kind) {
-		parentApiVersion = ownerReferences[0].APIVersion
-		parentKind = ownerReferences[0].Kind
-		parentName = ownerReferences[0].Name
+	if ownerReference != nil && !helpers.IgnoreOwnerReference(ownerReference.Kind) {
+		parentApiVersion = ownerReference.APIVersion
+		parentKind = ownerReference.Kind
+		parentName = ownerReference.Name
 	}
 
 	for i := range containers {
 		instanceID := InstanceID{
-			apiVersion:    parentApiVersion,
-			namespace:     namespace,
-			kind:          parentKind,
-			name:          parentName,
-			containerName: containers[i].Name,
+			ApiVersion:    parentApiVersion,
+			Namespace:     namespace,
+			Kind:          parentKind,
+			Name:          parentName,
+			AlternateName: alternateName,
+			ContainerName: containers[i].Name,
+			ContainerType: containerType,
 		}
 
 		if err := validateInstanceID(&instanceID); err != nil {