Merge pull request #11 from stackhpc/upstream/victoria-2022-06-20

markgoddard · web-flow · commit a6e34934e77a · 2022-06-21T10:19:55.000+01:00
Synchronise victoria with upstream
diff --git a/cloudkitty/api/v1/controllers/rating.py b/cloudkitty/api/v1/controllers/rating.py
@@ -15,7 +15,6 @@
 #
 from oslo_concurrency import lockutils
 from oslo_log import log
-
 import pecan
 from pecan import rest
 
diff --git a/cloudkitty/api/v2/dataframes/dataframes.py b/cloudkitty/api/v2/dataframes/dataframes.py
@@ -72,7 +72,7 @@ def get(self,
         policy.authorize(
             flask.request.context,
             'dataframes:get',
-            {'tenant_id': flask.request.context.project_id},
+            {'project_id': flask.request.context.project_id},
         )
 
         begin = begin or tzutils.get_month_start()
diff --git a/releasenotes/notes/dataframes-get-v2-policy-check-6070fc047b2e1496.yaml b/releasenotes/notes/dataframes-get-v2-policy-check-6070fc047b2e1496.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes policy check when getting dataframes using the v2 API, causing the
+    operation to fail when run by a non-admin user. See story 2009879
+    <https://storyboard.openstack.org/#!/story/2009879>`_ for more details.
diff --git a/releasenotes/notes/fix-quote-v1-api-7282f01b596f0f3b.yaml b/releasenotes/notes/fix-quote-v1-api-7282f01b596f0f3b.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes the quote API method. See story 2009022
+    <https://storyboard.openstack.org/#!/story/2009022>`_ for more details.

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`#`
`16`	`16`	`from oslo_concurrency import lockutils`
`17`	`17`	`from oslo_log import log`
`18`		`-`
`19`	`18`	`import pecan`
`20`	`19`	`from pecan import rest`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ def get(self,`
`72`	`72`	`policy.authorize(`
`73`	`73`	`flask.request.context,`
`74`	`74`	`'dataframes:get',`
`75`		`- {'tenant_id': flask.request.context.project_id},`
	`75`	`+ {'project_id': flask.request.context.project_id},`
`76`	`76`	`)`
`77`	`77`
`78`	`78`	`begin = begin or tzutils.get_month_start()`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +fixes:
 +  - |
 +    Fixes the quote API method. See story 2009022
 +    <https://storyboard.openstack.org/#!/story/2009022>`_ for more details.