Add generation support to inbound rulesets

Author: heroku-johnny

docs/resources/space_inbound_ruleset.md

@@ -13,16 +13,18 @@ Provides a resource for managing [inbound rulesets](https://devcenter.heroku.com
 ## Example Usage
 
 ```hcl-terraform
-# Create a new Heroku space
+# Create a new Heroku space (Cedar generation - supports inbound rulesets)
 resource "heroku_space" "default" {
   name         = "test-space"
   organization = "my-company"
   region       = "virginia"
+  generation   = "cedar"
 }
 
 # Allow all traffic EXCEPT 8.8.4.4 to access the HPS.
 resource "heroku_space_inbound_ruleset" "default" {
-  space = heroku_space.default.id
+  space      = heroku_space.default.id
+  generation = "cedar"
 
   rule {
     action = "allow"
@@ -41,6 +43,7 @@ resource "heroku_space_inbound_ruleset" "default" {
 The following arguments are supported:
 
 * `space` - (Required) The ID of the space.
+* `generation` - (Optional) Generation of the space for inbound ruleset. Valid values are `cedar` and `fir`. Defaults to `cedar` for backward compatibility. **ForceNew**. Note: Inbound rulesets are not supported for `fir` generation spaces.
 * `rule` - (Required) At least one `rule` block. Rules are documented below.
 
 A `rule` block supports the following arguments:
@@ -53,3 +56,4 @@ A `rule` block supports the following arguments:
 The following attributes are exported:
 
 * `id` - The ID of the inbound ruleset.
+* `generation` - Generation of the space for inbound ruleset.

heroku/resource_heroku_space_inbound_ruleset.go

@@ -16,13 +16,24 @@ func resourceHerokuSpaceInboundRuleset() *schema.Resource {
 		Update: resourceHerokuSpaceInboundRulesetSet,
 		Delete: resourceHerokuSpaceInboundRulesetDelete,
 
+		CustomizeDiff: resourceHerokuSpaceInboundRulesetCustomizeDiff,
+
 		Schema: map[string]*schema.Schema{
 			"space": {
 				Type:     schema.TypeString,
 				Required: true,
 				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 inbound ruleset. Defaults to cedar for backward compatibility.",
+			},
+
 			"rule": {
 				Type:     schema.TypeSet,
 				Required: true,
@@ -136,3 +147,16 @@ func resourceHerokuSpaceInboundRulesetDelete(d *schema.ResourceData, meta interf
 	d.SetId("")
 	return nil
 }
+
+func resourceHerokuSpaceInboundRulesetCustomizeDiff(ctx context.Context, diff *schema.ResourceDiff, v interface{}) error {
+	generation, generationExists := diff.GetOk("generation")
+
+	if generationExists {
+		generationStr := generation.(string)
+
+		if !IsFeatureSupported(generationStr, "space", "inbound_ruleset") {
+			return fmt.Errorf("inbound rulesets are not supported for %s generation spaces", generationStr)
+		}
+	}
+	return nil
+}

heroku/resource_heroku_space_inbound_ruleset_test.go

@@ -40,3 +40,32 @@ resource "heroku_space_inbound_ruleset" "foobar" {
 }
 `, spaceConfig)
 }
+
+// Unit tests for inbound ruleset generation support
+func TestHerokuSpaceInboundRulesetGeneration(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 inbound rulesets"},
+		{name: "Fir generation should be unsupported", generation: "fir", expectError: true, description: "Fir does not support inbound rulesets"},
+		{name: "Default generation (cedar) should be supported", generation: "", expectError: false, description: "Default cedar generation supports inbound rulesets"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			generation := tt.generation
+			if generation == "" {
+				generation = "cedar"
+			}
+			supported := IsFeatureSupported(generation, "space", "inbound_ruleset")
+			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)
+		})
+	}
+}