Skip to content

Commit

Permalink
Merge pull request #5 from raojinlin/hotfix-get-cvm-instance-publicip
Browse files Browse the repository at this point in the history
hotfix: get cvm instance public-ip error
  • Loading branch information
raojinlin authored Jul 12, 2024
2 parents 8cb2910 + 68c3e74 commit 4748f82
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions plugins/cvm.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package plugins

import (
"fmt"
"log/slog"

"github.com/raojinlin/hostnav"
"github.com/raojinlin/hostnav/pkg/terminal"
Expand Down Expand Up @@ -83,15 +84,24 @@ func (p *CVMPlugin) List(options *ListOptions) ([]terminal.Host, error) {

var result []terminal.Host
for _, instance := range instances {
useLocalIP := p.Option.ConnectionOptions.UseLocalIP
publicIp := ""
if len(instance.PublicIpAddresses) > 0 {
publicIp = *instance.PublicIpAddresses[0]
} else {
slog.Warn("instance", *instance.InstanceName, "has no public IP address, falling back to private IP")
useLocalIP = true
}

result = append(result, terminal.Host{
Type: terminal.TerminalTypeHost,
SSHInfo: terminal.SSHInfo{
Name: fmt.Sprintf("%s(%s): %s", p.Name(), *instance.Placement.Zone, *instance.InstanceName),
PublicIP: *instance.PublicIpAddresses[0],
PublicIP: publicIp,
Port: 22,
User: "root",
LocalIP: *instance.PrivateIpAddresses[0],
UseLocalIP: p.Option.ConnectionOptions.UseLocalIP,
UseLocalIP: useLocalIP,
},
})
}
Expand Down

0 comments on commit 4748f82

Please sign in to comment.