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