Skip to content

Commit

Permalink
Fix panic in networking_secgroup_v2 data source (#1176)
Browse files Browse the repository at this point in the history
Fix panic in `networking_secgroup_v2` data source

Summary of the Pull Request
Fix #1175
PR Checklist

 Refers to: #1175
 Tests added/passed.
 Schema updated.

Acceptance Steps Performed
=== RUN   TestAccOpenTelekomCloudNetworkingSecGroupV2DataSource_basic
--- PASS: TestAccOpenTelekomCloudNetworkingSecGroupV2DataSource_basic (28.28s)
=== RUN   TestAccOpenTelekomCloudNetworkingSecGroupV2DataSource_secGroupID
--- PASS: TestAccOpenTelekomCloudNetworkingSecGroupV2DataSource_secGroupID (27.95s)
PASS

Process finished with the exit code 0

Reviewed-by: Anton Sidelnikov <None>
Reviewed-by: Rodion Gyrbu <fpsoff@outlook.com>
Reviewed-by: None <None>
  • Loading branch information
outcatcher committed Jun 29, 2021
1 parent 92c330e commit 1396cfb
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"log"

"github.com/hashicorp/go-multierror"
"github.com/opentelekomcloud/gophertelekomcloud/openstack/networking/v2/extensions/security/groups"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
Expand Down Expand Up @@ -38,6 +39,10 @@ func DataSourceNetworkingSecGroupV2() *schema.Resource {
ForceNew: true,
Computed: true,
},
"description": {
Type: schema.TypeString,
Computed: true,
},
},
}
}
Expand Down Expand Up @@ -75,10 +80,15 @@ func dataSourceNetworkingSecGroupV2Read(_ context.Context, d *schema.ResourceDat
log.Printf("[DEBUG] Retrieved Security Group %s: %+v", secGroup.ID, secGroup)
d.SetId(secGroup.ID)

d.Set("name", secGroup.Name)
d.Set("description", secGroup.Description)
d.Set("tenant_id", secGroup.TenantID)
d.Set("region", config.GetRegion(d))
mErr := multierror.Append(
d.Set("name", secGroup.Name),
d.Set("description", secGroup.Description),
d.Set("tenant_id", secGroup.TenantID),
d.Set("region", config.GetRegion(d)),
)
if err := mErr.ErrorOrNil(); err != nil {
return fmterr.Errorf("error setting security group fields: %w", err)
}

return nil
}
4 changes: 4 additions & 0 deletions releasenotes/notes/fix-secgroup-23e41d4ac82f0f34.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
fixes:
- |
Fix panic when using `opentelekomcloud_networking_secgroup_v2` data source ([#1176](https://github.com/opentelekomcloud/terraform-provider-opentelekomcloud/pull/1176))

0 comments on commit 1396cfb

Please sign in to comment.