mirror of
https://github.com/GAM-team/GAM.git
synced 2026-07-04 12:51:36 +00:00
fix check serviceaccount
This commit is contained in:
@@ -4,6 +4,9 @@ import re
|
||||
import json
|
||||
import sys
|
||||
|
||||
import google.auth
|
||||
import google.auth.exceptions
|
||||
|
||||
from gamlib import glaction
|
||||
from gamlib import glapi as API
|
||||
from gamlib import glcfg as GC
|
||||
|
||||
@@ -1190,7 +1190,7 @@ def checkServiceAccount(users):
|
||||
else:
|
||||
scopeStatus = testFail
|
||||
allScopesPass = False
|
||||
printPassFail(scope, f'{scopeStatus}{currentCount(j, jcount)}')
|
||||
printPassFail(scope, f'{scopeStatus}{_getMain().currentCount(j, jcount)}')
|
||||
Ind.Decrement()
|
||||
if checkDeprecatedScopes:
|
||||
deprecatedScopes = sorted(API.DEPRECATED_SCOPES)
|
||||
@@ -1222,7 +1222,7 @@ def checkServiceAccount(users):
|
||||
scopeStatus = testPass
|
||||
else:
|
||||
scopeStatus = testPass
|
||||
printPassFail(scope, f'{scopeStatus}{currentCount(j, jcount)}')
|
||||
printPassFail(scope, f'{scopeStatus}{_getMain().currentCount(j, jcount)}')
|
||||
Ind.Decrement()
|
||||
service_account = GM.Globals[GM.OAUTH2SERVICE_JSON_DATA]['client_id']
|
||||
if allScopesPass:
|
||||
|
||||
@@ -7,6 +7,9 @@ Part of the _userop_tmp sub-package."""
|
||||
import re
|
||||
import sys
|
||||
|
||||
import google.auth
|
||||
import google.auth.exceptions
|
||||
|
||||
from gamlib import glaction
|
||||
from gamlib import glapi as API
|
||||
from gamlib import glcfg as GC
|
||||
|
||||
Reference in New Issue
Block a user