You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2020/02/25 14:05:13 UTC
[GitHub] [trafficcontrol] shamrickus opened a new pull request #4445: TR
uses internal endpoints
shamrickus opened a new pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445
<!--
************ STOP!! ************
If this Pull Request is intended to fix a security vulnerability, DO NOT submit it! Instead, contact
the Apache Software Foundation Security Team at security@trafficcontrol.apache.org and follow the
guidelines at https://www.apache.org/security/ regarding vulnerability disclosure.
-->
## What does this PR (Pull Request) do?
<!-- Explain the changes you made here. If this fixes an Issue, identify it by
replacing the text in the checkbox item with the Issue number e.g.
- [x] This PR fixes #9001 OR is not related to any Issue
^ This will automatically close Issue number 9001 when the Pull Request is
merged (The '#' is important).
Be sure you check the box properly, see the "The following criteria are ALL
met by this PR" section for details.
-->
- [x] This PR is not related to any Issue. <!-- You can check for an issue here: https://github.com/apache/trafficcontrol/issues -->
TR calls the internal api end points, this changes it so that TR uses the official api to make these requests instead.
## Which Traffic Control components are affected by this PR?
<!-- Please delete all components from this list that are NOT affected by this
Pull Request. Also, feel free to add the name of a tool or script that is
affected but not on the list.
Additionally, if this Pull Request does NOT affect documentation, please
explain why documentation is not required. -->
- Traffic Router
## What is the best way to verify this PR?
Pull the code, build TR and run the tests for TR.
<!-- Please include here ALL the steps necessary to test your Pull Request. If
it includes tests (and most should), outline here the steps needed to run the
tests. If not, lay out the manual testing procedure and please explain why
tests are unnecessary for this Pull Request. -->
## The following criteria are ALL met by this PR
<!-- Check the boxes to signify that the associated statement is true. To
"check a box", replace the space inside of the square brackets with an 'x'.
e.g.
- [ x] <- Wrong
- [x ] <- Wrong
- [] <- Wrong
- [*] <- Wrong
- [x] <- Correct!
-->
- [x] This PR includes tests OR I have explained why tests are unnecessary
- [x] This PR includes documentation OR I have explained why documentation is unnecessary
- [x] This PR includes an update to CHANGELOG.md OR such an update is not necessary
- [x] This PR includes any and all required license headers
- [x] This PR ensures that database migration sequence is correct OR this PR does not include a database migration
- [x] This PR **DOES NOT FIX A SERIOUS SECURITY VULNERABILITY** (see [the Apache Software Foundation's security guidelines](https://www.apache.org/security/) for details)
## Additional Information
<!-- If you would like to include any additional information on the PR for
potential reviewers please put it here.
Some examples of this would be:
- Before and after screenshots/gifs of the Traffic Portal if it is affected
- Links to other dependent Pull Requests
- References to relevant context (e.g. new/updates to dependent libraries,
mailing list records, blueprints)
Feel free to leave this section blank (or, preferably, delete it entirely).
-->
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] shamrickus commented on a change in pull request
#4445: TR uses internal endpoints
Posted by GitBox <gi...@apache.org>.
shamrickus commented on a change in pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445#discussion_r384129649
##########
File path: traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java
##########
@@ -22,7 +22,7 @@
private static final Logger LOGGER = Logger.getLogger(SteeringWatcher.class);
private SteeringRegistry steeringRegistry;
- public static final String DEFAULT_STEERING_DATA_URL = "https://${toHostname}/internal/api/1.3/steering.json";
+ public static final String DEFAULT_STEERING_DATA_URL = "https://${toHostname}/api/2.0/steering.json";
Review comment:
Should be resolved now
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request
#4445: TR uses internal endpoints
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445#discussion_r384633833
##########
File path: traffic_router/core/src/test/resources/publish/CrConfig.json
##########
@@ -1825,9 +1825,9 @@
"config": {
"certificate.api.url": "http://${toHostname}/api/2.0/cdns/name/${cdnName}/sslkeys",
"client.steering.forced.diversity": "true",
- "federationmapping.polling.url": "http://${toHostname}/internal/api/1.3/federations.json",
+ "federationmapping.polling.url": "http://${toHostname}/api/2.0/federations",
Review comment:
This should be `api/2.0/federations/all`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] rawlinp merged pull request #4445: TR uses
internal endpoints
Posted by GitBox <gi...@apache.org>.
rawlinp merged pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request
#4445: TR uses internal endpoints
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445#discussion_r384048245
##########
File path: traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java
##########
@@ -22,7 +22,7 @@
private static final Logger LOGGER = Logger.getLogger(SteeringWatcher.class);
private SteeringRegistry steeringRegistry;
- public static final String DEFAULT_STEERING_DATA_URL = "https://${toHostname}/internal/api/1.3/steering.json";
+ public static final String DEFAULT_STEERING_DATA_URL = "https://${toHostname}/api/2.0/steering.json";
Review comment:
I'm pretty sure these changes won't work because 2.0 doesn't support `.json` suffixes.
Also, I believe this directory structure will need updated to reflect the new 2.0 route as well:
```
./core/target/test-classes/internal
./core/target/test-classes/internal/api
./core/target/test-classes/internal/api/1.3
./core/target/test-classes/internal/api/1.3/steering2.json
./core/target/test-classes/internal/api/1.3/federations.json
./core/target/test-classes/internal/api/1.3/steering.json
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] shamrickus commented on a change in pull request
#4445: TR uses internal endpoints
Posted by GitBox <gi...@apache.org>.
shamrickus commented on a change in pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445#discussion_r384059333
##########
File path: traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java
##########
@@ -22,7 +22,7 @@
private static final Logger LOGGER = Logger.getLogger(SteeringWatcher.class);
private SteeringRegistry steeringRegistry;
- public static final String DEFAULT_STEERING_DATA_URL = "https://${toHostname}/internal/api/1.3/steering.json";
+ public static final String DEFAULT_STEERING_DATA_URL = "https://${toHostname}/api/2.0/steering.json";
Review comment:
The test resources paths have changed and as a result it shouldn't generate the `./core/target/test-classes/internal` folder anymore.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request
#4445: TR uses internal endpoints
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445#discussion_r384633944
##########
File path: traffic_router/core/src/test/resources/publish/CrConfig2.json
##########
@@ -1201,10 +1201,10 @@
}
},
"config": {
+ "federationmapping.polling.url": "http://${toHostname}/api/2.0/federations",
Review comment:
This should be `api/2.0/federations/all`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request
#4445: TR uses internal endpoints
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445#discussion_r384635800
##########
File path: traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java
##########
@@ -272,7 +272,7 @@ public void z_itemsMigrateFromSmallerToLargerBucket() throws Exception {
Map<String, String> domains = new HashMap<>();
Map<String, Integer> weights = new HashMap<>();
- setupSteering(domains, weights, "internal/api/1.3/steering2.json");
+ setupSteering(domains, weights, "api/2.0/steering2");
List<String> randomPaths = new ArrayList<>();
Review comment:
I can't comment on the file directly, but the `api/2.0/federations` file below probably needs to be `api/2.0/federations/all`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request
#4445: TR uses internal endpoints
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445#discussion_r384792953
##########
File path: traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java
##########
@@ -272,7 +272,7 @@ public void z_itemsMigrateFromSmallerToLargerBucket() throws Exception {
Map<String, String> domains = new HashMap<>();
Map<String, Integer> weights = new HashMap<>();
- setupSteering(domains, weights, "internal/api/1.3/steering2.json");
+ setupSteering(domains, weights, "api/2.0/steering2");
List<String> randomPaths = new ArrayList<>();
Review comment:
the file rename is backwards -- should be `federations/all` not `all/federations`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request
#4445: TR uses internal endpoints
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445#discussion_r384094729
##########
File path: traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/SteeringWatcher.java
##########
@@ -22,7 +22,7 @@
private static final Logger LOGGER = Logger.getLogger(SteeringWatcher.class);
private SteeringRegistry steeringRegistry;
- public static final String DEFAULT_STEERING_DATA_URL = "https://${toHostname}/internal/api/1.3/steering.json";
+ public static final String DEFAULT_STEERING_DATA_URL = "https://${toHostname}/api/2.0/steering.json";
Review comment:
Ah, I see the name changes in the PR now, so that leaves the `.json` issue.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] shamrickus commented on a change in pull request
#4445: TR uses internal endpoints
Posted by GitBox <gi...@apache.org>.
shamrickus commented on a change in pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445#discussion_r385755218
##########
File path: traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/external/SteeringTest.java
##########
@@ -272,7 +272,7 @@ public void z_itemsMigrateFromSmallerToLargerBucket() throws Exception {
Map<String, String> domains = new HashMap<>();
Map<String, Integer> weights = new HashMap<>();
- setupSteering(domains, weights, "internal/api/1.3/steering2.json");
+ setupSteering(domains, weights, "api/2.0/steering2");
List<String> randomPaths = new ArrayList<>();
Review comment:
Should be corrected
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request
#4445: TR uses internal endpoints
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445#discussion_r384633327
##########
File path: traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/FederationsWatcher.java
##########
@@ -22,7 +22,7 @@
private static final Logger LOGGER = Logger.getLogger(FederationsWatcher.class);
private FederationRegistry federationRegistry;
- public static final String DEFAULT_FEDERATION_DATA_URL = "https://${toHostname}/internal/api/1.3/federations.json";
+ public static final String DEFAULT_FEDERATION_DATA_URL = "https://${toHostname}/api/2.0/federations.json";
Review comment:
This should be `api/2.0/federations/all`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request
#4445: TR uses internal endpoints
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445#discussion_r384634027
##########
File path: traffic_router/core/src/test/resources/publish/CrConfig3.json
##########
@@ -1252,10 +1252,10 @@
}
},
"config": {
+ "federationmapping.polling.url": "http://${toHostname}/api/2.0/federations",
Review comment:
This should be `api/2.0/federations/all`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request
#4445: TR uses internal endpoints
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #4445: TR uses internal endpoints
URL: https://github.com/apache/trafficcontrol/pull/4445#discussion_r384634452
##########
File path: traffic_router/core/src/test/resources/publish/CrConfig4.json
##########
@@ -1246,10 +1246,10 @@
}
},
"config": {
+ "federationmapping.polling.url": "http://${toHostname}/api/2.0/federations",
Review comment:
This should be `api/2.0/federations/all`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services