From d71e9bfaec8268865a354c09fb576f6f72603f92 Mon Sep 17 00:00:00 2001 From: Sarkis Varozian Date: Sat, 28 May 2016 16:10:32 -0400 Subject: [PATCH 1/2] update docs to reflect attribute conflict --- .../docs/providers/aws/r/security_group_rule.html.markdown | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/website/source/docs/providers/aws/r/security_group_rule.html.markdown b/website/source/docs/providers/aws/r/security_group_rule.html.markdown index 76b4db2ba..c6255de5e 100644 --- a/website/source/docs/providers/aws/r/security_group_rule.html.markdown +++ b/website/source/docs/providers/aws/r/security_group_rule.html.markdown @@ -31,7 +31,6 @@ resource "aws_security_group_rule" "allow_all" { cidr_blocks = ["0.0.0.0/0"] security_group_id = "sg-123456" - source_security_group_id = "sg-654321" } ``` @@ -41,12 +40,12 @@ The following arguments are supported: * `type` - (Required) The type of rule being created. Valid options are `ingress` (inbound) or `egress` (outbound). -* `cidr_blocks` - (Optional) List of CIDR blocks. +* `cidr_blocks` - (Optional) List of CIDR blocks. Cannot be used with `source_security_group_id`. * `from_port` - (Required) The start port (or ICMP type number if protocol is "icmp"). * `protocol` - (Required) The protocol. * `security_group_id` - (Required) The security group to apply this rule to. * `source_security_group_id` - (Optional) The security group id to allow access to/from, - depending on the `type`. + depending on the `type`. Cannot be used with `cidr_blocks`. * `self` - (Optional) If true, the security group itself will be added as a source to this ingress rule. * `to_port` - (Required) The end range port. From 5843ffa03ef6232b65958b43402b6b839e41ba25 Mon Sep 17 00:00:00 2001 From: Sarkis Varozian Date: Sun, 29 May 2016 13:17:42 -0400 Subject: [PATCH 2/2] keep documentation consistent --- .../docs/providers/aws/r/security_group_rule.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/source/docs/providers/aws/r/security_group_rule.html.markdown b/website/source/docs/providers/aws/r/security_group_rule.html.markdown index c6255de5e..dd36c0731 100644 --- a/website/source/docs/providers/aws/r/security_group_rule.html.markdown +++ b/website/source/docs/providers/aws/r/security_group_rule.html.markdown @@ -40,12 +40,12 @@ The following arguments are supported: * `type` - (Required) The type of rule being created. Valid options are `ingress` (inbound) or `egress` (outbound). -* `cidr_blocks` - (Optional) List of CIDR blocks. Cannot be used with `source_security_group_id`. +* `cidr_blocks` - (Optional) List of CIDR blocks. Cannot be specified with `source_security_group_id`. * `from_port` - (Required) The start port (or ICMP type number if protocol is "icmp"). * `protocol` - (Required) The protocol. * `security_group_id` - (Required) The security group to apply this rule to. * `source_security_group_id` - (Optional) The security group id to allow access to/from, - depending on the `type`. Cannot be used with `cidr_blocks`. + depending on the `type`. Cannot be specified with `cidr_blocks`. * `self` - (Optional) If true, the security group itself will be added as a source to this ingress rule. * `to_port` - (Required) The end range port.