feat: Validated unit tests and manual tests for OIDC custom property integration

Author: gogoyan11

github/resource_github_actions_organization_oidc_custom_property_inclusion.go

@@ -3,11 +3,14 @@ package github
 import (
 	"context"
 	"fmt"
+	"log"
 
 	"github.com/google/go-github/v84/github"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
+const oidcCustomPropertyAPIVersion = "2026-03-10"
+
 func resourceGithubActionsOrganizationOIDCCustomPropertyInclusion() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceGithubActionsOrganizationOIDCCustomPropertyInclusionCreate,
@@ -47,12 +50,15 @@ func resourceGithubActionsOrganizationOIDCCustomPropertyInclusionCreate(d *schem
 	if err != nil {
 		return fmt.Errorf("error creating request to add OIDC custom property inclusion: %w", err)
 	}
+	req.Header.Set("X-GitHub-Api-Version", oidcCustomPropertyAPIVersion)
 
 	_, err = client.Do(ctx, req, nil)
 	if err != nil {
 		return fmt.Errorf("error adding OIDC custom property inclusion %q for organization %q: %w", customPropertyName, orgName, err)
 	}
 
+	log.Printf("[DEBUG] Successfully added OIDC custom property inclusion %q for organization %q", customPropertyName, orgName)
+
 	d.SetId(buildTwoPartID(orgName, customPropertyName))
 
 	return resourceGithubActionsOrganizationOIDCCustomPropertyInclusionRead(d, meta)
@@ -115,6 +121,7 @@ func resourceGithubActionsOrganizationOIDCCustomPropertyInclusionDelete(d *schem
 	if err != nil {
 		return fmt.Errorf("error creating request to delete OIDC custom property inclusion: %w", err)
 	}
+	req.Header.Set("X-GitHub-Api-Version", oidcCustomPropertyAPIVersion)
 
 	_, err = client.Do(ctx, req, nil)
 	if err != nil {
@@ -126,7 +133,8 @@ func resourceGithubActionsOrganizationOIDCCustomPropertyInclusionDelete(d *schem
 
 // OIDCCustomPropertyInclusion represents a custom property included in OIDC tokens.
 type OIDCCustomPropertyInclusion struct {
-	PropertyName string `json:"property_name"`
+	PropertyName    string `json:"custom_property_name"`
+	InclusionSource string `json:"inclusion_source,omitempty"`
 }
 
 // listOrgOIDCCustomPropertyInclusions lists all custom properties included in OIDC tokens for an organization.
@@ -135,6 +143,7 @@ func listOrgOIDCCustomPropertyInclusions(ctx context.Context, client *github.Cli
 	if err != nil {
 		return nil, err
 	}
+	req.Header.Set("X-GitHub-Api-Version", oidcCustomPropertyAPIVersion)
 
 	var inclusions []*OIDCCustomPropertyInclusion
 	_, err = client.Do(ctx, req, &inclusions)

github/resource_github_actions_organization_oidc_custom_property_inclusion_test.go

@@ -9,14 +9,21 @@ import (
 func TestAccGithubActionsOrganizationOIDCCustomPropertyInclusion(t *testing.T) {
 	t.Run("creates and deletes an OIDC custom property inclusion without error", func(t *testing.T) {
 		config := `
+		resource "github_organization_custom_properties" "test" {
+			property_name  = "tf-acc-test-oidc-env"
+			value_type     = "single_select"
+			required       = false
+			allowed_values = ["production", "staging"]
+		}
+
 		resource "github_actions_organization_oidc_custom_property_inclusion" "test" {
-			custom_property_name = "environment"
+			custom_property_name = github_organization_custom_properties.test.property_name
 		}`
 
 		check := resource.ComposeTestCheckFunc(
 			resource.TestCheckResourceAttr(
 				"github_actions_organization_oidc_custom_property_inclusion.test",
-				"custom_property_name", "environment",
+				"custom_property_name", "tf-acc-test-oidc-env",
 			),
 		)
 		resource.Test(t, resource.TestCase{
@@ -33,14 +40,21 @@ func TestAccGithubActionsOrganizationOIDCCustomPropertyInclusion(t *testing.T) {
 
 	t.Run("imports an OIDC custom property inclusion without error", func(t *testing.T) {
 		config := `
+		resource "github_organization_custom_properties" "test" {
+			property_name  = "tf-acc-test-oidc-import"
+			value_type     = "single_select"
+			required       = false
+			allowed_values = ["production", "staging"]
+		}
+
 		resource "github_actions_organization_oidc_custom_property_inclusion" "test" {
-			custom_property_name = "environment"
+			custom_property_name = github_organization_custom_properties.test.property_name
 		}`
 
 		check := resource.ComposeTestCheckFunc(
 			resource.TestCheckResourceAttr(
 				"github_actions_organization_oidc_custom_property_inclusion.test",
-				"custom_property_name", "environment",
+				"custom_property_name", "tf-acc-test-oidc-import",
 			),
 		)
 
@@ -63,22 +77,35 @@ func TestAccGithubActionsOrganizationOIDCCustomPropertyInclusion(t *testing.T) {
 
 	t.Run("manages multiple OIDC custom property inclusions", func(t *testing.T) {
 		config := `
+		resource "github_organization_custom_properties" "env" {
+			property_name  = "tf-acc-test-oidc-env2"
+			value_type     = "single_select"
+			required       = false
+			allowed_values = ["production", "staging"]
+		}
+
+		resource "github_organization_custom_properties" "team" {
+			property_name  = "tf-acc-test-oidc-team"
+			value_type     = "string"
+			required       = false
+		}
+
 		resource "github_actions_organization_oidc_custom_property_inclusion" "env" {
-			custom_property_name = "environment"
+			custom_property_name = github_organization_custom_properties.env.property_name
 		}
 
 		resource "github_actions_organization_oidc_custom_property_inclusion" "team" {
-			custom_property_name = "team"
+			custom_property_name = github_organization_custom_properties.team.property_name
 		}`
 
 		check := resource.ComposeTestCheckFunc(
 			resource.TestCheckResourceAttr(
 				"github_actions_organization_oidc_custom_property_inclusion.env",
-				"custom_property_name", "environment",
+				"custom_property_name", "tf-acc-test-oidc-env2",
 			),
 			resource.TestCheckResourceAttr(
 				"github_actions_organization_oidc_custom_property_inclusion.team",
-				"custom_property_name", "team",
+				"custom_property_name", "tf-acc-test-oidc-team",
 			),
 		)
 
@@ -98,8 +125,15 @@ func TestAccGithubActionsOrganizationOIDCCustomPropertyInclusion(t *testing.T) {
 func TestAccGithubActionsOrganizationOIDCCustomPropertyInclusionsDataSource(t *testing.T) {
 	t.Run("reads OIDC custom property inclusions without error", func(t *testing.T) {
 		config := `
+		resource "github_organization_custom_properties" "test" {
+			property_name  = "tf-acc-test-oidc-ds"
+			value_type     = "single_select"
+			required       = false
+			allowed_values = ["production", "staging"]
+		}
+
 		resource "github_actions_organization_oidc_custom_property_inclusion" "test" {
-			custom_property_name = "environment"
+			custom_property_name = github_organization_custom_properties.test.property_name
 		}
 
 		data "github_actions_organization_oidc_custom_property_inclusions" "test" {