Skip to content

Commit f077234

Browse files
deigadeiga
committed
Refactor to use ConfigStateChecks
Signed-off-by: Timo Sand <[email protected]>
1 parent 00df2e0 commit f077234

1 file changed

Lines changed: 38 additions & 34 deletions

File tree

‎github/data_source_github_ip_ranges_test.go‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,55 @@ import (
44
"testing"
55

66
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
7+
"github.com/hashicorp/terraform-plugin-testing/knownvalue"
8+
"github.com/hashicorp/terraform-plugin-testing/statecheck"
9+
"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
710
)
811

912
func TestAccGithubIpRangesDataSource(t *testing.T) {
1013
t.Run("reads IP ranges without error", func(t *testing.T) {
1114
config := `data "github_ip_ranges" "test" {}`
1215

13-
check := resource.ComposeTestCheckFunc(
14-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "hooks.#"),
15-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "git.#"),
16-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "api.#"),
17-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "web.#"),
18-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "packages.#"),
19-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "pages.#"),
20-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "importer.#"),
21-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "actions.#"),
22-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "actions_macos.#"),
23-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "github_enterprise_importer.#"),
24-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "hooks_ipv4.#"),
25-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "git_ipv4.#"),
26-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "api_ipv4.#"),
27-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "web_ipv4.#"),
28-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "packages_ipv4.#"),
29-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "pages_ipv4.#"),
30-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "importer_ipv4.#"),
31-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "actions_ipv4.#"),
32-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "actions_macos_ipv4.#"),
33-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "github_enterprise_importer_ipv4.#"),
34-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "hooks_ipv6.#"),
35-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "git_ipv6.#"),
36-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "api_ipv6.#"),
37-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "web_ipv6.#"),
38-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "packages_ipv6.#"),
39-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "pages_ipv6.#"),
40-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "importer_ipv6.#"),
41-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "actions_ipv6.#"),
42-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "actions_macos_ipv6.#"),
43-
resource.TestCheckResourceAttrSet("data.github_ip_ranges.test", "github_enterprise_importer_ipv6.#"),
44-
)
45-
4616
resource.Test(t, resource.TestCase{
4717
ProviderFactories: providerFactories,
4818
Steps: []resource.TestStep{
4919
{
5020
Config: config,
51-
Check: check,
21+
ConfigStateChecks: []statecheck.StateCheck{
22+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("actions_ipv4"), knownvalue.NotNull()),
23+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("actions_ipv6"), knownvalue.NotNull()),
24+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("actions_macos_ipv4"), knownvalue.NotNull()),
25+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("actions_macos_ipv6"), knownvalue.NotNull()),
26+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("actions_macos"), knownvalue.NotNull()),
27+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("actions"), knownvalue.NotNull()),
28+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("api_ipv4"), knownvalue.NotNull()),
29+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("api_ipv6"), knownvalue.NotNull()),
30+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("api"), knownvalue.NotNull()),
31+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("dependabot_ipv4"), knownvalue.Null()),
32+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("dependabot_ipv6"), knownvalue.Null()),
33+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("dependabot"), knownvalue.Null()),
34+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("git_ipv4"), knownvalue.NotNull()),
35+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("git_ipv6"), knownvalue.NotNull()),
36+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("git"), knownvalue.NotNull()),
37+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("github_enterprise_importer_ipv4"), knownvalue.NotNull()),
38+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("github_enterprise_importer_ipv6"), knownvalue.NotNull()),
39+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("github_enterprise_importer"), knownvalue.NotNull()),
40+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("hooks_ipv4"), knownvalue.NotNull()),
41+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("hooks_ipv6"), knownvalue.NotNull()),
42+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("hooks"), knownvalue.NotNull()),
43+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("importer_ipv4"), knownvalue.NotNull()),
44+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("importer_ipv6"), knownvalue.NotNull()),
45+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("importer"), knownvalue.NotNull()),
46+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("packages_ipv4"), knownvalue.NotNull()),
47+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("packages_ipv6"), knownvalue.NotNull()),
48+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("packages"), knownvalue.NotNull()),
49+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("pages_ipv4"), knownvalue.NotNull()),
50+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("pages_ipv6"), knownvalue.NotNull()),
51+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("pages"), knownvalue.NotNull()),
52+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("web_ipv4"), knownvalue.NotNull()),
53+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("web_ipv6"), knownvalue.NotNull()),
54+
statecheck.ExpectKnownValue("data.github_ip_ranges.test", tfjsonpath.New("web"), knownvalue.NotNull()),
55+
},
5256
},
5357
},
5458
})

0 commit comments

Comments
 (0)