++ more strict comparison for paths, rename public consts to private.

Signed-off-by: Ivan Mikheykin <ivan.mikheykin@flant.com>

Author: diafour

images/virtualization-artifact/pkg/controller/vmchange/comparator_block_devices.go

@@ -23,7 +23,7 @@ import (
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
-const BlockDevicesPath = "blockDeviceRefs"
+const blockDevicesPath = "blockDeviceRefs"
 
 // compareBlockDevices returns changes between current and desired blockDevices lists.
 func compareBlockDevices(current, desired *v1alpha2.VirtualMachineSpec) []FieldChange {
@@ -32,7 +32,7 @@ func compareBlockDevices(current, desired *v1alpha2.VirtualMachineSpec) []FieldC
 	}
 
 	fullChanges := compareEmpty(
-		BlockDevicesPath,
+		blockDevicesPath,
 		NewValue(current.BlockDeviceRefs, len(current.BlockDeviceRefs) == 0, false),
 		NewValue(desired.BlockDeviceRefs, len(desired.BlockDeviceRefs) == 0, false),
 		ActionApplyImmediate,
@@ -152,7 +152,7 @@ func vmdIndexedNames(vm *v1alpha2.VirtualMachineSpec) map[string]int {
 }
 
 func blockDevicesItemPath(idx int) string {
-	return fmt.Sprintf("%s.%d", BlockDevicesPath, idx)
+	return fmt.Sprintf("%s.%d", blockDevicesPath, idx)
 }
 
 func updateIndexesForAddedDevices(added map[int]struct{}, currentDevices, desiredDevices map[string]int) {

images/virtualization-artifact/pkg/controller/vmchange/comparator_cpu.go

@@ -28,7 +28,7 @@ type comparatorCPU struct {
 	featureGate featuregate.FeatureGate
 }
 
-const CPUPath = "cpu"
+const cpuPath = "cpu"
 
 func NewComparatorCPU(featureGate featuregate.FeatureGate) VMSpecFieldComparator {
 	return &comparatorCPU{

images/virtualization-artifact/pkg/controller/vmchange/comparator_memory.go

@@ -25,7 +25,7 @@ import (
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
-const MemoryPath = "memory"
+const memoryPath = "memory"
 
 type comparatorMemory struct {
 	featureGate featuregate.FeatureGate

images/virtualization-artifact/pkg/controller/vmchange/spec_changes.go

@@ -244,16 +244,17 @@ func (s *SpecChanges) ConvertPendingChanges() ([]apiextensionsv1.JSON, error) {
 
 func (s *SpecChanges) UpgradeBlockDeviceChangesToRestart() {
 	for i := range s.changes {
-		if strings.HasPrefix(s.changes[i].Path, BlockDevicesPath) && s.changes[i].ActionRequired == ActionApplyImmediate {
+		isBlockDeviceChange := s.changes[i].Path == blockDevicesPath || strings.HasPrefix(s.changes[i].Path, blockDevicesPath+".")
+		if isBlockDeviceChange && s.changes[i].ActionRequired == ActionApplyImmediate {
 			s.changes[i].ActionRequired = ActionRestart
 		}
 	}
 }
 
 func (s *SpecChanges) UpgradeHotplugComputeChangesToRestart() {
 	for i := range s.changes {
-		isCPUChange := strings.HasPrefix(s.changes[i].Path, CPUPath)
-		isMemoryChange := strings.HasPrefix(s.changes[i].Path, MemoryPath)
+		isCPUChange := s.changes[i].Path == cpuPath || strings.HasPrefix(s.changes[i].Path, cpuPath+".")
+		isMemoryChange := s.changes[i].Path == memoryPath || strings.HasPrefix(s.changes[i].Path, memoryPath+".")
 		if (isCPUChange || isMemoryChange) && s.changes[i].ActionRequired == ActionApplyImmediate {
 			s.changes[i].ActionRequired = ActionRestart
 		}