Fix borked merge conflicts and rerun bingen

core/pkg/model/kubemodel/diagnostic.go

@@ -11,4 +11,4 @@ type DiagnosticResult struct {
 	Timestamp   time.Time         `json:"timestamp"`         // @bingen:field[version=1]
 	Error       string            `json:"error,omitempty"`   // @bingen:field[version=1]
 	Details     map[string]string `json:"details,omitempty"` // @bingen:field[version=1]
-}
+}

core/pkg/model/kubemodel/kubemodel.go

@@ -1,7 +1,6 @@
 package kubemodel
 
 import (
-<<<<<<< HEAD
 	"time"
 )
 
@@ -22,33 +21,6 @@ func NewKubeModelSet(start, end time.Time) *KubeModelSet {
 		namespaceByName: map[string]*Namespace{},
 	}
 
-=======
-	"errors"
-	"fmt"
-	"time"
-)
-
-// @bingen:generate[stringtable]:KubeModelSet
-type KubeModelSet struct {
-	Metadata   *Metadata             `json:"meta"`                 // @bingen:field[version=1]
-	Window     Window                `json:"window"`               // @bingen:field[version=1]
-	Cluster    *Cluster              `json:"cluster"`              // @bingen:field[version=1]
-	Namespaces map[string]*Namespace `json:"namespaces"`           // @bingen:field[version=1]
-	Containers map[string]*Container `json:"containers,omitempty"` // @bingen:field[version=1]
-	Owners     map[string]*Owner     `json:"owners,omitempty"`     // @bingen:field[version=1]
-	Nodes      map[string]*Node      `json:"nodes,omitempty"`      // @bingen:field[version=1]
-	Pods       map[string]*Pod       `json:"pods,omitempty"`       // @bingen:field[version=1]
-	Services   map[string]*Service   `json:"services,omitempty"`   // @bingen:field[version=1]
-	idx        *kubeModelSetIndexes  // @bingen:field[ignore]
-}
-
-func (kms *KubeModelSet) MarshalBinary() (data []byte, err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func NewKubeModelSet(start time.Time, end time.Time) *KubeModelSet {
->>>>>>> 92af4761 (Introduce kubemodel with core Kubernetes resources (Cluster, Namespace, Node, Pod, Container, Owner, Service) (#3472))
 	return &KubeModelSet{
 		Metadata: &Metadata{
 			CreatedAt: time.Now().UTC(),
@@ -57,7 +29,6 @@ func NewKubeModelSet(start time.Time, end time.Time) *KubeModelSet {
 			Start: start,
 			End:   end,
 		},
-<<<<<<< HEAD
 		Namespaces:     map[string]*Namespace{},
 		ResourceQuotas: map[string]*ResourceQuota{},
 		idx:            index,
@@ -74,168 +45,4 @@ func (kms *KubeModelSet) IsEmpty() bool {
 
 type index struct {
 	namespaceByName map[string]*Namespace
-=======
-		Containers: map[string]*Container{},
-		Owners:     map[string]*Owner{},
-		Namespaces: map[string]*Namespace{},
-		Nodes:      map[string]*Node{},
-		Pods:       map[string]*Pod{},
-		Services:   map[string]*Service{},
-		idx: &kubeModelSetIndexes{
-			namespaceNameToID: map[string]string{},
-		},
-	}
-}
-
-func (kms *KubeModelSet) RegisterNamespace(id string, name string) error {
-	if _, ok := kms.Namespaces[id]; !ok {
-		if kms.Cluster == nil {
-			return errors.New("KubeModelSet missing Cluster")
-		}
-
-		kms.Namespaces[id] = &Namespace{
-			UID:        id,
-			ClusterUID: kms.Cluster.UID,
-			Name:       name,
-		}
-
-		// Index namespace name-to-ID for fast lookup
-		if name != "" {
-			kms.idx.namespaceNameToID[name] = id
-		}
-
-		kms.Metadata.ObjectCount++
-	}
-
-	return nil
-}
-
-// GetNamespaceByName retrieves a namespace by its name using the index
-func (kms *KubeModelSet) GetNamespaceByName(name string) (*Namespace, bool) {
-	if kms.idx == nil {
-		return nil, false
-	}
-
-	id, ok := kms.idx.namespaceNameToID[name]
-	if !ok {
-		return nil, false
-	}
-
-	ns, ok := kms.Namespaces[id]
-	return ns, ok
-}
-
-// IsEmpty returns true if the KubeModelSet is nil, has no cluster, or contains no resources
-func (kms *KubeModelSet) IsEmpty() bool {
-	if kms == nil || kms.Cluster == nil {
-		return true
-	}
-
-	// Check if all resource maps are empty
-	return len(kms.Containers) == 0 &&
-		len(kms.Owners) == 0 &&
-		len(kms.Namespaces) == 0 &&
-		len(kms.Nodes) == 0 &&
-		len(kms.Pods) == 0 &&
-		len(kms.Services) == 0
-}
-
-func (kms *KubeModelSet) RegisterPod(id, name, namespace string) error {
-	if _, ok := kms.Pods[id]; !ok {
-		nsID, ok := kms.idx.namespaceNameToID[namespace]
-		if !ok {
-			return fmt.Errorf("KubeModelSet missing namespace '%s'", namespace)
-		}
-
-		kms.Pods[id] = &Pod{
-			UID:          id,
-			Name:         name,
-			NamespaceUID: nsID,
-		}
-
-		kms.Metadata.ObjectCount++
-	}
-
-	return nil
-}
-
-func (kms *KubeModelSet) RegisterNode(id, name string) error {
-	if _, ok := kms.Nodes[id]; !ok {
-		if kms.Cluster == nil {
-			return errors.New("KubeModelSet missing Cluster")
-		}
-
-		kms.Nodes[id] = &Node{
-			UID:        id,
-			ClusterUID: kms.Cluster.UID,
-			Name:       name,
-		}
-
-		kms.Metadata.ObjectCount++
-	}
-
-	return nil
-}
-
-func (kms *KubeModelSet) RegisterOwner(id, name, namespace, kind string, isController bool) error {
-	if _, ok := kms.Owners[id]; !ok {
-		nsID, ok := kms.idx.namespaceNameToID[namespace]
-		if !ok {
-			return fmt.Errorf("KubeModelSet missing namespace '%s'", namespace)
-		}
-
-		kms.Owners[id] = &Owner{
-			UID:        id,
-			Name:       name,
-			OwnerUID:   nsID,
-			Kind:       OwnerKind(kind),
-			Controller: isController,
-		}
-
-		kms.Metadata.ObjectCount++
-	}
-
-	return nil
-}
-
-func (kms *KubeModelSet) RegisterService(id, name, namespace string) error {
-	if _, ok := kms.Services[id]; !ok {
-		if kms.Cluster == nil {
-			return errors.New("KubeModelSet missing Cluster")
-		}
-
-		nsID, ok := kms.idx.namespaceNameToID[namespace]
-		if !ok {
-			return fmt.Errorf("KubeModelSet missing namespace '%s'", namespace)
-		}
-
-		kms.Services[id] = &Service{
-			UID:          id,
-			ClusterUID:   kms.Cluster.UID,
-			NamespaceUID: nsID,
-			Name:         name,
-		}
-
-		kms.Metadata.ObjectCount++
-	}
-
-	return nil
-}
-
-func (kms *KubeModelSet) RegisterContainer(id, name, podID string) error {
-	if _, ok := kms.Containers[id]; !ok {
-		kms.Containers[id] = &Container{
-			PodUID: podID,
-			Name:   name,
-		}
-
-		kms.Metadata.ObjectCount++
-	}
-
-	return nil
-}
-
-type kubeModelSetIndexes struct {
-	namespaceNameToID map[string]string
->>>>>>> 92af4761 (Introduce kubemodel with core Kubernetes resources (Cluster, Namespace, Node, Pod, Container, Owner, Service) (#3472))
 }

core/pkg/model/kubemodel/kubemodel_test.go

@@ -1,10 +1,10 @@
 package kubemodel
 
 import (
-<<<<<<< HEAD
-	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestKubeModel(t *testing.T) {
@@ -246,239 +246,4 @@ func TestKubeModel(t *testing.T) {
 			require.Equal(t, 5, kms.Metadata.ObjectCount) // 2 namespaces and 3 RQs
 		})
 	})
-=======
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestKubeModel(t *testing.T) {
-	start := time.Now().Add(-1 * time.Hour)
-	end := time.Now()
-
-	t.Run("RegisterNamespace", func(t *testing.T) {
-		t.Run("register new namespace", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-
-			err := kms.RegisterNamespace("ns-1", "default")
-			require.NoError(t, err)
-
-			require.Len(t, kms.Namespaces, 1)
-			ns, ok := kms.Namespaces["ns-1"]
-			require.True(t, ok)
-			require.NotNil(t, ns)
-			require.Equal(t, "ns-1", ns.UID)
-			require.Equal(t, "default", ns.Name)
-			require.Equal(t, 1, kms.Metadata.ObjectCount)
-		})
-
-		t.Run("register duplicate namespace", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-
-			err := kms.RegisterNamespace("ns-1", "default")
-			require.NoError(t, err)
-			require.Equal(t, 1, kms.Metadata.ObjectCount)
-
-			err = kms.RegisterNamespace("ns-1", "default")
-			require.NoError(t, err)
-			require.Len(t, kms.Namespaces, 1)
-			require.Equal(t, 1, kms.Metadata.ObjectCount, "ObjectCount should not increment for duplicate")
-		})
-
-		t.Run("register multiple namespaces", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-
-			err := kms.RegisterNamespace("ns-1", "default")
-			require.NoError(t, err)
-
-			err = kms.RegisterNamespace("ns-2", "kube-system")
-			require.NoError(t, err)
-
-			require.Len(t, kms.Namespaces, 2)
-			require.Equal(t, 2, kms.Metadata.ObjectCount)
-		})
-	})
-
-	t.Run("RegisterPod", func(t *testing.T) {
-		t.Run("register new pod", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-			kms.RegisterNamespace("ns-1", "default")
-
-			err := kms.RegisterPod("pod-1", "nginx", "default")
-			require.NoError(t, err)
-
-			require.Len(t, kms.Pods, 1)
-			pod, ok := kms.Pods["pod-1"]
-			require.True(t, ok)
-			require.NotNil(t, pod)
-			require.Equal(t, "pod-1", pod.UID)
-			require.Equal(t, "nginx", pod.Name)
-			require.Equal(t, "ns-1", pod.NamespaceUID)
-		})
-
-		t.Run("register duplicate pod", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-			kms.RegisterNamespace("ns-1", "default")
-
-			err := kms.RegisterPod("pod-1", "nginx", "default")
-			require.NoError(t, err)
-
-			err = kms.RegisterPod("pod-1", "nginx", "default")
-			require.NoError(t, err)
-			require.Len(t, kms.Pods, 1)
-		})
-	})
-
-	t.Run("RegisterNode", func(t *testing.T) {
-		t.Run("register new node", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-
-			err := kms.RegisterNode("node-1", "worker-1")
-			require.NoError(t, err)
-
-			require.Len(t, kms.Nodes, 1)
-			node, ok := kms.Nodes["node-1"]
-			require.True(t, ok)
-			require.NotNil(t, node)
-			require.Equal(t, "node-1", node.UID)
-			require.Equal(t, "worker-1", node.Name)
-		})
-
-		t.Run("register duplicate node", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-
-			err := kms.RegisterNode("node-1", "worker-1")
-			require.NoError(t, err)
-
-			err = kms.RegisterNode("node-1", "worker-1")
-			require.NoError(t, err)
-			require.Len(t, kms.Nodes, 1)
-		})
-	})
-
-	t.Run("RegisterOwner", func(t *testing.T) {
-		t.Run("register new owner", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-			kms.RegisterNamespace("ns-1", "default")
-
-			err := kms.RegisterOwner("ctrl-1", "nginx-deployment", "default", "Deployment", true)
-			require.NoError(t, err)
-
-			require.Len(t, kms.Owners, 1)
-			owner, ok := kms.Owners["ctrl-1"]
-			require.True(t, ok)
-			require.NotNil(t, owner)
-			require.Equal(t, "ctrl-1", owner.UID)
-			require.Equal(t, "nginx-deployment", owner.Name)
-			require.Equal(t, OwnerKind("Deployment"), owner.Kind)
-			require.True(t, owner.Controller)
-		})
-
-		t.Run("register duplicate owner", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-			kms.RegisterNamespace("ns-1", "default")
-
-			err := kms.RegisterOwner("ctrl-1", "nginx-deployment", "default", "Deployment", true)
-			require.NoError(t, err)
-
-			err = kms.RegisterOwner("ctrl-1", "nginx-deployment", "default", "Deployment", true)
-			require.NoError(t, err)
-			require.Len(t, kms.Owners, 1)
-		})
-	})
-
-	t.Run("RegisterService", func(t *testing.T) {
-		t.Run("register new service", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-			kms.RegisterNamespace("ns-1", "default")
-
-			err := kms.RegisterService("svc-1", "nginx-service", "default")
-			require.NoError(t, err)
-
-			require.Len(t, kms.Services, 1)
-			svc, ok := kms.Services["svc-1"]
-			require.True(t, ok)
-			require.NotNil(t, svc)
-			require.Equal(t, "svc-1", svc.UID)
-			require.Equal(t, "nginx-service", svc.Name)
-		})
-
-		t.Run("register duplicate service", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-			kms.RegisterNamespace("ns-1", "default")
-
-			err := kms.RegisterService("svc-1", "nginx-service", "default")
-			require.NoError(t, err)
-
-			err = kms.RegisterService("svc-1", "nginx-service", "default")
-			require.NoError(t, err)
-			require.Len(t, kms.Services, 1)
-		})
-	})
-
-	t.Run("RegisterContainer", func(t *testing.T) {
-		t.Run("register new container", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-			kms.RegisterNamespace("ns-1", "default")
-			kms.RegisterPod("pod-1", "nginx", "default")
-
-			err := kms.RegisterContainer("container-1", "nginx-container", "pod-1")
-			require.NoError(t, err)
-
-			require.Len(t, kms.Containers, 1)
-			container, ok := kms.Containers["container-1"]
-			require.True(t, ok)
-			require.NotNil(t, container)
-			require.Equal(t, "nginx-container", container.Name)
-			require.Equal(t, "pod-1", container.PodUID)
-		})
-
-		t.Run("register duplicate container", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-			kms.RegisterNamespace("ns-1", "default")
-			kms.RegisterPod("pod-1", "nginx", "default")
-
-			err := kms.RegisterContainer("container-1", "nginx-container", "pod-1")
-			require.NoError(t, err)
-
-			err = kms.RegisterContainer("container-1", "nginx-container", "pod-1")
-			require.NoError(t, err)
-			require.Len(t, kms.Containers, 1)
-		})
-	})
-
-	t.Run("IsEmpty", func(t *testing.T) {
-		t.Run("empty KubeModelSet", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-
-			isEmpty := kms.IsEmpty()
-			require.True(t, isEmpty)
-		})
-
-		t.Run("KubeModelSet with namespace", func(t *testing.T) {
-			kms := NewKubeModelSet(start, end)
-			kms.Cluster = &Cluster{UID: "cluster-1"}
-			kms.RegisterNamespace("ns-1", "default")
-
-			isEmpty := kms.IsEmpty()
-			require.False(t, isEmpty)
-		})
-
-	})
->>>>>>> 92af4761 (Introduce kubemodel with core Kubernetes resources (Cluster, Namespace, Node, Pod, Container, Owner, Service) (#3472))
 }

core/pkg/model/kubemodel/metadata.go

@@ -6,16 +6,9 @@ import (
 
 // @bingen:generate:Metadata
 type Metadata struct {
-<<<<<<< HEAD
 	CreatedAt   time.Time `json:"createdAt"`   // @bingen:field[version=1]
 	CompletedAt time.Time `json:"completedAt"` // @bingen:field[version=1]
 	ObjectCount int       `json:"objectCount"` // @bingen:field[version=1]
 	Errors      []string  `json:"errors"`      // @bingen:field[version=1]
 	Warnings    []string  `json:"warnings"`    // @bingen:field[version=1]
-=======
-	CreatedAt   time.Time           `json:"createdAt"`             // @bingen:field[version=1]
-	CompletedAt time.Time           `json:"completedAt"`           // @bingen:field[version=1]
-	ObjectCount int                 `json:"objectCount"`           // @bingen:field[version=1]
-	Diagnostics []*DiagnosticResult `json:"diagnostics,omitempty"` // @bingen:field[version=1]
->>>>>>> 92af4761 (Introduce kubemodel with core Kubernetes resources (Cluster, Namespace, Node, Pod, Container, Owner, Service) (#3472))
 }

core/pkg/model/kubemodel/namespace.go

@@ -1,15 +1,11 @@
 package kubemodel
 
-<<<<<<< HEAD
 import (
 	"fmt"
 	"time"
 
 	"github.com/opencost/opencost/core/pkg/log"
 )
-=======
-import "time"
->>>>>>> 92af4761 (Introduce kubemodel with core Kubernetes resources (Cluster, Namespace, Node, Pod, Container, Owner, Service) (#3472))
 
 // @bingen:generate:Namespace
 type Namespace struct {
@@ -21,7 +17,6 @@ type Namespace struct {
 	Start       time.Time         `json:"start"`       // @bingen:field[version=1]
 	End         time.Time         `json:"end"`         // @bingen:field[version=1]
 }
-<<<<<<< HEAD
 
 func (kms *KubeModelSet) RegisterNamespace(uid, name string) error {
 	if uid == "" {
@@ -55,5 +50,3 @@ func (kms *KubeModelSet) RegisterNamespace(uid, name string) error {
 
 	return nil
 }
-=======
->>>>>>> 92af4761 (Introduce kubemodel with core Kubernetes resources (Cluster, Namespace, Node, Pod, Container, Owner, Service) (#3472))

core/pkg/model/kubemodel/pod.go

@@ -4,17 +4,17 @@ import "time"
 
 // @bingen:generate:Pod
 type Pod struct {
-	UID                        string            `json:"uid"`                        // @bingen:field[version=1]
-	NamespaceUID               string            `json:"namespaceUid"`               // @bingen:field[version=1]
-	OwnerUID                   string            `json:"ownerUid"`                   // @bingen:field[version=1]
-	NodeUID                    string            `json:"nodeUid"`                    // @bingen:field[version=1]
-	Name                       string            `json:"name"`                       // @bingen:field[version=1]
-	Labels                     map[string]string `json:"labels,omitempty"`           // @bingen:field[version=1]
-	Annotations                map[string]string `json:"annotations,omitempty"`      // @bingen:field[version=1]
-	Start                      time.Time         `json:"start"`                      // @bingen:field[version=1]
-	End                        time.Time         `json:"end"`                        // @bingen:field[version=1]
-	CpuMillicoreUsageMax       uint64            `json:"cpuMillicoreUsageMax"`       // @bingen:field[version=1]
-	RAMByteUsageMax            uint64            `json:"ramByteUsageMax"`            // @bingen:field[version=1]
-	NetworkTransferBytes       uint64            `json:"networkTransferBytes"`       // @bingen:field[version=1]
-	NetworkReceiveBytes        uint64            `json:"networkReceiveBytes"`        // @bingen:field[version=1]
+	UID                  string            `json:"uid"`                   // @bingen:field[version=1]
+	NamespaceUID         string            `json:"namespaceUid"`          // @bingen:field[version=1]
+	OwnerUID             string            `json:"ownerUid"`              // @bingen:field[version=1]
+	NodeUID              string            `json:"nodeUid"`               // @bingen:field[version=1]
+	Name                 string            `json:"name"`                  // @bingen:field[version=1]
+	Labels               map[string]string `json:"labels,omitempty"`      // @bingen:field[version=1]
+	Annotations          map[string]string `json:"annotations,omitempty"` // @bingen:field[version=1]
+	Start                time.Time         `json:"start"`                 // @bingen:field[version=1]
+	End                  time.Time         `json:"end"`                   // @bingen:field[version=1]
+	CpuMillicoreUsageMax uint64            `json:"cpuMillicoreUsageMax"`  // @bingen:field[version=1]
+	RAMByteUsageMax      uint64            `json:"ramByteUsageMax"`       // @bingen:field[version=1]
+	NetworkTransferBytes uint64            `json:"networkTransferBytes"`  // @bingen:field[version=1]
+	NetworkReceiveBytes  uint64            `json:"networkReceiveBytes"`   // @bingen:field[version=1]
 }

core/pkg/model/kubemodel/provider.go

@@ -4,7 +4,6 @@ package kubemodel
 type Provider string
 
 const (
-<<<<<<< HEAD
 	ProviderEmpty        Provider = ""
 	ProviderAWS          Provider = "AWS"
 	ProviderGCP          Provider = "GCP"
@@ -13,13 +12,3 @@ const (
 	ProviderDigitalOcean Provider = "DigitalOcean"
 	ProviderOracle       Provider = "Oracle"
 )
-=======
-	ProviderAWS          Provider = "aws"
-	ProviderGCP          Provider = "gcp"
-	ProviderAzure        Provider = "azure"
-	ProviderOnPremises   Provider = "on_premises"
-	ProviderAlibaba      Provider = "alibaba"
-	ProviderDigitalOcean Provider = "digitalocean"
-	ProviderOracle       Provider = "oracle"
-)
->>>>>>> 92af4761 (Introduce kubemodel with core Kubernetes resources (Cluster, Namespace, Node, Pod, Container, Owner, Service) (#3472))