compare string slices unordered lists

Author: jcollins-axway

pkg/apic/apiservicerevision.go

@@ -7,9 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"reflect"
 	"regexp"
-	"sort"
 	"strconv"
 	"strings"
 	"text/template"
@@ -165,7 +163,15 @@ func (c *ServiceClient) getRevisionsIfUpdating(serviceBody *ServiceBody) ([]*man
 
 // checkAndUpdateExistingRevision checks if a revision with the same hash exists and updates tags if needed
 func (c *ServiceClient) checkAndUpdateExistingRevision(serviceBody *ServiceBody, apiServiceRevisions []*management.APIServiceRevision) (bool, error) {
+	// attempt to use the stripped spec hash
 	revName, found := serviceBody.specHashes[serviceBody.specHash]
+	if !found && serviceBody.originalSpecHash != "" {
+		// check if the original spec hash matches an existing revision,
+		// this is to cover the case where the spec content has not changed since the last publish,
+		// but the hash has changed due to non-content related changes (e.g. stripping servers)
+		revName, found = serviceBody.specHashes[serviceBody.originalSpecHash]
+	}
+
 	if !found {
 		return false, nil
 	}
@@ -205,19 +211,15 @@ func (c *ServiceClient) checkAndUpdateExistingRevision(serviceBody *ServiceBody,
 // different, return the updated tags
 func (c *ServiceClient) getUpdatedTagKeys(serviceBodyTags map[string]interface{}, revisionTags []string) []string {
 	// Extract values from map and convert to []string
-	var mapValues []string
+	mapValues := []string{}
 	for _, v := range serviceBodyTags {
 		if strVal, ok := v.(string); ok {
 			mapValues = append(mapValues, strVal)
 		}
 	}
 
-	// Sort both slices to allow unordered comparison
-	sort.Strings(mapValues)
-	sort.Strings(revisionTags)
-
 	// Compare
-	if reflect.DeepEqual(mapValues, revisionTags) {
+	if util.StringSlicesEqualUnordered(mapValues, revisionTags) {
 		return []string{} // return empty string slice if equal
 	}
 

pkg/apic/client.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"slices"
 	"strconv"
 	"strings"
 	"sync"
@@ -870,7 +869,7 @@ func (c *ServiceClient) updateSpecORCreateResourceInstance(data *apiv1.ResourceI
 		method = coreapi.PUT
 
 		// check if either hash, tags or title have changed and mark for update
-		equalTags := slices.Equal(existingRI.GetTags(), data.GetTags())
+		equalTags := util.StringSlicesEqualUnordered(existingRI.GetTags(), data.GetTags())
 		oldHash, _ := util.GetAgentDetailsValue(existingRI, defs.AttrSpecHash)
 		newHash, _ := util.GetAgentDetailsValue(data, defs.AttrSpecHash)
 		if oldHash == newHash && existingRI.Title == data.Title && equalTags {

pkg/util/util.go

@@ -595,3 +595,21 @@ func IsInArray[K comparable](arr []K, val K) bool {
 	}
 	return false
 }
+
+func StringSlicesEqualUnordered(a, b []string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+
+	counts := make(map[string]int)
+	for _, item := range a {
+		counts[item]++
+	}
+	for _, item := range b {
+		counts[item]--
+		if counts[item] < 0 {
+			return false
+		}
+	}
+	return true
+}