Skip to content

Commit 2eb508d

Browse files
committed
Fixing code review changes
1 parent 8918bb8 commit 2eb508d

3 files changed

Lines changed: 48 additions & 9 deletions

File tree

github/resource_github_enterprise_ip_allow_list_entry.go

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,16 +228,58 @@ func resourceGithubEnterpriseIpAllowListEntryDelete(ctx context.Context, d *sche
228228
}
229229

230230
func resourceGithubEnterpriseIpAllowListEntryImport(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
231-
// <enterprise_slug>:<ip_allow_list_entry_id>
232-
enterprise_slug, ip_allow_list_entry_id, err := parseID2(d.Id())
231+
client := meta.(*Owner).v4client
232+
233+
var query struct {
234+
Node struct {
235+
IpAllowListEntry struct {
236+
ID githubv4.String
237+
AllowListValue githubv4.String
238+
Name githubv4.String
239+
IsActive githubv4.Boolean
240+
CreatedAt githubv4.String
241+
UpdatedAt githubv4.String
242+
Owner struct {
243+
Enterprise struct {
244+
Slug githubv4.String
245+
} `graphql:"... on Enterprise"`
246+
}
247+
} `graphql:"... on IpAllowListEntry"`
248+
} `graphql:"node(id: $id)"`
249+
}
250+
251+
variables := map[string]interface{}{
252+
"id": githubv4.ID(d.Id()),
253+
}
254+
255+
err := client.Query(ctx, &query, variables)
233256
if err != nil {
234257
return nil, err
235258
}
236259

237-
if err := d.Set("enterprise_slug", enterprise_slug); err != nil {
260+
entry := query.Node.IpAllowListEntry
261+
262+
if err := d.Set("enterprise_slug", string(entry.Owner.Enterprise.Slug)); err != nil {
263+
return nil, err
264+
}
265+
if err := d.Set("ip", string(entry.AllowListValue)); err != nil {
266+
return nil, err
267+
}
268+
if err := d.Set("name", entry.Name); err != nil {
269+
return nil, err
270+
}
271+
if err := d.Set("ip", entry.AllowListValue); err != nil {
272+
return nil, err
273+
}
274+
if err := d.Set("is_active", entry.IsActive); err != nil {
275+
return nil, err
276+
}
277+
if err := d.Set("created_at", entry.CreatedAt); err != nil {
278+
return nil, err
279+
}
280+
if err := d.Set("updated_at", entry.UpdatedAt); err != nil {
238281
return nil, err
239282
}
240-
d.SetId(ip_allow_list_entry_id)
241283

242284
return []*schema.ResourceData{d}, nil
243285
}

github/resource_github_enterprise_ip_allow_list_entry_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ resource "github_enterprise_ip_allow_list_entry" "test" {
4747
},
4848
})
4949
})
50-
}
51-
52-
func TestAccGithubEnterpriseIpAllowListEntry_update(t *testing.T) {
5350
t.Run("update", func(t *testing.T) {
5451
resourceName := "github_enterprise_ip_allow_list_entry.test"
5552
ip := "192.168.1.0/24"

website/docs/r/enterprise_ip_allow_list_entry.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ The following arguments are supported:
3131

3232
## Import
3333

34-
This resource can be imported using the enterprise slug and ID of the IP allow list entry:
34+
This resource can be imported using the ID of the IP allow list entry:
3535

3636
```bash
37-
$ terraform import github_enterprise_ip_allow_list_entry.test enterprise-slug:IALE_kwHOC1234567890a
37+
$ terraform import github_enterprise_ip_allow_list_entry.test IALE_kwHOC1234567890a
3838
```

0 commit comments

Comments
 (0)