Skip to content
This repository was archived by the owner on Mar 1, 2023. It is now read-only.

Commit 8c938f6

Browse files
committed
security_group data source fixed
1 parent ae57561 commit 8c938f6

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ terraform {
1818
required_providers {
1919
gcore = {
2020
source = "G-Core/gcorelabs"
21-
version = "0.1.2"
21+
version = "0.1.3"
2222
}
2323
}
2424
}

examples/provider/provider.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33
required_providers {
44
gcore = {
55
source = "G-Core/gcorelabs"
6-
version = "0.1.2"
6+
version = "0.1.3"
77
}
88
}
99
}

gcore/data_source_gcore_securitygroup.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,12 @@ func dataSourceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, m
153153
r["id"] = sgr.ID
154154
r["direction"] = sgr.Direction.String()
155155

156+
r["ethertype"] = ""
156157
if sgr.EtherType != nil {
157158
r["ethertype"] = sgr.EtherType.String()
158159
}
159160

161+
r["protocol"] = types.ProtocolAny.String()
160162
if sgr.Protocol != nil {
161163
r["protocol"] = sgr.Protocol.String()
162164
}

gcore/utils.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ func findProjectByName(arr []projects.Project, name string) (int, error) {
268268
return el.ID, nil
269269
}
270270
}
271-
return 0, fmt.Errorf("Region with name %s not found", name)
271+
return 0, fmt.Errorf("project with name %s not found", name)
272272
}
273273

274274
//GetProject returns valid projectID for a resource
@@ -306,7 +306,7 @@ func findRegionByName(arr []regions.Region, name string) (int, error) {
306306
return el.ID, nil
307307
}
308308
}
309-
return 0, fmt.Errorf("Region with name %s not found", name)
309+
return 0, fmt.Errorf("region with name %s not found", name)
310310
}
311311

312312
//GetRegion returns valid regionID for a resource
@@ -321,12 +321,12 @@ func GetRegion(provider *gcorecloud.ProviderClient, regionID int, regionName str
321321
Project: 0,
322322
Version: "v1",
323323
})
324-
regions, err := regions.ListAll(client)
324+
rs, err := regions.ListAll(client)
325325
if err != nil {
326326
return 0, err
327327
}
328-
log.Printf("[DEBUG] Regions: %v", regions)
329-
regionID, err = findRegionByName(regions, regionName)
328+
log.Printf("[DEBUG] Regions: %v", rs)
329+
regionID, err = findRegionByName(rs, regionName)
330330
if err != nil {
331331
return 0, err
332332
}

0 commit comments

Comments
 (0)