Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TR: use TO API 4.0 by default #7037

Merged
merged 1 commit into from
Aug 26, 2022
Merged

TR: use TO API 4.0 by default #7037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

### Changed
- Traffic Portal now obscures sensitive text in Delivery Service "Raw Remap" fields, private SSL keys, "Header Rewrite" rules, and ILO interface passwords by default.
- Traffic Router now uses Traffic Ops API 4.0 by default

## [7.0.0] - 2022-07-19
### Added
Expand Down
2 changes: 1 addition & 1 deletion ...re/src/main/java/org/apache/traffic_control/traffic_router/core/util/TrafficOpsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.Map;

public class TrafficOpsUtils {
public static final String TO_API_VERSION = "3.1";
public static final String TO_API_VERSION = "4.0";

private String username;
private String password;
Expand Down
0 ...esources/api/3.1/cdns/name/thecdn/sslkeys → ...esources/api/4.0/cdns/name/thecdn/sslkeys
View file
Open in desktop
File renamed without changes.
0 ...pi/3.1/cdns/name/thecdn/sslkeys-missing-1 → ...pi/4.0/cdns/name/thecdn/sslkeys-missing-1
View file
Open in desktop
File renamed without changes.
0 ...rc/test/resources/api/3.1/federations/all → ...rc/test/resources/api/4.0/federations/all
View file
Open in desktop
File renamed without changes.
0 .../core/src/test/resources/api/3.1/steering → .../core/src/test/resources/api/4.0/steering
View file
Open in desktop
File renamed without changes.
0 ...core/src/test/resources/api/3.1/steering2 → ...core/src/test/resources/api/4.0/steering2
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions traffic_router/core/src/test/resources/publish/CrConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1916,12 +1916,12 @@
}
},
"config": {
"certificate.api.url": "http://${toHostname}/api/3.1/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/3.1/dnsrecords/",
"certificate.api.url": "http://${toHostname}/api/4.0/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/4.0/dnsrecords/",
"dnschallengemapping.polling.interval": "600000",
"federationmapping.polling.url": "http://${toHostname}/api/3.1/federations/all",
"federationmapping.polling.url": "http://${toHostname}/api/4.0/federations/all",
"federationmapping.polling.interval": "600000",
"steeringmapping.polling.url": "http://${toHostname}/api/3.1/steering",
"steeringmapping.polling.url": "http://${toHostname}/api/4.0/steering",
"steeringmapping.polling.interval": "15000",
"weight": "1.0",
"requestHeaders": [
Expand All @@ -1940,7 +1940,7 @@
},
"coveragezone.polling.interval": "86400000",
"regional_geoblock.polling.url.renamed": "http://testing-tm-01.cdn.example.com/some/path",
"keystore.auth.url": "http://localhost:3000/api/3.1/user/login",
"keystore.auth.url": "http://localhost:3000/api/4.0/user/login",
"neustar.polling.interval": "12800000",
"geolocation6.polling.interval": "86400000",
"domain_name": "thecdn.example.com",
Expand All @@ -1954,7 +1954,7 @@
},
"coveragezone.polling.url": "http://localhost:8889/czf.json",
"deepcoveragezone.polling.url": "http://localhost:8889/dczmap.json",
"api.auth.url": "http://${toHostname}/api/3.1/user/login",
"api.auth.url": "http://${toHostname}/api/4.0/user/login",
"certificates.polling.interval": "10000",
"dnssec.enabled": "false",
"edge.dns.routing": "true",
Expand Down
12 changes: 6 additions & 6 deletions traffic_router/core/src/test/resources/publish/CrConfig2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,12 +1210,12 @@
}
},
"config": {
"certificate.api.url": "http://${toHostname}/api/3.1/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/3.1/dnsrecords/",
"certificate.api.url": "http://${toHostname}/api/4.0/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/4.0/dnsrecords/",
"dnschallengemapping.polling.interval": "600000",
"federationmapping.polling.url": "http://${toHostname}/api/3.1/federations/all",
"federationmapping.polling.url": "http://${toHostname}/api/4.0/federations/all",
"federationmapping.polling.interval": "600000",
"steeringmapping.polling.url": "http://${toHostname}/api/3.1/steering",
"steeringmapping.polling.url": "http://${toHostname}/api/4.0/steering",
"steeringmapping.polling.interval": "15000",
"weight": "1.0",
"requestHeaders": [
Expand All @@ -1234,7 +1234,7 @@
},
"coveragezone.polling.interval": "86400000",
"regional_geoblock.polling.url.renamed": "http://testing-tm-01.cdn.example.com/some/path",
"keystore.auth.url": "http://localhost:3000/api/3.1/user/login",
"keystore.auth.url": "http://localhost:3000/api/4.0/user/login",
"neustar.polling.interval": "12800000",
"geolocation6.polling.interval": "86400000",
"domain_name": "thecdn.example.com",
Expand All @@ -1247,7 +1247,7 @@
"refresh": "28800"
},
"coveragezone.polling.url": "http://localhost:8889/czf.json",
"api.auth.url": "http://${toHostname}/api/3.1/user/login",
"api.auth.url": "http://${toHostname}/api/4.0/user/login",
"certificates.polling.interval": "10000",
"dnssec.enabled": "false"
}
Expand Down
12 changes: 6 additions & 6 deletions traffic_router/core/src/test/resources/publish/CrConfig3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,12 +1210,12 @@
}
},
"config": {
"certificate.api.url": "http://${toHostname}/api/3.1/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/3.1/dnsrecords/",
"certificate.api.url": "http://${toHostname}/api/4.0/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/4.0/dnsrecords/",
"dnschallengemapping.polling.interval": "600000",
"federationmapping.polling.url": "http://${toHostname}/api/3.1/federations/all",
"federationmapping.polling.url": "http://${toHostname}/api/4.0/federations/all",
"federationmapping.polling.interval": "600000",
"steeringmapping.polling.url": "http://${toHostname}/api/3.1/steering",
"steeringmapping.polling.url": "http://${toHostname}/api/4.0/steering",
"steeringmapping.polling.interval": "15000",
"weight": "1.0",
"requestHeaders": [
Expand All @@ -1234,7 +1234,7 @@
},
"coveragezone.polling.interval": "86400000",
"regional_geoblock.polling.url.renamed": "http://testing-tm-01.cdn.example.com/some/path",
"keystore.auth.url": "http://localhost:3000/api/3.1/user/login",
"keystore.auth.url": "http://localhost:3000/api/4.0/user/login",
"neustar.polling.interval": "12800000",
"geolocation6.polling.interval": "86400000",
"domain_name": "thecdn.example.com",
Expand All @@ -1247,7 +1247,7 @@
"refresh": "28800"
},
"coveragezone.polling.url": "http://localhost:8889/czf.json",
"api.auth.url": "http://${toHostname}/api/3.1/user/login",
"api.auth.url": "http://${toHostname}/api/4.0/user/login",
"certificates.polling.interval": "10000",
"dnssec.enabled": "false"
}
Expand Down
12 changes: 6 additions & 6 deletions traffic_router/core/src/test/resources/publish/CrConfig4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,12 +1255,12 @@
}
},
"config": {
"certificate.api.url": "http://${toHostname}/api/3.1/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/3.1/dnsrecords/",
"certificate.api.url": "http://${toHostname}/api/4.0/cdns/name/${cdnName}/sslkeys",
"dnschallengemapping.polling.url": "http://${toHostname}/api/4.0/dnsrecords/",
"dnschallengemapping.polling.interval": "600000",
"federationmapping.polling.url": "http://${toHostname}/api/3.1/federations/all",
"federationmapping.polling.url": "http://${toHostname}/api/4.0/federations/all",
"federationmapping.polling.interval": "600000",
"steeringmapping.polling.url": "http://${toHostname}/api/3.1/steering",
"steeringmapping.polling.url": "http://${toHostname}/api/4.0/steering",
"steeringmapping.polling.interval": "15000",
"weight": "1.0",
"requestHeaders": [
Expand All @@ -1279,7 +1279,7 @@
},
"coveragezone.polling.interval": "86400000",
"regional_geoblock.polling.url.renamed": "http://testing-tm-01.cdn.example.com/some/path",
"keystore.auth.url": "http://localhost:3000/api/3.1/user/login",
"keystore.auth.url": "http://localhost:3000/api/4.0/user/login",
"neustar.polling.interval": "12800000",
"geolocation6.polling.interval": "86400000",
"domain_name": "thecdn.example.com",
Expand All @@ -1292,7 +1292,7 @@
"refresh": "28800"
},
"coveragezone.polling.url": "http://localhost:8889/czf.json",
"api.auth.url": "http://${toHostname}/api/3.1/user/login",
"api.auth.url": "http://${toHostname}/api/4.0/user/login",
"certificates.polling.interval": "10000",
"dnssec.enabled": "false"
}
Expand Down