point release fixes (#22)

EventStore · Jan 26, 2021 · 248898f · 248898f
1 parent 1190f26
commit 248898f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# 1.5.1 (Jan 26, 2021)
+
+ENHANCEMENTS:
+
+* Add missing server version
+* Add missing instance types
+* Fix ESC_ORG_ID environment variable key
+
+# 1.5.0 (Dec 11, 2020)
+
+ENHANCEMENTS:
+
+* Publish to registry
+
 # 1.4.0 (Dec 9, 2020)
 
 ENHANCEMENTS:

diff --git a/README.md b/README.md
@@ -15,8 +15,8 @@ Alternatively, the binary can be placed alongside the main `terraform` binary.
 
 On macOS and Linux, you can download the provider using the following commands:
 
-- macOS: `curl -o ./terraform-provider-eventstorecloud.zip -L https://github.com/EventStore/terraform-provider-eventstorecloud/releases/download/v1.5.0/terraform-provider-eventstorecloud_1.5.0_darwin_amd64.zip && unzip ./terraform-provider-eventstorecloud.zip && mv ./terraform-provider-eventstorecloud ~/.terraform.d/plugins/terraform-provider-eventstorecloud`
-- Linux: `curl -o ./terraform-provider-eventstorecloud.zip -L https://github.com/EventStore/terraform-provider-eventstorecloud/releases/download/v1.5.0/terraform-provider-eventstorecloud_1.5.0_linux_amd64.zip && unzip ./terraform-provider-eventstorecloud.zip && mv ./terraform-provider-eventstorecloud ~/.terraform.d/plugins/terraform-provider-eventstorecloud`
+- macOS: `curl -o ./terraform-provider-eventstorecloud.zip -L https://github.com/EventStore/terraform-provider-eventstorecloud/releases/download/v1.5.1/terraform-provider-eventstorecloud_1.5.1_darwin_amd64.zip && unzip ./terraform-provider-eventstorecloud.zip && mv ./terraform-provider-eventstorecloud ~/.terraform.d/plugins/terraform-provider-eventstorecloud`
+- Linux: `curl -o ./terraform-provider-eventstorecloud.zip -L https://github.com/EventStore/terraform-provider-eventstorecloud/releases/download/v1.5.1/terraform-provider-eventstorecloud_1.5.1_linux_amd64.zip && unzip ./terraform-provider-eventstorecloud.zip && mv ./terraform-provider-eventstorecloud ~/.terraform.d/plugins/terraform-provider-eventstorecloud`
 
 If you prefer to install from source, use the `make install` target in this repository. You'll need a Go 1.13+
 development environment.
@@ -31,7 +31,7 @@ terraform {
   required_providers {
     eventstorecloud = {
       source = "EventStore/eventstorecloud"
-      version = "1.5.0"
+      version = "1.5.1"
     }
   }
 }

diff --git a/esc/provider.go b/esc/provider.go
@@ -32,7 +32,7 @@ func Provider() terraform.ResourceProvider {
 			"organization_id": {
 				Type:        schema.TypeString,
 				Required:    true,
-				DefaultFunc: schema.EnvDefaultFunc("ESC_ORG", ""),
+				DefaultFunc: schema.EnvDefaultFunc("ESC_ORG_ID", ""),
 			},
 
 			"token_store": {
@@ -97,8 +97,8 @@ var slowResourceTimeout = &schema.ResourceTimeout{
 }
 
 var validProviders = []string{"aws", "gcp", "azure"}
-var validServerVersions = []string{"20.6"}
+var validServerVersions = []string{"20.6", "20.10"}
 var validTopologies = []string{"single-node", "three-node-multi-zone"}
-var validInstanceTypes = []string{"F1", "C4"}
+var validInstanceTypes = []string{"F1", "C4", "M8", "M16", "M32", "M64", "M128"}
 var validDiskTypes = []string{"GP2", "SSD", "PREMIUM-SSD-LRS"}
 var validProjectionLevels = []string{"off", "system", "user"}