test: fix CLI nodes discovery without provisioner data

When integration tests run without data from Talos provisioner (e.g.
against AWS/GCP), it should work only with `talosconfig` as an input.

This specific flow was missing filling out `infoWrapper` properly.

Clean up things a bit by reducing code duplication.

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
This commit is contained in:
Andrey Smirnov
2022-06-20 22:55:49 +04:00
parent 916a306829
commit a167a54021
11 changed files with 353 additions and 128 deletions

View File

@@ -13,13 +13,30 @@ import (
)
type infoWrapper struct {
masterNodes []string
workerNodes []string
nodeInfos []cluster.NodeInfo
nodeInfosByType map[machine.Type][]cluster.NodeInfo
}
func newNodeInfo(masterNodes, workerNodes []string) (*infoWrapper, error) {
controlPlaneNodeInfos, err := cluster.IPsToNodeInfos(masterNodes)
if err != nil {
return nil, err
}
workerNodeInfos, err := cluster.IPsToNodeInfos(workerNodes)
if err != nil {
return nil, err
}
return &infoWrapper{
nodeInfos: append(append([]cluster.NodeInfo(nil), controlPlaneNodeInfos...), workerNodeInfos...),
nodeInfosByType: map[machine.Type][]cluster.NodeInfo{
machine.TypeControlPlane: controlPlaneNodeInfos,
machine.TypeWorker: workerNodeInfos,
},
}, nil
}
func (wrapper *infoWrapper) Nodes() []cluster.NodeInfo {
return wrapper.nodeInfos
}