kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

address comments

Browse Source 
Co-authored-by: Seth Hoenig <seth.a.hoenig@gmail.com>
This commit is contained in:
Kevin Schoonover
2022-02-07 08:48:42 -08:00
committed by Kevin Schoonover
parent 7b6f9540db
commit 5cea36639d
2 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
client/fingerprint/env_digitalocean.go
View File

@@ -1,6 +1,7 @@
package fingerprint
import (
"fmt"
"io/ioutil"
"net/http"
"net/url"
@@ -17,6 +18,7 @@ import (
const (
// DigitalOceanMetadataURL is where the DigitalOcean metadata api normally resides.
// https://docs.digitalocean.com/products/droplets/how-to/retrieve-droplet-metadata/#how-to-retrieve-droplet-metadata
DigitalOceanMetadataURL = "http://169.254.169.254/metadata/v1/"
// DigitalOceanMetadataTimeout is the timeout used when contacting the DigitalOcean metadata
@@ -67,7 +69,7 @@ func (f *EnvDigitalOceanFingerprint) Get(attribute string, format string) (strin
}
req := &http.Request{
Method: "GET",
Method: http.MethodGet,
URL: parsedURL,
Header: http.Header{
"User-Agent": []string{useragent.String()},
@@ -76,36 +78,23 @@ func (f *EnvDigitalOceanFingerprint) Get(attribute string, format string) (strin
res, err := f.client.Do(req)
if err != nil {
f.logger.Debug("could not read value for attribute", "attribute", attribute, "error", err)
return "", err
} else if res.StatusCode != http.StatusOK {
f.logger.Debug("could not read value for attribute", "attribute", attribute, "resp_code", res.StatusCode)
f.logger.Debug("failed to request metadata", "attribute", attribute, "error", err)
return "", err
}
resp, err := ioutil.ReadAll(res.Body)
body, err := ioutil.ReadAll(res.Body)
res.Body.Close()
if err != nil {
f.logger.Error("error reading response body for DigitalOcean attribute", "attribute", attribute, "error", err)
f.logger.Error("failed to read metadata", "attribute", attribute, "error", err, "resp_code", res.StatusCode)
return "", err
}
if res.StatusCode >= 400 {
return "", ReqError{res.StatusCode}
if res.StatusCode != http.StatusOK {
f.logger.Debug("could not read value for attribute", "attribute", attribute, "resp_code", res.StatusCode)
return "", fmt.Errorf("error reading attribute %s. digitalocean metadata api returned an error: resp_code: %d, resp_body: %s", attribute, res.StatusCode, body)
}
return string(resp), nil
}
func checkDigitalOceanError(err error, logger log.Logger, desc string) error {
// If it's a URL error, assume we're not actually in an DigitalOcean environment.
// To the outer layers, this isn't an error so return nil.
if _, ok := err.(*url.Error); ok {
logger.Debug("error querying DigitalOcean attribute; skipping", "attribute", desc)
return nil
}
// Otherwise pass the error through.
return err
return string(body), nil
}
func (f *EnvDigitalOceanFingerprint) Fingerprint(request *FingerprintRequest, response *FingerprintResponse) error {
@@ -138,7 +127,8 @@ func (f *EnvDigitalOceanFingerprint) Fingerprint(request *FingerprintRequest, re
resp, err := f.Get(attr.path, "text")
v := strings.TrimSpace(resp)
if err != nil {
return checkDigitalOceanError(err, f.logger, k)
f.logger.Warn("failed to read attribute", "attribute", k, "err", err)
continue
} else if v == "" {
f.logger.Debug("read an empty value", "attribute", k)
continue

14
client/fingerprint/env_digitalocean_test.go
View File

@@ -12,6 +12,7 @@ import (
"github.com/hashicorp/nomad/client/config"
"github.com/hashicorp/nomad/helper/testlog"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/stretchr/testify/assert"
)
func TestDigitalOceanFingerprint_nonDigitalOcean(t *testing.T) {
@@ -90,13 +91,8 @@ func TestFingerprint_DigitalOcean(t *testing.T) {
request := &FingerprintRequest{Config: &config.Config{}, Node: node}
var response FingerprintResponse
err := f.Fingerprint(request, &response)
if err != nil {
t.Fatalf("err: %v", err)
}
if !response.Detected {
t.Fatalf("expected response to be applicable")
}
assert.NoError(t, err)
assert.True(t, response.Detected, "expected response to be applicable")
keys := []string{
"unique.platform.digitalocean.id",
@@ -112,9 +108,7 @@ func TestFingerprint_DigitalOcean(t *testing.T) {
assertNodeAttributeContains(t, response.Attributes, k)
}
if len(response.Links) == 0 {
t.Fatalf("Empty links for Node in DO Fingerprint test")
}
assert.NotEmpty(t, response.Links, "Empty links for Node in DO Fingerprint test")
// Make sure Links contains the DO ID.
for _, k := range []string{"digitalocean"} {