gce: normalize scopes in comparison

The order of scopes should not matter here, so do not force
a new instance template just because the order is different.

Author: justinsb

upup/pkg/fi/cloudup/gcetasks/instancetemplate.go

@@ -411,6 +411,11 @@ func (a ByKey) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 func (a ByKey) Less(i, j int) bool { return a[i].Key < a[j].Key }
 
 func matches(l, r *compute.InstanceTemplate) bool {
+	normalizeServiceAccount := func(v *compute.ServiceAccount) *compute.ServiceAccount {
+		c := *v
+		sort.Strings(c.Scopes)
+		return &c
+	}
 	normalizeInstanceProperties := func(v *compute.InstanceProperties) *compute.InstanceProperties {
 		c := *v
 		if c.Metadata != nil {
@@ -419,6 +424,11 @@ func matches(l, r *compute.InstanceTemplate) bool {
 			c.Metadata.Fingerprint = ""
 			sort.Sort(ByKey(c.Metadata.Items))
 		}
+		if c.ServiceAccounts != nil {
+			for i, serviceAccount := range c.ServiceAccounts {
+				c.ServiceAccounts[i] = normalizeServiceAccount(serviceAccount)
+			}
+		}
 		// Ignore output fields
 		for _, ni := range c.NetworkInterfaces {
 			ni.Name = ""