Skip to content

Commit ef3ae0f

Browse files
committed
Merge pull request #18467 from mschuchard/b-self-conflicts-with
2 parents b6d154d + d21d1a4 commit ef3ae0f

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

aws/resource_aws_security_group_rule.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ func resourceAwsSecurityGroupRule() *schema.Resource {
9696
Type: schema.TypeString,
9797
ValidateFunc: validateCIDRNetworkAddress,
9898
},
99+
ConflictsWith: []string{"source_security_group_id", "self"},
99100
},
100101

101102
"ipv6_cidr_blocks": {
@@ -106,6 +107,7 @@ func resourceAwsSecurityGroupRule() *schema.Resource {
106107
Type: schema.TypeString,
107108
ValidateFunc: validateCIDRNetworkAddress,
108109
},
110+
ConflictsWith: []string{"source_security_group_id", "self"},
109111
},
110112

111113
"prefix_list_ids": {
@@ -126,14 +128,15 @@ func resourceAwsSecurityGroupRule() *schema.Resource {
126128
Optional: true,
127129
ForceNew: true,
128130
Computed: true,
129-
ConflictsWith: []string{"cidr_blocks", "self"},
131+
ConflictsWith: []string{"cidr_blocks", "ipv6_cidr_blocks", "self"},
130132
},
131133

132134
"self": {
133-
Type: schema.TypeBool,
134-
Optional: true,
135-
Default: false,
136-
ForceNew: true,
135+
Type: schema.TypeBool,
136+
Optional: true,
137+
Default: false,
138+
ForceNew: true,
139+
ConflictsWith: []string{"cidr_blocks", "ipv6_cidr_blocks", "source_security_group_id"},
137140
},
138141

139142
"description": {

0 commit comments

Comments
 (0)