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 2021/03/08 20:42:36 UTC
[GitHub] [trafficcontrol] rimashah25 opened a new pull request #5615: Added check so no two users can modify topology name at the same time.
rimashah25 opened a new pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615
<!--
************ 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 but good check to have when updating topology name <!-- You can check for an issue here: https://github.com/apache/trafficcontrol/issues -->
## 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 Ops
## What is the best way to verify this PR?
<!-- 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. -->
## If this is a bug fix, what versions of Traffic Control are affected?
<!-- If this PR fixes a bug, please list here all of the affected versions - to
the best of your knowledge. It's also pretty helpful to include a commit hash
of where 'master' is at the time this PR is opened (if it affects master),
because what 'master' means will change over time. For example, if this PR
fixes a bug that's present in master (at commit hash '1df853c8'), in v4.0.0,
and in the current 4.0.1 Release candidate (e.g. RC1), then this list would
look like:
- master (1df853c8)
- 4.0.0
- 4.0.1 (RC1)
If you don't know what other versions might have this bug, AND don't know how
to find the commit hash of 'master', then feel free to leave this section
blank (or, preferably, delete it entirely).
-->
## 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] I have explained why tests are unnecessary
- [x] T I have explained why documentation is unnecessary
- [x] This PR does not include an update to CHANGELOG.md as such an update is not necessary
- [x] This PR includes any and all required license headers
- [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).
-->
The update logic or documentation hasn't changed.. This is an additional check that has been added to ensure no two users are updating the topology name at the same time.
<!--
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
[GitHub] [trafficcontrol] rimashah25 commented on a change in pull request #5615: If-UnModified-Since/If-Match Improvements
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on a change in pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615#discussion_r595449712
##########
File path: traffic_ops/v4-client/topology.go
##########
@@ -64,11 +64,11 @@ func (to *Session) GetTopology(name string) (*tc.Topology, toclientlib.ReqInf, e
return to.GetTopologyWithHdr(name, nil)
}
-// UpdateTopology updates a Topology by name.
-func (to *Session) UpdateTopology(name string, t tc.Topology) (*tc.TopologyResponse, toclientlib.ReqInf, error) {
+// UpdateTopologyWithHdr updates a Topology by name with header.
+func (to *Session) UpdateTopologyWithHdr(name string, t tc.Topology, header http.Header) (*tc.TopologyResponse, toclientlib.ReqInf, error) {
Review comment:
Done.
----------------------------------------------------------------
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
[GitHub] [trafficcontrol] rimashah25 commented on a change in pull request #5615: If-UnModified-Since/If-Match Improvements
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on a change in pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615#discussion_r595437798
##########
File path: traffic_ops/testing/api/v4/servercapabilities_test.go
##########
@@ -83,6 +96,29 @@ func GetTestServerCapabilities(t *testing.T) {
}
}
+func UpdateTestServerCapabilitiesWithHeaders(t *testing.T, header http.Header) {
+ resp, _, err := TOSession.GetServerCapabilitiesWithHdr(header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if len(resp) == 0 {
+ t.Fatal("no server capability in response, quitting")
+ }
+ originalName := resp[0].Name
+ newSCName := "sc-test"
+ resp[0].Name = newSCName
+
+ if (resp) != nil {
+ _, reqInf, err := TOSession.UpdateServerCapabilityByNameWithHdr(originalName, &resp[0], header)
Review comment:
Header is passed as the last argument.. a function may have one, two or three (etc) variables being passed, and header is the last variable.
```
UpdateTopologyWithHdr(name string, t tc.Topology, header http.Header)
UpdateServerCapabilityByNameWithHdr(name string, sc *tc.ServerCapability, header http.Header)
GetTopologyWithHdr(name string, header http.Header)
GetServerCapabilityWithHdr(name string, header http.Header)
GetServerCapabilitiesWithHdr(header http.Header)
```
----------------------------------------------------------------
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
[GitHub] [trafficcontrol] rimashah25 commented on a change in pull request #5615: If-UnModified-Since/If-Match Improvements
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on a change in pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615#discussion_r595437798
##########
File path: traffic_ops/testing/api/v4/servercapabilities_test.go
##########
@@ -83,6 +96,29 @@ func GetTestServerCapabilities(t *testing.T) {
}
}
+func UpdateTestServerCapabilitiesWithHeaders(t *testing.T, header http.Header) {
+ resp, _, err := TOSession.GetServerCapabilitiesWithHdr(header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if len(resp) == 0 {
+ t.Fatal("no server capability in response, quitting")
+ }
+ originalName := resp[0].Name
+ newSCName := "sc-test"
+ resp[0].Name = newSCName
+
+ if (resp) != nil {
+ _, reqInf, err := TOSession.UpdateServerCapabilityByNameWithHdr(originalName, &resp[0], header)
Review comment:
Header is passed as the last argument.. a function may have one, two or three (etc) variables being passed, and header is the last variable.
UpdateTopologyWithHdr(name string, t tc.Topology, header http.Header)
UpdateServerCapabilityByNameWithHdr(name string, sc *tc.ServerCapability, header http.Header)
GetTopologyWithHdr(name string, header http.Header)
GetServerCapabilityWithHdr(name string, header http.Header)
GetServerCapabilitiesWithHdr(header http.Header)
----------------------------------------------------------------
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
[GitHub] [trafficcontrol] rawlinp merged pull request #5615: If-UnModified-Since/If-Match Improvements
Posted by GitBox <gi...@apache.org>.
rawlinp merged pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615
----------------------------------------------------------------
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
[GitHub] [trafficcontrol] rimashah25 commented on a change in pull request #5615: If-UnModified-Since/If-Match Improvements
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on a change in pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615#discussion_r595450989
##########
File path: traffic_ops/v4-client/servercapability.go
##########
@@ -69,11 +69,11 @@ func (to *Session) GetServerCapability(name string) (*tc.ServerCapability, tocli
return to.GetServerCapabilityWithHdr(name, nil)
}
-// UpdateServerCapabilityByName updates a Server Capability by name.
-func (to *Session) UpdateServerCapabilityByName(name string, sc *tc.ServerCapability) (*tc.ServerCapability, toclientlib.ReqInf, error) {
+// UpdateServerCapabilityByNameWithHdr updates a Server Capability by name.
+func (to *Session) UpdateServerCapabilityByNameWithHdr(name string, sc *tc.ServerCapability, header http.Header) (*tc.ServerCapability, toclientlib.ReqInf, error) {
Review comment:
Based on our side conversation, I will change the function and remove words `WithHdr` assuming all other function calls that have these defined in them, will be updated later in the future.
----------------------------------------------------------------
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
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request #5615: Added check so no two users can modify topology name at the same time.
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615#discussion_r593265286
##########
File path: traffic_ops/traffic_ops_golang/topology/topologies.go
##########
@@ -600,6 +600,20 @@ func (topology *TOTopology) Update(h http.Header) (error, error, int) {
if len(topologies) != 1 {
return fmt.Errorf("cannot find exactly 1 topology with the query string provided"), nil, http.StatusBadRequest
}
+
+ // check if the name field was being updated by someone else
+ var existingLastUpdated *tc.TimeNoMod
Review comment:
This is pretty much the same code as https://github.com/apache/trafficcontrol/pull/5605/files#diff-cc0495e268314edbdfc50fba81e5ad6943ff1a3cd940fd94ef7de741862710f3R135
We have a shared function that already does this for `id`-based objects (https://github.com/apache/trafficcontrol/blob/master/traffic_ops/traffic_ops_golang/api/api.go#L1131), but we should add another similar function `CheckIfUnModifiedByName()` for `name`-based objects, which calls `GetLastUpdatedByName` instead of `GetLastUpdated`. Additionally, I'm thinking we should update the method to skip the `LastUpdated` IMS check if the request headers don't even contain `if-match`/`if-modified-since`. Otherwise, it's just a wasted query.
----------------------------------------------------------------
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
[GitHub] [trafficcontrol] rimashah25 commented on a change in pull request #5615: If-UnModified-Since/If-Match Improvements
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on a change in pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615#discussion_r595450989
##########
File path: traffic_ops/v4-client/servercapability.go
##########
@@ -69,11 +69,11 @@ func (to *Session) GetServerCapability(name string) (*tc.ServerCapability, tocli
return to.GetServerCapabilityWithHdr(name, nil)
}
-// UpdateServerCapabilityByName updates a Server Capability by name.
-func (to *Session) UpdateServerCapabilityByName(name string, sc *tc.ServerCapability) (*tc.ServerCapability, toclientlib.ReqInf, error) {
+// UpdateServerCapabilityByNameWithHdr updates a Server Capability by name.
+func (to *Session) UpdateServerCapabilityByNameWithHdr(name string, sc *tc.ServerCapability, header http.Header) (*tc.ServerCapability, toclientlib.ReqInf, error) {
Review comment:
Based on our side conversation, I will change the function and remove `WithHdr` assuming all other function calls that have these defined in them, will be updated later in the future.
----------------------------------------------------------------
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
[GitHub] [trafficcontrol] rimashah25 commented on a change in pull request #5615: Added check so no two users can modify topology name at the same time.
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on a change in pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615#discussion_r589804893
##########
File path: traffic_ops/traffic_ops_golang/topology/topologies.go
##########
@@ -600,6 +600,20 @@ func (topology *TOTopology) Update(h http.Header) (error, error, int) {
if len(topologies) != 1 {
return fmt.Errorf("cannot find exactly 1 topology with the query string provided"), nil, http.StatusBadRequest
}
+
+ // check if the name field was being updated by someone else
+ var existingLastUpdated *tc.TimeNoMod
+ q := `SELECT last_updated FROM topology WHERE name = $1`
+ if err := topology.ReqInfo.Tx.QueryRow(q, topology.Name).Scan(&existingLastUpdated); err != nil {
+ if err == sql.ErrNoRows {
+ return errors.New("topology was not found"), nil, http.StatusNotFound
+ }
+ return nil, errors.New("topology update: querying: " + err.Error()), http.StatusInternalServerError
+ }
+ if !api.IsUnmodified(h, existingLastUpdated.Time) {
+ return errors.New("resource was modified"), nil, http.StatusPreconditionFailed
Review comment:
lol.. i'll update it to make it sound like an error message :)
----------------------------------------------------------------
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
[GitHub] [trafficcontrol] rimashah25 commented on a change in pull request #5615: If-UnModified-Since/If-Match Improvements
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on a change in pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615#discussion_r593468656
##########
File path: traffic_ops/traffic_ops_golang/topology/topologies.go
##########
@@ -600,6 +600,20 @@ func (topology *TOTopology) Update(h http.Header) (error, error, int) {
if len(topologies) != 1 {
return fmt.Errorf("cannot find exactly 1 topology with the query string provided"), nil, http.StatusBadRequest
}
+
+ // check if the name field was being updated by someone else
+ var existingLastUpdated *tc.TimeNoMod
Review comment:
Done.
----------------------------------------------------------------
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
[GitHub] [trafficcontrol] mitchell852 commented on a change in pull request #5615: Added check so no two users can modify topology name at the same time.
Posted by GitBox <gi...@apache.org>.
mitchell852 commented on a change in pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615#discussion_r589769574
##########
File path: traffic_ops/traffic_ops_golang/topology/topologies.go
##########
@@ -600,6 +600,20 @@ func (topology *TOTopology) Update(h http.Header) (error, error, int) {
if len(topologies) != 1 {
return fmt.Errorf("cannot find exactly 1 topology with the query string provided"), nil, http.StatusBadRequest
}
+
+ // check if the name field was being updated by someone else
+ var existingLastUpdated *tc.TimeNoMod
+ q := `SELECT last_updated FROM topology WHERE name = $1`
+ if err := topology.ReqInfo.Tx.QueryRow(q, topology.Name).Scan(&existingLastUpdated); err != nil {
+ if err == sql.ErrNoRows {
+ return errors.New("topology was not found"), nil, http.StatusNotFound
+ }
+ return nil, errors.New("topology update: querying: " + err.Error()), http.StatusInternalServerError
+ }
+ if !api.IsUnmodified(h, existingLastUpdated.Time) {
+ return errors.New("resource was modified"), nil, http.StatusPreconditionFailed
Review comment:
doesn't really sound like an error message.... sounds more like a success message :)
----------------------------------------------------------------
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
[GitHub] [trafficcontrol] srijeet0406 commented on a change in pull request #5615: If-UnModified-Since/If-Match Improvements
Posted by GitBox <gi...@apache.org>.
srijeet0406 commented on a change in pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615#discussion_r595264845
##########
File path: traffic_ops/traffic_ops_golang/servercapability/servercapability.go
##########
@@ -131,17 +129,10 @@ func (v *TOServerCapability) Update(h http.Header) (error, error, int) {
return fmt.Errorf("cannot find exactly one server capability with the query string provided"), nil, http.StatusBadRequest
}
- // check if the name was being updated by someone else
- var existingLastUpdated *tc.TimeNoMod
- q := `SELECT last_updated FROM server_capability WHERE name = $1`
- if err := v.ReqInfo.Tx.QueryRow(q, v.Name).Scan(&existingLastUpdated); err != nil {
- if err == sql.ErrNoRows {
- return errors.New("server capability was not found"), nil, http.StatusNotFound
- }
- return nil, errors.New("server capability update: querying: " + err.Error()), http.StatusInternalServerError
- }
- if !api.IsUnmodified(h, existingLastUpdated.Time) {
- return errors.New("the resource has been modified since the time specified by the request headers"), nil, http.StatusPreconditionFailed
+ // check if the name field was being updated by someone else
Review comment:
As is the case with the next review comment, you can just change this comment to be `check if the entity was already updated by someone else`
##########
File path: traffic_ops/v4-client/servercapability.go
##########
@@ -69,11 +69,11 @@ func (to *Session) GetServerCapability(name string) (*tc.ServerCapability, tocli
return to.GetServerCapabilityWithHdr(name, nil)
}
-// UpdateServerCapabilityByName updates a Server Capability by name.
-func (to *Session) UpdateServerCapabilityByName(name string, sc *tc.ServerCapability) (*tc.ServerCapability, toclientlib.ReqInf, error) {
+// UpdateServerCapabilityByNameWithHdr updates a Server Capability by name.
+func (to *Session) UpdateServerCapabilityByNameWithHdr(name string, sc *tc.ServerCapability, header http.Header) (*tc.ServerCapability, toclientlib.ReqInf, error) {
Review comment:
Since these are for new clients and nobody else is using them, you can just keep the name as `UpdateServercapability`
##########
File path: traffic_ops/testing/api/v4/servercapabilities_test.go
##########
@@ -83,6 +96,29 @@ func GetTestServerCapabilities(t *testing.T) {
}
}
+func UpdateTestServerCapabilitiesWithHeaders(t *testing.T, header http.Header) {
+ resp, _, err := TOSession.GetServerCapabilitiesWithHdr(header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if len(resp) == 0 {
+ t.Fatal("no server capability in response, quitting")
+ }
+ originalName := resp[0].Name
+ newSCName := "sc-test"
+ resp[0].Name = newSCName
+
+ if (resp) != nil {
Review comment:
if `len(resp) != 0`, can `resp` ever be `nil`?
##########
File path: traffic_ops/traffic_ops_golang/topology/topologies.go
##########
@@ -600,6 +600,13 @@ func (topology *TOTopology) Update(h http.Header) (error, error, int) {
if len(topologies) != 1 {
return fmt.Errorf("cannot find exactly 1 topology with the query string provided"), nil, http.StatusBadRequest
}
+
+ // check if the name field was being updated by someone else
Review comment:
This comment is misleading. This function just checks whether or not this entity (queried by its name) was modified or not. The modified field could be anything though. For ex, in case of topologies, the field could either be name or description.
##########
File path: traffic_ops/v4-client/topology.go
##########
@@ -64,11 +64,11 @@ func (to *Session) GetTopology(name string) (*tc.Topology, toclientlib.ReqInf, e
return to.GetTopologyWithHdr(name, nil)
}
-// UpdateTopology updates a Topology by name.
-func (to *Session) UpdateTopology(name string, t tc.Topology) (*tc.TopologyResponse, toclientlib.ReqInf, error) {
+// UpdateTopologyWithHdr updates a Topology by name with header.
+func (to *Session) UpdateTopologyWithHdr(name string, t tc.Topology, header http.Header) (*tc.TopologyResponse, toclientlib.ReqInf, error) {
Review comment:
Since these are for new clients and nobody else is using them, you can just keep the name as `UpdateTopology`
##########
File path: traffic_ops/testing/api/v4/servercapabilities_test.go
##########
@@ -83,6 +96,29 @@ func GetTestServerCapabilities(t *testing.T) {
}
}
+func UpdateTestServerCapabilitiesWithHeaders(t *testing.T, header http.Header) {
+ resp, _, err := TOSession.GetServerCapabilitiesWithHdr(header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if len(resp) == 0 {
+ t.Fatal("no server capability in response, quitting")
+ }
+ originalName := resp[0].Name
+ newSCName := "sc-test"
+ resp[0].Name = newSCName
+
+ if (resp) != nil {
+ _, reqInf, err := TOSession.UpdateServerCapabilityByNameWithHdr(originalName, &resp[0], header)
Review comment:
Also, I noticed that in some functions, the header is passed as the second argument, and in some, it is passed in as the last argument. It would be nice to keep it consistent.
----------------------------------------------------------------
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
[GitHub] [trafficcontrol] rimashah25 commented on a change in pull request #5615: If-UnModified-Since/If-Match Improvements
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on a change in pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615#discussion_r595447769
##########
File path: traffic_ops/traffic_ops_golang/servercapability/servercapability.go
##########
@@ -131,17 +129,10 @@ func (v *TOServerCapability) Update(h http.Header) (error, error, int) {
return fmt.Errorf("cannot find exactly one server capability with the query string provided"), nil, http.StatusBadRequest
}
- // check if the name was being updated by someone else
- var existingLastUpdated *tc.TimeNoMod
- q := `SELECT last_updated FROM server_capability WHERE name = $1`
- if err := v.ReqInfo.Tx.QueryRow(q, v.Name).Scan(&existingLastUpdated); err != nil {
- if err == sql.ErrNoRows {
- return errors.New("server capability was not found"), nil, http.StatusNotFound
- }
- return nil, errors.New("server capability update: querying: " + err.Error()), http.StatusInternalServerError
- }
- if !api.IsUnmodified(h, existingLastUpdated.Time) {
- return errors.New("the resource has been modified since the time specified by the request headers"), nil, http.StatusPreconditionFailed
+ // check if the name field was being updated by someone else
Review comment:
Changed it to a general comment.
##########
File path: traffic_ops/traffic_ops_golang/topology/topologies.go
##########
@@ -600,6 +600,13 @@ func (topology *TOTopology) Update(h http.Header) (error, error, int) {
if len(topologies) != 1 {
return fmt.Errorf("cannot find exactly 1 topology with the query string provided"), nil, http.StatusBadRequest
}
+
+ // check if the name field was being updated by someone else
Review comment:
Same as below.
----------------------------------------------------------------
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
[GitHub] [trafficcontrol] rimashah25 commented on a change in pull request #5615: If-UnModified-Since/If-Match Improvements
Posted by GitBox <gi...@apache.org>.
rimashah25 commented on a change in pull request #5615:
URL: https://github.com/apache/trafficcontrol/pull/5615#discussion_r595447501
##########
File path: traffic_ops/testing/api/v4/servercapabilities_test.go
##########
@@ -83,6 +96,29 @@ func GetTestServerCapabilities(t *testing.T) {
}
}
+func UpdateTestServerCapabilitiesWithHeaders(t *testing.T, header http.Header) {
+ resp, _, err := TOSession.GetServerCapabilitiesWithHdr(header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if len(resp) == 0 {
+ t.Fatal("no server capability in response, quitting")
+ }
+ originalName := resp[0].Name
+ newSCName := "sc-test"
+ resp[0].Name = newSCName
+
+ if (resp) != nil {
Review comment:
nope. i'll remove the redundant check.
----------------------------------------------------------------
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