diff --git a/api/types/derived.gen.go b/api/types/derived.gen.go index 0f96c2afaa430..14d2c580f8c41 100644 --- a/api/types/derived.gen.go +++ b/api/types/derived.gen.go @@ -194,7 +194,8 @@ func deriveTeleportEqual(this, that *AppSpecV3) bool { deriveTeleportEqual_21(this.UserGroups, that.UserGroups) && this.Integration == that.Integration && deriveTeleportEqual_21(this.RequiredAppNames, that.RequiredAppNames) && - deriveTeleportEqual_22(this.CORS, that.CORS) + deriveTeleportEqual_22(this.CORS, that.CORS) && + deriveTeleportEqual_23(this.TCPPorts, that.TCPPorts) } // deriveTeleportEqual_ returns whether this and that are equal. @@ -319,12 +320,12 @@ func deriveTeleportEqual_11(this, that *DatabaseSpecV3) bool { deriveTeleportEqualAWS(&this.AWS, &that.AWS) && deriveTeleportEqualGCPCloudSQL(&this.GCP, &that.GCP) && deriveTeleportEqualAzure(&this.Azure, &that.Azure) && - deriveTeleportEqual_23(&this.TLS, &that.TLS) && - deriveTeleportEqual_24(&this.AD, &that.AD) && - deriveTeleportEqual_25(&this.MySQL, &that.MySQL) && - deriveTeleportEqual_26(this.AdminUser, that.AdminUser) && - deriveTeleportEqual_27(&this.MongoAtlas, &that.MongoAtlas) && - deriveTeleportEqual_28(&this.Oracle, &that.Oracle) + deriveTeleportEqual_24(&this.TLS, &that.TLS) && + deriveTeleportEqual_25(&this.AD, &that.AD) && + deriveTeleportEqual_26(&this.MySQL, &that.MySQL) && + deriveTeleportEqual_27(this.AdminUser, that.AdminUser) && + deriveTeleportEqual_28(&this.MongoAtlas, &that.MongoAtlas) && + deriveTeleportEqual_29(&this.Oracle, &that.Oracle) } // deriveTeleportEqual_12 returns whether this and that are equal. @@ -334,7 +335,7 @@ func deriveTeleportEqual_12(this, that *DynamicWindowsDesktopSpecV1) bool { this.Addr == that.Addr && this.Domain == that.Domain && this.NonAD == that.NonAD && - deriveTeleportEqual_29(this.ScreenSize, that.ScreenSize) + deriveTeleportEqual_30(this.ScreenSize, that.ScreenSize) } // deriveTeleportEqual_13 returns whether this and that are equal. @@ -345,7 +346,7 @@ func deriveTeleportEqual_13(this, that *WindowsDesktopSpecV3) bool { this.Domain == that.Domain && this.HostID == that.HostID && this.NonAD == that.NonAD && - deriveTeleportEqual_29(this.ScreenSize, that.ScreenSize) + deriveTeleportEqual_30(this.ScreenSize, that.ScreenSize) } // deriveTeleportEqual_14 returns whether this and that are equal. @@ -366,7 +367,7 @@ func deriveTeleportEqual_15(this, that *KubernetesServerSpecV3) bool { this.Version == that.Version && this.Hostname == that.Hostname && this.HostID == that.HostID && - deriveTeleportEqual_30(&this.Rotation, &that.Rotation) && + deriveTeleportEqual_31(&this.Rotation, &that.Rotation) && deriveTeleportEqualKubernetesClusterV3(this.Cluster, that.Cluster) && deriveTeleportEqual_21(this.ProxyIDs, that.ProxyIDs) } @@ -376,7 +377,7 @@ func deriveTeleportEqual_16(this, that *OktaAssignmentSpecV1) bool { return (this == nil && that == nil) || this != nil && that != nil && this.User == that.User && - deriveTeleportEqual_31(this.Targets, that.Targets) && + deriveTeleportEqual_32(this.Targets, that.Targets) && this.CleanupTime.Equal(that.CleanupTime) && this.Status == that.Status && this.LastTransition.Equal(that.LastTransition) && @@ -403,7 +404,7 @@ func deriveTeleportEqual_18(this, that map[string]CommandLabelV2) bool { if !ok { return false } - if !(deriveTeleportEqual_32(&v, &thatv)) { + if !(deriveTeleportEqual_33(&v, &thatv)) { return false } } @@ -415,7 +416,7 @@ func deriveTeleportEqual_19(this, that *Rewrite) bool { return (this == nil && that == nil) || this != nil && that != nil && deriveTeleportEqual_21(this.Redirect, that.Redirect) && - deriveTeleportEqual_33(this.Headers, that.Headers) && + deriveTeleportEqual_34(this.Headers, that.Headers) && this.JWTClaims == that.JWTClaims } @@ -455,7 +456,23 @@ func deriveTeleportEqual_22(this, that *CORSPolicy) bool { } // deriveTeleportEqual_23 returns whether this and that are equal. -func deriveTeleportEqual_23(this, that *DatabaseTLS) bool { +func deriveTeleportEqual_23(this, that []*PortRange) bool { + if this == nil || that == nil { + return this == nil && that == nil + } + if len(this) != len(that) { + return false + } + for i := 0; i < len(this); i++ { + if !(deriveTeleportEqual_35(this[i], that[i])) { + return false + } + } + return true +} + +// deriveTeleportEqual_24 returns whether this and that are equal. +func deriveTeleportEqual_24(this, that *DatabaseTLS) bool { return (this == nil && that == nil) || this != nil && that != nil && this.Mode == that.Mode && @@ -464,8 +481,8 @@ func deriveTeleportEqual_23(this, that *DatabaseTLS) bool { this.TrustSystemCertPool == that.TrustSystemCertPool } -// deriveTeleportEqual_24 returns whether this and that are equal. -func deriveTeleportEqual_24(this, that *AD) bool { +// deriveTeleportEqual_25 returns whether this and that are equal. +func deriveTeleportEqual_25(this, that *AD) bool { return (this == nil && that == nil) || this != nil && that != nil && this.KeytabFile == that.KeytabFile && @@ -476,45 +493,45 @@ func deriveTeleportEqual_24(this, that *AD) bool { this.KDCHostName == that.KDCHostName } -// deriveTeleportEqual_25 returns whether this and that are equal. -func deriveTeleportEqual_25(this, that *MySQLOptions) bool { +// deriveTeleportEqual_26 returns whether this and that are equal. +func deriveTeleportEqual_26(this, that *MySQLOptions) bool { return (this == nil && that == nil) || this != nil && that != nil && this.ServerVersion == that.ServerVersion } -// deriveTeleportEqual_26 returns whether this and that are equal. -func deriveTeleportEqual_26(this, that *DatabaseAdminUser) bool { +// deriveTeleportEqual_27 returns whether this and that are equal. +func deriveTeleportEqual_27(this, that *DatabaseAdminUser) bool { return (this == nil && that == nil) || this != nil && that != nil && this.Name == that.Name && this.DefaultDatabase == that.DefaultDatabase } -// deriveTeleportEqual_27 returns whether this and that are equal. -func deriveTeleportEqual_27(this, that *MongoAtlas) bool { +// deriveTeleportEqual_28 returns whether this and that are equal. +func deriveTeleportEqual_28(this, that *MongoAtlas) bool { return (this == nil && that == nil) || this != nil && that != nil && this.Name == that.Name } -// deriveTeleportEqual_28 returns whether this and that are equal. -func deriveTeleportEqual_28(this, that *OracleOptions) bool { +// deriveTeleportEqual_29 returns whether this and that are equal. +func deriveTeleportEqual_29(this, that *OracleOptions) bool { return (this == nil && that == nil) || this != nil && that != nil && this.AuditUser == that.AuditUser } -// deriveTeleportEqual_29 returns whether this and that are equal. -func deriveTeleportEqual_29(this, that *Resolution) bool { +// deriveTeleportEqual_30 returns whether this and that are equal. +func deriveTeleportEqual_30(this, that *Resolution) bool { return (this == nil && that == nil) || this != nil && that != nil && this.Width == that.Width && this.Height == that.Height } -// deriveTeleportEqual_30 returns whether this and that are equal. -func deriveTeleportEqual_30(this, that *Rotation) bool { +// deriveTeleportEqual_31 returns whether this and that are equal. +func deriveTeleportEqual_31(this, that *Rotation) bool { return (this == nil && that == nil) || this != nil && that != nil && this.State == that.State && @@ -524,11 +541,11 @@ func deriveTeleportEqual_30(this, that *Rotation) bool { this.Started.Equal(that.Started) && this.GracePeriod == that.GracePeriod && this.LastRotated.Equal(that.LastRotated) && - deriveTeleportEqual_34(&this.Schedule, &that.Schedule) + deriveTeleportEqual_36(&this.Schedule, &that.Schedule) } -// deriveTeleportEqual_31 returns whether this and that are equal. -func deriveTeleportEqual_31(this, that []*OktaAssignmentTargetV1) bool { +// deriveTeleportEqual_32 returns whether this and that are equal. +func deriveTeleportEqual_32(this, that []*OktaAssignmentTargetV1) bool { if this == nil || that == nil { return this == nil && that == nil } @@ -536,15 +553,15 @@ func deriveTeleportEqual_31(this, that []*OktaAssignmentTargetV1) bool { return false } for i := 0; i < len(this); i++ { - if !(deriveTeleportEqual_35(this[i], that[i])) { + if !(deriveTeleportEqual_37(this[i], that[i])) { return false } } return true } -// deriveTeleportEqual_32 returns whether this and that are equal. -func deriveTeleportEqual_32(this, that *CommandLabelV2) bool { +// deriveTeleportEqual_33 returns whether this and that are equal. +func deriveTeleportEqual_33(this, that *CommandLabelV2) bool { return (this == nil && that == nil) || this != nil && that != nil && this.Period == that.Period && @@ -552,8 +569,8 @@ func deriveTeleportEqual_32(this, that *CommandLabelV2) bool { this.Result == that.Result } -// deriveTeleportEqual_33 returns whether this and that are equal. -func deriveTeleportEqual_33(this, that []*Header) bool { +// deriveTeleportEqual_34 returns whether this and that are equal. +func deriveTeleportEqual_34(this, that []*Header) bool { if this == nil || that == nil { return this == nil && that == nil } @@ -561,15 +578,23 @@ func deriveTeleportEqual_33(this, that []*Header) bool { return false } for i := 0; i < len(this); i++ { - if !(deriveTeleportEqual_36(this[i], that[i])) { + if !(deriveTeleportEqual_38(this[i], that[i])) { return false } } return true } -// deriveTeleportEqual_34 returns whether this and that are equal. -func deriveTeleportEqual_34(this, that *RotationSchedule) bool { +// deriveTeleportEqual_35 returns whether this and that are equal. +func deriveTeleportEqual_35(this, that *PortRange) bool { + return (this == nil && that == nil) || + this != nil && that != nil && + this.Port == that.Port && + this.EndPort == that.EndPort +} + +// deriveTeleportEqual_36 returns whether this and that are equal. +func deriveTeleportEqual_36(this, that *RotationSchedule) bool { return (this == nil && that == nil) || this != nil && that != nil && this.UpdateClients.Equal(that.UpdateClients) && @@ -577,16 +602,16 @@ func deriveTeleportEqual_34(this, that *RotationSchedule) bool { this.Standby.Equal(that.Standby) } -// deriveTeleportEqual_35 returns whether this and that are equal. -func deriveTeleportEqual_35(this, that *OktaAssignmentTargetV1) bool { +// deriveTeleportEqual_37 returns whether this and that are equal. +func deriveTeleportEqual_37(this, that *OktaAssignmentTargetV1) bool { return (this == nil && that == nil) || this != nil && that != nil && this.Type == that.Type && this.Id == that.Id } -// deriveTeleportEqual_36 returns whether this and that are equal. -func deriveTeleportEqual_36(this, that *Header) bool { +// deriveTeleportEqual_38 returns whether this and that are equal. +func deriveTeleportEqual_38(this, that *Header) bool { return (this == nil && that == nil) || this != nil && that != nil && this.Name == that.Name &&