From 69a018bb5d997f869bd146dabf56b2c648c77606 Mon Sep 17 00:00:00 2001 From: James Bebbington Date: Sat, 4 Jul 2020 16:05:33 +1000 Subject: [PATCH] Correctly obtain machine-type info from gce metadata --- .../resourcedetectionprocessor/internal/gcp/gce/gce.go | 2 +- .../internal/gcp/gce/gce_test.go | 8 ++++---- .../internal/gcp/gce/metadata.go | 6 +++--- .../internal/gcp/gce/metadata_test.go | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/processor/resourcedetectionprocessor/internal/gcp/gce/gce.go b/processor/resourcedetectionprocessor/internal/gcp/gce/gce.go index 50abf357ab50..0186faff66a6 100644 --- a/processor/resourcedetectionprocessor/internal/gcp/gce/gce.go +++ b/processor/resourcedetectionprocessor/internal/gcp/gce/gce.go @@ -99,7 +99,7 @@ func (d *Detector) initializeHostAttributes(attr pdata.AttributeMap) []error { attr.InsertString(conventions.AttributeHostName, name) } - hostType, err := d.metadata.InstanceAttributeValue("instance/machine-type") + hostType, err := d.metadata.Get("instance/machine-type") if err != nil { errors = append(errors, err) } else { diff --git a/processor/resourcedetectionprocessor/internal/gcp/gce/gce_test.go b/processor/resourcedetectionprocessor/internal/gcp/gce/gce_test.go index 61e821da4f09..ce264f207788 100644 --- a/processor/resourcedetectionprocessor/internal/gcp/gce/gce_test.go +++ b/processor/resourcedetectionprocessor/internal/gcp/gce/gce_test.go @@ -60,8 +60,8 @@ func (m *mockMetadata) InstanceName() (string, error) { return args.String(0), args.Error(1) } -func (m *mockMetadata) InstanceAttributeValue(attr string) (string, error) { - args := m.MethodCalled("InstanceAttributeValue") +func (m *mockMetadata) Get(suffix string) (string, error) { + args := m.MethodCalled("Get") return args.String(0), args.Error(1) } @@ -73,7 +73,7 @@ func TestDetectTrue(t *testing.T) { md.On("Hostname").Return("hostname", nil) md.On("InstanceID").Return("2", nil) md.On("InstanceName").Return("name", nil) - md.On("InstanceAttributeValue").Return("machine-type", nil) + md.On("Get").Return("machine-type", nil) detector := &Detector{metadata: md} res, err := detector.Detect(context.Background()) @@ -115,7 +115,7 @@ func TestDetectError(t *testing.T) { md.On("Hostname").Return("", errors.New("err3")) md.On("InstanceID").Return("", errors.New("err4")) md.On("InstanceName").Return("", errors.New("err5")) - md.On("InstanceAttributeValue").Return("", errors.New("err6")) + md.On("Get").Return("", errors.New("err6")) detector := &Detector{metadata: md} res, err := detector.Detect(context.Background()) diff --git a/processor/resourcedetectionprocessor/internal/gcp/gce/metadata.go b/processor/resourcedetectionprocessor/internal/gcp/gce/metadata.go index 7cd8c5db19d6..be5198615eef 100644 --- a/processor/resourcedetectionprocessor/internal/gcp/gce/metadata.go +++ b/processor/resourcedetectionprocessor/internal/gcp/gce/metadata.go @@ -23,7 +23,7 @@ type gceMetadata interface { Hostname() (string, error) InstanceID() (string, error) InstanceName() (string, error) - InstanceAttributeValue(attr string) (string, error) + Get(suffix string) (string, error) } type gceMetadataImpl struct{} @@ -52,6 +52,6 @@ func (m *gceMetadataImpl) InstanceName() (string, error) { return metadata.InstanceName() } -func (m *gceMetadataImpl) InstanceAttributeValue(attr string) (string, error) { - return metadata.InstanceAttributeValue(attr) +func (m *gceMetadataImpl) Get(suffix string) (string, error) { + return metadata.Get(suffix) } diff --git a/processor/resourcedetectionprocessor/internal/gcp/gce/metadata_test.go b/processor/resourcedetectionprocessor/internal/gcp/gce/metadata_test.go index 241260101cb0..fb7660288c5f 100644 --- a/processor/resourcedetectionprocessor/internal/gcp/gce/metadata_test.go +++ b/processor/resourcedetectionprocessor/internal/gcp/gce/metadata_test.go @@ -26,5 +26,5 @@ func TestGCEMetadata(t *testing.T) { metadata.Hostname() metadata.InstanceID() metadata.InstanceName() - metadata.InstanceAttributeValue("") + metadata.Get("") }