Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not import aws_security_group_rule for associated rules during aws_security_group import #12616

Merged
merged 2 commits into from
Jul 15, 2020
Merged

Do not import aws_security_group_rule for associated rules during aws_security_group import #12616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50125f3
Removing import of aws_security_group_rule for rules associated with …
spavuluri Mar 31, 2020
0297e0a
rebased and addressed review feedback
spavuluri Jul 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 0 additions & 175 deletions aws/import_aws_security_group.go
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions aws/resource_aws_security_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func resourceAwsSecurityGroup() *schema.Resource {
Update: resourceAwsSecurityGroupUpdate,
Delete: resourceAwsSecurityGroupDelete,
Importer: &schema.ResourceImporter{
State: resourceAwsSecurityGroupImportState,
State: schema.ImportStatePassthrough,
},

Timeouts: &schema.ResourceTimeout{
Expand Down Expand Up @@ -383,8 +383,9 @@ func resourceAwsSecurityGroupRead(d *schema.ResourceData, meta interface{}) erro
d.Set("arn", sgArn.String())
d.Set("description", sg.Description)
d.Set("name", sg.GroupName)
d.Set("vpc_id", sg.VpcId)
d.Set("name_prefix", aws.StringValue(naming.NamePrefixFromName(aws.StringValue(sg.GroupName))))
d.Set("owner_id", sg.OwnerId)
d.Set("vpc_id", sg.VpcId)

if err := d.Set("ingress", ingressRules); err != nil {
log.Printf("[WARN] Error setting Ingress rule set for (%s): %s", d.Id(), err)
Expand Down
Loading