Merge pull request #3 from benzaita/region-for-cs

Added a possibility to specify a region

Author: kzonov

Makefile

@@ -3,7 +3,7 @@ HOSTNAME=registry.terraform.io
 NAMESPACE=benzaita
 NAME=chaossearch
 BINARY=terraform-provider-${NAME}
-VERSION=0.5.1
+VERSION=0.5.2
 OS_ARCH=linux_amd64
 
 default: install

chaossearch/client/client.go

@@ -46,7 +46,7 @@ func (client *Client) signAndDo(req *http.Request, bodyAsBytes []byte) (*http.Re
 	req.Header.Add("User-Agent", client.userAgent)
 
 	credentials := credentials.NewStaticCredentials(client.config.AccessKeyID, client.config.SecretAccessKey, "")
-	_, err := v4.NewSigner(credentials).Sign(req, bodyReader, client.config.AWSServiceName, client.config.AWSRegion, time.Now())
+	_, err := v4.NewSigner(credentials).Sign(req, bodyReader, client.config.AWSServiceName, client.config.Region, time.Now())
 	if err != nil {
 		return nil, fmt.Errorf("Failed to sign request: %s", err)
 	}

chaossearch/client/configuration.go

@@ -6,14 +6,13 @@ type Configuration struct {
 	AccessKeyID     string
 	SecretAccessKey string
 	AWSServiceName  string
-	AWSRegion       string
+	Region       string
 }
 
 // NewConfiguration creates a default Configuration struct
 func NewConfiguration() *Configuration {
 	cfg := &Configuration{
 		AWSServiceName: "s3",
-		AWSRegion:      "eu-west-1",
 	}
 
 	return cfg

chaossearch/provider.go

@@ -33,6 +33,11 @@ func Provider() *schema.Provider {
 				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("CHAOSSEARCH_SECRET_ACCESS_KEY", ""),
 			},
+			"region": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("CHAOSSEARCH_REGION", "eu-west-1"),
+			},
 		},
 		ResourcesMap: map[string]*schema.Resource{
 			"chaossearch_object_group": resourceObjectGroup(),
@@ -48,6 +53,7 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}
 	url := d.Get("url").(string)
 	accessKeyID := d.Get("access_key_id").(string)
 	secretAccessKey := d.Get("secret_access_key").(string)
+	region := d.Get("region").(string)
 
 	if url == "" {
 		return nil, diag.Errorf("Expected 'url' to be defined in provider configuration, but it was not")
@@ -58,11 +64,15 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}
 	if secretAccessKey == "" {
 		return nil, diag.Errorf("Expected 'secret_access_key' to be defined in provider configuration, but it was not")
 	}
+	if region == "" {
+		return nil, diag.Errorf("Expected 'region' to be defined in provider configuration, but it was not")
+	}
 
 	config := client.NewConfiguration()
 	config.URL = url
 	config.AccessKeyID = accessKeyID
 	config.SecretAccessKey = secretAccessKey
+	config.Region = region
 
 	csClient := client.NewClient(config)