Merge pull request tmknom#16 from tmknom/rename-to-source-cidr-blocks

tmknom · web-flow · commit 10c5dba055e9 · 2020-05-03T22:17:00.000+09:00
Rename ingress_cidr_blocks to source_cidr_blocks
diff --git a/README.md b/README.md
@@ -33,9 +33,9 @@ module "elasticache_redis" {
   number_cache_clusters = 2
   node_type             = "cache.m3.medium"
 
-  subnet_ids          = var.subnet_ids
-  vpc_id              = var.vpc_id
-  ingress_cidr_blocks = var.ingress_cidr_blocks
+  subnet_ids         = var.subnet_ids
+  vpc_id             = var.vpc_id
+  source_cidr_blocks = var.source_cidr_blocks
 }
 ```
 
@@ -60,9 +60,9 @@ module "elasticache_redis" {
   family                     = "redis5.0"
   description                = "This is example"
 
-  subnet_ids          = var.subnet_ids
-  vpc_id              = var.vpc_id
-  ingress_cidr_blocks = var.ingress_cidr_blocks
+  subnet_ids         = var.subnet_ids
+  vpc_id             = var.vpc_id
+  source_cidr_blocks = var.source_cidr_blocks
 
   tags = {
     Environment = "prod"
@@ -93,10 +93,10 @@ module "elasticache_redis" {
 
 | Name                       | Description                                                                                                               | Type           | Default                  | Required |
 | -------------------------- | ------------------------------------------------------------------------------------------------------------------------- | -------------- | ------------------------ | :------: |
-| ingress_cidr_blocks        | List of Ingress CIDR blocks.                                                                                              | `list(string)` | n/a                      |   yes    |
 | name                       | The replication group identifier. This parameter is stored as a lowercase string.                                         | `string`       | n/a                      |   yes    |
 | node_type                  | The compute and memory capacity of the nodes in the node group.                                                           | `string`       | n/a                      |   yes    |
 | number_cache_clusters      | The number of cache clusters (primary and replicas) this replication group will have.                                     | `string`       | n/a                      |   yes    |
+| source_cidr_blocks         | List of source CIDR blocks.                                                                                               | `list(string)` | n/a                      |   yes    |
 | subnet_ids                 | List of VPC Subnet IDs for the cache subnet group.                                                                        | `list(string)` | n/a                      |   yes    |
 | vpc_id                     | VPC Id to associate with Redis ElastiCache.                                                                               | `string`       | n/a                      |   yes    |
 | apply_immediately          | Specifies whether any modifications are applied immediately, or during the next maintenance window.                       | `bool`         | `false`                  |    no    |
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -16,9 +16,9 @@ module "elasticache_redis" {
   family                     = "redis5.0"
   description                = "This is example"
 
-  subnet_ids          = module.vpc.public_subnet_ids
-  vpc_id              = module.vpc.vpc_id
-  ingress_cidr_blocks = [module.vpc.vpc_cidr_block]
+  subnet_ids         = module.vpc.public_subnet_ids
+  vpc_id             = module.vpc.vpc_id
+  source_cidr_blocks = [module.vpc.vpc_cidr_block]
 
   tags = {
     Environment = "prod"
diff --git a/examples/minimal/main.tf b/examples/minimal/main.tf
@@ -4,9 +4,9 @@ module "elasticache_redis" {
   number_cache_clusters = 2
   node_type             = "cache.m3.medium"
 
-  subnet_ids          = module.vpc.public_subnet_ids
-  vpc_id              = module.vpc.vpc_id
-  ingress_cidr_blocks = [module.vpc.vpc_cidr_block]
+  subnet_ids         = module.vpc.public_subnet_ids
+  vpc_id             = module.vpc.vpc_id
+  source_cidr_blocks = [module.vpc.vpc_cidr_block]
 }
 
 module "vpc" {
diff --git a/main.tf b/main.tf
@@ -123,7 +123,7 @@ resource "aws_security_group_rule" "ingress" {
   from_port         = var.port
   to_port           = var.port
   protocol          = "tcp"
-  cidr_blocks       = var.ingress_cidr_blocks
+  cidr_blocks       = var.source_cidr_blocks
   security_group_id = aws_security_group.default.id
 }
 
diff --git a/variables.tf b/variables.tf
@@ -23,9 +23,9 @@ variable "vpc_id" {
   description = "VPC Id to associate with Redis ElastiCache."
 }
 
-variable "ingress_cidr_blocks" {
+variable "source_cidr_blocks" {
   type        = list(string)
-  description = "List of Ingress CIDR blocks."
+  description = "List of source CIDR blocks."
 }
 
 variable "engine_version" {

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ resource "aws_security_group_rule" "ingress" {`
`123`	`123`	`from_port = var.port`
`124`	`124`	`to_port = var.port`
`125`	`125`	`protocol = "tcp"`
`126`		`- cidr_blocks = var.ingress_cidr_blocks`
	`126`	`+ cidr_blocks = var.source_cidr_blocks`
`127`	`127`	`security_group_id = aws_security_group.default.id`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@ variable "vpc_id" {`
`23`	`23`	`description = "VPC Id to associate with Redis ElastiCache."`
`24`	`24`	`}`
`25`	`25`
`26`		`-variable "ingress_cidr_blocks" {`
	`26`	`+variable "source_cidr_blocks" {`
`27`	`27`	`type = list(string)`
`28`		`- description = "List of Ingress CIDR blocks."`
	`28`	`+ description = "List of source CIDR blocks."`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`variable "engine_version" {`