address test comments

Signed-off-by: Jordan Rodgers <jrodgers@figma.com>

utils/replicaset/canary_test.go

@@ -1339,23 +1339,20 @@ func TestSyncEphemeralPodMetadata(t *testing.T) {
 			"ddd": "444",
 		},
 	}
-	{
-		// verify modified is false if there are no changes
+	t.Run("verify modified is false if there are no changes", func(t *testing.T) {
 		newMetadata, modified := SyncEphemeralPodMetadata(&meta, &existing, &existing)
 		assert.False(t, modified)
 		assert.Equal(t, meta, *newMetadata)
-	}
-	{
-		// verify modified is false if there are no actual deletions
-		desired := existing.DeepCopy()
-		existing.Labels["foo"] = "bar"
-		newMetadata, modified := SyncEphemeralPodMetadata(&meta, &existing, desired)
+	})
+	t.Run("verify modified is false if there are no actual deletions", func(t *testing.T) {
+		existingWithExtraLabel := existing.DeepCopy()
+		existingWithExtraLabel.Labels["foo"] = "bar"
+		newMetadata, modified := SyncEphemeralPodMetadata(&meta, existingWithExtraLabel, &existing)
 		assert.False(t, modified)
 		assert.Equal(t, meta, *newMetadata)
 		delete(existing.Labels, "foo")
-	}
-	{
-		// verify we don't touch metadata that we did not inject ourselves
+	})
+	t.Run("verify we don't touch metadata that we did not inject ourselves", func(t *testing.T) {
 		desired := v1alpha1.PodTemplateMetadata{
 			Labels: map[string]string{
 				"aaa": "222",
@@ -1365,7 +1362,6 @@ func TestSyncEphemeralPodMetadata(t *testing.T) {
 			},
 		}
 		newMetadata, modified := SyncEphemeralPodMetadata(&meta, &existing, &desired)
-		assert.True(t, modified)
 		expected := metav1.ObjectMeta{
 			Labels: map[string]string{
 				"aaa":    "222",
@@ -1376,8 +1372,9 @@ func TestSyncEphemeralPodMetadata(t *testing.T) {
 				"do-not": "touch",
 			},
 		}
+		assert.True(t, modified)
 		assert.Equal(t, expected, *newMetadata)
-	}
+	})
 }
 
 func TestGetReplicasForScaleDown(t *testing.T) {