Skip to content

Commit 68e3977

Browse files
author
Birol Bilgin
committed
removed log line in Probe func
switch to UserData for probing cleaned up base64 decoding Signed-off-by: Birol Bilgin <birolbilgin@gmail.com>
1 parent 652a03e commit 68e3977

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

pkg/metadata/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func main() {
7878
log.SetLevel(log.DebugLevel)
7979
}
8080

81-
providers := []string{"aws", "gcp", "hetzner", "openstack", "scaleway", "vultr", "digitalocean", "packet", "cdrom", "vmware"}
81+
providers := []string{"aws", "gcp", "hetzner", "openstack", "scaleway", "vultr", "digitalocean", "packet", "vmware", "cdrom"}
8282
args := flag.Args()
8383
if len(args) > 0 {
8484
providers = args

pkg/metadata/provider_vmware.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,12 @@ func (p *ProviderVMware) String() string {
3737
func (p *ProviderVMware) Probe() bool {
3838
c, err := exec.LookPath("vmware-rpctool")
3939
if err != nil {
40-
log.Debugf("Look for vmware-rcptool failed %v", err)
4140
return false
4241
}
4342

4443
p.cmd = c
4544

46-
b, err := p.vmwareGet(guestMetaData)
45+
b, err := p.vmwareGet(guestUserData)
4746
return (err == nil) && len(b) > 0 && string(b) != " " && string(b) != "---"
4847
}
4948

@@ -91,15 +90,13 @@ func (p *ProviderVMware) vmwareGet(name string) ([]byte, error) {
9190
return nil, err
9291
}
9392

94-
//out = bytes.TrimSuffix(out, []byte("\n"))
95-
9693
switch strings.TrimSuffix(string(enc), "\n") {
9794
case " ":
9895
return bytes.TrimSuffix(out, []byte("\n")), nil
9996
case "base64":
100-
dst := make([]byte, base64.StdEncoding.DecodedLen(len(out)))
97+
r := base64.NewDecoder(base64.StdEncoding, bytes.NewBuffer(out))
10198

102-
_, err = base64.StdEncoding.Decode(dst, out)
99+
dst, err := ioutil.ReadAll(r)
103100
if err != nil {
104101
log.Debugf("Decoding base64 of '%s' failed %v", name, err)
105102
return nil, err

0 commit comments

Comments
 (0)