Skip to content

Commit

Permalink
Pull request #7: CG-724 - Issue with Connect report template.
Browse files Browse the repository at this point in the history
Merge in SITCI/google-workspace-connect-report from ~RUBEN.ALVAREZ/fork_google-workspace-connect-report:bugfix/CG-724-clone-issue-with-connect-report-template-it-is-not-reporting-field to master

Squashed commit of the following:

commit 892756c2ca399a302c2e988305303faa9edcc9ae
Author: ralvarezingram <[email protected]>
Date:   Wed Mar 6 13:00:18 2024 +0100

    Dependencies update

commit 19a65f27a7c7f7ef4e89f37c3e0a4f68c5271ee6
Author: ralvarezingram <[email protected]>
Date:   Tue Mar 5 14:08:30 2024 +0100

    CG-724 - Issue with Connect report template. It is not reporting field.
  • Loading branch information
Ruben Alvarez committed Mar 6, 2024
1 parent 9ffe210 commit ebbdb2e
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 7 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
htmlcov
.coverage
coverage.xml
.idea/
.idea/
.vscode/
.env/
.python-version
poetry.lock
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Google Workspace Reports

## Version 1.0.1

- Fixed issue getting parameter domain id

## Version 1.0.0

- Initial version
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "google-workspace-report"
version = "1.0.0"
version = "1.0.1"
description = "Google Workspace Reports"
authors = ["1.0.0"]
license = "Apache Software License 2.0"
Expand All @@ -11,16 +11,16 @@ readme = "./README.md"

[tool.poetry.dependencies]
python = "^3.8"
connect-openapi-client = "^24"
connect-openapi-client = "^29.3"
openpyxl = "^3.0.5"
pygments = "^2.14.0"

[tool.poetry.dev-dependencies]
connect-cli = "^24.5"
connect-cli = "^29.2"
pytest = "^6.2.1"
pytest-cov = "^2.10.1"
pytest-mock = "^3.4"
responses = "^0.12"
responses = ">=0.14.0,<1"
coverage = { extras = ["toml"], version = "^5.3.1" }
flake8 = "^3.8.4"
flake8-broken-line = "^0"
Expand Down Expand Up @@ -54,4 +54,4 @@ exclude_lines = [
"if __name__ == .__main__.:",
]
[tool.coverage.html]
skip_covered = true
skip_covered = true
2 changes: 1 addition & 1 deletion reports/google_workspace_report/entrypoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def _get_subscriptions(client, parameters):
if parameters.get('status') and parameters['status']['all'] is False:
query &= R().status.oneof(parameters['status']['choices'])

return client.ns('subscriptions').assets.filter(query)
return client.assets.filter(query)


def calculate_period(delta, uom):
Expand Down

0 comments on commit ebbdb2e

Please sign in to comment.