Export Provider constructors taking io.Reader (#69)

Export the already-existing constructor functions that take io.Reader. This
helps build Providers from sources other than files.

config_test.go

@@ -362,7 +362,7 @@ rpc:
 		return "4324", true
 	}
 
-	p, err := newYAMLProviderFromReaderWithExpand(
+	p, err := NewYAMLProviderFromReaderWithExpand(
 		lookup,
 		ioutil.NopCloser(bytes.NewBufferString(rpc)))
 

expand_test.go

@@ -159,7 +159,7 @@ func TestExpanderFailingTransform(t *testing.T) {
 		switch s {
 		case "t3sT":
 			return "test", nil
-		// missing "i5_" case
+			// missing "i5_" case
 		}
 
 		return "NOMATCH", errors.New("No Match")

static_provider.go

@@ -40,7 +40,7 @@ func NewStaticProvider(data interface{}) (Provider, error) {
 		return nil, err
 	}
 
-	p, err := newYAMLProviderFromReader(c)
+	p, err := NewYAMLProviderFromReader(c)
 	if err != nil {
 		return nil, err
 	}
@@ -58,7 +58,7 @@ func NewStaticProviderWithExpand(
 		return nil, err
 	}
 
-	p, err := newYAMLProviderFromReaderWithExpand(mapping, reader)
+	p, err := NewYAMLProviderFromReaderWithExpand(mapping, reader)
 	if err != nil {
 		return nil, err
 	}

static_provider_test.go

@@ -350,7 +350,7 @@ func TestInterpolatedBool(t *testing.T) {
 		return "", false
 	}
 
-	p, err := newYAMLProviderFromReaderWithExpand(
+	p, err := NewYAMLProviderFromReaderWithExpand(
 		f,
 		ioutil.NopCloser(strings.NewReader("val: ${interpolate:false}")))
 

yaml.go

@@ -144,7 +144,7 @@ func NewYAMLProviderFromFiles(files ...string) (Provider, error) {
 		readers[i] = r
 	}
 
-	provider, err := newYAMLProviderFromReader(readers...)
+	provider, err := NewYAMLProviderFromReader(readers...)
 
 	for _, r := range readClosers {
 		nerr := r.Close()
@@ -181,7 +181,7 @@ func NewYAMLProviderWithExpand(mapping func(string) (string, bool), files ...str
 		readers[i] = r
 	}
 
-	provider, err := newYAMLProviderFromReaderWithExpand(mapping,
+	provider, err := NewYAMLProviderFromReaderWithExpand(mapping,
 		readers...)
 
 	for _, r := range readClosers {
@@ -196,7 +196,7 @@ func NewYAMLProviderWithExpand(mapping func(string) (string, bool), files ...str
 
 // NewYAMLProviderFromReader creates a configuration provider from a list of io.Readers.
 // As above, all the objects are going to be merged and arrays/values overridden in the order of the files.
-func newYAMLProviderFromReader(readers ...io.Reader) (Provider, error) {
+func NewYAMLProviderFromReader(readers ...io.Reader) (Provider, error) {
 	p, err := newYAMLProviderCore(readers...)
 	if err != nil {
 		return nil, err
@@ -208,7 +208,7 @@ func newYAMLProviderFromReader(readers ...io.Reader) (Provider, error) {
 // NewYAMLProviderFromReaderWithExpand creates a configuration provider from
 // a list of `io.Readers and uses the mapping function to expand values
 // in the underlying provider.
-func newYAMLProviderFromReaderWithExpand(
+func NewYAMLProviderFromReaderWithExpand(
 	mapping func(string) (string, bool),
 	readers ...io.Reader) (Provider, error) {
 
@@ -221,7 +221,7 @@ func newYAMLProviderFromReaderWithExpand(
 			&expandTransformer{expand: expandFunc})
 	}
 
-	return newYAMLProviderFromReader(ereaders...)
+	return NewYAMLProviderFromReader(ereaders...)
 }
 
 // NewYAMLProviderFromBytes creates a config provider from a byte-backed YAML
@@ -233,7 +233,7 @@ func NewYAMLProviderFromBytes(yamls ...[]byte) (Provider, error) {
 		readers[i] = bytes.NewReader(yml)
 	}
 
-	return newYAMLProviderFromReader(readers...)
+	return NewYAMLProviderFromReader(readers...)
 }
 
 func filesToReaders(files ...string) ([]io.ReadCloser, error) {

yaml_test.go

@@ -76,7 +76,7 @@ module:
   fake:
     number: ${FAKE_NUMBER:321}`)
 
-	p, err := newYAMLProviderFromReaderWithExpand(f, cfg)
+	p, err := NewYAMLProviderFromReaderWithExpand(f, cfg)
 	require.NoError(t, err, "Can't create a YAML provider")
 	require.Equal(t, "321", p.Get("module.fake.number").String())
 
@@ -95,7 +95,7 @@ name: some name here
 email: ${EMAIL_ADDRESS}`)
 
 	f := func(string) (string, bool) { return "", false }
-	_, err := newYAMLProviderFromReaderWithExpand(f, cfg)
+	_, err := NewYAMLProviderFromReaderWithExpand(f, cfg)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), `default is empty for "EMAIL_ADDRESS"`)
 }
@@ -108,7 +108,7 @@ name: some name here
 telephone: ${SUPPORT_TEL:}`)
 
 	f := func(string) (string, bool) { return "", false }
-	_, err := newYAMLProviderFromReaderWithExpand(f, cfg)
+	_, err := NewYAMLProviderFromReaderWithExpand(f, cfg)
 
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), `default is empty for "SUPPORT_TEL" (use "" for empty string)`)
@@ -122,7 +122,7 @@ func TestYAMLEnvInterpolationWithColon(t *testing.T) {
 		return "", false
 	}
 
-	p, err := newYAMLProviderFromReaderWithExpand(f, cfg)
+	p, err := NewYAMLProviderFromReaderWithExpand(f, cfg)
 	require.NoError(t, err, "Can't create a YAML provider")
 
 	require.Equal(t, "this:is:my:value", p.Get("fullValue").String())
@@ -136,7 +136,7 @@ name: ${APP_NAME:my shiny app}
 fullTel: 1-800-LOLZ${TELEPHONE_EXTENSION:""}`)
 
 	f := func(string) (string, bool) { return "", false }
-	p, err := newYAMLProviderFromReaderWithExpand(f, cfg)
+	p, err := NewYAMLProviderFromReaderWithExpand(f, cfg)
 	require.NoError(t, err, "Can't create a YAML provider")
 
 	require.Equal(t, "my shiny app", p.Get("name").String())
@@ -221,7 +221,7 @@ func TestNewYAMLProviderFromReader(t *testing.T) {
 	t.Parallel()
 
 	buff := bytes.NewBuffer([]byte(_yamlConfig1))
-	provider, err := newYAMLProviderFromReader(buff)
+	provider, err := NewYAMLProviderFromReader(buff)
 	require.NoError(t, err, "Can't create a YAML provider")
 
 	cs := &configStruct{}
@@ -1199,7 +1199,7 @@ func TestYAMLEnvInterpolationValueMissing(t *testing.T) {
 	cfg := strings.NewReader(`name:`)
 
 	f := func(string) (string, bool) { return "", false }
-	p, err := newYAMLProviderFromReaderWithExpand(f, cfg)
+	p, err := NewYAMLProviderFromReaderWithExpand(f, cfg)
 	require.NoError(t, err, "Can't create a YAML provider")
 	assert.Equal(t, nil, p.Get("name").Value())
 }
@@ -1214,7 +1214,7 @@ func TestYAMLEnvInterpolationValueConversion(t *testing.T) {
 		return "3", true
 	}
 
-	p, err := newYAMLProviderFromReaderWithExpand(f, cfg)
+	p, err := NewYAMLProviderFromReaderWithExpand(f, cfg)
 	require.NoError(t, err, "Can't create a YAML provider")
 
 	assert.Equal(t, "3", p.Get("number").String())
@@ -1782,7 +1782,7 @@ func TestMergeErrorsFromReaders(t *testing.T) {
 		dev := strings.NewReader(`a:
   b: c`)
 
-		_, err := newYAMLProviderFromReader(base, dev)
+		_, err := NewYAMLProviderFromReader(base, dev)
 		require.Error(t, err)
 		assert.Contains(t, err.Error(), "can't merge map")
 	})
@@ -1795,7 +1795,7 @@ func TestMergeErrorsFromReaders(t *testing.T) {
 		dev := strings.NewReader(`a:
   b: c`)
 
-		_, err := newYAMLProviderFromReaderWithExpand(expand, base, dev)
+		_, err := NewYAMLProviderFromReaderWithExpand(expand, base, dev)
 		require.Error(t, err)
 		assert.Contains(t, err.Error(), "can't merge map")
 	})
@@ -1832,7 +1832,7 @@ func TestMergeErrorsFromFiles(t *testing.T) {
 		d, err := ioutil.ReadFile(dev.Name())
 		require.NoError(t, err, "Can't read dev file")
 
-		_, err = newYAMLProviderFromReader(
+		_, err = NewYAMLProviderFromReader(
 			bytes.NewBuffer(b),
 			bytes.NewBuffer(d))
 
@@ -1857,7 +1857,7 @@ func TestMergeErrorsFromFiles(t *testing.T) {
 
 		expand := func(string) (string, bool) { return "", false }
 
-		_, err = newYAMLProviderFromReaderWithExpand(
+		_, err = NewYAMLProviderFromReaderWithExpand(
 			expand,
 			bytes.NewBuffer(b),
 			bytes.NewBuffer(d))