@@ -18,8 +18,7 @@ func resourceGithubBranchDefault() *schema.Resource {
1818 UpdateContext : resourceGithubBranchDefaultUpdate ,
1919 DeleteContext : resourceGithubBranchDefaultDelete ,
2020 Importer : & schema.ResourceImporter {
21- StateContext : schema .ImportStatePassthroughContext ,
22- // StateContext: resourceGithubBranchDefaultImport,
21+ StateContext : resourceGithubBranchDefaultImport ,
2322 },
2423
2524 CustomizeDiff : diffRepository ,
@@ -126,8 +125,7 @@ func resourceGithubBranchDefaultRead(ctx context.Context, d *schema.ResourceData
126125 client := meta .v3client
127126 owner := meta .name
128127
129- // repoName := d.Get("repository").(string)
130- repoName := d .Id ()
128+ repoName := d .Get ("repository" ).(string )
131129
132130 tflog .Trace (ctx , "Reading default branch resource" , map [string ]any {
133131 "owner" : owner ,
@@ -186,8 +184,7 @@ func resourceGithubBranchDefaultUpdate(ctx context.Context, d *schema.ResourceDa
186184 client := meta .v3client
187185 owner := meta .name
188186
189- // repoName := d.Get("repository").(string)
190- repoName := d .Id ()
187+ repoName := d .Get ("repository" ).(string )
191188 defaultBranch := d .Get ("branch" ).(string )
192189 rename := d .Get ("rename" ).(bool )
193190
@@ -235,8 +232,7 @@ func resourceGithubBranchDefaultDelete(ctx context.Context, d *schema.ResourceDa
235232 meta := m .(* Owner )
236233 client := meta .v3client
237234 owner := meta .name
238- // repoName := d.Get("repository").(string)
239- repoName := d .Id ()
235+ repoName := d .Get ("repository" ).(string )
240236
241237 tflog .Trace (ctx , "Deleting default branch resource" , map [string ]any {
242238 "owner" : owner ,
@@ -256,19 +252,12 @@ func resourceGithubBranchDefaultDelete(ctx context.Context, d *schema.ResourceDa
256252 return nil
257253}
258254
259- // func resourceGithubBranchDefaultImport(ctx context.Context, d *schema.ResourceData, m any) ([]*schema.ResourceData, error) {
260- // repoName, defaultBranch, err := parseID2(d.Id())
261- // if err != nil {
262- // return nil, err
263- // }
264-
265- // d.SetId(repoName)
266- // if err := d.Set("branch", defaultBranch); err != nil {
267- // return nil, err
268- // }
269- // if err := d.Set("repository", repoName); err != nil {
270- // return nil, err
271- // }
272-
273- // return []*schema.ResourceData{d}, nil
274- // }
255+ func resourceGithubBranchDefaultImport (ctx context.Context , d * schema.ResourceData , m any ) ([]* schema.ResourceData , error ) {
256+ repoName := d .Id ()
257+
258+ if err := d .Set ("repository" , repoName ); err != nil {
259+ return nil , err
260+ }
261+
262+ return []* schema.ResourceData {d }, nil
263+ }
0 commit comments