Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

fix: unknown ostype when getting an index should probably create an error #2681

Merged
merged 2 commits into from
Feb 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pkg/armhelpers/utils/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,18 @@ func GetVMNameIndex(osType compute.OperatingSystemTypes, vmName string) (int, er
log.Errorln(err)
return 0, err
}
} else if osType == compute.Windows {
return agentIndex, nil
}
if osType == compute.Windows {
_, _, _, agentIndex, err = WindowsVMNameParts(vmName)
if err != nil {
log.Errorln(err)
return 0, err
}
return agentIndex, nil
}

return agentIndex, nil
return 0, errors.Errorf("Unknown os type. Can't determine vm index")
}

// GetK8sVMName reconstructs the VM name
Expand Down
8 changes: 8 additions & 0 deletions pkg/armhelpers/utils/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ func Test_WindowsVMNameParts(t *testing.T) {
}
}

func Test_GetVMNameIndexUnknown(t *testing.T) {
var ostype compute.OperatingSystemTypes
_, err := GetVMNameIndex(ostype, "k8s-agentpool1-38988164-65")
if err == nil {
t.Fatalf("unexpected error but got none")
}
}

func Test_GetVMNameIndexLinux(t *testing.T) {
expectedAgentIndex := 65

Expand Down