wip fix diff again

hashicorp · Apr 20, 2022 · ed41878 · ed41878
1 parent f8ec991
commit ed41878
Showing 1 changed file with 26 additions and 26 deletions.
diff --git a/nomad/structs/diff_test.go b/nomad/structs/diff_test.go
@@ -2843,13 +2843,13 @@ func TestTaskGroupDiff(t *testing.T) {
 						Fields: []*FieldDiff{
 							{
 								Type: DiffTypeNone,
-								Name: "AddressMode",
+								Name: "Address",
 								Old:  "",
 								New:  "",
 							},
 							{
 								Type: DiffTypeNone,
-								Name: "Address",
+								Name: "AddressMode",
 								Old:  "",
 								New:  "",
 							},
@@ -5656,15 +5656,15 @@ func TestTaskDiff(t *testing.T) {
 						Fields: []*FieldDiff{
 							{
 								Type: DiffTypeAdded,
-								Name: "AddressMode",
+								Name: "Address",
 								Old:  "",
-								New:  "driver",
+								New:  "a.example.com",
 							},
 							{
 								Type: DiffTypeAdded,
-								Name: "Address",
+								Name: "AddressMode",
 								Old:  "",
-								New:  "a.example.com",
+								New:  "driver",
 							},
 							{
 								Type: DiffTypeNone,
@@ -5820,11 +5820,11 @@ func TestTaskDiff(t *testing.T) {
 						Fields: []*FieldDiff{
 							{
 								Type: DiffTypeNone,
-								Name: "AddressMode",
+								Name: "Address",
 							},
 							{
 								Type: DiffTypeNone,
-								Name: "Address",
+								Name: "AddressMode",
 							},
 							{
 								Type: DiffTypeNone,
@@ -6339,13 +6339,13 @@ func TestTaskDiff(t *testing.T) {
 						Fields: []*FieldDiff{
 							{
 								Type: DiffTypeNone,
-								Name: "AddressMode",
+								Name: "Address",
 								Old:  "",
 								New:  "",
 							},
 							{
 								Type: DiffTypeNone,
-								Name: "Address",
+								Name: "AddressMode",
 								Old:  "",
 								New:  "",
 							},
@@ -7466,18 +7466,18 @@ func TestServicesDiff(t *testing.T) {
 					Type: DiffTypeEdited,
 					Name: "Service",
 					Fields: []*FieldDiff{
-						{
-							Type: DiffTypeEdited,
-							Name: "AddressMode",
-							Old:  "host",
-							New:  "alloc",
-						},
 						{
 							Type: DiffTypeEdited,
 							Name: "Address",
 							Old:  "a.example.com",
 							New:  "b.example.com",
 						},
+						{
+							Type: DiffTypeEdited,
+							Name: "AddressMode",
+							Old:  "host",
+							New:  "alloc",
+						},
 						{
 							Type: DiffTypeEdited,
 							Name: "EnableTagOverride",
@@ -7568,11 +7568,11 @@ func TestServicesDiff(t *testing.T) {
 					Fields: []*FieldDiff{
 						{
 							Type: DiffTypeNone,
-							Name: "AddressMode",
+							Name: "Address",
 						},
 						{
 							Type: DiffTypeNone,
-							Name: "Address",
+							Name: "AddressMode",
 						},
 						{
 							Type: DiffTypeAdded,
@@ -7635,11 +7635,11 @@ func TestServicesDiff(t *testing.T) {
 					Fields: []*FieldDiff{
 						{
 							Type: DiffTypeNone,
-							Name: "AddressMode",
+							Name: "Address",
 						},
 						{
 							Type: DiffTypeNone,
-							Name: "Address",
+							Name: "AddressMode",
 						},
 						{
 							Type: DiffTypeAdded,
@@ -7706,11 +7706,11 @@ func TestServicesDiff(t *testing.T) {
 					Fields: []*FieldDiff{
 						{
 							Type: DiffTypeNone,
-							Name: "AddressMode",
+							Name: "Address",
 						},
 						{
 							Type: DiffTypeNone,
-							Name: "Address",
+							Name: "AddressMode",
 						},
 						{
 							Type: DiffTypeNone,
@@ -7783,11 +7783,11 @@ func TestServicesDiff(t *testing.T) {
 					Fields: []*FieldDiff{
 						{
 							Type: DiffTypeNone,
-							Name: "AddressMode",
+							Name: "Address",
 						},
 						{
 							Type: DiffTypeNone,
-							Name: "Address",
+							Name: "AddressMode",
 						},
 						{
 							Type: DiffTypeNone,
@@ -7870,11 +7870,11 @@ func TestServicesDiff(t *testing.T) {
 					Fields: []*FieldDiff{
 						{
 							Type: DiffTypeNone,
-							Name: "AddressMode",
+							Name: "Address",
 						},
 						{
 							Type: DiffTypeNone,
-							Name: "Address",
+							Name: "AddressMode",
 						},
 						{
 							Type: DiffTypeNone,