Add support for packages IP ranges in github_ip_ranges (#1958)

* Add support for packages IP ranges in github_ip_ranges

* Update docks for packages IP ranges in github_ip_ranges

* gofmt

* Add tests for packages IP ranges in github_ip_ranges

* Update tests for packages IP ranges in github_ip_ranges

---------

Co-authored-by: Keegan Campbell <[email protected]>

Author: Nmishin

github/data_source_github_ip_ranges.go

@@ -32,6 +32,11 @@ func dataSourceGithubIpRanges() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"packages": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"pages": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -72,6 +77,11 @@ func dataSourceGithubIpRanges() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"packages_ipv4": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"pages_ipv4": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -112,6 +122,11 @@ func dataSourceGithubIpRanges() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"packages_ipv6": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"pages_ipv6": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -154,6 +169,11 @@ func dataSourceGithubIpRangesRead(d *schema.ResourceData, meta interface{}) erro
 		return err
 	}
 
+	cidrPackagesIpv4, cidrPackagesIpv6, err := splitIpv4Ipv6Cidrs(&api.Packages)
+	if err != nil {
+		return err
+	}
+
 	cidrPagesIpv4, cidrPagesIpv6, err := splitIpv4Ipv6Cidrs(&api.Pages)
 	if err != nil {
 		return err
@@ -197,6 +217,11 @@ func dataSourceGithubIpRangesRead(d *schema.ResourceData, meta interface{}) erro
 		d.Set("git_ipv4", cidrGitIpv4)
 		d.Set("git_ipv6", cidrGitIpv6)
 	}
+	if len(api.Packages) > 0 {
+		d.Set("packages", api.Packages)
+		d.Set("packages_ipv4", cidrPackagesIpv4)
+		d.Set("packages_ipv6", cidrPackagesIpv6)
+	}
 	if len(api.Pages) > 0 {
 		d.Set("pages", api.Pages)
 		d.Set("pages_ipv4", cidrPagesIpv4)

github/data_source_github_ip_ranges_test.go

@@ -17,6 +17,7 @@ func TestAccGithubIpRangesDataSource(t *testing.T) {
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "git.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "api.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "web.#"),
+			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "packages.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "pages.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "importer.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "actions.#"),
@@ -25,6 +26,7 @@ func TestAccGithubIpRangesDataSource(t *testing.T) {
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "git_ipv4.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "api_ipv4.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "web_ipv4.#"),
+			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "packages_ipv4.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "pages_ipv4.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "importer_ipv4.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "actions_ipv4.#"),
@@ -33,6 +35,7 @@ func TestAccGithubIpRangesDataSource(t *testing.T) {
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "git_ipv6.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "api_ipv6.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "web_ipv6.#"),
+			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "packages_ipv6.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "pages_ipv6.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "importer_ipv6.#"),
 			resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "actions_ipv6.#"),

website/docs/d/ip_ranges.html.markdown

@@ -35,6 +35,9 @@ data "github_ip_ranges" "test" {}
  * `api` - An Array of IP addresses in CIDR format for the GitHub API.
  * `api_ipv4` - A subset of the `api` array that contains IP addresses in IPv4 CIDR format.
  * `api_ipv6` - A subset of the `api` array that contains IP addresses in IPv6 CIDR format.
+ * `packages` - An Array of IP addresses in CIDR format specifying the A records for GitHub Packages.
+ * `packages_ipv4` - A subset of the `packages` array that contains IP addresses in IPv4 CIDR format.
+ * `packages_ipv6` - A subset of the `packages` array that contains IP addresses in IPv6 CIDR format.
  * `pages` - An Array of IP addresses in CIDR format specifying the A records for GitHub Pages.
  * `pages_ipv4` - A subset of the `pages` array that contains IP addresses in IPv4 CIDR format.
  * `pages_ipv6` - A subset of the `pages` array that contains IP addresses in IPv6 CIDR format.