luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity
open-nomad/nomad/structs/diff_test.go

5349 lines
100 KiB
Go
Raw Normal View History

Job diff using generic structures
2016-05-11 05:23:34 +00:00
package structs
import (
"reflect"
"testing"
"time"
)
func TestJobDiff(t *testing.T) {
cases := []struct {
contextual diff
2016-05-11 18:10:09 +00:00
Old, New *Job
Expected *JobDiff
Error bool
Contextual bool
Job diff using generic structures
2016-05-11 05:23:34 +00:00
}{
{
Old: nil,
New: nil,
Expected: &JobDiff{
Type: DiffTypeNone,
},
},
{
// Different IDs
Old: &Job{
ID: "foo",
},
New: &Job{
ID: "bar",
},
Error: true,
},
{
// Primitive only that is the same
Old: &Job{
Region: "foo",
ID: "foo",
Name: "foo",
Type: "batch",
Priority: 10,
AllAtOnce: true,
Meta: map[string]string{
"foo": "bar",
},
},
New: &Job{
Region: "foo",
ID: "foo",
Name: "foo",
Type: "batch",
Priority: 10,
AllAtOnce: true,
Meta: map[string]string{
"foo": "bar",
},
},
Expected: &JobDiff{
Type: DiffTypeNone,
ID: "foo",
},
},
{
// Primitive only that is has diffs
Old: &Job{
Region: "foo",
ID: "foo",
Name: "foo",
Type: "batch",
Priority: 10,
AllAtOnce: true,
Meta: map[string]string{
"foo": "bar",
},
},
New: &Job{
Region: "bar",
ID: "foo",
Name: "bar",
Type: "system",
Priority: 100,
AllAtOnce: false,
Meta: map[string]string{
"foo": "baz",
},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
ID: "foo",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "AllAtOnce",
Old: "true",
New: "false",
},
{
Type: DiffTypeEdited,
Name: "Meta[foo]",
Old: "bar",
New: "baz",
},
{
Type: DiffTypeEdited,
Name: "Name",
Old: "foo",
New: "bar",
},
{
Type: DiffTypeEdited,
Name: "Priority",
Old: "10",
New: "100",
},
{
Type: DiffTypeEdited,
Name: "Region",
Old: "foo",
New: "bar",
},
{
Type: DiffTypeEdited,
Name: "Type",
Old: "batch",
New: "system",
},
},
},
},
{
// Primitive only deleted job
Old: &Job{
Region: "foo",
ID: "foo",
Name: "foo",
Type: "batch",
Priority: 10,
AllAtOnce: true,
Meta: map[string]string{
"foo": "bar",
},
},
New: nil,
Expected: &JobDiff{
Type: DiffTypeDeleted,
ID: "foo",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "AllAtOnce",
Old: "true",
New: "",
},
nomad/structs: fix job diff test
2018-06-11 17:06:49 +00:00
{
Type: DiffTypeDeleted,
Name: "Dispatched",
Old: "false",
New: "",
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
Type: DiffTypeDeleted,
Name: "Meta[foo]",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Name",
Old: "foo",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Priority",
Old: "10",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Region",
Old: "foo",
New: "",
},
Diff code fixes
2017-04-16 23:54:02 +00:00
{
Type: DiffTypeDeleted,
Name: "Stop",
Old: "false",
New: "",
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
Type: DiffTypeDeleted,
Name: "Type",
Old: "batch",
New: "",
},
},
Fixes
2016-05-13 18:53:11 +00:00
},
},
{
// Primitive only added job
Old: nil,
New: &Job{
Region: "foo",
ID: "foo",
Name: "foo",
Type: "batch",
Priority: 10,
AllAtOnce: true,
Meta: map[string]string{
"foo": "bar",
},
},
Expected: &JobDiff{
Type: DiffTypeAdded,
ID: "foo",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "AllAtOnce",
Old: "",
New: "true",
},
nomad/structs: fix job diff test
2018-06-11 17:06:49 +00:00
{
Type: DiffTypeAdded,
Name: "Dispatched",
Old: "",
New: "false",
},
Fixes
2016-05-13 18:53:11 +00:00
{
Type: DiffTypeAdded,
Name: "Meta[foo]",
Old: "",
New: "bar",
},
{
Type: DiffTypeAdded,
Name: "Name",
Old: "",
New: "foo",
},
{
Type: DiffTypeAdded,
Name: "Priority",
Old: "",
New: "10",
},
{
Type: DiffTypeAdded,
Name: "Region",
Old: "",
New: "foo",
},
Diff code fixes
2017-04-16 23:54:02 +00:00
{
Type: DiffTypeAdded,
Name: "Stop",
Old: "",
New: "false",
},
Fixes
2016-05-13 18:53:11 +00:00
{
Type: DiffTypeAdded,
Name: "Type",
Old: "",
New: "batch",
},
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
{
// Map diff
Old: &Job{
Meta: map[string]string{
"foo": "foo",
"bar": "bar",
},
},
New: &Job{
Meta: map[string]string{
"bar": "bar",
"baz": "baz",
},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Meta[baz]",
Old: "",
New: "baz",
},
{
Type: DiffTypeDeleted,
Name: "Meta[foo]",
Old: "foo",
New: "",
},
},
},
},
{
// Datacenter diff both added and removed
Old: &Job{
Datacenters: []string{"foo", "bar"},
},
New: &Job{
Datacenters: []string{"baz", "bar"},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Datacenters",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Datacenters",
Old: "",
New: "baz",
},
{
Type: DiffTypeDeleted,
Name: "Datacenters",
Old: "foo",
New: "",
},
},
},
},
},
},
{
// Datacenter diff just added
Old: &Job{
Datacenters: []string{"foo", "bar"},
},
New: &Job{
Datacenters: []string{"foo", "bar", "baz"},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Datacenters",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Datacenters",
Old: "",
New: "baz",
},
},
},
},
},
},
{
// Datacenter diff just deleted
Old: &Job{
Datacenters: []string{"foo", "bar"},
},
New: &Job{
Datacenters: []string{"foo"},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Name: "Datacenters",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Datacenters",
Old: "bar",
New: "",
},
},
},
},
},
},
Vault diff
2016-09-21 20:49:34 +00:00
{
Fix diff alignment and remove no change DC Old Output: ``` +/- Job: "example" Datacenters { Datacenters: "dc1" } +/- Task Group: "cache" (1 create/destroy update) +/- RestartPolicy { +/- Attempts: "10" => "9" Delay: "25000000000" Interval: "300000000000" Mode: "delay" } +/- EphemeralDisk { Migrate: "false" +/- SizeMB: "300" => "301" Sticky: "false" } +/- Task: "redis" (forces create/destroy update) + Meta[key]: "value" +/- Config { image: "redis:3.2" +/- port_map[0][db]: "6379" => "6380" } +/- Resources { CPU: "500" DiskMB: "0" IOPS: "0" +/- MemoryMB: "256" => "257" } +/- Service { Name: "global-redis-check" PortLabel: "db" +/- Check { Command: "" InitialStatus: "" Interval: "10000000000" Name: "alive" Path: "" PortLabel: "" Protocol: "" +/- Timeout: "2000000000" => "3000000000" Type: "tcp" } } ``` New Output: ``` +/- Job: "example" +/- Task Group: "cache" (1 create/destroy update) +/- RestartPolicy { +/- Attempts: "10" => "9" Delay: "25000000000" Interval: "300000000000" Mode: "delay" } +/- EphemeralDisk { Migrate: "false" +/- SizeMB: "300" => "301" Sticky: "false" } +/- Task: "redis" (forces create/destroy update) + Meta[key]: "value" +/- Config { image: "redis:3.2" +/- port_map[0][db]: "6379" => "6380" } +/- Resources { CPU: "500" DiskMB: "0" IOPS: "0" +/- MemoryMB: "256" => "257" } +/- Service { Name: "global-redis-check" PortLabel: "db" +/- Check { Command: "" InitialStatus: "" Interval: "10000000000" Name: "alive" Path: "" PortLabel: "" Protocol: "" +/- Timeout: "2000000000" => "3000000000" Type: "tcp" } } ```
2017-03-21 18:42:10 +00:00
// Datacenter contextual no change
Vault diff
2016-09-21 20:49:34 +00:00
Contextual: true,
Old: &Job{
Datacenters: []string{"foo", "bar"},
},
New: &Job{
Datacenters: []string{"foo", "bar"},
},
Expected: &JobDiff{
Type: DiffTypeNone,
},
},
Fix diff alignment and remove no change DC Old Output: ``` +/- Job: "example" Datacenters { Datacenters: "dc1" } +/- Task Group: "cache" (1 create/destroy update) +/- RestartPolicy { +/- Attempts: "10" => "9" Delay: "25000000000" Interval: "300000000000" Mode: "delay" } +/- EphemeralDisk { Migrate: "false" +/- SizeMB: "300" => "301" Sticky: "false" } +/- Task: "redis" (forces create/destroy update) + Meta[key]: "value" +/- Config { image: "redis:3.2" +/- port_map[0][db]: "6379" => "6380" } +/- Resources { CPU: "500" DiskMB: "0" IOPS: "0" +/- MemoryMB: "256" => "257" } +/- Service { Name: "global-redis-check" PortLabel: "db" +/- Check { Command: "" InitialStatus: "" Interval: "10000000000" Name: "alive" Path: "" PortLabel: "" Protocol: "" +/- Timeout: "2000000000" => "3000000000" Type: "tcp" } } ``` New Output: ``` +/- Job: "example" +/- Task Group: "cache" (1 create/destroy update) +/- RestartPolicy { +/- Attempts: "10" => "9" Delay: "25000000000" Interval: "300000000000" Mode: "delay" } +/- EphemeralDisk { Migrate: "false" +/- SizeMB: "300" => "301" Sticky: "false" } +/- Task: "redis" (forces create/destroy update) + Meta[key]: "value" +/- Config { image: "redis:3.2" +/- port_map[0][db]: "6379" => "6380" } +/- Resources { CPU: "500" DiskMB: "0" IOPS: "0" +/- MemoryMB: "256" => "257" } +/- Service { Name: "global-redis-check" PortLabel: "db" +/- Check { Command: "" InitialStatus: "" Interval: "10000000000" Name: "alive" Path: "" PortLabel: "" Protocol: "" +/- Timeout: "2000000000" => "3000000000" Type: "tcp" } } ```
2017-03-21 18:42:10 +00:00
{
// Datacenter contextual
Contextual: true,
Old: &Job{
Datacenters: []string{"foo", "bar"},
},
New: &Job{
Datacenters: []string{"foo", "bar", "baz"},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Datacenters",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Datacenters",
Old: "",
New: "baz",
},
{
Type: DiffTypeNone,
Name: "Datacenters",
Old: "bar",
New: "bar",
},
{
Type: DiffTypeNone,
Name: "Datacenters",
Old: "foo",
New: "foo",
},
},
},
},
},
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
// Periodic added
Old: &Job{},
New: &Job{
Periodic: &PeriodicConfig{
Enabled: false,
Spec: "*/15 * * * * *",
SpecType: "foo",
ProhibitOverlap: false,
Fix diff
2017-02-15 23:23:29 +00:00
TimeZone: "Europe/Minsk",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Periodic",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Enabled",
Old: "",
New: "false",
},
{
Type: DiffTypeAdded,
Name: "ProhibitOverlap",
Old: "",
New: "false",
},
{
Type: DiffTypeAdded,
Name: "Spec",
Old: "",
New: "*/15 * * * * *",
},
{
Type: DiffTypeAdded,
Name: "SpecType",
Old: "",
New: "foo",
},
Fix diff
2017-02-15 23:23:29 +00:00
{
Type: DiffTypeAdded,
Name: "TimeZone",
Old: "",
New: "Europe/Minsk",
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
},
},
},
{
// Periodic deleted
Old: &Job{
Periodic: &PeriodicConfig{
Enabled: false,
Spec: "*/15 * * * * *",
SpecType: "foo",
ProhibitOverlap: false,
Fix diff
2017-02-15 23:23:29 +00:00
TimeZone: "Europe/Minsk",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
New: &Job{},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Name: "Periodic",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Enabled",
Old: "false",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "ProhibitOverlap",
Old: "false",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Spec",
Old: "*/15 * * * * *",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "SpecType",
Old: "foo",
New: "",
},
Fix diff
2017-02-15 23:23:29 +00:00
{
Type: DiffTypeDeleted,
Name: "TimeZone",
Old: "Europe/Minsk",
New: "",
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
},
},
},
{
// Periodic edited
Old: &Job{
Periodic: &PeriodicConfig{
Enabled: false,
Spec: "*/15 * * * * *",
SpecType: "foo",
ProhibitOverlap: false,
Fix diff
2017-02-15 23:23:29 +00:00
TimeZone: "Europe/Minsk",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
New: &Job{
Periodic: &PeriodicConfig{
Enabled: true,
Spec: "* * * * * *",
SpecType: "cron",
ProhibitOverlap: true,
Fix diff
2017-02-15 23:23:29 +00:00
TimeZone: "America/Los_Angeles",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Periodic",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Enabled",
Old: "false",
New: "true",
},
{
Type: DiffTypeEdited,
Name: "ProhibitOverlap",
Old: "false",
New: "true",
},
{
Type: DiffTypeEdited,
Name: "Spec",
Old: "*/15 * * * * *",
New: "* * * * * *",
},
{
Type: DiffTypeEdited,
Name: "SpecType",
Old: "foo",
New: "cron",
},
Fix diff
2017-02-15 23:23:29 +00:00
{
Type: DiffTypeEdited,
Name: "TimeZone",
Old: "Europe/Minsk",
New: "America/Los_Angeles",
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
},
},
},
contextual diff
2016-05-11 18:10:09 +00:00
{
// Periodic edited with context
Contextual: true,
Old: &Job{
Periodic: &PeriodicConfig{
Enabled: false,
Spec: "*/15 * * * * *",
SpecType: "foo",
ProhibitOverlap: false,
Fix diff
2017-02-15 23:23:29 +00:00
TimeZone: "Europe/Minsk",
contextual diff
2016-05-11 18:10:09 +00:00
},
},
New: &Job{
Periodic: &PeriodicConfig{
Enabled: true,
Spec: "* * * * * *",
SpecType: "foo",
ProhibitOverlap: false,
Fix diff
2017-02-15 23:23:29 +00:00
TimeZone: "Europe/Minsk",
contextual diff
2016-05-11 18:10:09 +00:00
},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Periodic",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Enabled",
Old: "false",
New: "true",
},
{
Type: DiffTypeNone,
Name: "ProhibitOverlap",
Old: "false",
New: "false",
},
{
Type: DiffTypeEdited,
Name: "Spec",
Old: "*/15 * * * * *",
New: "* * * * * *",
},
{
Type: DiffTypeNone,
Name: "SpecType",
Old: "foo",
New: "foo",
},
Fix diff
2017-02-15 23:23:29 +00:00
{
Type: DiffTypeNone,
Name: "TimeZone",
Old: "Europe/Minsk",
New: "Europe/Minsk",
},
contextual diff
2016-05-11 18:10:09 +00:00
},
},
},
},
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
// Constraints edited
Old: &Job{
Constraints: []*Constraint{
{
LTarget: "foo",
RTarget: "foo",
Operand: "foo",
str: "foo",
},
{
LTarget: "bar",
RTarget: "bar",
Operand: "bar",
str: "bar",
},
},
},
New: &Job{
Constraints: []*Constraint{
{
LTarget: "foo",
RTarget: "foo",
Operand: "foo",
str: "foo",
},
{
LTarget: "baz",
RTarget: "baz",
Operand: "baz",
str: "baz",
},
},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Constraint",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "LTarget",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "Operand",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "RTarget",
Old: "",
New: "baz",
},
},
},
{
Type: DiffTypeDeleted,
Name: "Constraint",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "LTarget",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Operand",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "RTarget",
Old: "bar",
New: "",
},
},
},
},
},
},
Include affinities in job and task diff, and more test cases
2018-07-18 19:23:29 +00:00
{
// Affinities edited
Old: &Job{
Affinities: []*Affinity{
{
LTarget: "foo",
RTarget: "foo",
Operand: "foo",
Weight: 20,
str: "foo",
},
{
LTarget: "bar",
RTarget: "bar",
Operand: "bar",
Weight: 20,
str: "bar",
},
},
},
New: &Job{
Affinities: []*Affinity{
{
LTarget: "foo",
RTarget: "foo",
Operand: "foo",
Weight: 20,
str: "foo",
},
{
LTarget: "baz",
RTarget: "baz",
Operand: "baz",
Weight: 20,
str: "baz",
},
},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Affinity",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "LTarget",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "Operand",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "RTarget",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "Weight",
Old: "",
New: "20",
},
},
},
{
Type: DiffTypeDeleted,
Name: "Affinity",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "LTarget",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Operand",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "RTarget",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Weight",
Old: "20",
New: "",
},
},
},
},
},
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
// Task groups edited
Old: &Job{
TaskGroups: []*TaskGroup{
{
Name: "foo",
Count: 1,
},
{
Name: "bar",
Count: 1,
},
{
Name: "baz",
Count: 1,
},
},
},
New: &Job{
TaskGroups: []*TaskGroup{
{
Name: "bar",
Count: 1,
},
{
Name: "baz",
Count: 2,
},
{
Name: "bam",
Count: 1,
},
},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
TaskGroups: []*TaskGroupDiff{
{
Type: DiffTypeAdded,
Name: "bam",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Count",
Old: "",
New: "1",
},
},
},
{
Type: DiffTypeNone,
Name: "bar",
},
{
Type: DiffTypeEdited,
Name: "baz",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Count",
Old: "1",
New: "2",
},
},
},
{
Type: DiffTypeDeleted,
Name: "foo",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Count",
Old: "1",
New: "",
},
},
},
},
},
},
JobDiff
2016-12-15 23:40:18 +00:00
{
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
// Parameterized Job added
JobDiff
2016-12-15 23:40:18 +00:00
Old: &Job{},
New: &Job{
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
ParameterizedJob: &ParameterizedJobConfig{
JobDiff
2016-12-15 23:40:18 +00:00
Payload: DispatchPayloadRequired,
MetaOptional: []string{"foo"},
MetaRequired: []string{"bar"},
},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
Name: "ParameterizedJob",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Payload",
Old: "",
New: DispatchPayloadRequired,
},
},
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaOptional",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaOptional",
JobDiff
2016-12-15 23:40:18 +00:00
Old: "",
New: "foo",
},
},
},
{
Type: DiffTypeAdded,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaRequired",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaRequired",
JobDiff
2016-12-15 23:40:18 +00:00
Old: "",
New: "bar",
},
},
},
},
},
},
},
},
{
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
// Parameterized Job deleted
JobDiff
2016-12-15 23:40:18 +00:00
Old: &Job{
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
ParameterizedJob: &ParameterizedJobConfig{
JobDiff
2016-12-15 23:40:18 +00:00
Payload: DispatchPayloadRequired,
MetaOptional: []string{"foo"},
MetaRequired: []string{"bar"},
},
},
New: &Job{},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Fix tests
2017-01-21 01:04:52 +00:00
Name: "ParameterizedJob",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Payload",
Old: DispatchPayloadRequired,
New: "",
},
},
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaOptional",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaOptional",
JobDiff
2016-12-15 23:40:18 +00:00
Old: "foo",
New: "",
},
},
},
{
Type: DiffTypeDeleted,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaRequired",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaRequired",
JobDiff
2016-12-15 23:40:18 +00:00
Old: "bar",
New: "",
},
},
},
},
},
},
},
},
{
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
// Parameterized Job edited
JobDiff
2016-12-15 23:40:18 +00:00
Old: &Job{
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
ParameterizedJob: &ParameterizedJobConfig{
JobDiff
2016-12-15 23:40:18 +00:00
Payload: DispatchPayloadRequired,
MetaOptional: []string{"foo"},
MetaRequired: []string{"bar"},
},
},
New: &Job{
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
ParameterizedJob: &ParameterizedJobConfig{
JobDiff
2016-12-15 23:40:18 +00:00
Payload: DispatchPayloadOptional,
MetaOptional: []string{"bam"},
MetaRequired: []string{"bang"},
},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
Name: "ParameterizedJob",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Payload",
Old: DispatchPayloadRequired,
New: DispatchPayloadOptional,
},
},
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaOptional",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaOptional",
JobDiff
2016-12-15 23:40:18 +00:00
Old: "",
New: "bam",
},
{
Type: DiffTypeDeleted,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaOptional",
JobDiff
2016-12-15 23:40:18 +00:00
Old: "foo",
New: "",
},
},
},
{
Type: DiffTypeEdited,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaRequired",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaRequired",
JobDiff
2016-12-15 23:40:18 +00:00
Old: "",
New: "bang",
},
{
Type: DiffTypeDeleted,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaRequired",
JobDiff
2016-12-15 23:40:18 +00:00
Old: "bar",
New: "",
},
},
},
},
},
},
},
},
{
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
// Parameterized Job edited with context
JobDiff
2016-12-15 23:40:18 +00:00
Contextual: true,
Old: &Job{
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
ParameterizedJob: &ParameterizedJobConfig{
JobDiff
2016-12-15 23:40:18 +00:00
Payload: DispatchPayloadRequired,
MetaOptional: []string{"foo"},
MetaRequired: []string{"bar"},
},
},
New: &Job{
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
ParameterizedJob: &ParameterizedJobConfig{
JobDiff
2016-12-15 23:40:18 +00:00
Payload: DispatchPayloadOptional,
MetaOptional: []string{"foo"},
MetaRequired: []string{"bar"},
},
},
Expected: &JobDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Rename Constructor -> Parameterized Job
2017-01-20 18:33:52 +00:00
Name: "ParameterizedJob",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Payload",
Old: DispatchPayloadRequired,
New: DispatchPayloadOptional,
},
},
Objects: []*ObjectDiff{
{
Type: DiffTypeNone,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaOptional",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeNone,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaOptional",
JobDiff
2016-12-15 23:40:18 +00:00
Old: "foo",
New: "foo",
},
},
},
{
Type: DiffTypeNone,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaRequired",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeNone,
missing tests
2017-01-26 05:20:50 +00:00
Name: "MetaRequired",
JobDiff
2016-12-15 23:40:18 +00:00
Old: "bar",
New: "bar",
},
},
},
},
},
},
},
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
}
for i, c := range cases {
contextual diff
2016-05-11 18:10:09 +00:00
actual, err := c.Old.Diff(c.New, c.Contextual)
Job diff using generic structures
2016-05-11 05:23:34 +00:00
if c.Error && err == nil {
struct: tiny: output case number of the diff test
2016-08-17 10:15:59 +00:00
t.Fatalf("case %d: expected errored", i+1)
Job diff using generic structures
2016-05-11 05:23:34 +00:00
} else if err != nil {
if !c.Error {
t.Fatalf("case %d: errored %#v", i+1, err)
} else {
continue
}
}
if !reflect.DeepEqual(actual, c.Expected) {
t.Fatalf("case %d: got:\n%#v\n want:\n%#v\n",
i+1, actual, c.Expected)
}
}
}
func TestTaskGroupDiff(t *testing.T) {
cases := []struct {
contextual diff
2016-05-11 18:10:09 +00:00
Old, New *TaskGroup
Expected *TaskGroupDiff
Error bool
Contextual bool
Job diff using generic structures
2016-05-11 05:23:34 +00:00
}{
{
Old: nil,
New: nil,
Expected: &TaskGroupDiff{
Type: DiffTypeNone,
},
},
{
// Primitive only that has different names
Old: &TaskGroup{
Name: "foo",
Count: 10,
Meta: map[string]string{
"foo": "bar",
},
},
New: &TaskGroup{
Name: "bar",
Count: 10,
Meta: map[string]string{
"foo": "bar",
},
},
Error: true,
},
{
// Primitive only that is the same
Old: &TaskGroup{
Name: "foo",
Count: 10,
Meta: map[string]string{
"foo": "bar",
},
},
New: &TaskGroup{
Name: "foo",
Count: 10,
Meta: map[string]string{
"foo": "bar",
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeNone,
Name: "foo",
},
},
{
// Primitive only that has diffs
Old: &TaskGroup{
Name: "foo",
Count: 10,
Meta: map[string]string{
"foo": "bar",
},
},
New: &TaskGroup{
Name: "foo",
Count: 100,
Meta: map[string]string{
"foo": "baz",
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Name: "foo",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Count",
Old: "10",
New: "100",
},
{
Type: DiffTypeEdited,
Name: "Meta[foo]",
Old: "bar",
New: "baz",
},
},
},
},
{
// Map diff
Old: &TaskGroup{
Meta: map[string]string{
"foo": "foo",
"bar": "bar",
},
},
New: &TaskGroup{
Meta: map[string]string{
"bar": "bar",
"baz": "baz",
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Meta[baz]",
Old: "",
New: "baz",
},
{
Type: DiffTypeDeleted,
Name: "Meta[foo]",
Old: "foo",
New: "",
},
},
},
},
{
// Constraints edited
Old: &TaskGroup{
Constraints: []*Constraint{
{
LTarget: "foo",
RTarget: "foo",
Operand: "foo",
str: "foo",
},
{
LTarget: "bar",
RTarget: "bar",
Operand: "bar",
str: "bar",
},
},
},
New: &TaskGroup{
Constraints: []*Constraint{
{
LTarget: "foo",
RTarget: "foo",
Operand: "foo",
str: "foo",
},
{
LTarget: "baz",
RTarget: "baz",
Operand: "baz",
str: "baz",
},
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Constraint",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "LTarget",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "Operand",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "RTarget",
Old: "",
New: "baz",
},
},
},
{
Type: DiffTypeDeleted,
Name: "Constraint",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "LTarget",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Operand",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "RTarget",
Old: "bar",
New: "",
},
},
},
},
},
},
Affinity parsing, api and structs
2018-07-16 13:30:58 +00:00
{
// Affinities edited
Old: &TaskGroup{
Affinities: []*Affinity{
{
LTarget: "foo",
RTarget: "foo",
Operand: "foo",
Weight: 20,
str: "foo",
},
{
LTarget: "bar",
RTarget: "bar",
Operand: "bar",
Weight: 20,
str: "bar",
},
},
},
New: &TaskGroup{
Affinities: []*Affinity{
{
LTarget: "foo",
RTarget: "foo",
Operand: "foo",
Weight: 20,
str: "foo",
},
{
LTarget: "baz",
RTarget: "baz",
Operand: "baz",
Weight: 20,
str: "baz",
},
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Affinity",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "LTarget",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "Operand",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "RTarget",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "Weight",
Old: "",
New: "20",
},
},
},
{
Type: DiffTypeDeleted,
Name: "Affinity",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "LTarget",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Operand",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "RTarget",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Weight",
Old: "20",
New: "",
},
},
},
},
},
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
// RestartPolicy added
Old: &TaskGroup{},
New: &TaskGroup{
RestartPolicy: &RestartPolicy{
Attempts: 1,
Interval: 1 * time.Second,
Delay: 1 * time.Second,
Mode: "fail",
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "RestartPolicy",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Attempts",
Old: "",
New: "1",
},
{
Type: DiffTypeAdded,
Name: "Delay",
Old: "",
New: "1000000000",
},
{
Type: DiffTypeAdded,
Name: "Interval",
Old: "",
New: "1000000000",
},
{
Type: DiffTypeAdded,
Name: "Mode",
Old: "",
New: "fail",
},
},
},
},
},
},
{
// RestartPolicy deleted
Old: &TaskGroup{
RestartPolicy: &RestartPolicy{
Attempts: 1,
Interval: 1 * time.Second,
Delay: 1 * time.Second,
Mode: "fail",
},
},
New: &TaskGroup{},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Name: "RestartPolicy",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Attempts",
Old: "1",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Delay",
Old: "1000000000",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Interval",
Old: "1000000000",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Mode",
Old: "fail",
New: "",
},
},
},
},
},
},
{
// RestartPolicy edited
Old: &TaskGroup{
RestartPolicy: &RestartPolicy{
Attempts: 1,
Interval: 1 * time.Second,
Delay: 1 * time.Second,
Mode: "fail",
},
},
New: &TaskGroup{
RestartPolicy: &RestartPolicy{
Attempts: 2,
Interval: 2 * time.Second,
Delay: 2 * time.Second,
Mode: "delay",
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "RestartPolicy",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Attempts",
Old: "1",
New: "2",
},
{
Type: DiffTypeEdited,
Name: "Delay",
Old: "1000000000",
New: "2000000000",
},
{
Type: DiffTypeEdited,
Name: "Interval",
Old: "1000000000",
New: "2000000000",
},
{
Type: DiffTypeEdited,
Name: "Mode",
Old: "fail",
New: "delay",
},
},
},
},
},
},
contextual diff
2016-05-11 18:10:09 +00:00
{
// RestartPolicy edited with context
Contextual: true,
Old: &TaskGroup{
RestartPolicy: &RestartPolicy{
Attempts: 1,
Interval: 1 * time.Second,
Delay: 1 * time.Second,
Mode: "fail",
},
},
New: &TaskGroup{
RestartPolicy: &RestartPolicy{
Attempts: 2,
Interval: 2 * time.Second,
Delay: 1 * time.Second,
Mode: "fail",
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "RestartPolicy",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Attempts",
Old: "1",
New: "2",
},
{
Type: DiffTypeNone,
Name: "Delay",
Old: "1000000000",
New: "1000000000",
},
{
Type: DiffTypeEdited,
Name: "Interval",
Old: "1000000000",
New: "2000000000",
},
{
Type: DiffTypeNone,
Name: "Mode",
Old: "fail",
New: "fail",
},
},
},
},
},
},
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
{
// ReschedulePolicy added
Old: &TaskGroup{},
New: &TaskGroup{
ReschedulePolicy: &ReschedulePolicy{
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
Attempts: 1,
Interval: 15 * time.Second,
Delay: 5 * time.Second,
Rename DelayCeiling to MaxDelay
2018-03-13 15:06:26 +00:00
MaxDelay: 20 * time.Second,
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
DelayFunction: "exponential",
Unlimited: false,
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "ReschedulePolicy",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Attempts",
Old: "",
New: "1",
},
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
{
Type: DiffTypeAdded,
Name: "Delay",
Old: "",
New: "5000000000",
},
{
Type: DiffTypeAdded,
Name: "DelayFunction",
Old: "",
New: "exponential",
},
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
{
Type: DiffTypeAdded,
Name: "Interval",
Old: "",
New: "15000000000",
},
Rename DelayCeiling to MaxDelay
2018-03-13 15:06:26 +00:00
{
Type: DiffTypeAdded,
Name: "MaxDelay",
Old: "",
New: "20000000000",
},
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
{
Type: DiffTypeAdded,
Name: "Unlimited",
Old: "",
New: "false",
},
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
},
},
},
},
},
{
// ReschedulePolicy deleted
Old: &TaskGroup{
ReschedulePolicy: &ReschedulePolicy{
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
Attempts: 1,
Interval: 15 * time.Second,
Delay: 5 * time.Second,
Rename DelayCeiling to MaxDelay
2018-03-13 15:06:26 +00:00
MaxDelay: 20 * time.Second,
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
DelayFunction: "exponential",
Unlimited: false,
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
},
},
New: &TaskGroup{},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Name: "ReschedulePolicy",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Attempts",
Old: "1",
New: "",
},
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
{
Type: DiffTypeDeleted,
Name: "Delay",
Old: "5000000000",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "DelayFunction",
Old: "exponential",
New: "",
},
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
{
Type: DiffTypeDeleted,
Name: "Interval",
Old: "15000000000",
New: "",
},
Rename DelayCeiling to MaxDelay
2018-03-13 15:06:26 +00:00
{
Type: DiffTypeDeleted,
Name: "MaxDelay",
Old: "20000000000",
New: "",
},
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
{
Type: DiffTypeDeleted,
Name: "Unlimited",
Old: "false",
New: "",
},
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
},
},
},
},
},
{
// ReschedulePolicy edited
Old: &TaskGroup{
ReschedulePolicy: &ReschedulePolicy{
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
Attempts: 1,
Interval: 1 * time.Second,
DelayFunction: "exponential",
Delay: 20 * time.Second,
Rename DelayCeiling to MaxDelay
2018-03-13 15:06:26 +00:00
MaxDelay: 1 * time.Minute,
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
Unlimited: false,
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
},
},
New: &TaskGroup{
ReschedulePolicy: &ReschedulePolicy{
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
Attempts: 2,
Interval: 2 * time.Second,
s/linear/constant/g
2018-03-26 19:45:09 +00:00
DelayFunction: "constant",
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
Delay: 30 * time.Second,
Rename DelayCeiling to MaxDelay
2018-03-13 15:06:26 +00:00
MaxDelay: 1 * time.Minute,
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
Unlimited: true,
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "ReschedulePolicy",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Attempts",
Old: "1",
New: "2",
},
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
{
Type: DiffTypeEdited,
Name: "Delay",
Old: "20000000000",
New: "30000000000",
},
{
Type: DiffTypeEdited,
Name: "DelayFunction",
Old: "exponential",
s/linear/constant/g
2018-03-26 19:45:09 +00:00
New: "constant",
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
},
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
{
Type: DiffTypeEdited,
Name: "Interval",
Old: "1000000000",
New: "2000000000",
},
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
{
Type: DiffTypeEdited,
Name: "Unlimited",
Old: "false",
New: "true",
},
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
},
},
},
},
}, {
// ReschedulePolicy edited with context
Contextual: true,
Old: &TaskGroup{
ReschedulePolicy: &ReschedulePolicy{
Attempts: 1,
Interval: 1 * time.Second,
},
},
New: &TaskGroup{
ReschedulePolicy: &ReschedulePolicy{
Attempts: 1,
Interval: 2 * time.Second,
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "ReschedulePolicy",
Fields: []*FieldDiff{
{
Type: DiffTypeNone,
Name: "Attempts",
Old: "1",
New: "1",
},
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
{
Type: DiffTypeNone,
Name: "Delay",
Old: "0",
New: "0",
},
{
Type: DiffTypeNone,
Name: "DelayFunction",
Old: "",
New: "",
},
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
{
Type: DiffTypeEdited,
Name: "Interval",
Old: "1000000000",
New: "2000000000",
},
Rename DelayCeiling to MaxDelay
2018-03-13 15:06:26 +00:00
{
Type: DiffTypeNone,
Name: "MaxDelay",
Old: "0",
New: "0",
},
New delayed rescheduling options, validation function and unit tests
2018-02-22 23:43:07 +00:00
{
Type: DiffTypeNone,
Name: "Unlimited",
Old: "false",
New: "false",
},
Wrap reschedule events in another struct and other review feedback
2018-01-17 17:05:22 +00:00
},
},
},
},
},
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
{
// Update strategy deleted
Old: &TaskGroup{
Update: &UpdateStrategy{
AutoRevert: true,
},
},
New: &TaskGroup{},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Name: "Update",
Fields: []*FieldDiff{
add update AutoPromote bool
2019-05-09 13:42:18 +00:00
{
Type: DiffTypeDeleted,
Name: "AutoPromote",
Old: "false",
New: "",
},
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
{
Type: DiffTypeDeleted,
Name: "AutoRevert",
Old: "true",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Canary",
Old: "0",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "HealthyDeadline",
Old: "0",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "MaxParallel",
Old: "0",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "MinHealthyTime",
Old: "0",
New: "",
},
Initial implementation
2018-03-23 17:56:00 +00:00
{
Type: DiffTypeDeleted,
Name: "ProgressDeadline",
Old: "0",
New: "",
},
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
},
},
},
},
},
{
// Update strategy added
Old: &TaskGroup{},
New: &TaskGroup{
Update: &UpdateStrategy{
AutoRevert: true,
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Update",
Fields: []*FieldDiff{
add update AutoPromote bool
2019-05-09 13:42:18 +00:00
{
Type: DiffTypeAdded,
Name: "AutoPromote",
Old: "",
New: "false",
},
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
{
Type: DiffTypeAdded,
Name: "AutoRevert",
Old: "",
New: "true",
},
{
Type: DiffTypeAdded,
Name: "Canary",
Old: "",
New: "0",
},
{
Type: DiffTypeAdded,
Name: "HealthyDeadline",
Old: "",
New: "0",
},
{
Type: DiffTypeAdded,
Name: "MaxParallel",
Old: "",
New: "0",
},
{
Type: DiffTypeAdded,
Name: "MinHealthyTime",
Old: "",
New: "0",
},
Initial implementation
2018-03-23 17:56:00 +00:00
{
Type: DiffTypeAdded,
Name: "ProgressDeadline",
Old: "",
New: "0",
},
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
},
},
},
},
},
{
// Update strategy edited
Old: &TaskGroup{
Update: &UpdateStrategy{
Initial implementation
2018-03-23 17:56:00 +00:00
MaxParallel: 5,
HealthCheck: "foo",
MinHealthyTime: 1 * time.Second,
HealthyDeadline: 30 * time.Second,
ProgressDeadline: 29 * time.Second,
AutoRevert: true,
add update AutoPromote bool
2019-05-09 13:42:18 +00:00
AutoPromote: true,
Initial implementation
2018-03-23 17:56:00 +00:00
Canary: 2,
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
},
},
New: &TaskGroup{
Update: &UpdateStrategy{
Initial implementation
2018-03-23 17:56:00 +00:00
MaxParallel: 7,
HealthCheck: "bar",
MinHealthyTime: 2 * time.Second,
HealthyDeadline: 31 * time.Second,
ProgressDeadline: 32 * time.Second,
AutoRevert: false,
add update AutoPromote bool
2019-05-09 13:42:18 +00:00
AutoPromote: false,
Initial implementation
2018-03-23 17:56:00 +00:00
Canary: 1,
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Update",
Fields: []*FieldDiff{
add update AutoPromote bool
2019-05-09 13:42:18 +00:00
{
Type: DiffTypeEdited,
Name: "AutoPromote",
Old: "true",
New: "false",
},
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
{
Type: DiffTypeEdited,
Name: "AutoRevert",
Old: "true",
New: "false",
},
{
Type: DiffTypeEdited,
Name: "Canary",
Old: "2",
New: "1",
},
{
Type: DiffTypeEdited,
Name: "HealthCheck",
Old: "foo",
New: "bar",
},
{
Type: DiffTypeEdited,
Name: "HealthyDeadline",
Old: "30000000000",
New: "31000000000",
},
{
Type: DiffTypeEdited,
Name: "MaxParallel",
Old: "5",
New: "7",
},
{
Type: DiffTypeEdited,
Name: "MinHealthyTime",
Old: "1000000000",
New: "2000000000",
},
Initial implementation
2018-03-23 17:56:00 +00:00
{
Type: DiffTypeEdited,
Name: "ProgressDeadline",
Old: "29000000000",
New: "32000000000",
},
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
},
},
},
},
},
{
// Update strategy edited with context
Contextual: true,
Old: &TaskGroup{
Update: &UpdateStrategy{
Initial implementation
2018-03-23 17:56:00 +00:00
MaxParallel: 5,
HealthCheck: "foo",
MinHealthyTime: 1 * time.Second,
HealthyDeadline: 30 * time.Second,
ProgressDeadline: 30 * time.Second,
AutoRevert: true,
add update AutoPromote bool
2019-05-09 13:42:18 +00:00
AutoPromote: true,
Initial implementation
2018-03-23 17:56:00 +00:00
Canary: 2,
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
},
},
New: &TaskGroup{
Update: &UpdateStrategy{
Initial implementation
2018-03-23 17:56:00 +00:00
MaxParallel: 7,
HealthCheck: "foo",
MinHealthyTime: 1 * time.Second,
HealthyDeadline: 30 * time.Second,
ProgressDeadline: 30 * time.Second,
AutoRevert: true,
add update AutoPromote bool
2019-05-09 13:42:18 +00:00
AutoPromote: true,
Initial implementation
2018-03-23 17:56:00 +00:00
Canary: 2,
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Update",
Fields: []*FieldDiff{
add update AutoPromote bool
2019-05-09 13:42:18 +00:00
{
Type: DiffTypeNone,
Name: "AutoPromote",
Old: "true",
New: "true",
},
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
{
Type: DiffTypeNone,
Name: "AutoRevert",
Old: "true",
New: "true",
},
{
Type: DiffTypeNone,
Name: "Canary",
Old: "2",
New: "2",
},
{
Type: DiffTypeNone,
Name: "HealthCheck",
Old: "foo",
New: "foo",
},
{
Type: DiffTypeNone,
Name: "HealthyDeadline",
Old: "30000000000",
New: "30000000000",
},
{
Type: DiffTypeEdited,
Name: "MaxParallel",
Old: "5",
New: "7",
},
{
Type: DiffTypeNone,
Name: "MinHealthyTime",
Old: "1000000000",
New: "1000000000",
},
Initial implementation
2018-03-23 17:56:00 +00:00
{
Type: DiffTypeNone,
Name: "ProgressDeadline",
Old: "30000000000",
New: "30000000000",
},
New update block; still need to handle the upgrade path
2017-05-09 00:44:26 +00:00
},
},
},
},
},
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
{
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
// EphemeralDisk added
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
Old: &TaskGroup{},
New: &TaskGroup{
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
EphemeralDisk: &EphemeralDisk{
Fix diff test
2016-10-06 21:14:59 +00:00
Migrate: true,
Sticky: true,
SizeMB: 100,
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
Name: "EphemeralDisk",
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
Fields: []*FieldDiff{
Fix diff test
2016-10-06 21:14:59 +00:00
{
Type: DiffTypeAdded,
Name: "Migrate",
Old: "",
New: "true",
},
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
{
Type: DiffTypeAdded,
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
Name: "SizeMB",
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
Old: "",
New: "100",
},
{
Type: DiffTypeAdded,
Name: "Sticky",
Old: "",
New: "true",
},
},
},
},
},
},
{
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
// EphemeralDisk deleted
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
Old: &TaskGroup{
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
EphemeralDisk: &EphemeralDisk{
Fix diff test
2016-10-06 21:14:59 +00:00
Migrate: true,
Sticky: true,
SizeMB: 100,
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
},
},
New: &TaskGroup{},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
Name: "EphemeralDisk",
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
Fields: []*FieldDiff{
Fix diff test
2016-10-06 21:14:59 +00:00
{
Type: DiffTypeDeleted,
Name: "Migrate",
Old: "true",
New: "",
},
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
{
Type: DiffTypeDeleted,
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
Name: "SizeMB",
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
Old: "100",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Sticky",
Old: "true",
New: "",
},
},
},
},
},
},
{
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
// EphemeralDisk edited
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
Old: &TaskGroup{
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
EphemeralDisk: &EphemeralDisk{
Fix diff test
2016-10-06 21:14:59 +00:00
Migrate: true,
Sticky: true,
SizeMB: 150,
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
},
},
New: &TaskGroup{
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
EphemeralDisk: &EphemeralDisk{
Fix diff test
2016-10-06 21:14:59 +00:00
Migrate: false,
Sticky: false,
SizeMB: 90,
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
Name: "EphemeralDisk",
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
Fields: []*FieldDiff{
Fix diff test
2016-10-06 21:14:59 +00:00
{
Type: DiffTypeEdited,
Name: "Migrate",
Old: "true",
New: "false",
},
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
{
Type: DiffTypeEdited,
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
Name: "SizeMB",
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
Old: "150",
New: "90",
},
{
Type: DiffTypeEdited,
Name: "Sticky",
Old: "true",
New: "false",
},
},
},
},
},
},
{
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
// EphemeralDisk edited with context
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
Contextual: true,
Old: &TaskGroup{
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
EphemeralDisk: &EphemeralDisk{
Fix diff test
2016-10-06 21:14:59 +00:00
Migrate: false,
Sticky: false,
SizeMB: 100,
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
},
},
New: &TaskGroup{
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
EphemeralDisk: &EphemeralDisk{
Fix diff test
2016-10-06 21:14:59 +00:00
Migrate: true,
Sticky: true,
SizeMB: 90,
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
Name: "EphemeralDisk",
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
Fields: []*FieldDiff{
Fix diff test
2016-10-06 21:14:59 +00:00
{
Type: DiffTypeEdited,
Name: "Migrate",
Old: "false",
New: "true",
},
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
{
Type: DiffTypeEdited,
Renaming LocalDisk to EphemeralDisk (#1710) Renaming LocalDisk to EphemeralDisk
2016-09-14 22:43:42 +00:00
Name: "SizeMB",
Added LocalDisk to diff
2016-08-27 03:38:50 +00:00
Old: "100",
New: "90",
},
{
Type: DiffTypeEdited,
Name: "Sticky",
Old: "false",
New: "true",
},
},
},
},
},
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
// Tasks edited
Old: &TaskGroup{
Tasks: []*Task{
{
Name: "foo",
Driver: "docker",
},
{
Name: "bar",
Driver: "docker",
},
{
Add optional shutdown delay to tasks Fixes #2441 Defaults to 0 (no delay) for backward compat and because this feature should be opt-in.
2017-08-17 00:54:11 +00:00
Name: "baz",
ShutdownDelay: 1 * time.Second,
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
},
New: &TaskGroup{
Tasks: []*Task{
{
Name: "bar",
Driver: "docker",
},
{
Name: "bam",
Driver: "docker",
},
Fix ShutdownDelay diff test
2017-08-17 21:05:51 +00:00
{
Name: "baz",
ShutdownDelay: 2 * time.Second,
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
Expected: &TaskGroupDiff{
Type: DiffTypeEdited,
Tasks: []*TaskDiff{
{
Type: DiffTypeAdded,
Name: "bam",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Driver",
Old: "",
New: "docker",
},
{
Type: DiffTypeAdded,
Name: "KillTimeout",
Old: "",
New: "0",
},
Fix test
2017-02-13 22:31:22 +00:00
{
Type: DiffTypeAdded,
Name: "Leader",
Old: "",
New: "false",
},
Fix ShutdownDelay diff test
2017-08-17 21:05:51 +00:00
{
Type: DiffTypeAdded,
Name: "ShutdownDelay",
Old: "",
New: "0",
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
{
Type: DiffTypeNone,
Name: "bar",
},
{
Type: DiffTypeEdited,
Name: "baz",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Fix ShutdownDelay diff test
2017-08-17 21:05:51 +00:00
Name: "ShutdownDelay",
Old: "1000000000",
New: "2000000000",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
},
{
Type: DiffTypeDeleted,
Name: "foo",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Driver",
Old: "docker",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "KillTimeout",
Old: "0",
New: "",
},
Fix test
2017-02-13 22:31:22 +00:00
{
Type: DiffTypeDeleted,
Name: "Leader",
Old: "false",
New: "",
},
Fix ShutdownDelay diff test
2017-08-17 21:05:51 +00:00
{
Type: DiffTypeDeleted,
Name: "ShutdownDelay",
Old: "0",
New: "",
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
},
},
},
},
}
for i, c := range cases {
contextual diff
2016-05-11 18:10:09 +00:00
actual, err := c.Old.Diff(c.New, c.Contextual)
Job diff using generic structures
2016-05-11 05:23:34 +00:00
if c.Error && err == nil {
Fix vet script and fix vet problems This PR fixes our vet script and fixes all the missed vet changes. It also fixes pointers being printed in `nomad stop <job>` and `nomad node-status <node>`.
2017-02-28 00:00:19 +00:00
t.Fatalf("case %d: expected errored", i+1)
Job diff using generic structures
2016-05-11 05:23:34 +00:00
} else if err != nil {
if !c.Error {
t.Fatalf("case %d: errored %#v", i+1, err)
} else {
continue
}
}
if !reflect.DeepEqual(actual, c.Expected) {
t.Fatalf("case %d: got:\n%#v\n want:\n%#v\n",
i+1, actual, c.Expected)
}
}
}
func TestTaskDiff(t *testing.T) {
cases := []struct {
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name string
contextual diff
2016-05-11 18:10:09 +00:00
Old, New *Task
Expected *TaskDiff
Error bool
Contextual bool
Job diff using generic structures
2016-05-11 05:23:34 +00:00
}{
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Empty",
Old: nil,
New: nil,
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Expected: &TaskDiff{
Type: DiffTypeNone,
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Primitive only that has different names",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Old: &Task{
Name: "foo",
Meta: map[string]string{
"foo": "bar",
},
},
New: &Task{
Name: "bar",
Meta: map[string]string{
"foo": "bar",
},
},
Error: true,
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Primitive only that is the same",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Old: &Task{
Name: "foo",
Driver: "exec",
User: "foo",
Env: map[string]string{
"FOO": "bar",
},
Meta: map[string]string{
"foo": "bar",
},
KillTimeout: 1 * time.Second,
Add leader task to api and server side
2017-02-11 00:57:47 +00:00
Leader: true,
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
New: &Task{
Name: "foo",
Driver: "exec",
User: "foo",
Env: map[string]string{
"FOO": "bar",
},
Meta: map[string]string{
"foo": "bar",
},
KillTimeout: 1 * time.Second,
Add leader task to api and server side
2017-02-11 00:57:47 +00:00
Leader: true,
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
Expected: &TaskDiff{
Type: DiffTypeNone,
Name: "foo",
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Primitive only that has diffs",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Old: &Task{
Name: "foo",
Driver: "exec",
User: "foo",
Env: map[string]string{
"FOO": "bar",
},
Meta: map[string]string{
"foo": "bar",
},
KillTimeout: 1 * time.Second,
Add leader task to api and server side
2017-02-11 00:57:47 +00:00
Leader: true,
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
New: &Task{
Name: "foo",
Driver: "docker",
User: "bar",
Env: map[string]string{
"FOO": "baz",
},
Meta: map[string]string{
"foo": "baz",
},
KillTimeout: 2 * time.Second,
Add leader task to api and server side
2017-02-11 00:57:47 +00:00
Leader: false,
Job diff using generic structures
2016-05-11 05:23:34 +00:00
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Name: "foo",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Driver",
Old: "exec",
New: "docker",
},
{
Type: DiffTypeEdited,
Name: "Env[FOO]",
Old: "bar",
New: "baz",
},
{
Type: DiffTypeEdited,
Name: "KillTimeout",
Old: "1000000000",
New: "2000000000",
},
Add leader task to api and server side
2017-02-11 00:57:47 +00:00
{
Type: DiffTypeEdited,
Name: "Leader",
Old: "true",
New: "false",
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
Type: DiffTypeEdited,
Name: "Meta[foo]",
Old: "bar",
New: "baz",
},
{
Type: DiffTypeEdited,
Name: "User",
Old: "foo",
New: "bar",
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Map diff",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Old: &Task{
Meta: map[string]string{
"foo": "foo",
"bar": "bar",
},
Env: map[string]string{
"foo": "foo",
"bar": "bar",
},
},
New: &Task{
Meta: map[string]string{
"bar": "bar",
"baz": "baz",
},
Env: map[string]string{
"bar": "bar",
"baz": "baz",
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Env[baz]",
Old: "",
New: "baz",
},
{
Type: DiffTypeDeleted,
Name: "Env[foo]",
Old: "foo",
New: "",
},
{
Type: DiffTypeAdded,
Name: "Meta[baz]",
Old: "",
New: "baz",
},
{
Type: DiffTypeDeleted,
Name: "Meta[foo]",
Old: "foo",
New: "",
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Constraints edited",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Old: &Task{
Constraints: []*Constraint{
{
LTarget: "foo",
RTarget: "foo",
Operand: "foo",
str: "foo",
},
{
LTarget: "bar",
RTarget: "bar",
Operand: "bar",
str: "bar",
},
},
},
New: &Task{
Constraints: []*Constraint{
{
LTarget: "foo",
RTarget: "foo",
Operand: "foo",
str: "foo",
},
{
LTarget: "baz",
RTarget: "baz",
Operand: "baz",
str: "baz",
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Constraint",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "LTarget",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "Operand",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "RTarget",
Old: "",
New: "baz",
},
},
},
{
Type: DiffTypeDeleted,
Name: "Constraint",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "LTarget",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Operand",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "RTarget",
Old: "bar",
New: "",
},
},
},
},
},
},
Include affinities in job and task diff, and more test cases
2018-07-18 19:23:29 +00:00
{
Name: "Affinities edited",
Old: &Task{
Affinities: []*Affinity{
{
LTarget: "foo",
RTarget: "foo",
Operand: "foo",
Weight: 20,
str: "foo",
},
{
LTarget: "bar",
RTarget: "bar",
Operand: "bar",
Weight: 20,
str: "bar",
},
},
},
New: &Task{
Affinities: []*Affinity{
{
LTarget: "foo",
RTarget: "foo",
Operand: "foo",
Weight: 20,
str: "foo",
},
{
LTarget: "baz",
RTarget: "baz",
Operand: "baz",
Weight: 20,
str: "baz",
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Affinity",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "LTarget",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "Operand",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "RTarget",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "Weight",
Old: "",
New: "20",
},
},
},
{
Type: DiffTypeDeleted,
Name: "Affinity",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "LTarget",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Operand",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "RTarget",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Weight",
Old: "20",
New: "",
},
},
},
},
},
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "LogConfig added",
Old: &Task{},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
New: &Task{
LogConfig: &LogConfig{
MaxFiles: 1,
MaxFileSizeMB: 10,
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "LogConfig",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "MaxFileSizeMB",
Old: "",
New: "10",
},
{
Type: DiffTypeAdded,
Name: "MaxFiles",
Old: "",
New: "1",
},
},
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "LogConfig deleted",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Old: &Task{
LogConfig: &LogConfig{
MaxFiles: 1,
MaxFileSizeMB: 10,
},
},
New: &Task{},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Name: "LogConfig",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "MaxFileSizeMB",
Old: "10",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "MaxFiles",
Old: "1",
New: "",
},
},
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "LogConfig edited",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Old: &Task{
LogConfig: &LogConfig{
MaxFiles: 1,
MaxFileSizeMB: 10,
},
},
New: &Task{
LogConfig: &LogConfig{
MaxFiles: 2,
MaxFileSizeMB: 20,
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "LogConfig",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "MaxFileSizeMB",
Old: "10",
New: "20",
},
{
Type: DiffTypeEdited,
Name: "MaxFiles",
Old: "1",
New: "2",
},
},
},
},
},
},
contextual diff
2016-05-11 18:10:09 +00:00
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "LogConfig edited with context",
contextual diff
2016-05-11 18:10:09 +00:00
Contextual: true,
Old: &Task{
LogConfig: &LogConfig{
MaxFiles: 1,
MaxFileSizeMB: 10,
},
},
New: &Task{
LogConfig: &LogConfig{
MaxFiles: 1,
MaxFileSizeMB: 20,
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "LogConfig",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "MaxFileSizeMB",
Old: "10",
New: "20",
},
{
Type: DiffTypeNone,
Name: "MaxFiles",
Old: "1",
New: "1",
},
},
},
},
},
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Artifacts edited",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Old: &Task{
Artifacts: []*TaskArtifact{
{
GetterSource: "foo",
GetterOptions: map[string]string{
"foo": "bar",
},
RelativeDest: "foo",
},
{
GetterSource: "bar",
GetterOptions: map[string]string{
"bar": "baz",
},
Add support for go-getter modes Fixes #2678
2017-07-06 03:44:49 +00:00
GetterMode: "dir",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
RelativeDest: "bar",
},
},
},
New: &Task{
Artifacts: []*TaskArtifact{
{
GetterSource: "foo",
GetterOptions: map[string]string{
"foo": "bar",
},
RelativeDest: "foo",
},
{
GetterSource: "bam",
GetterOptions: map[string]string{
"bam": "baz",
},
Add support for go-getter modes Fixes #2678
2017-07-06 03:44:49 +00:00
GetterMode: "file",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
RelativeDest: "bam",
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Artifact",
Fields: []*FieldDiff{
Add support for go-getter modes Fixes #2678
2017-07-06 03:44:49 +00:00
{
Type: DiffTypeAdded,
Name: "GetterMode",
Old: "",
New: "file",
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
Type: DiffTypeAdded,
Name: "GetterOptions[bam]",
Old: "",
New: "baz",
},
{
Type: DiffTypeAdded,
Name: "GetterSource",
Old: "",
New: "bam",
},
{
Type: DiffTypeAdded,
Name: "RelativeDest",
Old: "",
New: "bam",
},
},
},
{
Type: DiffTypeDeleted,
Name: "Artifact",
Fields: []*FieldDiff{
Add support for go-getter modes Fixes #2678
2017-07-06 03:44:49 +00:00
{
Type: DiffTypeDeleted,
Name: "GetterMode",
Old: "dir",
New: "",
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
Type: DiffTypeDeleted,
Name: "GetterOptions[bar]",
Old: "baz",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "GetterSource",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "RelativeDest",
Old: "bar",
New: "",
},
},
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Resources edited (no networks)",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Old: &Task{
Resources: &Resources{
CPU: 100,
MemoryMB: 100,
DiskMB: 100,
},
},
New: &Task{
Resources: &Resources{
CPU: 200,
MemoryMB: 200,
DiskMB: 200,
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Resources",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "CPU",
Old: "100",
New: "200",
},
{
Type: DiffTypeEdited,
Name: "DiskMB",
Old: "100",
New: "200",
},
{
Type: DiffTypeEdited,
Name: "MemoryMB",
Old: "100",
New: "200",
},
},
},
},
},
},
contextual diff
2016-05-11 18:10:09 +00:00
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Resources edited (no networks) with context",
contextual diff
2016-05-11 18:10:09 +00:00
Contextual: true,
Old: &Task{
Resources: &Resources{
CPU: 100,
MemoryMB: 100,
DiskMB: 100,
},
},
New: &Task{
Resources: &Resources{
CPU: 200,
MemoryMB: 100,
DiskMB: 200,
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Resources",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "CPU",
Old: "100",
New: "200",
},
{
Type: DiffTypeEdited,
Name: "DiskMB",
Old: "100",
New: "200",
},
fix iops related tests
2018-12-12 22:32:22 +00:00
{
Type: DiffTypeNone,
Name: "IOPS",
Old: "0",
New: "0",
},
contextual diff
2016-05-11 18:10:09 +00:00
{
Type: DiffTypeNone,
Name: "MemoryMB",
Old: "100",
New: "100",
},
},
},
},
},
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Network Resources edited",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Old: &Task{
Resources: &Resources{
Networks: []*NetworkResource{
{
Device: "foo",
CIDR: "foo",
IP: "foo",
MBits: 100,
ReservedPorts: []Port{
{
Label: "foo",
Value: 80,
},
},
DynamicPorts: []Port{
{
Label: "bar",
},
},
},
},
},
},
New: &Task{
Resources: &Resources{
Networks: []*NetworkResource{
{
Device: "bar",
CIDR: "bar",
IP: "bar",
MBits: 200,
ReservedPorts: []Port{
{
Label: "foo",
Value: 81,
},
},
DynamicPorts: []Port{
{
Label: "baz",
},
},
},
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Resources",
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Network",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "MBits",
Old: "",
New: "200",
},
},
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Static Port",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Label",
Old: "",
New: "foo",
},
{
Type: DiffTypeAdded,
Name: "Value",
Old: "",
New: "81",
},
},
},
{
Type: DiffTypeAdded,
Name: "Dynamic Port",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Label",
Old: "",
New: "baz",
},
},
},
},
},
{
Type: DiffTypeDeleted,
Name: "Network",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "MBits",
Old: "100",
New: "",
},
},
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Name: "Static Port",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Label",
Old: "foo",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Value",
Old: "80",
New: "",
},
},
},
{
Type: DiffTypeDeleted,
Name: "Dynamic Port",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Label",
Old: "bar",
New: "",
},
},
},
},
},
},
},
},
},
},
Diff
2018-10-08 23:58:19 +00:00
{
Name: "Device Resources edited",
Old: &Task{
Resources: &Resources{
Devices: []*RequestedDevice{
{
Name: "foo",
Count: 2,
},
{
Name: "bar",
Count: 2,
},
{
Name: "baz",
Count: 2,
},
},
},
},
New: &Task{
Resources: &Resources{
Devices: []*RequestedDevice{
{
Name: "foo",
Count: 2,
},
{
Name: "bar",
Count: 3,
},
{
Name: "bam",
Count: 2,
},
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Resources",
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Device",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Count",
Old: "2",
New: "3",
},
},
},
{
Type: DiffTypeAdded,
Name: "Device",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Count",
Old: "",
New: "2",
},
{
Type: DiffTypeAdded,
Name: "Name",
Old: "",
New: "bam",
},
},
},
{
Type: DiffTypeDeleted,
Name: "Device",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Count",
Old: "2",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Name",
Old: "baz",
New: "",
},
},
},
},
},
},
},
},
{
Name: "Device Resources edited with context",
Contextual: true,
Old: &Task{
Resources: &Resources{
CPU: 100,
MemoryMB: 100,
DiskMB: 100,
Devices: []*RequestedDevice{
{
Name: "foo",
Count: 2,
},
{
Name: "bar",
Count: 2,
},
{
Name: "baz",
Count: 2,
},
},
},
},
New: &Task{
Resources: &Resources{
CPU: 100,
MemoryMB: 100,
DiskMB: 100,
Devices: []*RequestedDevice{
{
Name: "foo",
Count: 2,
},
{
Name: "bar",
Count: 3,
},
{
Name: "bam",
Count: 2,
},
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Resources",
Fields: []*FieldDiff{
{
Type: DiffTypeNone,
Name: "CPU",
Old: "100",
New: "100",
},
{
Type: DiffTypeNone,
Name: "DiskMB",
Old: "100",
New: "100",
},
fix iops related tests
2018-12-12 22:32:22 +00:00
{
Type: DiffTypeNone,
Name: "IOPS",
Old: "0",
New: "0",
},
Diff
2018-10-08 23:58:19 +00:00
{
Type: DiffTypeNone,
Name: "MemoryMB",
Old: "100",
New: "100",
},
},
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Device",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Count",
Old: "2",
New: "3",
},
{
Type: DiffTypeNone,
Name: "Name",
Old: "bar",
New: "bar",
},
},
},
{
Type: DiffTypeAdded,
Name: "Device",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Count",
Old: "",
New: "2",
},
{
Type: DiffTypeAdded,
Name: "Name",
Old: "",
New: "bam",
},
},
},
{
Type: DiffTypeDeleted,
Name: "Device",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Count",
Old: "2",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Name",
Old: "baz",
New: "",
},
},
},
},
},
},
},
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Config same",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Old: &Task{
Config: map[string]interface{}{
"foo": 1,
"bar": "bar",
"bam": []string{"a", "b"},
"baz": map[string]int{
"a": 1,
"b": 2,
},
"boom": &Port{
Label: "boom_port",
},
},
},
New: &Task{
Config: map[string]interface{}{
"foo": 1,
"bar": "bar",
"bam": []string{"a", "b"},
"baz": map[string]int{
"a": 1,
"b": 2,
},
"boom": &Port{
Label: "boom_port",
},
},
},
Expected: &TaskDiff{
Type: DiffTypeNone,
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Config edited",
Job diff using generic structures
2016-05-11 05:23:34 +00:00
Old: &Task{
Config: map[string]interface{}{
"foo": 1,
"bar": "baz",
"bam": []string{"a", "b"},
"baz": map[string]int{
"a": 1,
"b": 2,
},
"boom": &Port{
Label: "boom_port",
},
},
},
New: &Task{
Config: map[string]interface{}{
"foo": 2,
"bar": "baz",
"bam": []string{"a", "c", "d"},
"baz": map[string]int{
"b": 3,
"c": 4,
},
"boom": &Port{
Label: "boom_port2",
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Config",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "bam[1]",
Old: "b",
New: "c",
},
{
Type: DiffTypeAdded,
Name: "bam[2]",
Old: "",
New: "d",
},
{
Type: DiffTypeDeleted,
Name: "baz[a]",
Old: "1",
New: "",
},
{
Type: DiffTypeEdited,
Name: "baz[b]",
Old: "2",
New: "3",
},
{
Type: DiffTypeAdded,
Name: "baz[c]",
Old: "",
New: "4",
},
{
Type: DiffTypeEdited,
Name: "boom.Label",
Old: "boom_port",
New: "boom_port2",
},
{
Type: DiffTypeEdited,
Name: "foo",
Old: "1",
New: "2",
},
},
},
},
},
},
contextual diff
2016-05-11 18:10:09 +00:00
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Config edited with context",
contextual diff
2016-05-11 18:10:09 +00:00
Contextual: true,
Old: &Task{
Config: map[string]interface{}{
"foo": 1,
"bar": "baz",
"bam": []string{"a", "b"},
"baz": map[string]int{
"a": 1,
"b": 2,
},
"boom": &Port{
Label: "boom_port",
},
},
},
New: &Task{
Config: map[string]interface{}{
"foo": 2,
"bar": "baz",
"bam": []string{"a", "c", "d"},
"baz": map[string]int{
"a": 1,
"b": 2,
},
"boom": &Port{
Label: "boom_port",
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Config",
Fields: []*FieldDiff{
{
Type: DiffTypeNone,
Name: "bam[0]",
Old: "a",
New: "a",
},
{
Type: DiffTypeEdited,
Name: "bam[1]",
Old: "b",
New: "c",
},
{
Type: DiffTypeAdded,
Name: "bam[2]",
Old: "",
New: "d",
},
{
Type: DiffTypeNone,
Name: "bar",
Old: "baz",
New: "baz",
},
{
Type: DiffTypeNone,
Name: "baz[a]",
Old: "1",
New: "1",
},
{
Type: DiffTypeNone,
Name: "baz[b]",
Old: "2",
New: "2",
},
{
Type: DiffTypeNone,
Name: "boom.Label",
Old: "boom_port",
New: "boom_port",
},
{
Type: DiffTypeNone,
Name: "boom.Value",
Old: "0",
New: "0",
},
{
Type: DiffTypeEdited,
Name: "foo",
Old: "1",
New: "2",
},
},
},
},
},
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Services edited (no checks)",
Add service diff
2016-05-11 22:25:59 +00:00
Old: &Task{
Rename ConsulService back to Service
2016-06-12 23:36:49 +00:00
Services: []*Service{
Add service diff
2016-05-11 22:25:59 +00:00
{
Name: "foo",
PortLabel: "foo",
},
{
Name: "bar",
PortLabel: "bar",
},
{
Name: "baz",
PortLabel: "baz",
},
},
},
New: &Task{
Rename ConsulService back to Service
2016-06-12 23:36:49 +00:00
Services: []*Service{
Add service diff
2016-05-11 22:25:59 +00:00
{
Name: "bar",
PortLabel: "bar",
},
{
Name: "baz",
PortLabel: "baz2",
},
{
Name: "bam",
PortLabel: "bam",
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Service",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "PortLabel",
Old: "baz",
New: "baz2",
},
},
},
{
Type: DiffTypeAdded,
Name: "Service",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Name",
Old: "",
New: "bam",
},
{
Type: DiffTypeAdded,
Name: "PortLabel",
Old: "",
New: "bam",
},
},
},
{
Type: DiffTypeDeleted,
Name: "Service",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Name",
Old: "foo",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "PortLabel",
Old: "foo",
New: "",
},
},
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Services edited (no checks) with context",
Add service diff
2016-05-11 22:25:59 +00:00
Contextual: true,
Old: &Task{
Rename ConsulService back to Service
2016-06-12 23:36:49 +00:00
Services: []*Service{
Add service diff
2016-05-11 22:25:59 +00:00
{
Name: "foo",
PortLabel: "foo",
},
},
},
New: &Task{
Rename ConsulService back to Service
2016-06-12 23:36:49 +00:00
Services: []*Service{
Add service diff
2016-05-11 22:25:59 +00:00
{
Skip DRIVER env vars for labels without a port mapping
2017-06-20 19:26:52 +00:00
Name: "foo",
PortLabel: "bar",
AddressMode: "driver",
Add service diff
2016-05-11 22:25:59 +00:00
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Service",
Fields: []*FieldDiff{
Skip DRIVER env vars for labels without a port mapping
2017-06-20 19:26:52 +00:00
{
Type: DiffTypeAdded,
Name: "AddressMode",
New: "driver",
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Type: DiffTypeNone,
Name: "Name",
Old: "foo",
New: "foo",
},
{
Type: DiffTypeEdited,
Name: "PortLabel",
Old: "foo",
New: "bar",
},
},
},
},
},
},
Canary tags structs
2018-04-19 22:12:23 +00:00
{
Name: "Services tags edited (no checks) with context",
Contextual: true,
Old: &Task{
Services: []*Service{
{
Tags: []string{"foo", "bar"},
CanaryTags: []string{"foo", "bar"},
},
},
},
New: &Task{
Services: []*Service{
{
Tags: []string{"bar", "bam"},
CanaryTags: []string{"bar", "bam"},
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Service",
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "CanaryTags",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "CanaryTags",
Old: "",
New: "bam",
},
{
Type: DiffTypeNone,
Name: "CanaryTags",
Old: "bar",
New: "bar",
},
{
Type: DiffTypeDeleted,
Name: "CanaryTags",
Old: "foo",
New: "",
},
},
},
{
Type: DiffTypeEdited,
Name: "Tags",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Tags",
Old: "",
New: "bam",
},
{
Type: DiffTypeNone,
Name: "Tags",
Old: "bar",
New: "bar",
},
{
Type: DiffTypeDeleted,
Name: "Tags",
Old: "foo",
New: "",
},
},
},
},
Fields: []*FieldDiff{
{
Type: DiffTypeNone,
Name: "AddressMode",
},
{
Type: DiffTypeNone,
Name: "Name",
},
{
Type: DiffTypeNone,
Name: "PortLabel",
},
},
},
},
},
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Service Checks edited",
Add service diff
2016-05-11 22:25:59 +00:00
Old: &Task{
Rename ConsulService back to Service
2016-06-12 23:36:49 +00:00
Services: []*Service{
Add service diff
2016-05-11 22:25:59 +00:00
{
Name: "foo",
Checks: []*ServiceCheck{
{
Name: "foo",
Type: "http",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
Test Check.Header add/removes
2017-09-29 00:08:43 +00:00
Header: map[string][]string{
"Foo": {"bar"},
},
Add service diff
2016-05-11 22:25:59 +00:00
},
{
Name: "bar",
Type: "http",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
},
{
Name: "baz",
Type: "http",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
},
},
},
},
},
New: &Task{
Rename ConsulService back to Service
2016-06-12 23:36:49 +00:00
Services: []*Service{
Add service diff
2016-05-11 22:25:59 +00:00
{
Name: "foo",
Checks: []*ServiceCheck{
{
Name: "bar",
Type: "http",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
},
{
Name: "baz",
Type: "tcp",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
Test Check.Header add/removes
2017-09-29 00:08:43 +00:00
Header: map[string][]string{
"Eggs": {"spam"},
},
Add service diff
2016-05-11 22:25:59 +00:00
},
{
Name: "bam",
Type: "http",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
},
},
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Service",
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Check",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Type",
Old: "http",
New: "tcp",
},
},
Test Check.Header add/removes
2017-09-29 00:08:43 +00:00
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Header",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Eggs[0]",
Old: "",
New: "spam",
},
},
},
},
Add service diff
2016-05-11 22:25:59 +00:00
},
{
Type: DiffTypeAdded,
Name: "Check",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Command",
Old: "",
New: "foo",
},
tests: fix grpc fields in task diff
2018-05-03 23:54:42 +00:00
{
Type: DiffTypeAdded,
Name: "GRPCUseTLS",
Old: "",
New: "false",
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Type: DiffTypeAdded,
Name: "Interval",
Old: "",
New: "1000000000",
},
{
Type: DiffTypeAdded,
Name: "Name",
Old: "",
New: "bam",
},
{
Type: DiffTypeAdded,
Name: "Path",
Old: "",
New: "foo",
},
{
Type: DiffTypeAdded,
Name: "Protocol",
Old: "",
New: "http",
},
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
{
Type: DiffTypeAdded,
Name: "TLSSkipVerify",
Old: "",
New: "false",
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Type: DiffTypeAdded,
Name: "Timeout",
Old: "",
New: "1000000000",
},
{
Type: DiffTypeAdded,
Name: "Type",
Old: "",
New: "http",
},
},
},
{
Type: DiffTypeDeleted,
Name: "Check",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Command",
Old: "foo",
New: "",
},
tests: fix grpc fields in task diff
2018-05-03 23:54:42 +00:00
{
Type: DiffTypeDeleted,
Name: "GRPCUseTLS",
Old: "false",
New: "",
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Type: DiffTypeDeleted,
Name: "Interval",
Old: "1000000000",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Name",
Old: "foo",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Path",
Old: "foo",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Protocol",
Old: "http",
New: "",
},
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
{
Type: DiffTypeDeleted,
Name: "TLSSkipVerify",
Old: "false",
New: "",
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Type: DiffTypeDeleted,
Name: "Timeout",
Old: "1000000000",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Type",
Old: "http",
New: "",
},
},
Test Check.Header add/removes
2017-09-29 00:08:43 +00:00
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Name: "Header",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Foo[0]",
Old: "bar",
},
},
},
},
Add service diff
2016-05-11 22:25:59 +00:00
},
},
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Service Checks edited with context",
Add service diff
2016-05-11 22:25:59 +00:00
Contextual: true,
Old: &Task{
Rename ConsulService back to Service
2016-06-12 23:36:49 +00:00
Services: []*Service{
Add service diff
2016-05-11 22:25:59 +00:00
{
Name: "foo",
Checks: []*ServiceCheck{
{
Fix TaskDiff test
2016-08-17 18:07:11 +00:00
Name: "foo",
Type: "http",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
InitialStatus: "critical",
Add diff support for ServiceCheck.Header
2017-08-16 21:41:37 +00:00
Header: map[string][]string{
"Foo": {"bar"},
},
Add service diff
2016-05-11 22:25:59 +00:00
},
},
},
},
},
New: &Task{
Rename ConsulService back to Service
2016-06-12 23:36:49 +00:00
Services: []*Service{
Add service diff
2016-05-11 22:25:59 +00:00
{
Name: "foo",
Checks: []*ServiceCheck{
{
Fix TaskDiff test
2016-08-17 18:07:11 +00:00
Name: "foo",
Type: "tcp",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
InitialStatus: "passing",
Add diff support for ServiceCheck.Header
2017-08-16 21:41:37 +00:00
Method: "POST",
Header: map[string][]string{
"Foo": {"bar", "baz"},
"Eggs": {"spam"},
},
Add service diff
2016-05-11 22:25:59 +00:00
},
},
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Service",
Fields: []*FieldDiff{
Skip DRIVER env vars for labels without a port mapping
2017-06-20 19:26:52 +00:00
{
Type: DiffTypeNone,
Name: "AddressMode",
Old: "",
New: "",
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Type: DiffTypeNone,
Name: "Name",
Old: "foo",
New: "foo",
},
{
Type: DiffTypeNone,
Name: "PortLabel",
Old: "",
New: "",
},
},
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Check",
Fields: []*FieldDiff{
Improve port label validation and diff testing
2017-12-08 06:09:37 +00:00
{
Type: DiffTypeNone,
Name: "AddressMode",
Old: "",
New: "",
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Type: DiffTypeNone,
Name: "Command",
Old: "foo",
New: "foo",
},
tests: fix grpc fields in task diff
2018-05-03 23:54:42 +00:00
{
Type: DiffTypeNone,
Name: "GRPCService",
Old: "",
New: "",
},
{
Type: DiffTypeNone,
Name: "GRPCUseTLS",
Old: "false",
New: "false",
},
Fix TaskDiff test
2016-08-17 18:07:11 +00:00
{
Type: DiffTypeEdited,
Name: "InitialStatus",
Old: "critical",
New: "passing",
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Type: DiffTypeNone,
Name: "Interval",
Old: "1000000000",
New: "1000000000",
},
Add diff support for ServiceCheck.Header
2017-08-16 21:41:37 +00:00
{
Type: DiffTypeAdded,
Name: "Method",
Old: "",
New: "POST",
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Type: DiffTypeNone,
Name: "Name",
Old: "foo",
New: "foo",
},
{
Type: DiffTypeNone,
Name: "Path",
Old: "foo",
New: "foo",
},
Using net.JoinHostPort instead of handcrafting addrs
2016-07-08 23:31:54 +00:00
{
Type: DiffTypeNone,
Name: "PortLabel",
Old: "",
New: "",
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Type: DiffTypeNone,
Name: "Protocol",
Old: "http",
New: "http",
},
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
{
Type: DiffTypeNone,
Name: "TLSSkipVerify",
Old: "false",
New: "false",
},
Add service diff
2016-05-11 22:25:59 +00:00
{
Type: DiffTypeNone,
Name: "Timeout",
Old: "1000000000",
New: "1000000000",
},
{
Type: DiffTypeEdited,
Name: "Type",
Old: "http",
New: "tcp",
},
},
Add diff support for ServiceCheck.Header
2017-08-16 21:41:37 +00:00
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Header",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Eggs[0]",
Old: "",
New: "spam",
},
{
Type: DiffTypeNone,
Name: "Foo[0]",
Old: "bar",
New: "bar",
},
{
Type: DiffTypeAdded,
Name: "Foo[1]",
Old: "",
New: "baz",
},
},
},
},
Add service diff
2016-05-11 22:25:59 +00:00
},
},
},
},
},
},
Diff CheckRestart objects
2017-09-28 21:06:18 +00:00
{
Name: "CheckRestart edited",
Old: &Task{
Services: []*Service{
{
Name: "foo",
Checks: []*ServiceCheck{
{
Name: "foo",
Type: "http",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
},
{
Name: "bar",
Type: "http",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
CheckRestart: &CheckRestart{
Limit: 2,
Grace: 2 * time.Second,
},
},
{
Name: "baz",
Type: "http",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
CheckRestart: &CheckRestart{
Limit: 3,
Grace: 3 * time.Second,
},
},
},
},
},
},
New: &Task{
Services: []*Service{
{
Name: "foo",
Checks: []*ServiceCheck{
{
Name: "foo",
Type: "http",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
CheckRestart: &CheckRestart{
Limit: 1,
Grace: 1 * time.Second,
},
},
{
Name: "bar",
Type: "http",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
},
{
Name: "baz",
Type: "http",
Command: "foo",
Args: []string{"foo"},
Path: "foo",
Protocol: "http",
Interval: 1 * time.Second,
Timeout: 1 * time.Second,
CheckRestart: &CheckRestart{
Limit: 4,
Grace: 4 * time.Second,
},
},
},
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Service",
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Check",
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "CheckRestart",
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "Grace",
Old: "3000000000",
New: "4000000000",
},
{
Type: DiffTypeEdited,
Name: "Limit",
Old: "3",
New: "4",
},
},
},
},
},
{
Type: DiffTypeEdited,
Name: "Check",
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "CheckRestart",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Grace",
New: "1000000000",
},
{
Type: DiffTypeAdded,
Name: "IgnoreWarnings",
New: "false",
},
{
Type: DiffTypeAdded,
Name: "Limit",
New: "1",
},
},
},
},
},
{
Type: DiffTypeEdited,
Name: "Check",
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Name: "CheckRestart",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Grace",
Old: "2000000000",
},
{
Type: DiffTypeDeleted,
Name: "IgnoreWarnings",
Old: "false",
},
{
Type: DiffTypeDeleted,
Name: "Limit",
Old: "2",
},
},
},
},
},
},
},
},
},
},
Vault diff
2016-09-21 20:49:34 +00:00
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Vault added",
Old: &Task{},
Vault diff
2016-09-21 20:49:34 +00:00
New: &Task{
Vault: &Vault{
tests
2016-10-18 21:54:14 +00:00
Policies: []string{"foo", "bar"},
Env: true,
ChangeMode: "signal",
ChangeSignal: "SIGUSR1",
Vault diff
2016-09-21 20:49:34 +00:00
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Vault",
Fields: []*FieldDiff{
tests
2016-10-18 21:54:14 +00:00
{
Type: DiffTypeAdded,
Name: "ChangeMode",
Old: "",
New: "signal",
},
{
Type: DiffTypeAdded,
Name: "ChangeSignal",
Old: "",
New: "SIGUSR1",
},
Vault diff
2016-09-21 20:49:34 +00:00
{
Type: DiffTypeAdded,
Name: "Env",
Old: "",
New: "true",
},
},
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Policies",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Policies",
Old: "",
New: "bar",
},
{
Type: DiffTypeAdded,
Name: "Policies",
Old: "",
New: "foo",
},
},
},
},
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Vault deleted",
Vault diff
2016-09-21 20:49:34 +00:00
Old: &Task{
Vault: &Vault{
tests
2016-10-18 21:54:14 +00:00
Policies: []string{"foo", "bar"},
Env: true,
ChangeMode: "signal",
ChangeSignal: "SIGUSR1",
Vault diff
2016-09-21 20:49:34 +00:00
},
},
New: &Task{},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Name: "Vault",
Fields: []*FieldDiff{
tests
2016-10-18 21:54:14 +00:00
{
Type: DiffTypeDeleted,
Name: "ChangeMode",
Old: "signal",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "ChangeSignal",
Old: "SIGUSR1",
New: "",
},
Vault diff
2016-09-21 20:49:34 +00:00
{
Type: DiffTypeDeleted,
Name: "Env",
Old: "true",
New: "",
},
},
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Name: "Policies",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "Policies",
Old: "bar",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Policies",
Old: "foo",
New: "",
},
},
},
},
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Vault edited",
Vault diff
2016-09-21 20:49:34 +00:00
Old: &Task{
Vault: &Vault{
tests
2016-10-18 21:54:14 +00:00
Policies: []string{"foo", "bar"},
Env: true,
ChangeMode: "signal",
ChangeSignal: "SIGUSR1",
Vault diff
2016-09-21 20:49:34 +00:00
},
},
New: &Task{
Vault: &Vault{
tests
2016-10-18 21:54:14 +00:00
Policies: []string{"bar", "baz"},
Env: false,
ChangeMode: "restart",
ChangeSignal: "foo",
Vault diff
2016-09-21 20:49:34 +00:00
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Vault",
Fields: []*FieldDiff{
tests
2016-10-18 21:54:14 +00:00
{
Type: DiffTypeEdited,
Name: "ChangeMode",
Old: "signal",
New: "restart",
},
{
Type: DiffTypeEdited,
Name: "ChangeSignal",
Old: "SIGUSR1",
New: "foo",
},
Vault diff
2016-09-21 20:49:34 +00:00
{
Type: DiffTypeEdited,
Name: "Env",
Old: "true",
New: "false",
},
},
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Policies",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Policies",
Old: "",
New: "baz",
},
{
Type: DiffTypeDeleted,
Name: "Policies",
Old: "foo",
New: "",
},
},
},
},
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Vault edited with context",
Vault diff
2016-09-21 20:49:34 +00:00
Contextual: true,
Old: &Task{
Vault: &Vault{
tests
2016-10-18 21:54:14 +00:00
Policies: []string{"foo", "bar"},
Env: true,
ChangeMode: "signal",
ChangeSignal: "SIGUSR1",
Vault diff
2016-09-21 20:49:34 +00:00
},
},
New: &Task{
Vault: &Vault{
tests
2016-10-18 21:54:14 +00:00
Policies: []string{"bar", "baz"},
Env: true,
ChangeMode: "signal",
ChangeSignal: "SIGUSR1",
Vault diff
2016-09-21 20:49:34 +00:00
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Vault",
Fields: []*FieldDiff{
tests
2016-10-18 21:54:14 +00:00
{
Type: DiffTypeNone,
Name: "ChangeMode",
Old: "signal",
New: "signal",
},
{
Type: DiffTypeNone,
Name: "ChangeSignal",
Old: "SIGUSR1",
New: "SIGUSR1",
},
Vault diff
2016-09-21 20:49:34 +00:00
{
Type: DiffTypeNone,
Name: "Env",
Old: "true",
New: "true",
},
},
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Name: "Policies",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "Policies",
Old: "",
New: "baz",
},
{
Type: DiffTypeNone,
Name: "Policies",
Old: "bar",
New: "bar",
},
{
Type: DiffTypeDeleted,
Name: "Policies",
Old: "foo",
New: "",
},
},
},
},
},
},
},
},
Template diff
2016-09-23 23:14:20 +00:00
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Template edited",
Template diff
2016-09-23 23:14:20 +00:00
Old: &Task{
Templates: []*Template{
{
Consul Template Manager
2016-10-03 19:42:18 +00:00
SourcePath: "foo",
DestPath: "bar",
EmbeddedTmpl: "baz",
ChangeMode: "bam",
ChangeSignal: "SIGHUP",
Splay: 1,
Template destination file permissions. This PR allows setting the file permissions of the rendered template.
2017-02-01 04:00:33 +00:00
Perms: "0644",
Fix broken Template Diff Test
2017-08-08 18:09:27 +00:00
VaultGrace: 3 * time.Second,
Template diff
2016-09-23 23:14:20 +00:00
},
{
Consul Template Manager
2016-10-03 19:42:18 +00:00
SourcePath: "foo2",
DestPath: "bar2",
EmbeddedTmpl: "baz2",
ChangeMode: "bam2",
ChangeSignal: "SIGHUP2",
Splay: 2,
Template destination file permissions. This PR allows setting the file permissions of the rendered template.
2017-02-01 04:00:33 +00:00
Perms: "0666",
Fix diff test
2017-05-27 00:05:14 +00:00
Envvars: true,
Fix broken Template Diff Test
2017-08-08 18:09:27 +00:00
VaultGrace: 5 * time.Second,
Template diff
2016-09-23 23:14:20 +00:00
},
},
},
New: &Task{
Templates: []*Template{
{
Consul Template Manager
2016-10-03 19:42:18 +00:00
SourcePath: "foo",
DestPath: "bar",
EmbeddedTmpl: "baz",
ChangeMode: "bam",
ChangeSignal: "SIGHUP",
Splay: 1,
Template destination file permissions. This PR allows setting the file permissions of the rendered template.
2017-02-01 04:00:33 +00:00
Perms: "0644",
Fix broken Template Diff Test
2017-08-08 18:09:27 +00:00
VaultGrace: 3 * time.Second,
Consul Template Manager
2016-10-03 19:42:18 +00:00
},
{
SourcePath: "foo3",
DestPath: "bar3",
EmbeddedTmpl: "baz3",
ChangeMode: "bam3",
ChangeSignal: "SIGHUP3",
Splay: 3,
Template destination file permissions. This PR allows setting the file permissions of the rendered template.
2017-02-01 04:00:33 +00:00
Perms: "0776",
Fix broken Template Diff Test
2017-08-08 18:09:27 +00:00
VaultGrace: 10 * time.Second,
Template diff
2016-09-23 23:14:20 +00:00
},
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Name: "Template",
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "ChangeMode",
Old: "",
New: "bam3",
},
{
Type: DiffTypeAdded,
Tests
2016-10-06 22:17:34 +00:00
Name: "ChangeSignal",
Template diff
2016-09-23 23:14:20 +00:00
Old: "",
Tests
2016-10-06 22:17:34 +00:00
New: "SIGHUP3",
Template diff
2016-09-23 23:14:20 +00:00
},
{
Type: DiffTypeAdded,
Tests
2016-10-06 22:17:34 +00:00
Name: "DestPath",
Template diff
2016-09-23 23:14:20 +00:00
Old: "",
Tests
2016-10-06 22:17:34 +00:00
New: "bar3",
Template diff
2016-09-23 23:14:20 +00:00
},
{
Type: DiffTypeAdded,
Tests
2016-10-06 22:17:34 +00:00
Name: "EmbeddedTmpl",
Template diff
2016-09-23 23:14:20 +00:00
Old: "",
Tests
2016-10-06 22:17:34 +00:00
New: "baz3",
Template diff
2016-09-23 23:14:20 +00:00
},
Fix diff test
2017-05-27 00:05:14 +00:00
{
Type: DiffTypeAdded,
Name: "Envvars",
Old: "",
New: "false",
},
Template destination file permissions. This PR allows setting the file permissions of the rendered template.
2017-02-01 04:00:33 +00:00
{
Type: DiffTypeAdded,
Name: "Perms",
Old: "",
New: "0776",
},
Template diff
2016-09-23 23:14:20 +00:00
{
Type: DiffTypeAdded,
Name: "SourcePath",
Old: "",
New: "foo3",
},
{
Type: DiffTypeAdded,
Name: "Splay",
Old: "",
New: "3",
},
Fix broken Template Diff Test
2017-08-08 18:09:27 +00:00
{
Type: DiffTypeAdded,
Name: "VaultGrace",
Old: "",
New: "10000000000",
},
Template diff
2016-09-23 23:14:20 +00:00
},
},
{
Type: DiffTypeDeleted,
Name: "Template",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "ChangeMode",
Old: "bam2",
New: "",
},
{
Type: DiffTypeDeleted,
Tests
2016-10-06 22:17:34 +00:00
Name: "ChangeSignal",
Old: "SIGHUP2",
Template diff
2016-09-23 23:14:20 +00:00
New: "",
},
{
Type: DiffTypeDeleted,
Tests
2016-10-06 22:17:34 +00:00
Name: "DestPath",
Old: "bar2",
Template diff
2016-09-23 23:14:20 +00:00
New: "",
},
{
Type: DiffTypeDeleted,
Tests
2016-10-06 22:17:34 +00:00
Name: "EmbeddedTmpl",
Old: "baz2",
Template diff
2016-09-23 23:14:20 +00:00
New: "",
},
Fix diff test
2017-05-27 00:05:14 +00:00
{
Type: DiffTypeDeleted,
Name: "Envvars",
Old: "true",
New: "",
},
Template destination file permissions. This PR allows setting the file permissions of the rendered template.
2017-02-01 04:00:33 +00:00
{
Type: DiffTypeDeleted,
Name: "Perms",
Old: "0666",
New: "",
},
Template diff
2016-09-23 23:14:20 +00:00
{
Type: DiffTypeDeleted,
Name: "SourcePath",
Old: "foo2",
New: "",
},
{
Type: DiffTypeDeleted,
Name: "Splay",
Old: "2",
New: "",
},
Fix broken Template Diff Test
2017-08-08 18:09:27 +00:00
{
Type: DiffTypeDeleted,
Name: "VaultGrace",
Old: "5000000000",
New: "",
},
Template diff
2016-09-23 23:14:20 +00:00
},
},
},
},
},
JobDiff
2016-12-15 23:40:18 +00:00
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "DispatchPayload added",
Old: &Task{},
JobDiff
2016-12-15 23:40:18 +00:00
New: &Task{
Rename dispatch_input to dispatch_payload
2017-01-26 05:06:16 +00:00
DispatchPayload: &DispatchPayloadConfig{
JobDiff
2016-12-15 23:40:18 +00:00
File: "foo",
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeAdded,
Rename dispatch_input to dispatch_payload
2017-01-26 05:06:16 +00:00
Name: "DispatchPayload",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeAdded,
Name: "File",
Old: "",
New: "foo",
},
},
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "DispatchPayload deleted",
JobDiff
2016-12-15 23:40:18 +00:00
Old: &Task{
Rename dispatch_input to dispatch_payload
2017-01-26 05:06:16 +00:00
DispatchPayload: &DispatchPayloadConfig{
JobDiff
2016-12-15 23:40:18 +00:00
File: "foo",
},
},
New: &Task{},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Rename dispatch_input to dispatch_payload
2017-01-26 05:06:16 +00:00
Name: "DispatchPayload",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,
Name: "File",
Old: "foo",
New: "",
},
},
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
Name: "Dispatch payload edited",
JobDiff
2016-12-15 23:40:18 +00:00
Old: &Task{
Rename dispatch_input to dispatch_payload
2017-01-26 05:06:16 +00:00
DispatchPayload: &DispatchPayloadConfig{
JobDiff
2016-12-15 23:40:18 +00:00
File: "foo",
},
},
New: &Task{
Rename dispatch_input to dispatch_payload
2017-01-26 05:06:16 +00:00
DispatchPayload: &DispatchPayloadConfig{
JobDiff
2016-12-15 23:40:18 +00:00
File: "bar",
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Rename dispatch_input to dispatch_payload
2017-01-26 05:06:16 +00:00
Name: "DispatchPayload",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "File",
Old: "foo",
New: "bar",
},
},
},
},
},
},
{
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
// Place holder for if more fields are added
Name: "DispatchPayload edited with context",
JobDiff
2016-12-15 23:40:18 +00:00
Contextual: true,
Old: &Task{
Rename dispatch_input to dispatch_payload
2017-01-26 05:06:16 +00:00
DispatchPayload: &DispatchPayloadConfig{
JobDiff
2016-12-15 23:40:18 +00:00
File: "foo",
},
},
New: &Task{
Rename dispatch_input to dispatch_payload
2017-01-26 05:06:16 +00:00
DispatchPayload: &DispatchPayloadConfig{
JobDiff
2016-12-15 23:40:18 +00:00
File: "bar",
},
},
Expected: &TaskDiff{
Type: DiffTypeEdited,
Objects: []*ObjectDiff{
{
Type: DiffTypeEdited,
Rename dispatch_input to dispatch_payload
2017-01-26 05:06:16 +00:00
Name: "DispatchPayload",
JobDiff
2016-12-15 23:40:18 +00:00
Fields: []*FieldDiff{
{
Type: DiffTypeEdited,
Name: "File",
Old: "foo",
New: "bar",
},
},
},
},
},
},
Job diff using generic structures
2016-05-11 05:23:34 +00:00
}
for i, c := range cases {
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
t.Run(c.Name, func(t *testing.T) {
actual, err := c.Old.Diff(c.New, c.Contextual)
if c.Error && err == nil {
t.Fatalf("case %d: expected errored", i+1)
} else if err != nil {
if !c.Error {
t.Fatalf("case %d: errored %#v", i+1, err)
} else {
return
}
Job diff using generic structures
2016-05-11 05:23:34 +00:00
}
Fix diff test + bonus upgrade to subtests
2017-04-19 18:37:57 +00:00
if !reflect.DeepEqual(actual, c.Expected) {
t.Errorf("case %d: got:\n%#v\n want:\n%#v\n",
i+1, actual, c.Expected)
}
})
Job diff using generic structures
2016-05-11 05:23:34 +00:00
}
}
Reference in a new issue Copy permalink