From 070f2fa34506cd503dd65f7948995f7098893a86 Mon Sep 17 00:00:00 2001 From: Pablo Cantera Date: Fri, 10 Aug 2018 14:39:17 +0200 Subject: [PATCH] Fixed LabeledResources type name (issue #77) --- api/labels/labels_api.go | 2 +- api/labels/labels_api_mocked.go | 8 ++++---- api/types/labels.go | 2 +- testdata/labels_data.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/labels/labels_api.go b/api/labels/labels_api.go index 998b65b..380436f 100644 --- a/api/labels/labels_api.go +++ b/api/labels/labels_api.go @@ -74,7 +74,7 @@ func (lbl *LabelService) CreateLabel(labelVector *map[string]interface{}) (label } // AddLabel assigns a single label from a single labelable resource -func (lbl *LabelService) AddLabel(labelVector *map[string]interface{}, labelID string) (labeledResources []types.LabeledResources, err error) { +func (lbl *LabelService) AddLabel(labelVector *map[string]interface{}, labelID string) (labeledResources []types.LabeledResource, err error) { log.Debug("AddLabel") data, status, err := lbl.concertoService.Post(fmt.Sprintf("/v1/labels/%s/resources", labelID), labelVector) diff --git a/api/labels/labels_api_mocked.go b/api/labels/labels_api_mocked.go index ec0d5e0..bbde988 100644 --- a/api/labels/labels_api_mocked.go +++ b/api/labels/labels_api_mocked.go @@ -253,7 +253,7 @@ func CreateLabelFailJSONMocked(t *testing.T, labelIn *types.Label) *types.Label } // AddLabelMocked test mocked function -func AddLabelMocked(t *testing.T, labelIn *types.Label, labeledResourcesOut []types.LabeledResources) []types.LabeledResources { +func AddLabelMocked(t *testing.T, labelIn *types.Label, labeledResourcesOut []types.LabeledResource) []types.LabeledResource { assert := assert.New(t) @@ -281,7 +281,7 @@ func AddLabelMocked(t *testing.T, labelIn *types.Label, labeledResourcesOut []ty } // AddLabelFailErrMocked test mocked function -func AddLabelFailErrMocked(t *testing.T, labelIn *types.Label, labeledResourcesOut []types.LabeledResources) []types.LabeledResources { +func AddLabelFailErrMocked(t *testing.T, labelIn *types.Label, labeledResourcesOut []types.LabeledResource) []types.LabeledResource { assert := assert.New(t) @@ -310,7 +310,7 @@ func AddLabelFailErrMocked(t *testing.T, labelIn *types.Label, labeledResourcesO } // AddLabelFailStatusMocked test mocked function -func AddLabelFailStatusMocked(t *testing.T, labelIn *types.Label, labeledResourcesOut []types.LabeledResources) []types.LabeledResources { +func AddLabelFailStatusMocked(t *testing.T, labelIn *types.Label, labeledResourcesOut []types.LabeledResource) []types.LabeledResource { assert := assert.New(t) @@ -339,7 +339,7 @@ func AddLabelFailStatusMocked(t *testing.T, labelIn *types.Label, labeledResourc } // AddLabelFailJSONMocked test mocked function -func AddLabelFailJSONMocked(t *testing.T, labelIn *types.Label, labeledResourcesOut []types.LabeledResources) []types.LabeledResources { +func AddLabelFailJSONMocked(t *testing.T, labelIn *types.Label, labeledResourcesOut []types.LabeledResource) []types.LabeledResource { assert := assert.New(t) diff --git a/api/types/labels.go b/api/types/labels.go index b079714..5397a81 100644 --- a/api/types/labels.go +++ b/api/types/labels.go @@ -8,7 +8,7 @@ type Label struct { Value string `json:"value" header:"VALUE" show:"nolist"` } -type LabeledResources struct { +type LabeledResource struct { ID string `json:"id" header:"ID"` ResourceType string `json:"resource_type" header:"RESOURCE_TYPE"` } diff --git a/testdata/labels_data.go b/testdata/labels_data.go index 0b5af93..9597576 100644 --- a/testdata/labels_data.go +++ b/testdata/labels_data.go @@ -47,9 +47,9 @@ func GetLabelWithNamespaceData() *[]types.Label { } // GetLabeledResourcesData loads test data -func GetLabeledResourcesData() *[]types.LabeledResources { +func GetLabeledResourcesData() *[]types.LabeledResource { - testLabeledResources := []types.LabeledResources{ + testLabeledResources := []types.LabeledResource{ { ID: "fakeID0", ResourceType: "server",