Merge pull request #23 from zencoder/remove-assumptions

Remove forced assumptions about bucket naming

Author: philcluff

.gitignore

@@ -1,3 +1,4 @@
 bin/
 coverage/
 vendor/
+.idea

Makefile

@@ -13,6 +13,9 @@ build:
 	go build -v -o bin/go-remote-config
 fmt:
 	go fmt ./...
+
+test: export AWS_ACCESS_KEY_ID := 1
+test: export AWS_SECRET_ACCESS_KEY := 1
 test:
 	if [ ! -d coverage ]; then mkdir coverage; fi
 	go test -v ./ -race -cover -coverprofile=$(COVERAGEDIR)/remoteconfig.coverprofile

glide.lock

@@ -1,21 +1,8 @@
 package: github.com/zencoder/go-remote-config
 import:
-- package: github.com/aws/aws-sdk-go
-  version: v1.0.9 
-  subpackages:
-  - aws
-  - internal/endpoints
-  - internal/protocol/query
-  - internal/protocol/rest
-  - internal/protocol/restxml
-  - internal/protocol/xml/xmlutil
-  - internal/signer/v4
-  - service/s3
 - package: github.com/stretchr/testify
   version: c478a808a1b37e10c82f71a2172728f8742bad51
   subpackages:
   - assert
   - require
   - suite
-- package: github.com/vaughan0/go-ini
-  version: a98ad7ee00ec53921f08832bc06ecf7fd600e6a1

glide.yaml

@@ -3,6 +3,7 @@ package remoteconfig
 import (
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
 	"reflect"
 	"strings"
@@ -20,39 +21,30 @@ type Validater interface {
 // Downloads a configuration JSON file from S3.
 // Parses it to a particular struct type and runs a validation.
 // URL should be of the format s3://bucket/path/file.json
-func LoadConfigFromS3(configURL string, configRegion AWSRegion, configEndpoint string, configStruct interface{}) error {
-	// Build a Signed URL to the config file in S3
-	signedURL, err := BuildSignedS3URL(configURL, configRegion, DEFAULT_S3_EXPIRY, configEndpoint)
-	if err != nil {
-		return err
-	}
-
-	return DownloadJSONValidate(signedURL, configStruct)
-}
-
-// Downloads JSON from a URL, decodes it and then validates.
-func DownloadJSONValidate(signedURL string, configStruct interface{}) error {
-	// Download the config file from S3
-	resp, err := http.Get(signedURL)
+func LoadConfigFromURL(configURL string, configStruct interface{}) error {
+	resp, err := http.Get(configURL)
 	if err != nil {
 		return err
 	}
 	defer resp.Body.Close()
 
-	// Check that we got a valid response code
 	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("Download of JSON failed, URL = %s, Response Code = %d", signedURL, resp.StatusCode)
+		return fmt.Errorf("Request to '%s' returned non-200 OK status '%d: %s'", configURL, resp.StatusCode, http.StatusText(resp.StatusCode))
 	}
 
+	return ReadJSONValidate(resp.Body, configStruct)
+}
+
+// Downloads JSON from a URL, decodes it and then validates.
+func ReadJSONValidate(cfgReader io.Reader, configStruct interface{}) error {
 	// Do a streaming JSON decode
-	dec := json.NewDecoder(resp.Body)
-	if err = dec.Decode(configStruct); err != nil {
+	dec := json.NewDecoder(cfgReader)
+	if err := dec.Decode(configStruct); err != nil {
 		return fmt.Errorf("Failed to decode JSON, with error, %s", err.Error())
 	}
 
 	// Run validation on the config
-	err = validateConfigWithReflection(configStruct)
-	if err != nil {
+	if err := validateConfigWithReflection(configStruct); err != nil {
 		return err
 	}