Skip to content

Commit 916a54d

Browse files
authored
fix: Adjust the service account migration output and the Github Actions (#28)
* fix: Adjust the service account migration output and the GitHub Action
1 parent 6b9ad57 commit 916a54d

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.github/workflows/pull-request-checks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
run: pip install -r requirements.txt
4949

5050
- name: Execute the linting checks
51-
uses: reviewdog/action-flake8@v3.6.0
51+
uses: reviewdog/action-flake8@v3.7.0
5252
with:
5353
github_token: ${{ secrets.GITHUB_TOKEN }}
5454
flake8_args: --config=.flake8
@@ -79,7 +79,7 @@ jobs:
7979
run: export PYTHONPATH=$PWD && pytest --junitxml=pytest.xml --cov=. tests/unittests | tee pytest-coverage.txt
8080

8181
- name: Execute the coverage checks
82-
uses: MishaKav/[email protected].37
82+
uses: MishaKav/[email protected].47
8383
with:
8484
github_token: ${{ secrets.GITHUB_TOKEN }}
8585
pytest-coverage-path: ./pytest-coverage.txt
@@ -94,7 +94,7 @@ jobs:
9494
run: pydoc-markdown --render-toc && rm -rf docs/content && mv build/docs/* docs
9595

9696
- name: Check changed files
97-
uses: tj-actions/verify-changed-files@v12.0
97+
uses: tj-actions/verify-changed-files@v16
9898
id: verify-changed-files
9999
with:
100100
files: |

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ The main feature that is implemented inside this library:
1010

1111
In general my focus inside this project is to implement and deliver old and new features from the Grafana API, to document all features and functionality clear and to increase the overall test coverage of the project.
1212

13+
## Features on the roadmap
14+
- [ ] [Query and resource caching API](https://grafana.com/docs/grafana/latest/developers/http_api/query_and_resource_caching/) Planned for CW 26/27
15+
1316
## Currently, supported features
1417

1518
### Dashboard

grafana_api/service_account.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ def migrate_api_keys_to_service_accounts(self):
312312
json.dumps(dict()),
313313
)
314314

315-
if api_call.get("message") != "API keys migrated to service accounts":
315+
if api_call.get("migrated") is None and api_call.get("message") != "API keys migrated to service accounts":
316316
logging.error(f"Check the error: {api_call}.")
317317
raise Exception
318318
else:

0 commit comments

Comments
 (0)