fix(resource/github_organization_custom_properties): allow for import (#2834)

renamed file to match others
add some testing

Co-authored-by: Nick Floyd <[email protected]>

Author: pippitt

github/resource_github_organisation_custom_properties.go renamed to github/resource_github_organization_custom_properties.go

@@ -136,6 +136,8 @@ func resourceGithubCustomPropertiesDelete(d *schema.ResourceData, meta interface
 }
 
 func resourceGithubCustomPropertiesImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
-	// WIP
+	if err := d.Set("property_name", d.Id()); err != nil {
+		return nil, err
+	}
 	return []*schema.ResourceData{d}, nil
 }

github/resource_github_organization_custom_properties_test.go

@@ -0,0 +1,156 @@
+package github
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccGithubOrganizationCustomProperties(t *testing.T) {
+	t.Run("creates custom property without error", func(t *testing.T) {
+
+		config := `
+		resource "github_organization_custom_properties" "test" {
+			allowed_values = [ "Test" ]
+			description    = "Test Description"
+			default_value  = "Test"
+			property_name  = "Test"
+			required       = true
+			value_type     = "single_select"
+		  }`
+
+		check := resource.ComposeTestCheckFunc(
+			resource.TestCheckResourceAttr(
+				"github_organization_custom_properties.test",
+				"property_name", "Test",
+			),
+		)
+		testCase := func(t *testing.T, mode string) {
+			resource.Test(t, resource.TestCase{
+				PreCheck:  func() { skipUnlessMode(t, mode) },
+				Providers: testAccProviders,
+				Steps: []resource.TestStep{
+					{
+						Config: config,
+						Check:  check,
+					},
+				},
+			})
+		}
+		t.Run("run with an anonymous account", func(t *testing.T) {
+			t.Skip("anonymous account not supported for this operation")
+		})
+		t.Run("run with an individual account", func(t *testing.T) {
+			t.Skip("individual account not supported for this operation")
+		})
+		t.Run("run with an organization account", func(t *testing.T) {
+			testCase(t, organization)
+		})
+
+	})
+	t.Run("create custom property and update them", func(t *testing.T) {
+		configBefore := `
+		resource "github_organization_custom_properties" "test" {
+			allowed_values = ["one"]
+			description    = "Test Description"
+			property_name  = "Test"
+			value_type     = "single_select"
+		}`
+
+		configAfter := `
+		resource "github_organization_custom_properties" "test" {
+			allowed_values = ["one", "two"]
+			description    = "Test Description 2"
+			property_name  = "Test"
+			value_type     = "single_select"
+		}`
+
+		const resourceName = "github_organization_custom_properties.test"
+
+		checkBefore := resource.ComposeTestCheckFunc(
+			resource.TestCheckResourceAttr(resourceName, "allowed_values.#", "1"),
+		)
+		checkAfter := resource.ComposeTestCheckFunc(
+			resource.TestCheckResourceAttr(resourceName, "allowed_values.#", "2"),
+		)
+
+		testCase := func(t *testing.T, mode string) {
+			resource.Test(t, resource.TestCase{
+				PreCheck:  func() { skipUnlessMode(t, mode) },
+				Providers: testAccProviders,
+				Steps: []resource.TestStep{
+					{
+						Config: configBefore,
+						Check:  checkBefore,
+					},
+					{
+						Config: configAfter,
+						Check:  checkAfter,
+					},
+				},
+			})
+		}
+
+		t.Run("with an anonymous account", func(t *testing.T) {
+			t.Skip("anonymous account not supported for this operation")
+		})
+
+		t.Run("with an individual account", func(t *testing.T) {
+			t.Skip("individual account not supported for this operation")
+		})
+
+		t.Run("with an organization account", func(t *testing.T) {
+			testCase(t, organization)
+		})
+	})
+
+	t.Run("imports organization custom property without error", func(t *testing.T) {
+		description := "Test Description Import"
+		propertyName := "Test"
+		valueType := "string"
+
+		config := fmt.Sprintf(`
+		resource "github_organization_custom_properties" "test" {
+			description = "%s"
+			property_name = "%s"
+			value_type = "%s"
+			}`, description, propertyName, valueType)
+
+		check := resource.ComposeTestCheckFunc(
+			resource.TestCheckResourceAttr(
+				"github_organization_custom_properties.test",
+				"description", description,
+			),
+		)
+
+		testCase := func(t *testing.T, mode string) {
+			resource.Test(t, resource.TestCase{
+				PreCheck:  func() { skipUnlessMode(t, mode) },
+				Providers: testAccProviders,
+				Steps: []resource.TestStep{
+					{
+						Config: config,
+						Check:  check,
+					},
+					{
+						ResourceName:      "github_organization_custom_properties.test",
+						ImportState:       true,
+						ImportStateVerify: true,
+					},
+				},
+			})
+		}
+		t.Run("with an anonymous account", func(t *testing.T) {
+			t.Skip("anonymous account not supported for this operation")
+		})
+
+		t.Run("with an individual account", func(t *testing.T) {
+			t.Skip("individual account not supported for this operation")
+		})
+
+		t.Run("with an organization account", func(t *testing.T) {
+			testCase(t, organization)
+		})
+	})
+}