[fix]: Removes file in a deleted branch from state

nickfloyd · web-flow · commit ce9034e06180 · 2023-10-11T13:32:08.000-05:00
diff --git a/github/resource_github_repository_file.go b/github/resource_github_repository_file.go
@@ -238,7 +238,10 @@ func resourceGithubRepositoryFileRead(d *schema.ResourceData, meta interface{})
 	if branch, ok := d.GetOk("branch"); ok {
 		log.Printf("[DEBUG] Using explicitly set branch: %s", branch.(string))
 		if err := checkRepositoryBranchExists(client, owner, repo, branch.(string)); err != nil {
-			return err
+			log.Printf("[INFO] Removing repository path %s/%s/%s from state because the branch no longer exists in GitHub",
+				owner, repo, file)
+			d.SetId("")
+			return nil
 		}
 		opts.Ref = branch.(string)
 	}

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,10 @@ func resourceGithubRepositoryFileRead(d *schema.ResourceData, meta interface{})`
`238`	`238`	`if branch, ok := d.GetOk("branch"); ok {`
`239`	`239`	`log.Printf("[DEBUG] Using explicitly set branch: %s", branch.(string))`
`240`	`240`	`if err := checkRepositoryBranchExists(client, owner, repo, branch.(string)); err != nil {`
`241`		`- return err`
	`241`	`+ log.Printf("[INFO] Removing repository path %s/%s/%s from state because the branch no longer exists in GitHub",`
	`242`	`+ owner, repo, file)`
	`243`	`+ d.SetId("")`
	`244`	`+ return nil`
`242`	`245`	`}`
`243`	`246`	`opts.Ref = branch.(string)`
`244`	`247`	`}`