Merge branch 'main' of github.com:GAM-team/GAM

This commit is contained in:
Jay Lee
2022-11-30 20:51:53 +00:00
3 changed files with 9 additions and 2 deletions

View File

@ -69,6 +69,11 @@ jobs:
python: "3.10" python: "3.10"
jid: 10 jid: 10
arch: x86_64 arch: x86_64
- os: ubuntu-22.04
goal: test
python: "3.12.0-alpha - 3.12"
jid: 11
arch: x86_64
steps: steps:
@ -696,7 +701,7 @@ jobs:
$gam user $gam_user delete shareddrive "${driveid}" nukefromorbit $gam user $gam_user delete shareddrive "${driveid}" nukefromorbit
echo "printer model count:" echo "printer model count:"
$gam print printermodels | wc -l $gam print printermodels | wc -l
ssoprofile=$($gam create inboundssoprofile name "El Goog ${newbase}" loginurl https://www.google.com logouturl https://www.google.com changepasswordurl https://www.google.com entityid ElGoog name_only) ssoprofile=$($gam create inboundssoprofile name "El Goog ${newbase}" loginurl https://www.google.com logouturl https://www.google.com changepasswordurl https://www.google.com entityid ElGoog return_name_only)
$gam create inboundssocredential profile "id:${ssoprofile}" generate_key $gam create inboundssocredential profile "id:${ssoprofile}" generate_key
$gam create inboundssoassignment profile "id:${ssoprofile}" orgunit "${newou}" mode SAML_SSO $gam create inboundssoassignment profile "id:${ssoprofile}" orgunit "${newou}" mode SAML_SSO
$gam delete ou "${newou}" $gam delete ou "${newou}"

View File

@ -1555,8 +1555,10 @@ gam print group-members|groups-members [todrive]
gam create inboundssoprofile [name <SSOProfileDisplayName>] gam create inboundssoprofile [name <SSOProfileDisplayName>]
[entityid <String>] [loginurl <URL>] [logouturl <URL>] [changepasswordurl <URL>] [entityid <String>] [loginurl <URL>] [logouturl <URL>] [changepasswordurl <URL>]
[returnnameonly]
gam update inboundssoprofile <SSOProfileItem> gam update inboundssoprofile <SSOProfileItem>
[entityid <String>] [loginurl <URL>] [logouturl <URL>] [changepasswordurl <URL>] [entityid <String>] [loginurl <URL>] [logouturl <URL>] [changepasswordurl <URL>]
[returnnameonly]
gam delete inboundssoprofile <SSOProfileItem> gam delete inboundssoprofile <SSOProfileItem>
gam info inboundssoprofile <SSOProfileItem> gam info inboundssoprofile <SSOProfileItem>
gam show inboundssoprofiles gam show inboundssoprofiles

View File

@ -49,7 +49,7 @@ def parse_profile(body, i):
elif myarg == 'entityid': elif myarg == 'entityid':
body.setdefault('idpConfig', {})['entityId'] = sys.argv[i+1] body.setdefault('idpConfig', {})['entityId'] = sys.argv[i+1]
i += 2 i += 2
elif myarg == 'nameonly': elif myarg == 'returnnameonly':
name_only = True name_only = True
i += 1 i += 1
elif myarg == 'loginurl': elif myarg == 'loginurl':