Sort rules after update

provider/pkg/resources/customresources/custom_pim.go

@@ -1,8 +1,10 @@
 package customresources
 
 import (
+	"cmp"
 	"context"
 	"fmt"
+	"slices"
 
 	"github.com/pulumi/pulumi-azure-native/v2/provider/pkg/provider/crud"
 	"github.com/pulumi/pulumi-azure-native/v2/provider/pkg/resources"
@@ -62,8 +64,8 @@ func pimRoleManagementPolicy(lookupResource resources.ResourceLookupFunc, crudCl
 			bodyParams := client.PrepareAzureRESTBody(id, inputs)
 			queryParams := map[string]any{"api-version": client.ApiVersion()}
 
-			// TODO we could skip this if bodyParams = originalState, i.e., the user adds a policy
-			// in its default configuration to their program
+			// We could skip this if bodyParams = originalState, i.e., the user adds a policy
+			// in its default configuration to their program, but we don't have a diff function.
 			resp, _, err := client.CreateOrUpdate(ctx, id, bodyParams, queryParams)
 			if err != nil {
 				return nil, err
@@ -94,7 +96,9 @@ func pimRoleManagementPolicy(lookupResource resources.ResourceLookupFunc, crudCl
 			}
 
 			outputs := client.ResponseBodyToSdkOutputs(resp)
-			outputs[OriginalStateKey] = olds[OriginalStateKey]
+			if olds.HasValue(OriginalStateKey) {
+				outputs[OriginalStateKey] = olds[OriginalStateKey].Mappable()
+			}
 			return outputs, nil
 		},
 
@@ -152,10 +156,18 @@ func restoreDefaultsForDeletedRules(olds, news resource.PropertyMap) {
 		}
 	}
 
-	// TODO sort?
+	sortRules(newRulesList)
 	news["rules"] = resource.NewArrayProperty(newRulesList)
 }
 
+func sortRules(rules []resource.PropertyValue) {
+	slices.SortFunc(rules, func(a, b resource.PropertyValue) int {
+		return cmp.Compare(
+			a.ObjectValue()["id"].StringValue(),
+			b.ObjectValue()["id"].StringValue())
+	})
+}
+
 func mapRulesById(managementPolicy resource.PropertyMap) map[string]resource.PropertyValue {
 	if !managementPolicy.HasValue("rules") {
 		return nil

provider/pkg/resources/customresources/custom_pim_test.go

@@ -68,8 +68,8 @@ func TestRestoreDefaultsForDeletedRules(t *testing.T) {
 		assert.NotEqual(t, newsPropertyMap, newsPropertyMapCopy)
 		assert.Equal(t,
 			[]resource.PropertyValue{
-				resource.NewObjectProperty(resource.NewPropertyMapFromMap(map[string]any{"id": "rule2"})),
 				resource.NewObjectProperty(resource.NewPropertyMapFromMap(map[string]any{"id": "rule1", "isExpirationRequired": false})),
+				resource.NewObjectProperty(resource.NewPropertyMapFromMap(map[string]any{"id": "rule2"})),
 			},
 			newsPropertyMap["rules"].ArrayValue(),
 		)