Add generation support to peering connections

Author: heroku-johnny

docs/resources/space_peering_connection_accepter.md

@@ -25,10 +25,11 @@ resource "aws_vpc_peering_connection" "request" {
   vpc_id        = aws_vpc.main.id
 }
 
-# Accept the request.
+# Accept the request (Cedar generation - supports peering connections).
 resource "heroku_space_peering_connection_accepter" "accept" {
   space                     = heroku_space.peer_space.id
   vpc_peering_connection_id = aws_vpc_peering_connection.request.id
+  generation                = "cedar"
 }
 ```
 
@@ -38,10 +39,12 @@ The following arguments are supported:
 
 * `space` - (Required) The ID of the space.
 * `vpc_peering_connection_id` - (Required) The peering connection request ID.
+* `generation` - (Optional) Generation of the space for peering connection. Valid values are `cedar` and `fir`. Defaults to `cedar` for backward compatibility. **ForceNew**. Note: Peering connections are not supported for `fir` generation spaces.
 
 ## Attributes Reference
 
 The following attributes are exported:
 
 * `status` - The status of the peering connection request.
 * `type` - The type of the peering connection.
+* `generation` - Generation of the space for peering connection.

heroku/resource_heroku_space_peering_connection_accepter.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	heroku "github.com/heroku/heroku-go/v6"
 )
 
@@ -21,6 +22,8 @@ func resourceHerokuSpacePeeringConnectionAccepter() *schema.Resource {
 		Read:   resourceHerokuSpacePeeringConnectionAccepterRead,
 		Delete: resourceHerokuSpacePeeringConnectionAccepterDelete,
 
+		CustomizeDiff: resourceHerokuSpacePeeringConnectionAccepterCustomizeDiff,
+
 		Importer: &schema.ResourceImporter{
 			StateContext: resourceHerokuSpacePeeringConnectionAccepterImport,
 		},
@@ -32,6 +35,15 @@ func resourceHerokuSpacePeeringConnectionAccepter() *schema.Resource {
 				ForceNew: true,
 			},
 
+			"generation": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "cedar",
+				ForceNew:     true,
+				ValidateFunc: validation.StringInSlice([]string{"cedar", "fir"}, false),
+				Description:  "Generation of the space for peering connection. Defaults to cedar for backward compatibility.",
+			},
+
 			"status": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -171,3 +183,16 @@ func SpacePeeringConnAccepterStateRefreshFunc(client *heroku.Service, spaceIdent
 		return &pcx, peeringConn.Status, nil
 	}
 }
+
+func resourceHerokuSpacePeeringConnectionAccepterCustomizeDiff(ctx context.Context, diff *schema.ResourceDiff, v interface{}) error {
+	generation, generationExists := diff.GetOk("generation")
+
+	if generationExists {
+		generationStr := generation.(string)
+
+		if !IsFeatureSupported(generationStr, "space", "peering_connection") {
+			return fmt.Errorf("peering connections are not supported for %s generation spaces", generationStr)
+		}
+	}
+	return nil
+}

heroku/resource_heroku_space_peering_connection_accepter_test.go

@@ -0,0 +1,34 @@
+package heroku
+
+import (
+	"testing"
+)
+
+// Unit tests for peering connection generation support
+func TestHerokuSpacePeeringConnectionAccepterGeneration(t *testing.T) {
+	tests := []struct {
+		name        string
+		generation  string
+		expectError bool
+		description string
+	}{
+		{name: "Cedar generation should be supported", generation: "cedar", expectError: false, description: "Cedar supports peering connections"},
+		{name: "Fir generation should be unsupported", generation: "fir", expectError: true, description: "Fir does not support peering connections"},
+		{name: "Default generation (cedar) should be supported", generation: "", expectError: false, description: "Default cedar generation supports peering connections"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			generation := tt.generation
+			if generation == "" {
+				generation = "cedar"
+			}
+			supported := IsFeatureSupported(generation, "space", "peering_connection")
+			shouldError := !supported
+			if shouldError != tt.expectError {
+				t.Errorf("Expected error: %t, but got: %t for generation %s", tt.expectError, shouldError, generation)
+			}
+			t.Logf("✅ Generation: %s, Supported: %t, ShouldError: %t", generation, supported, shouldError)
+		})
+	}
+}