Merge pull request #82 from appilon/github-ip-ranges

datasource/github_ip_ranges: implement ip datasource via the GH Meta api

github/config.go

@@ -1,6 +1,7 @@
 package github
 
 import (
+	"context"
 	"net/url"
 
 	"github.com/google/go-github/github"
@@ -15,8 +16,9 @@ type Config struct {
 }
 
 type Organization struct {
-	name   string
-	client *github.Client
+	name        string
+	client      *github.Client
+	StopContext context.Context
 }
 
 // Client configures and returns a fully initialized GithubClient

github/data_source_github_ip_ranges.go

@@ -0,0 +1,55 @@
+package github
+
+import (
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func dataSourceGithubIpRanges() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceGithubIpRangesRead,
+
+		Schema: map[string]*schema.Schema{
+			"hooks": &schema.Schema{
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"git": &schema.Schema{
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"pages": &schema.Schema{
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			// TODO: importer IPs coming once this is merged
+			// https://github.com/google/go-github/pull/881
+		},
+	}
+}
+
+func dataSourceGithubIpRangesRead(d *schema.ResourceData, meta interface{}) error {
+	org := meta.(*Organization)
+
+	api, _, err := org.client.APIMeta(org.StopContext)
+	if err != nil {
+		return err
+	}
+
+	if len(api.Hooks)+len(api.Git)+len(api.Pages) > 0 {
+		d.SetId("github-ip-ranges")
+	}
+	if len(api.Hooks) > 0 {
+		d.Set("hooks", api.Hooks)
+	}
+	if len(api.Git) > 0 {
+		d.Set("git", api.Git)
+	}
+	if len(api.Pages) > 0 {
+		d.Set("pages", api.Pages)
+	}
+
+	return nil
+}

github/data_source_github_ip_ranges_test.go

@@ -0,0 +1,28 @@
+package github
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccGithubIpRangesDataSource_existing(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: `
+				data "github_ip_ranges" "test" {}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "hooks.#"),
+					resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "git.#"),
+					resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "pages.#"),
+				),
+			},
+		},
+	})
+}

github/provider.go

@@ -7,9 +7,9 @@ import (
 
 // Provider returns a terraform.ResourceProvider.
 func Provider() terraform.ResourceProvider {
-
+	var p *schema.Provider
 	// The actual provider
-	return &schema.Provider{
+	p = &schema.Provider{
 		Schema: map[string]*schema.Schema{
 			"token": &schema.Schema{
 				Type:        schema.TypeString,
@@ -46,12 +46,15 @@ func Provider() terraform.ResourceProvider {
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{
-			"github_user": dataSourceGithubUser(),
-			"github_team": dataSourceGithubTeam(),
+			"github_user":      dataSourceGithubUser(),
+			"github_team":      dataSourceGithubTeam(),
+			"github_ip_ranges": dataSourceGithubIpRanges(),
 		},
-
-		ConfigureFunc: providerConfigure,
 	}
+
+	p.ConfigureFunc = providerConfigure(p)
+
+	return p
 }
 
 var descriptions map[string]string
@@ -66,12 +69,21 @@ func init() {
 	}
 }
 
-func providerConfigure(d *schema.ResourceData) (interface{}, error) {
-	config := Config{
-		Token:        d.Get("token").(string),
-		Organization: d.Get("organization").(string),
-		BaseURL:      d.Get("base_url").(string),
-	}
+func providerConfigure(p *schema.Provider) schema.ConfigureFunc {
+	return func(d *schema.ResourceData) (interface{}, error) {
+		config := Config{
+			Token:        d.Get("token").(string),
+			Organization: d.Get("organization").(string),
+			BaseURL:      d.Get("base_url").(string),
+		}
+
+		meta, err := config.Client()
+		if err != nil {
+			return nil, err
+		}
 
-	return config.Client()
+		meta.(*Organization).StopContext = p.StopContext()
+
+		return meta, nil
+	}
 }

website/docs/d/ip_ranges.html.markdown

@@ -0,0 +1,22 @@
+---
+layout: "github"
+page_title: "Github: github_ip_ranges"
+sidebar_current: "docs-github-datasource-ip-ranges"
+description: |-
+  Get information on a Github's IP addresses.
+---
+
+# github_ip_ranges
+
+Use this data source to retrieve information about a Github's IP addresses.
+## Example Usage
+
+```
+data "github_ip_ranges" "test" {}
+```
+
+## Attributes Reference
+
+ * `hooks` - An Array of IP addresses in CIDR format specifying the addresses that incoming service hooks will originate from.
+ * `git` - An Array of IP addresses in CIDR format specifying the Git servers.
+ * `pages` - An Array of IP addresses in CIDR format specifying the A records for GitHub Pages.

website/github.erb

@@ -13,6 +13,9 @@
         <li<%= sidebar_current("docs-github-datasource") %>>
           <a href="#">Data Sources</a>
           <ul class="nav nav-visible">
+             <li<%= sidebar_current("docs-github-datasource-ip-ranges") %>>
+              <a href="/docs/providers/github/d/ip_ranges.html">github_ip_ranges</a>
+            </li>
             <li<%= sidebar_current("docs-github-datasource-user") %>>
               <a href="/docs/providers/github/d/user.html">github_user</a>
             </li>