ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14683 from ewbankkit/github-provider-handle-nil-response 

provider/github Check for potentially nil response from GitHub API client
This commit is contained in:
Jake Champlin 2017-05-19 16:46:38 -04:00 committed by GitHub
parent 5027cbd54c 7795904f78
commit 22a82c0dfb
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/github/resource_github_issue_label.go
View File

@ -84,7 +84,9 @@ func resourceGithubIssueLabelCreateOrUpdate(d *schema.ResourceData, meta interfa
} else { } else {
log.Printf("[DEBUG] Creating label: %s/%s (%s: %s)", o, r, n, c) log.Printf("[DEBUG] Creating label: %s/%s (%s: %s)", o, r, n, c)
_, resp, err := client.Issues.CreateLabel(context.TODO(), o, r, label) _, resp, err := client.Issues.CreateLabel(context.TODO(), o, r, label)
log.Printf("[DEBUG] Response from creating label: %s", *resp) if resp != nil {
log.Printf("[DEBUG] Response from creating label: %s", *resp)
}
if err != nil { if err != nil {
return err return err
} }

2
builtin/providers/github/resource_github_organization_webhook.go
View File

@ -94,7 +94,7 @@ func resourceGithubOrganizationWebhookRead(d *schema.ResourceData, meta interfac
hook, resp, err := client.Organizations.GetHook(context.TODO(), meta.(*Organization).name, hookID) hook, resp, err := client.Organizations.GetHook(context.TODO(), meta.(*Organization).name, hookID)
if err != nil { if err != nil {
if resp.StatusCode == 404 { if resp != nil && resp.StatusCode == 404 {
d.SetId("") d.SetId("")
return nil return nil
} }

2
builtin/providers/github/resource_github_repository.go
View File

@ -127,7 +127,7 @@ func resourceGithubRepositoryRead(d *schema.ResourceData, meta interface{}) erro
log.Printf("[DEBUG] read github repository %s/%s", meta.(*Organization).name, repoName) log.Printf("[DEBUG] read github repository %s/%s", meta.(*Organization).name, repoName)
repo, resp, err := client.Repositories.Get(context.TODO(), meta.(*Organization).name, repoName) repo, resp, err := client.Repositories.Get(context.TODO(), meta.(*Organization).name, repoName)
if err != nil { if err != nil {
if resp.StatusCode == 404 { if resp != nil && resp.StatusCode == 404 {
log.Printf( log.Printf(
"[WARN] removing %s/%s from state because it no longer exists in github", "[WARN] removing %s/%s from state because it no longer exists in github",
meta.(*Organization).name, meta.(*Organization).name,

2
builtin/providers/github/resource_github_repository_webhook.go
View File

@ -89,7 +89,7 @@ func resourceGithubRepositoryWebhookRead(d *schema.ResourceData, meta interface{
hook, resp, err := client.Repositories.GetHook(context.TODO(), meta.(*Organization).name, d.Get("repository").(string), hookID) hook, resp, err := client.Repositories.GetHook(context.TODO(), meta.(*Organization).name, d.Get("repository").(string), hookID)
if err != nil { if err != nil {
if resp.StatusCode == 404 { if resp != nil && resp.StatusCode == 404 {
d.SetId("") d.SetId("")
return nil return nil
} }