Silencing defineDatasource function

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

2 files changed, 16 insertions, 12 deletions

diff --git a/data/datasource.go b/data/datasource.go
index 3f5462a2..7f42cee9 100644
--- a/data/datasource.go
+++ b/data/datasource.go
@@ -225,16 +225,16 @@ func absURL(value string) (*url.URL, error) {
 }
 
 // DefineDatasource -
-func (d *Data) DefineDatasource(alias, value string) (*Source, error) {
+func (d *Data) DefineDatasource(alias, value string) (string, error) {
 	if alias == "" {
-		return nil, errors.New("datasource alias must be provided")
+		return "", errors.New("datasource alias must be provided")
 	}
 	if d.DatasourceExists(alias) {
-		return d.Sources[alias], nil
+		return "", nil
 	}
 	srcURL, err := parseSourceURL(value)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 	s := &Source{
 		Alias:  alias,
@@ -245,7 +245,7 @@ func (d *Data) DefineDatasource(alias, value string) (*Source, error) {
 		d.Sources = make(map[string]*Source)
 	}
 	d.Sources[alias] = s
-	return s, nil
+	return "", nil
 }
 
 // DatasourceExists -
diff --git a/data/datasource_test.go b/data/datasource_test.go
index fca4a23a..697350cc 100644
--- a/data/datasource_test.go
+++ b/data/datasource_test.go
@@ -340,26 +340,28 @@ func TestReadStdin(t *testing.T) {
 // nolint: megacheck
 func TestDefineDatasource(t *testing.T) {
 	d := &Data{}
-	s, err := d.DefineDatasource("", "foo.json")
+	_, err := d.DefineDatasource("", "foo.json")
 	assert.Error(t, err)
 
 	d = &Data{}
-	s, err = d.DefineDatasource("", "../foo.json")
+	_, err = d.DefineDatasource("", "../foo.json")
 	assert.Error(t, err)
 
 	d = &Data{}
-	s, err = d.DefineDatasource("", "ftp://example.com/foo.yml")
+	_, err = d.DefineDatasource("", "ftp://example.com/foo.yml")
 	assert.Error(t, err)
 
 	d = &Data{}
-	s, err = d.DefineDatasource("data", "foo.json")
+	_, err = d.DefineDatasource("data", "foo.json")
+	s := d.Sources["data"]
 	assert.NoError(t, err)
 	assert.Equal(t, "data", s.Alias)
 	assert.Equal(t, "file", s.URL.Scheme)
 	assert.True(t, s.URL.IsAbs())
 
 	d = &Data{}
-	s, err = d.DefineDatasource("data", "/otherdir/foo.json")
+	_, err = d.DefineDatasource("data", "/otherdir/foo.json")
+	s = d.Sources["data"]
 	assert.NoError(t, err)
 	assert.Equal(t, "data", s.Alias)
 	assert.Equal(t, "file", s.URL.Scheme)
@@ -367,7 +369,8 @@ func TestDefineDatasource(t *testing.T) {
 	assert.Equal(t, "/otherdir/foo.json", s.URL.Path)
 
 	d = &Data{}
-	s, err = d.DefineDatasource("data", "sftp://example.com/blahblah/foo.json")
+	_, err = d.DefineDatasource("data", "sftp://example.com/blahblah/foo.json")
+	s = d.Sources["data"]
 	assert.NoError(t, err)
 	assert.Equal(t, "data", s.Alias)
 	assert.Equal(t, "sftp", s.URL.Scheme)
@@ -379,7 +382,8 @@ func TestDefineDatasource(t *testing.T) {
 			"data": {Alias: "data"},
 		},
 	}
-	s, err = d.DefineDatasource("data", "/otherdir/foo.json")
+	_, err = d.DefineDatasource("data", "/otherdir/foo.json")
+	s = d.Sources["data"]
 	assert.NoError(t, err)
 	assert.Equal(t, "data", s.Alias)
 	assert.Nil(t, s.URL)