alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Equality operator on app should include syslogurl field (#1153)

Browse Source
This commit is contained in:
Richard Connon
2018-08-02 15:49:43 -07:00
committed by Tom Coupland
parent 9c3495c34d
commit a2e8be5e78
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/models/app.go
View File

@@ -127,6 +127,7 @@ func (a1 *App) Equals(a2 *App) bool {
eq = eq && a1.ID == a2.ID eq = eq && a1.ID == a2.ID
eq = eq && a1.Name == a2.Name eq = eq && a1.Name == a2.Name
eq = eq && a1.Config.Equals(a2.Config) eq = eq && a1.Config.Equals(a2.Config)
eq = eq && a1.SyslogURL == a2.SyslogURL
eq = eq && a1.Annotations.Equals(a2.Annotations) eq = eq && a1.Annotations.Equals(a2.Annotations)
// NOTE: datastore tests are not very fun to write with timestamp checks, // NOTE: datastore tests are not very fun to write with timestamp checks,
// and these are not values the user may set so we kind of don't care. // and these are not values the user may set so we kind of don't care.
@@ -143,6 +144,7 @@ func (a1 *App) EqualsWithAnnotationSubset(a2 *App) bool {
eq = eq && a1.ID == a2.ID eq = eq && a1.ID == a2.ID
eq = eq && a1.Name == a2.Name eq = eq && a1.Name == a2.Name
eq = eq && a1.Config.Equals(a2.Config) eq = eq && a1.Config.Equals(a2.Config)
eq = eq && a1.SyslogURL == a2.SyslogURL
eq = eq && a1.Annotations.Subset(a2.Annotations) eq = eq && a1.Annotations.Subset(a2.Annotations)
// NOTE: datastore tests are not very fun to write with timestamp checks, // NOTE: datastore tests are not very fun to write with timestamp checks,
// and these are not values the user may set so we kind of don't care. // and these are not values the user may set so we kind of don't care.