Addressed the Comments

mozilla-releng · May 28, 2017 · 01fd2e8 · 01fd2e8
1 parent 9de3f1d
commit 01fd2e8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/auslib/test/admin/views/test_rules.py b/auslib/test/admin/views/test_rules.py
@@ -218,9 +218,9 @@ def testInvalidMapping(self):
     def testPutDataVersionLessThanOne(self):
         # Throw 400 error when data_version is less than 1.
         ret = self._put('/rules/1', data=dict(backgroundRate=71, mapping='d',
-                                              priority=73, data_version=1,
+                                              priority=73, data_version=0,
                                               product='Firefox', channel='nightly', update_type='minor'))
-        self.assertEquals(ret.status_code, 200, "Status Code: %d, Data: %s" % (ret.status_code, ret.data))
+        self.assertEquals(ret.status_code, 400, "Status Code: %d, Data: %s" % (ret.status_code, ret.data))
 
 
 class TestSingleRuleView_JSON(ViewTest):

diff --git a/auslib/web/admin/base.py b/auslib/web/admin/base.py
@@ -102,8 +102,6 @@ def add_security_headers(response):
 # hosted at "/api", which is stripped away by the web server before we see
 # these requests.
 app.add_url_rule("/users/<username>/permissions/<permission>", view_func=SpecificPermissionView.as_view("specific_permission"))
-# Normal operations (get/update/delete) on rules can be done by id or alias...
-# ...but anything to do with history must be done by id, because alias may change over time
 app.add_url_rule("/releases", view_func=ReleasesAPIView.as_view("releases"))
 app.add_url_rule("/releases/<release>", view_func=SingleReleaseView.as_view("single_release"))
 app.add_url_rule("/releases/<release>/read_only", view_func=ReleaseReadOnlyView.as_view("read_only"))

diff --git a/auslib/web/admin/swagger/api.yaml b/auslib/web/admin/swagger/api.yaml
@@ -93,7 +93,7 @@ parameters:
     maxLength: 50
     required: true
 
-  rule_id_Or_alias_param:
+  rule_id_or_alias_param:
     name: id_or_alias
     in: path
     description: rule_id or alias field value to update the rule against
@@ -487,7 +487,7 @@ paths:
           examples:
             text/html: 514
         '400':
-          description: Bad Request. Invalid POST request.
+          description: Error in form data.
           schema:
             $ref: '#/definitions/4xxClientErrorResponseModel'
           examples:
@@ -518,7 +518,7 @@ paths:
         url: "http://mozilla-balrog.readthedocs.io/en/latest/admin_api.html#id2"
         description: "Returns the entire rule identified by the id or alias given in JSON format."
       parameters:
-        - $ref: '#/parameters/rule_id_Or_alias_param'
+        - $ref: '#/parameters/rule_id_or_alias_param'
 
       responses:
         '200':
@@ -535,7 +535,6 @@ paths:
           description: Requested rule did not exist
           schema:
             $ref: "#/definitions/4xxClientErrorResponseModel"
-            example: Requested rule does not exist
           examples:
             application/json:
               detail: "Requested rule does not exist"
@@ -555,7 +554,7 @@ paths:
         url: "http://mozilla-balrog.readthedocs.io/en/latest/admin_api.html#id2"
         description: "Returns the entire rule identified by the id or alias given in JSON format."
       parameters:
-        - $ref: '#/parameters/rule_id_Or_alias_param'
+        - $ref: '#/parameters/rule_id_or_alias_param'
         - name: rule
           in: body
           description: Rule object data
@@ -590,7 +589,7 @@ paths:
               detail: Requested rule does not exist
               status: 404
         '400':
-          description: "Bad Request's Response"
+          description: "Error in form data"
           schema:
             $ref: '#/definitions/4xxClientErrorResponseModel'
           examples:
@@ -620,7 +619,7 @@ paths:
         url: "http://mozilla-balrog.readthedocs.io/en/latest/admin_api.html#id2"
         description: "Returns the entire rule identified by the id or alias given in JSON format."
       parameters:
-        - $ref: '#/parameters/rule_id_Or_alias_param'
+        - $ref: '#/parameters/rule_id_or_alias_param'
         - name: rule
           in: body
           description: Rule object data
@@ -655,7 +654,7 @@ paths:
               detail: Requested rule does not exist
               status: 404
         '400':
-          description: "Bad Request's Response"
+          description: "Error in form data"
           schema:
             $ref: '#/definitions/4xxClientErrorResponseModel'
           examples:
@@ -684,7 +683,7 @@ paths:
         url: "http://mozilla-balrog.readthedocs.io/en/latest/admin_api.html#delete"
         description: "Deletes the rule identified by the rule_id."
       parameters:
-        - $ref: '#/parameters/rule_id_Or_alias_param'
+        - $ref: '#/parameters/rule_id_or_alias_param'
         - $ref: '#/parameters/csrfTokenParam'
         - $ref: '#/parameters/dataVersionParam'
       responses:
@@ -787,7 +786,7 @@ paths:
               detail: Requested rule revision does not exist
               status: 404
         '400':
-          description: "Bad Request's Response"
+          description: "Error in form data"
           schema:
             $ref: '#/definitions/4xxClientErrorResponseModel'
           examples:
@@ -841,7 +840,7 @@ paths:
               detail: Requested rule revision does not exist
               status: 404
         '400':
-          description: "Bad Request's Response"
+          description: "Error in form data"
           schema:
             $ref: '#/definitions/4xxClientErrorResponseModel'
           examples: