diff --git a/server/controller/recorder/constraint/constraint.go b/server/controller/recorder/constraint/constraint.go index 53a33b4a639..d0a191568bd 100644 --- a/server/controller/recorder/constraint/constraint.go +++ b/server/controller/recorder/constraint/constraint.go @@ -35,6 +35,8 @@ type CloudModel interface { cloudmodel.PodIngressRule | cloudmodel.PodIngressRuleBackend | cloudmodel.PodService | cloudmodel.PodServicePort | cloudmodel.PodGroup | cloudmodel.ConfigMap | cloudmodel.PodGroupConfigMapConnection | cloudmodel.PodGroupPort | cloudmodel.PodReplicaSet | cloudmodel.Pod | cloudmodel.Process | cloudmodel.VIP + + GetLcuuid() string } // 资源用于比对的缓存对象 diff --git a/server/controller/recorder/updater/az.go b/server/controller/recorder/updater/az.go index 4d82f7d7a62..6fbb452278c 100644 --- a/server/controller/recorder/updater/az.go +++ b/server/controller/recorder/updater/az.go @@ -73,11 +73,6 @@ func NewAZ(wholeCache *cache.Cache, cloudData []cloudmodel.AZ) *AZ { return updater } -func (z *AZ) getDiffBaseByCloudItem(cloudItem *cloudmodel.AZ) (diffBase *diffbase.AZ, exists bool) { - diffBase, exists = z.diffBaseData[cloudItem.Lcuuid] - return -} - func (z *AZ) generateDBItemToAdd(cloudItem *cloudmodel.AZ) (*metadbmodel.AZ, bool) { dbItem := &metadbmodel.AZ{ Name: cloudItem.Name, diff --git a/server/controller/recorder/updater/cen.go b/server/controller/recorder/updater/cen.go index ce98913184e..fa667d08042 100644 --- a/server/controller/recorder/updater/cen.go +++ b/server/controller/recorder/updater/cen.go @@ -74,11 +74,6 @@ func NewCEN(wholeCache *cache.Cache, cloudData []cloudmodel.CEN) *CEN { return updater } -func (c *CEN) getDiffBaseByCloudItem(cloudItem *cloudmodel.CEN) (diffBase *diffbase.CEN, exists bool) { - diffBase, exists = c.diffBaseData[cloudItem.Lcuuid] - return -} - func (c *CEN) generateDBItemToAdd(cloudItem *cloudmodel.CEN) (*metadbmodel.CEN, bool) { vpcIDs := []int{} for _, vpcLcuuid := range cloudItem.VPCLcuuids { diff --git a/server/controller/recorder/updater/config_map.go b/server/controller/recorder/updater/config_map.go index e7da3135ac4..fc15cb59576 100644 --- a/server/controller/recorder/updater/config_map.go +++ b/server/controller/recorder/updater/config_map.go @@ -78,11 +78,6 @@ func NewConfigMap(wholeCache *cache.Cache, cloudData []cloudmodel.ConfigMap) *Co return updater } -func (h *ConfigMap) getDiffBaseByCloudItem(cloudItem *cloudmodel.ConfigMap) (diffBase *diffbase.ConfigMap, exists bool) { - diffBase, exists = h.diffBaseData[cloudItem.Lcuuid] - return -} - func (h *ConfigMap) generateDBItemToAdd(cloudItem *cloudmodel.ConfigMap) (*metadbmodel.ConfigMap, bool) { podClusterID, exists := h.cache.ToolDataSet.GetPodClusterIDByLcuuid(cloudItem.PodClusterLcuuid) if !exists { diff --git a/server/controller/recorder/updater/dhcp_port.go b/server/controller/recorder/updater/dhcp_port.go index 2f2fbb4ca46..02627c00260 100644 --- a/server/controller/recorder/updater/dhcp_port.go +++ b/server/controller/recorder/updater/dhcp_port.go @@ -73,11 +73,6 @@ func NewDHCPPort(wholeCache *cache.Cache, cloudData []cloudmodel.DHCPPort) *DHCP return updater } -func (p *DHCPPort) getDiffBaseByCloudItem(cloudItem *cloudmodel.DHCPPort) (diffBase *diffbase.DHCPPort, exists bool) { - diffBase, exists = p.diffBaseData[cloudItem.Lcuuid] - return -} - func (p *DHCPPort) generateDBItemToAdd(cloudItem *cloudmodel.DHCPPort) (*metadbmodel.DHCPPort, bool) { vpcID, exists := p.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.VPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/floating_ip.go b/server/controller/recorder/updater/floating_ip.go index ff8d620614b..d04aa629d5e 100644 --- a/server/controller/recorder/updater/floating_ip.go +++ b/server/controller/recorder/updater/floating_ip.go @@ -74,11 +74,6 @@ func NewFloatingIP(wholeCache *cache.Cache, cloudData []cloudmodel.FloatingIP) * return updater } -func (f *FloatingIP) getDiffBaseByCloudItem(cloudItem *cloudmodel.FloatingIP) (diffBase *diffbase.FloatingIP, exists bool) { - diffBase, exists = f.diffBaseData[cloudItem.Lcuuid] - return -} - func (f *FloatingIP) generateDBItemToAdd(cloudItem *cloudmodel.FloatingIP) (*metadbmodel.FloatingIP, bool) { networkID, exists := f.cache.ToolDataSet.GetNetworkIDByLcuuid(cloudItem.NetworkLcuuid) if !exists { diff --git a/server/controller/recorder/updater/host.go b/server/controller/recorder/updater/host.go index 17159cb61ce..0e81c972f53 100644 --- a/server/controller/recorder/updater/host.go +++ b/server/controller/recorder/updater/host.go @@ -73,11 +73,6 @@ func NewHost(wholeCache *cache.Cache, cloudData []cloudmodel.Host) *Host { return updater } -func (h *Host) getDiffBaseByCloudItem(cloudItem *cloudmodel.Host) (diffBase *diffbase.Host, exists bool) { - diffBase, exists = h.diffBaseData[cloudItem.Lcuuid] - return -} - func (h *Host) generateDBItemToAdd(cloudItem *cloudmodel.Host) (*metadbmodel.Host, bool) { dbItem := &metadbmodel.Host{ Name: cloudItem.Name, diff --git a/server/controller/recorder/updater/lan_ip.go b/server/controller/recorder/updater/lan_ip.go index 2d579599aae..f9ae85d08ba 100644 --- a/server/controller/recorder/updater/lan_ip.go +++ b/server/controller/recorder/updater/lan_ip.go @@ -80,11 +80,6 @@ func (i *LANIP) SetCloudData(cloudData []cloudmodel.IP) { i.cloudData = cloudData } -func (i *LANIP) getDiffBaseByCloudItem(cloudItem *cloudmodel.IP) (diffBase *diffbase.LANIP, exists bool) { - diffBase, exists = i.diffBaseData[cloudItem.Lcuuid] - return -} - func (i *LANIP) generateDBItemToAdd(cloudItem *cloudmodel.IP) (*metadbmodel.LANIP, bool) { vinterfaceID, exists := i.cache.ToolDataSet.GetVInterfaceIDByLcuuid(cloudItem.VInterfaceLcuuid) if !exists { diff --git a/server/controller/recorder/updater/lb.go b/server/controller/recorder/updater/lb.go index 182f7c8bacd..37da5c5e88c 100644 --- a/server/controller/recorder/updater/lb.go +++ b/server/controller/recorder/updater/lb.go @@ -73,11 +73,6 @@ func NewLB(wholeCache *cache.Cache, cloudData []cloudmodel.LB) *LB { return updater } -func (l *LB) getDiffBaseByCloudItem(cloudItem *cloudmodel.LB) (diffBase *diffbase.LB, exists bool) { - diffBase, exists = l.diffBaseData[cloudItem.Lcuuid] - return -} - func (l *LB) generateDBItemToAdd(cloudItem *cloudmodel.LB) (*metadbmodel.LB, bool) { vpcID, exists := l.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.VPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/lb_listener.go b/server/controller/recorder/updater/lb_listener.go index 234e6c7ca02..dfc572a55dd 100644 --- a/server/controller/recorder/updater/lb_listener.go +++ b/server/controller/recorder/updater/lb_listener.go @@ -73,11 +73,6 @@ func NewLBListener(wholeCache *cache.Cache, cloudData []cloudmodel.LBListener) * return updater } -func (l *LBListener) getDiffBaseByCloudItem(cloudItem *cloudmodel.LBListener) (diffBase *diffbase.LBListener, exists bool) { - diffBase, exists = l.diffBaseData[cloudItem.Lcuuid] - return -} - func (l *LBListener) generateDBItemToAdd(cloudItem *cloudmodel.LBListener) (*metadbmodel.LBListener, bool) { lbID, exists := l.cache.ToolDataSet.GetLBIDByLcuuid(cloudItem.LBLcuuid) if !exists { diff --git a/server/controller/recorder/updater/lb_target_server.go b/server/controller/recorder/updater/lb_target_server.go index 506dd0a25ff..fda8f56c811 100644 --- a/server/controller/recorder/updater/lb_target_server.go +++ b/server/controller/recorder/updater/lb_target_server.go @@ -73,11 +73,6 @@ func NewLBTargetServer(wholeCache *cache.Cache, cloudData []cloudmodel.LBTargetS return updater } -func (s *LBTargetServer) getDiffBaseByCloudItem(cloudItem *cloudmodel.LBTargetServer) (diffBase *diffbase.LBTargetServer, exists bool) { - diffBase, exists = s.diffBaseData[cloudItem.Lcuuid] - return -} - func (s *LBTargetServer) generateDBItemToAdd(cloudItem *cloudmodel.LBTargetServer) (*metadbmodel.LBTargetServer, bool) { lbID, exists := s.cache.ToolDataSet.GetLBIDByLcuuid(cloudItem.LBLcuuid) if !exists { diff --git a/server/controller/recorder/updater/lb_vm_connection.go b/server/controller/recorder/updater/lb_vm_connection.go index d04bc1084b4..49068255886 100644 --- a/server/controller/recorder/updater/lb_vm_connection.go +++ b/server/controller/recorder/updater/lb_vm_connection.go @@ -73,11 +73,6 @@ func NewLBVMConnection(wholeCache *cache.Cache, cloudData []cloudmodel.LBVMConne return updater } -func (c *LBVMConnection) getDiffBaseByCloudItem(cloudItem *cloudmodel.LBVMConnection) (diffBase *diffbase.LBVMConnection, exists bool) { - diffBase, exists = c.diffBaseData[cloudItem.Lcuuid] - return -} - func (c *LBVMConnection) generateDBItemToAdd(cloudItem *cloudmodel.LBVMConnection) (*metadbmodel.LBVMConnection, bool) { vmID, exists := c.cache.ToolDataSet.GetVMIDByLcuuid(cloudItem.VMLcuuid) if !exists { diff --git a/server/controller/recorder/updater/logger.go b/server/controller/recorder/updater/logger.go index 35773641885..ccf54cd06b0 100644 --- a/server/controller/recorder/updater/logger.go +++ b/server/controller/recorder/updater/logger.go @@ -18,7 +18,6 @@ package updater import ( "fmt" - "reflect" "slices" "github.com/deepflowio/deepflow/server/controller/recorder/config" @@ -40,7 +39,7 @@ func debugCloudItem[CT constraint.CloudModel](resourceType string, cloudItem CT) if config.Get().LogDebug.DetailEnabled { return fmt.Sprintf("debug %s: %#v", resourceType, cloudItem) } - return fmt.Sprintf("debug %s: %s", resourceType, getCloudItemLcuuid(cloudItem)) + return fmt.Sprintf("debug %s: %s", resourceType, cloudItem.GetLcuuid()) } func logDebugResourceTypeEnabled(resourceType string) bool { @@ -51,15 +50,3 @@ func logDebugResourceTypeEnabled(resourceType string) bool { } return false } - -func logDebugEnabled() bool { - return config.Get().LogDebug.Enabled -} - -func getCloudItemLcuuid[CT constraint.CloudModel](cloudItem CT) string { - value := reflect.ValueOf(cloudItem).FieldByName("Lcuuid") - if value.IsValid() { - return value.String() - } - return "" -} diff --git a/server/controller/recorder/updater/nat_gateway.go b/server/controller/recorder/updater/nat_gateway.go index 8b66ab6c031..527201292f5 100644 --- a/server/controller/recorder/updater/nat_gateway.go +++ b/server/controller/recorder/updater/nat_gateway.go @@ -73,11 +73,6 @@ func NewNATGateway(wholeCache *cache.Cache, cloudData []cloudmodel.NATGateway) * return updater } -func (g *NATGateway) getDiffBaseByCloudItem(cloudItem *cloudmodel.NATGateway) (diffBase *diffbase.NATGateway, exists bool) { - diffBase, exists = g.diffBaseData[cloudItem.Lcuuid] - return -} - func (g *NATGateway) generateDBItemToAdd(cloudItem *cloudmodel.NATGateway) (*metadbmodel.NATGateway, bool) { vpcID, exists := g.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.VPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/nat_rule.go b/server/controller/recorder/updater/nat_rule.go index 78ddcc93017..e3e7099d636 100644 --- a/server/controller/recorder/updater/nat_rule.go +++ b/server/controller/recorder/updater/nat_rule.go @@ -73,11 +73,6 @@ func NewNATRule(wholeCache *cache.Cache, cloudData []cloudmodel.NATRule) *NATRul return updater } -func (r *NATRule) getDiffBaseByCloudItem(cloudItem *cloudmodel.NATRule) (diffBase *diffbase.NATRule, exists bool) { - diffBase, exists = r.diffBaseData[cloudItem.Lcuuid] - return -} - func (r *NATRule) generateDBItemToAdd(cloudItem *cloudmodel.NATRule) (*metadbmodel.NATRule, bool) { var natGatewayID int var exists bool diff --git a/server/controller/recorder/updater/nat_vm_connection.go b/server/controller/recorder/updater/nat_vm_connection.go index 39c977b5482..ddab2f00d17 100644 --- a/server/controller/recorder/updater/nat_vm_connection.go +++ b/server/controller/recorder/updater/nat_vm_connection.go @@ -73,11 +73,6 @@ func NewNATVMConnection(wholeCache *cache.Cache, cloudData []cloudmodel.NATVMCon return updater } -func (c *NATVMConnection) getDiffBaseByCloudItem(cloudItem *cloudmodel.NATVMConnection) (diffBase *diffbase.NATVMConnection, exists bool) { - diffBase, exists = c.diffBaseData[cloudItem.Lcuuid] - return -} - func (c *NATVMConnection) generateDBItemToAdd(cloudItem *cloudmodel.NATVMConnection) (*metadbmodel.NATVMConnection, bool) { vmID, exists := c.cache.ToolDataSet.GetVMIDByLcuuid(cloudItem.VMLcuuid) if !exists { diff --git a/server/controller/recorder/updater/network.go b/server/controller/recorder/updater/network.go index 3d11dbc5b3b..95089fa691b 100644 --- a/server/controller/recorder/updater/network.go +++ b/server/controller/recorder/updater/network.go @@ -73,11 +73,6 @@ func NewNetwork(wholeCache *cache.Cache, cloudData []cloudmodel.Network) *Networ return updater } -func (n *Network) getDiffBaseByCloudItem(cloudItem *cloudmodel.Network) (diffBase *diffbase.Network, exists bool) { - diffBase, exists = n.diffBaseData[cloudItem.Lcuuid] - return -} - func (n *Network) generateDBItemToAdd(cloudItem *cloudmodel.Network) (*metadbmodel.Network, bool) { vpcID, exists := n.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.VPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/peer_connection.go b/server/controller/recorder/updater/peer_connection.go index 40f892c63f3..f8d8755eea4 100644 --- a/server/controller/recorder/updater/peer_connection.go +++ b/server/controller/recorder/updater/peer_connection.go @@ -73,11 +73,6 @@ func NewPeerConnection(wholeCache *cache.Cache, cloudData []cloudmodel.PeerConne return updater } -func (c *PeerConnection) getDiffBaseByCloudItem(cloudItem *cloudmodel.PeerConnection) (diffBase *diffbase.PeerConnection, exists bool) { - diffBase, exists = c.diffBaseData[cloudItem.Lcuuid] - return -} - func (c *PeerConnection) generateDBItemToAdd(cloudItem *cloudmodel.PeerConnection) (*metadbmodel.PeerConnection, bool) { remoteVPCID, exists := c.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.RemoteVPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod.go b/server/controller/recorder/updater/pod.go index 1be4e2f6b3f..963ff9c3e88 100644 --- a/server/controller/recorder/updater/pod.go +++ b/server/controller/recorder/updater/pod.go @@ -76,11 +76,6 @@ func NewPod(wholeCache *cache.Cache, cloudData []cloudmodel.Pod) *Pod { return updater } -func (p *Pod) getDiffBaseByCloudItem(cloudItem *cloudmodel.Pod) (diffBase *diffbase.Pod, exists bool) { - diffBase, exists = p.diffBaseData[cloudItem.Lcuuid] - return -} - func (p *Pod) generateDBItemToAdd(cloudItem *cloudmodel.Pod) (*metadbmodel.Pod, bool) { vpcID, exists := p.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.VPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod_cluster.go b/server/controller/recorder/updater/pod_cluster.go index 9043583cbab..b7e87318edc 100644 --- a/server/controller/recorder/updater/pod_cluster.go +++ b/server/controller/recorder/updater/pod_cluster.go @@ -73,11 +73,6 @@ func NewPodCluster(wholeCache *cache.Cache, cloudData []cloudmodel.PodCluster) * return updater } -func (c *PodCluster) getDiffBaseByCloudItem(cloudItem *cloudmodel.PodCluster) (diffBase *diffbase.PodCluster, exists bool) { - diffBase, exists = c.diffBaseData[cloudItem.Lcuuid] - return -} - func (c *PodCluster) generateDBItemToAdd(cloudItem *cloudmodel.PodCluster) (*metadbmodel.PodCluster, bool) { vpcID, exists := c.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.VPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod_group.go b/server/controller/recorder/updater/pod_group.go index 7f7840cfdb1..8e460e992d4 100644 --- a/server/controller/recorder/updater/pod_group.go +++ b/server/controller/recorder/updater/pod_group.go @@ -76,11 +76,6 @@ func NewPodGroup(wholeCache *cache.Cache, cloudData []cloudmodel.PodGroup) *PodG return updater } -func (p *PodGroup) getDiffBaseByCloudItem(cloudItem *cloudmodel.PodGroup) (diffBase *diffbase.PodGroup, exists bool) { - diffBase, exists = p.diffBaseData[cloudItem.Lcuuid] - return -} - func (p *PodGroup) generateDBItemToAdd(cloudItem *cloudmodel.PodGroup) (*metadbmodel.PodGroup, bool) { podNamespaceID, exists := p.cache.ToolDataSet.GetPodNamespaceIDByLcuuid(cloudItem.PodNamespaceLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod_group_config_map_connection.go b/server/controller/recorder/updater/pod_group_config_map_connection.go index 0a3122e85b0..b0f5c9e855d 100644 --- a/server/controller/recorder/updater/pod_group_config_map_connection.go +++ b/server/controller/recorder/updater/pod_group_config_map_connection.go @@ -73,11 +73,6 @@ func NewPodGroupConfigMapConnection(wholeCache *cache.Cache, cloudData []cloudmo return updater } -func (h *PodGroupConfigMapConnection) getDiffBaseByCloudItem(cloudItem *cloudmodel.PodGroupConfigMapConnection) (diffBase *diffbase.PodGroupConfigMapConnection, exists bool) { - diffBase, exists = h.diffBaseData[cloudItem.Lcuuid] - return -} - func (h *PodGroupConfigMapConnection) generateDBItemToAdd(cloudItem *cloudmodel.PodGroupConfigMapConnection) (*metadbmodel.PodGroupConfigMapConnection, bool) { podGroupID, exists := h.cache.ToolDataSet.GetPodGroupIDByLcuuid(cloudItem.PodGroupLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod_group_port.go b/server/controller/recorder/updater/pod_group_port.go index 72b788edb5b..8e37cba62d3 100644 --- a/server/controller/recorder/updater/pod_group_port.go +++ b/server/controller/recorder/updater/pod_group_port.go @@ -73,11 +73,6 @@ func NewPodGroupPort(wholeCache *cache.Cache, cloudData []cloudmodel.PodGroupPor return updater } -func (p *PodGroupPort) getDiffBaseByCloudItem(cloudItem *cloudmodel.PodGroupPort) (diffBase *diffbase.PodGroupPort, exists bool) { - diffBase, exists = p.diffBaseData[cloudItem.Lcuuid] - return -} - func (p *PodGroupPort) generateDBItemToAdd(cloudItem *cloudmodel.PodGroupPort) (*metadbmodel.PodGroupPort, bool) { podGroupID, exists := p.cache.ToolDataSet.GetPodGroupIDByLcuuid(cloudItem.PodGroupLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod_ingress.go b/server/controller/recorder/updater/pod_ingress.go index d0b755f6c92..33753ee3ecd 100644 --- a/server/controller/recorder/updater/pod_ingress.go +++ b/server/controller/recorder/updater/pod_ingress.go @@ -73,11 +73,6 @@ func NewPodIngress(wholeCache *cache.Cache, cloudData []cloudmodel.PodIngress) * return updater } -func (i *PodIngress) getDiffBaseByCloudItem(cloudItem *cloudmodel.PodIngress) (diffBase *diffbase.PodIngress, exists bool) { - diffBase, exists = i.diffBaseData[cloudItem.Lcuuid] - return -} - func (i *PodIngress) generateDBItemToAdd(cloudItem *cloudmodel.PodIngress) (*metadbmodel.PodIngress, bool) { podNamespaceID, exists := i.cache.ToolDataSet.GetPodNamespaceIDByLcuuid(cloudItem.PodNamespaceLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod_ingress_rule.go b/server/controller/recorder/updater/pod_ingress_rule.go index db13d085661..55b5f6be800 100644 --- a/server/controller/recorder/updater/pod_ingress_rule.go +++ b/server/controller/recorder/updater/pod_ingress_rule.go @@ -73,11 +73,6 @@ func NewPodIngressRule(wholeCache *cache.Cache, cloudData []cloudmodel.PodIngres return updater } -func (r *PodIngressRule) getDiffBaseByCloudItem(cloudItem *cloudmodel.PodIngressRule) (diffBase *diffbase.PodIngressRule, exists bool) { - diffBase, exists = r.diffBaseData[cloudItem.Lcuuid] - return -} - func (r *PodIngressRule) generateDBItemToAdd(cloudItem *cloudmodel.PodIngressRule) (*metadbmodel.PodIngressRule, bool) { podIngressID, exists := r.cache.ToolDataSet.GetPodIngressIDByLcuuid(cloudItem.PodIngressLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod_ingress_rule_backend.go b/server/controller/recorder/updater/pod_ingress_rule_backend.go index 5012e42222a..b5d9f273380 100644 --- a/server/controller/recorder/updater/pod_ingress_rule_backend.go +++ b/server/controller/recorder/updater/pod_ingress_rule_backend.go @@ -73,11 +73,6 @@ func NewPodIngressRuleBackend(wholeCache *cache.Cache, cloudData []cloudmodel.Po return updater } -func (b *PodIngressRuleBackend) getDiffBaseByCloudItem(cloudItem *cloudmodel.PodIngressRuleBackend) (diffBase *diffbase.PodIngressRuleBackend, exists bool) { - diffBase, exists = b.diffBaseData[cloudItem.Lcuuid] - return -} - func (b *PodIngressRuleBackend) generateDBItemToAdd(cloudItem *cloudmodel.PodIngressRuleBackend) (*metadbmodel.PodIngressRuleBackend, bool) { podIngressRuleID, exists := b.cache.ToolDataSet.GetPodIngressRuleIDByLcuuid(cloudItem.PodIngressRuleLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod_namespace.go b/server/controller/recorder/updater/pod_namespace.go index 4b66ce061f5..488f03c2f38 100644 --- a/server/controller/recorder/updater/pod_namespace.go +++ b/server/controller/recorder/updater/pod_namespace.go @@ -76,11 +76,6 @@ func NewPodNamespace(wholeCache *cache.Cache, cloudData []cloudmodel.PodNamespac return updater } -func (n *PodNamespace) getDiffBaseByCloudItem(cloudItem *cloudmodel.PodNamespace) (diffBase *diffbase.PodNamespace, exists bool) { - diffBase, exists = n.diffBaseData[cloudItem.Lcuuid] - return -} - func (n *PodNamespace) generateDBItemToAdd(cloudItem *cloudmodel.PodNamespace) (*metadbmodel.PodNamespace, bool) { podClusterID, exists := n.cache.ToolDataSet.GetPodClusterIDByLcuuid(cloudItem.PodClusterLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod_node.go b/server/controller/recorder/updater/pod_node.go index 1fc83203cbf..070fa35daeb 100644 --- a/server/controller/recorder/updater/pod_node.go +++ b/server/controller/recorder/updater/pod_node.go @@ -73,11 +73,6 @@ func NewPodNode(wholeCache *cache.Cache, cloudData []cloudmodel.PodNode) *PodNod return updater } -func (n *PodNode) getDiffBaseByCloudItem(cloudItem *cloudmodel.PodNode) (diffBase *diffbase.PodNode, exists bool) { - diffBase, exists = n.diffBaseData[cloudItem.Lcuuid] - return -} - func (n *PodNode) generateDBItemToAdd(cloudItem *cloudmodel.PodNode) (*metadbmodel.PodNode, bool) { vpcID, exists := n.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.VPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod_replica_set.go b/server/controller/recorder/updater/pod_replica_set.go index 15a0bd6ff85..ebfe2436fb7 100644 --- a/server/controller/recorder/updater/pod_replica_set.go +++ b/server/controller/recorder/updater/pod_replica_set.go @@ -73,11 +73,6 @@ func NewPodReplicaSet(wholeCache *cache.Cache, cloudData []cloudmodel.PodReplica return updater } -func (r *PodReplicaSet) getDiffBaseByCloudItem(cloudItem *cloudmodel.PodReplicaSet) (diffBase *diffbase.PodReplicaSet, exists bool) { - diffBase, exists = r.diffBaseData[cloudItem.Lcuuid] - return -} - func (r *PodReplicaSet) generateDBItemToAdd(cloudItem *cloudmodel.PodReplicaSet) (*metadbmodel.PodReplicaSet, bool) { podNamespaceID, exists := r.cache.ToolDataSet.GetPodNamespaceIDByLcuuid(cloudItem.PodNamespaceLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod_service.go b/server/controller/recorder/updater/pod_service.go index 5c6fe8a155f..17477e69387 100644 --- a/server/controller/recorder/updater/pod_service.go +++ b/server/controller/recorder/updater/pod_service.go @@ -76,11 +76,6 @@ func NewPodService(wholeCache *cache.Cache, cloudData []cloudmodel.PodService) * return updater } -func (s *PodService) getDiffBaseByCloudItem(cloudItem *cloudmodel.PodService) (diffBase *diffbase.PodService, exists bool) { - diffBase, exists = s.diffBaseData[cloudItem.Lcuuid] - return -} - func (s *PodService) generateDBItemToAdd(cloudItem *cloudmodel.PodService) (*metadbmodel.PodService, bool) { vpcID, exists := s.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.VPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/pod_service_port.go b/server/controller/recorder/updater/pod_service_port.go index 87f6eaf07b4..504e35dc38c 100644 --- a/server/controller/recorder/updater/pod_service_port.go +++ b/server/controller/recorder/updater/pod_service_port.go @@ -73,11 +73,6 @@ func NewPodServicePort(wholeCache *cache.Cache, cloudData []cloudmodel.PodServic return updater } -func (s *PodServicePort) getDiffBaseByCloudItem(cloudItem *cloudmodel.PodServicePort) (diffBase *diffbase.PodServicePort, exists bool) { - diffBase, exists = s.diffBaseData[cloudItem.Lcuuid] - return -} - func (p *PodServicePort) generateDBItemToAdd(cloudItem *cloudmodel.PodServicePort) (*metadbmodel.PodServicePort, bool) { podServiceID, exists := p.cache.ToolDataSet.GetPodServiceIDByLcuuid(cloudItem.PodServiceLcuuid) if !exists { diff --git a/server/controller/recorder/updater/process.go b/server/controller/recorder/updater/process.go index 54ec20c7b4f..984fad59fb7 100644 --- a/server/controller/recorder/updater/process.go +++ b/server/controller/recorder/updater/process.go @@ -80,11 +80,6 @@ func NewProcess(wholeCache *cache.Cache, cloudData []cloudmodel.Process) *Proces return updater } -func (p *Process) getDiffBaseByCloudItem(cloudItem *cloudmodel.Process) (diffBase *diffbase.Process, exits bool) { - diffBase, exits = p.diffBaseData[cloudItem.Lcuuid] - return -} - func (p *Process) generateDBItemToAdd(cloudItem *cloudmodel.Process) (*metadbmodel.Process, bool) { deviceType, deviceID := p.cache.ToolDataSet.GetProcessDeviceTypeAndID(cloudItem.ContainerID, cloudItem.VTapID) // add pod node id diff --git a/server/controller/recorder/updater/rds_instance.go b/server/controller/recorder/updater/rds_instance.go index ed44e125c21..5ff741c88bb 100644 --- a/server/controller/recorder/updater/rds_instance.go +++ b/server/controller/recorder/updater/rds_instance.go @@ -73,11 +73,6 @@ func NewRDSInstance(wholeCache *cache.Cache, cloudData []cloudmodel.RDSInstance) return updater } -func (r *RDSInstance) getDiffBaseByCloudItem(cloudItem *cloudmodel.RDSInstance) (diffBase *diffbase.RDSInstance, exists bool) { - diffBase, exists = r.diffBaseData[cloudItem.Lcuuid] - return -} - func (r *RDSInstance) generateDBItemToAdd(cloudItem *cloudmodel.RDSInstance) (*metadbmodel.RDSInstance, bool) { vpcID, exists := r.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.VPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/redis_instance.go b/server/controller/recorder/updater/redis_instance.go index 0006f4d1c37..8eaa7420402 100644 --- a/server/controller/recorder/updater/redis_instance.go +++ b/server/controller/recorder/updater/redis_instance.go @@ -73,11 +73,6 @@ func NewRedisInstance(wholeCache *cache.Cache, cloudData []cloudmodel.RedisInsta return updater } -func (r *RedisInstance) getDiffBaseByCloudItem(cloudItem *cloudmodel.RedisInstance) (diffBase *diffbase.RedisInstance, exists bool) { - diffBase, exists = r.diffBaseData[cloudItem.Lcuuid] - return -} - func (r *RedisInstance) generateDBItemToAdd(cloudItem *cloudmodel.RedisInstance) (*metadbmodel.RedisInstance, bool) { vpcID, exists := r.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.VPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/routing_table.go b/server/controller/recorder/updater/routing_table.go index 5563de6d436..b8c3729ddb6 100644 --- a/server/controller/recorder/updater/routing_table.go +++ b/server/controller/recorder/updater/routing_table.go @@ -73,11 +73,6 @@ func NewRoutingTable(wholeCache *cache.Cache, cloudData []cloudmodel.RoutingTabl return updater } -func (t *RoutingTable) getDiffBaseByCloudItem(cloudItem *cloudmodel.RoutingTable) (diffBase *diffbase.RoutingTable, exists bool) { - diffBase, exists = t.diffBaseData[cloudItem.Lcuuid] - return -} - func (t *RoutingTable) generateDBItemToAdd(cloudItem *cloudmodel.RoutingTable) (*metadbmodel.RoutingTable, bool) { vrouterID, exists := t.cache.ToolDataSet.GetVRouterIDByLcuuid(cloudItem.VRouterLcuuid) if !exists { diff --git a/server/controller/recorder/updater/sub_domain.go b/server/controller/recorder/updater/sub_domain.go index 0dbd718232c..ff7f3a83707 100644 --- a/server/controller/recorder/updater/sub_domain.go +++ b/server/controller/recorder/updater/sub_domain.go @@ -73,11 +73,6 @@ func NewSubDomain(wholeCache *cache.Cache, cloudData []cloudmodel.SubDomain) *Su return updater } -func (d *SubDomain) getDiffBaseByCloudItem(cloudItem *cloudmodel.SubDomain) (diffBase *diffbase.SubDomain, exists bool) { - diffBase, exists = d.diffBaseData[cloudItem.Lcuuid] - return -} - func (d *SubDomain) generateDBItemToAdd(cloudItem *cloudmodel.SubDomain) (*metadbmodel.SubDomain, bool) { dbItem := &metadbmodel.SubDomain{ TeamID: cloudItem.TeamID, diff --git a/server/controller/recorder/updater/subnet.go b/server/controller/recorder/updater/subnet.go index 0fa78f3dc92..eedf4d00829 100644 --- a/server/controller/recorder/updater/subnet.go +++ b/server/controller/recorder/updater/subnet.go @@ -74,11 +74,6 @@ func NewSubnet(wholeCache *cache.Cache, cloudData []cloudmodel.Subnet) *Subnet { return updater } -func (s *Subnet) getDiffBaseByCloudItem(cloudItem *cloudmodel.Subnet) (diffBase *diffbase.Subnet, exists bool) { - diffBase, exists = s.diffBaseData[cloudItem.Lcuuid] - return -} - func (s *Subnet) generateDBItemToAdd(cloudItem *cloudmodel.Subnet) (*metadbmodel.Subnet, bool) { networkID, exists := s.cache.ToolDataSet.GetNetworkIDByLcuuid(cloudItem.NetworkLcuuid) if !exists { diff --git a/server/controller/recorder/updater/updater.go b/server/controller/recorder/updater/updater.go index 13fa4395e0e..09ecf38c945 100644 --- a/server/controller/recorder/updater/updater.go +++ b/server/controller/recorder/updater/updater.go @@ -54,8 +54,6 @@ type StatsdBuilder interface { } type DataGenerator[CT constraint.CloudModel, MT metadbmodel.AssetResourceConstraint, BT constraint.DiffBase, MFUPT msg.FieldsUpdatePtr[MFUT], MFUT msg.FieldsUpdate] interface { - // 根据 cloud 数据获取对应的 diff base 数据 - getDiffBaseByCloudItem(*CT) (BT, bool) // 生成插入 DB 所需的数据 generateDBItemToAdd(*CT) (*MT, bool) // 生产更新 DB 所需的数据 @@ -190,7 +188,7 @@ func (u *UpdaterBase[CT, BT, MPT, MT, MAPT, MAT, MAAT, MUPT, MUT, MFUPT, MFUT, M if logDebug { log.Info(debugCloudItem(u.resourceType, cloudItem), u.metadata.LogPrefixes) } - diffBase, exists := u.dataGenerator.getDiffBaseByCloudItem(&cloudItem) + diffBase, exists := u.diffBaseData[cloudItem.GetLcuuid()] if !exists { log.Infof("to %s (cloud item: %#v)", common.LogAdd(u.resourceType), common.ToLoggable(u.toLoggable, cloudItem), u.metadata.LogPrefixes) dbItem, ok := u.dataGenerator.generateDBItemToAdd(&cloudItem) diff --git a/server/controller/recorder/updater/vinterface.go b/server/controller/recorder/updater/vinterface.go index 0fda1bea5bb..3c45166198f 100644 --- a/server/controller/recorder/updater/vinterface.go +++ b/server/controller/recorder/updater/vinterface.go @@ -78,11 +78,6 @@ func NewVInterface(wholeCache *cache.Cache, cloudData []cloudmodel.VInterface, d return updater } -func (i *VInterface) getDiffBaseByCloudItem(cloudItem *cloudmodel.VInterface) (diffBase *diffbase.VInterface, exists bool) { - diffBase, exists = i.diffBaseData[cloudItem.Lcuuid] - return -} - func (i *VInterface) generateDBItemToAdd(cloudItem *cloudmodel.VInterface) (*metadbmodel.VInterface, bool) { var networkID int if cloudItem.NetworkLcuuid != "" { diff --git a/server/controller/recorder/updater/vip.go b/server/controller/recorder/updater/vip.go index 1ed90f78c95..6ba02363e55 100644 --- a/server/controller/recorder/updater/vip.go +++ b/server/controller/recorder/updater/vip.go @@ -73,11 +73,6 @@ func NewVIP(wholeCache *cache.Cache, cloudData []cloudmodel.VIP) *VIP { return updater } -func (p *VIP) getDiffBaseByCloudItem(cloudItem *cloudmodel.VIP) (diffBase *diffbase.VIP, exits bool) { - diffBase, exits = p.diffBaseData[cloudItem.Lcuuid] - return -} - func (p *VIP) generateDBItemToAdd(cloudItem *cloudmodel.VIP) (*metadbmodel.VIP, bool) { dbItem := &metadbmodel.VIP{ IP: cloudItem.IP, diff --git a/server/controller/recorder/updater/vm.go b/server/controller/recorder/updater/vm.go index c2b2e5996f0..6d6afbdb6aa 100644 --- a/server/controller/recorder/updater/vm.go +++ b/server/controller/recorder/updater/vm.go @@ -78,11 +78,6 @@ func NewVM(wholeCache *cache.Cache, cloudData []cloudmodel.VM) *VM { return updater } -func (m *VM) getDiffBaseByCloudItem(cloudItem *cloudmodel.VM) (diffBase *diffbase.VM, exists bool) { - diffBase, exists = m.diffBaseData[cloudItem.Lcuuid] - return -} - func (m *VM) generateDBItemToAdd(cloudItem *cloudmodel.VM) (*metadbmodel.VM, bool) { vpcID, exists := m.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.VPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/vm_pod_node_connection.go b/server/controller/recorder/updater/vm_pod_node_connection.go index 6927bd30293..3253b1263a8 100644 --- a/server/controller/recorder/updater/vm_pod_node_connection.go +++ b/server/controller/recorder/updater/vm_pod_node_connection.go @@ -73,11 +73,6 @@ func NewVMPodNodeConnection(wholeCache *cache.Cache, cloudData []cloudmodel.VMPo return updater } -func (c *VMPodNodeConnection) getDiffBaseByCloudItem(cloudItem *cloudmodel.VMPodNodeConnection) (diffBase *diffbase.VMPodNodeConnection, exists bool) { - diffBase, exists = c.diffBaseData[cloudItem.Lcuuid] - return -} - func (c *VMPodNodeConnection) generateDBItemToAdd(cloudItem *cloudmodel.VMPodNodeConnection) (*metadbmodel.VMPodNodeConnection, bool) { vmID, exists := c.cache.ToolDataSet.GetVMIDByLcuuid(cloudItem.VMLcuuid) if !exists { diff --git a/server/controller/recorder/updater/vpc.go b/server/controller/recorder/updater/vpc.go index b252fdac3de..33089bafc46 100644 --- a/server/controller/recorder/updater/vpc.go +++ b/server/controller/recorder/updater/vpc.go @@ -74,11 +74,6 @@ func NewVPC(wholeCache *cache.Cache, cloudData []cloudmodel.VPC) *VPC { return updater } -func (v *VPC) getDiffBaseByCloudItem(cloudItem *cloudmodel.VPC) (diffBase *diffbase.VPC, exists bool) { - diffBase, exists = v.diffBaseData[cloudItem.Lcuuid] - return -} - func (v *VPC) generateDBItemToAdd(cloudItem *cloudmodel.VPC) (*metadbmodel.VPC, bool) { if cloudItem.Label == "" { cloudItem.Label = common.GenerateResourceShortUUID(v.resourceType) diff --git a/server/controller/recorder/updater/vrouter.go b/server/controller/recorder/updater/vrouter.go index fcc22b5da54..44b43512bd3 100644 --- a/server/controller/recorder/updater/vrouter.go +++ b/server/controller/recorder/updater/vrouter.go @@ -74,11 +74,6 @@ func NewVRouter(wholeCache *cache.Cache, cloudData []cloudmodel.VRouter) *VRoute return updater } -func (r *VRouter) getDiffBaseByCloudItem(cloudItem *cloudmodel.VRouter) (diffBase *diffbase.VRouter, exists bool) { - diffBase, exists = r.diffBaseData[cloudItem.Lcuuid] - return -} - func (r *VRouter) generateDBItemToAdd(cloudItem *cloudmodel.VRouter) (*metadbmodel.VRouter, bool) { vpcID, exists := r.cache.ToolDataSet.GetVPCIDByLcuuid(cloudItem.VPCLcuuid) if !exists { diff --git a/server/controller/recorder/updater/wan_ip.go b/server/controller/recorder/updater/wan_ip.go index f9d6a52c147..636ee21b1ca 100644 --- a/server/controller/recorder/updater/wan_ip.go +++ b/server/controller/recorder/updater/wan_ip.go @@ -82,11 +82,6 @@ func (i *WANIP) SetCloudData(cloudData []cloudmodel.IP) { i.cloudData = cloudData } -func (i *WANIP) getDiffBaseByCloudItem(cloudItem *cloudmodel.IP) (diffBase *diffbase.WANIP, exists bool) { - diffBase, exists = i.diffBaseData[cloudItem.Lcuuid] - return -} - func (i *WANIP) generateDBItemToAdd(cloudItem *cloudmodel.IP) (*metadbmodel.WANIP, bool) { vinterfaceID, exists := i.cache.ToolDataSet.GetVInterfaceIDByLcuuid(cloudItem.VInterfaceLcuuid) if !exists {