From b236cdf918e31146c536b03df2c8d6446a4efa7f Mon Sep 17 00:00:00 2001 From: Jake Champlin Date: Sun, 31 May 2015 18:01:07 -0400 Subject: [PATCH 1/2] Set AWS Elasticache Port Number to be required Set Elasticache Port number to not be set by default, and require Elasticache Port number to be specified. Also updated acceptance tests to supply port number upon resource declaration Fixes #2084 --- builtin/providers/aws/resource_aws_elasticache_cluster.go | 5 ++--- .../providers/aws/resource_aws_elasticache_cluster_test.go | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/providers/aws/resource_aws_elasticache_cluster.go b/builtin/providers/aws/resource_aws_elasticache_cluster.go index 1095a93074..c8f5e55182 100644 --- a/builtin/providers/aws/resource_aws_elasticache_cluster.go +++ b/builtin/providers/aws/resource_aws_elasticache_cluster.go @@ -52,8 +52,7 @@ func resourceAwsElasticacheCluster() *schema.Resource { }, "port": &schema.Schema{ Type: schema.TypeInt, - Default: 11211, - Optional: true, + Required: true, ForceNew: true, }, "engine_version": &schema.Schema{ @@ -123,7 +122,7 @@ func resourceAwsElasticacheClusterCreate(d *schema.ResourceData, meta interface{ numNodes := int64(d.Get("num_cache_nodes").(int)) // 2 engine := d.Get("engine").(string) // memcached engineVersion := d.Get("engine_version").(string) // 1.4.14 - port := int64(d.Get("port").(int)) // 11211 + port := int64(d.Get("port").(int)) // e.g) 11211 subnetGroupName := d.Get("subnet_group_name").(string) securityNameSet := d.Get("security_group_names").(*schema.Set) securityIdSet := d.Get("security_group_ids").(*schema.Set) diff --git a/builtin/providers/aws/resource_aws_elasticache_cluster_test.go b/builtin/providers/aws/resource_aws_elasticache_cluster_test.go index 1fb478b26a..3257d9ac78 100644 --- a/builtin/providers/aws/resource_aws_elasticache_cluster_test.go +++ b/builtin/providers/aws/resource_aws_elasticache_cluster_test.go @@ -95,7 +95,7 @@ func genRandInt() int { } var testAccAWSElasticacheClusterConfig = fmt.Sprintf(` -provider "aws" { +provider "aws" { region = "us-east-1" } resource "aws_security_group" "bar" { @@ -120,6 +120,7 @@ resource "aws_elasticache_cluster" "bar" { engine = "memcached" node_type = "cache.m1.small" num_cache_nodes = 1 + port = 11211 parameter_group_name = "default.memcached1.4" security_group_names = ["${aws_elasticache_security_group.bar.name}"] } From a6e17d3b5f46079d66bfc4a5599c5769d6189fc3 Mon Sep 17 00:00:00 2001 From: Jake Champlin Date: Mon, 1 Jun 2015 10:55:07 -0400 Subject: [PATCH 2/2] Update Documentation --- .../docs/providers/aws/r/elasticache_cluster.html.markdown | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown b/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown index ccc4429ddb..575c74ad4e 100644 --- a/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown +++ b/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown @@ -17,6 +17,7 @@ resource "aws_elasticache_cluster" "bar" { cluster_id = "cluster-example" engine = "memcached" node_type = "cache.m1.small" + port = 11211 num_cache_nodes = 1 parameter_group_name = "default.memcached1.4" } @@ -47,8 +48,8 @@ value must be between 1 and 20 * `parameter_group_name` – (Required) Name of the parameter group to associate with this cache cluster -* `port` – (Optional) The port number on which each of the cache nodes will -accept connections. Default 11211. +* `port` – (Required) The port number on which each of the cache nodes will +accept connections. For Memcache the default is 11211, and for Redis the default port is 6379. * `subnet_group_name` – (Optional, VPC only) Name of the subnet group to be used for the cache cluster.