Merge pull request #294 from port-labs/PORT-16658-sort-rules

SCAB - scorecard rules change detection fix

Author: gilmor-port

port/scorecard/refreshScorecardState.go

@@ -3,13 +3,12 @@ package scorecard
 import (
 	"context"
 	"fmt"
-
-	"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
-
 	"reflect"
+	"sort"
 
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
+	"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
 )
 
 func shouldRefreshLevels(stateLevels []Level, cliLevels []cli.Level) bool {
@@ -117,6 +116,12 @@ func (r *ScorecardResource) refreshScorecardState(ctx context.Context, state *Sc
 		stateRules = append(stateRules, *stateRule)
 	}
 
+	// Sort rules by identifier to prevent Terraform from detecting false-positive changes
+	// due to API returning rules in different order
+	sort.Slice(stateRules, func(i, j int) bool {
+		return stateRules[i].Identifier.ValueString() < stateRules[j].Identifier.ValueString()
+	})
+
 	state.Rules = stateRules
 	if shouldRefreshLevels(state.Levels, s.Levels) {
 		state.Levels = fromCliLevelsToTerraformLevels(s.Levels)

port/scorecard/scorecardResourceToPortBody.go

@@ -3,6 +3,7 @@ package scorecard
 import (
 	"context"
 	"encoding/json"
+	"sort"
 
 	"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
 )
@@ -45,9 +46,17 @@ func scorecardResourceToPortBody(ctx context.Context, state *ScorecardModel) (*c
 		s.Filter = filter
 	}
 
+	// Sort rules by identifier to ensure consistent ordering
+	sortedStateRules := make([]Rule, len(state.Rules))
+	copy(sortedStateRules, state.Rules)
+
+	sort.Slice(sortedStateRules, func(i, j int) bool {
+		return sortedStateRules[i].Identifier.ValueString() < sortedStateRules[j].Identifier.ValueString()
+	})
+
 	var rules []cli.Rule
 
-	for _, stateRule := range state.Rules {
+	for _, stateRule := range sortedStateRules {
 		rule := &cli.Rule{
 			Level:      stateRule.Level.ValueString(),
 			Identifier: stateRule.Identifier.ValueString(),