This is an automated email from the ASF dual-hosted git repository.
zrhoffman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 9b4c31edc8 t3c fix null ptr issue in client fall back (#7817)
9b4c31edc8 is described below
commit 9b4c31edc81c4e6b45bbd33807bc140140180f15
Author: Joe Pappano <[email protected]>
AuthorDate: Tue Sep 26 12:39:50 2023 -0400
t3c fix null ptr issue in client fall back (#7817)
* removed structure fields not used in topology response
* added change log entry
---
CHANGELOG.md | 1 +
lib/go-atscfg/atscfg.go | 6 ++----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfa59cc094..b715fd5c04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -184,6 +184,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
- [#7628](https://github.com/apache/trafficcontrol/pull/7628) *Traffic Ops*:
Fixed an issue where certificate chain validation failed based on leading or
trailing whitespace.
- [#7688](https://github.com/apache/trafficcontrol/pull/7688) *Traffic Ops*:
Fixed secured parameters being visible when role has proper permissions.
- [#7697](https://github.com/apache/trafficcontrol/pull/7697) *Traffic Ops*:
Fixed `iloPassword` and `xmppPassword` checking for priv-level instead of using
permissions.
+- [#7817](https://github.com/apache/trafficcontrol/pull/7817) *Traffic Control
Cache Config (t3c)* fixed issue that would cause null ptr panic on client
fallback.
### Removed
- [#7804](https://github.com/apache/trafficcontrol/pull/7804) Removed unneeded
V5 client methods for `deliveryServiceRequiredcapabilities`.
diff --git a/lib/go-atscfg/atscfg.go b/lib/go-atscfg/atscfg.go
index 9218361219..1736ff0387 100644
--- a/lib/go-atscfg/atscfg.go
+++ b/lib/go-atscfg/atscfg.go
@@ -133,10 +133,8 @@ func ToTopology(topology tc.Topology) tc.TopologyV5 {
nodes := []tc.TopologyNodeV5{}
for _, n := range topology.Nodes {
nodes = append(nodes, tc.TopologyNodeV5{
- Id: n.Id,
- Cachegroup: n.Cachegroup,
- Parents: n.Parents,
- LastUpdated: &n.LastUpdated.Time,
+ Cachegroup: n.Cachegroup,
+ Parents: n.Parents,
})
}
return tc.TopologyV5{
