Skip to content

Commit 4f2a335

Browse files
committed
Re-order d.Set calls
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
1 parent 890e234 commit 4f2a335

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

github/resource_github_repository_pages.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -346,12 +346,6 @@ func resourceGithubRepositoryPagesImport(ctx context.Context, d *schema.Resource
346346
if strings.Contains(repoName, " ") {
347347
return nil, fmt.Errorf("invalid ID specified: supplied ID must be the slug of the repository name")
348348
}
349-
// if err := d.Set("owner", owner); err != nil { // TODO: Add owner support
350-
// return nil, err
351-
// }
352-
if err := d.Set("repository", repoName); err != nil {
353-
return nil, err
354-
}
355349

356350
meta := m.(*Owner)
357351
owner := meta.name
@@ -361,12 +355,18 @@ func resourceGithubRepositoryPagesImport(ctx context.Context, d *schema.Resource
361355
if err != nil {
362356
return nil, err
363357
}
358+
359+
d.SetId(strconv.Itoa(int(repo.GetID())))
360+
// if err := d.Set("owner", owner); err != nil { // TODO: Add owner support
361+
// return nil, err
362+
// }
363+
if err := d.Set("repository", repoName); err != nil {
364+
return nil, err
365+
}
364366
if err = d.Set("repository_id", int(repo.GetID())); err != nil {
365367
return nil, err
366368
}
367369

368-
d.SetId(strconv.Itoa(int(repo.GetID())))
369-
370370
return []*schema.ResourceData{d}, nil
371371
}
372372

0 commit comments

Comments
 (0)