Reverting client_id Name Change (#2889)

This commit is contained in:
Noah McGregor Harper
2023-02-28 00:01:57 +00:00
committed by GitHub
parent 3d299ce51e
commit ca7e07f027
3 changed files with 5 additions and 5 deletions

View File

@ -47,7 +47,7 @@ jobs:
# On Windows, this text replacement could instead be implemented via PowerShell. # On Windows, this text replacement could instead be implemented via PowerShell.
sed -i s/INSERT_YOUR_PERSONAL_ACCESS_TOKEN_HERE/${ONEFUZZ_PAT}/ github-issues.json sed -i s/INSERT_YOUR_PERSONAL_ACCESS_TOKEN_HERE/${ONEFUZZ_PAT}/ github-issues.json
onefuzz config --endpoint $ONEFUZZ_ENDPOINT --override_client_id $ONEFUZZ_CLIENT_ID onefuzz config --endpoint $ONEFUZZ_ENDPOINT --client_id $ONEFUZZ_CLIENT_ID
onefuzz --client_secret $ONEFUZZ_CLIENT_SECRET template libfuzzer basic $ONEFUZZ_PROJECT $ONEFUZZ_NAME $GITHUB_SHA $ONEFUZZ_POOL --target_exe fuzz.exe --colocate_all_tasks --duration 1 --vm_count 1 --notification_config @./github-issues.json onefuzz --client_secret $ONEFUZZ_CLIENT_SECRET template libfuzzer basic $ONEFUZZ_PROJECT $ONEFUZZ_NAME $GITHUB_SHA $ONEFUZZ_POOL --target_exe fuzz.exe --colocate_all_tasks --duration 1 --vm_count 1 --notification_config @./github-issues.json
# Default for Linux. Would only need to be specified if `runs-on` == `windows-latest`. # Default for Linux. Would only need to be specified if `runs-on` == `windows-latest`.
shell: bash shell: bash

View File

@ -13,7 +13,7 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
o.config( o.config(
endpoint=os.environ.get("ONEFUZZ_ENDPOINT"), endpoint=os.environ.get("ONEFUZZ_ENDPOINT"),
override_authority=os.environ.get("ONEFUZZ_AUTHORITY"), override_authority=os.environ.get("ONEFUZZ_AUTHORITY"),
override_client_id=os.environ.get("ONEFUZZ_CLIENT_ID"), client_id=os.environ.get("ONEFUZZ_CLIENT_ID"),
) )
info = o.info.get() info = o.info.get()
return func.HttpResponse(info.json()) return func.HttpResponse(info.json())

View File

@ -1895,7 +1895,7 @@ class Onefuzz:
self, self,
endpoint: Optional[str] = None, endpoint: Optional[str] = None,
override_authority: Optional[str] = None, override_authority: Optional[str] = None,
override_client_id: Optional[str] = None, client_id: Optional[str] = None,
override_tenant_domain: Optional[str] = None, override_tenant_domain: Optional[str] = None,
enable_feature: Optional[PreviewFeature] = None, enable_feature: Optional[PreviewFeature] = None,
reset: Optional[bool] = None, reset: Optional[bool] = None,
@ -1922,10 +1922,10 @@ class Onefuzz:
"Missing HTTP Authentication" "Missing HTTP Authentication"
) )
self._backend.config.endpoint = endpoint self._backend.config.endpoint = endpoint
if client_id is not None:
self._backend.config.client_id = client_id
if override_authority is not None: if override_authority is not None:
self._backend.config.authority = override_authority self._backend.config.authority = override_authority
if override_client_id is not None:
self._backend.config.client_id = override_client_id
if enable_feature: if enable_feature:
self._backend.enable_feature(enable_feature.name) self._backend.enable_feature(enable_feature.name)
if override_tenant_domain is not None: if override_tenant_domain is not None: