ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-17 20:38:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replacing 'Upgrade' flag with 'Skip AAD'. (#3345)

Browse Source 
* Replacing 'Upgrade' flag with 'Skip AAD'.

* Format.

* Just skipping role assignment."

* Fixing role.

* Updating help.
This commit is contained in:
Noah McGregor Harper
2023-07-26 11:26:20 -07:00
committed by GitHub
parent ed4c02a8e8
commit fc4e698f9b
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/deployment/deploy.py
View File

@ -147,7 +147,7 @@ class Client:
create_registration: bool, create_registration: bool,
migrations: List[str], migrations: List[str],
export_appinsights: bool, export_appinsights: bool,
upgrade: bool, skip_aad_setup: bool,
subscription_id: Optional[str], subscription_id: Optional[str],
admins: List[UUID], admins: List[UUID],
allowed_aad_tenants: List[UUID], allowed_aad_tenants: List[UUID],
@ -168,7 +168,7 @@ class Client:
self.third_party = third_party self.third_party = third_party
self.create_registration = create_registration self.create_registration = create_registration
self.custom_domain = custom_domain self.custom_domain = custom_domain
self.upgrade = upgrade self.skip_aad_setup = skip_aad_setup
self.results: Dict = { self.results: Dict = {
"client_id": client_id, "client_id": client_id,
"client_secret": client_secret, "client_secret": client_secret,
@ -465,12 +465,13 @@ class Client:
subscription=self.get_subscription_id(), subscription=self.get_subscription_id(),
) )
assign_instance_app_role( if not self.skip_aad_setup:
self.application_name, assign_instance_app_role(
onefuzz_cli_app["displayName"], self.application_name,
self.get_subscription_id(), onefuzz_cli_app["displayName"],
OnefuzzAppRole.ManagedNode, self.get_subscription_id(),
) OnefuzzAppRole.CliClient,
)
self.results["client_id"] = app["appId"] self.results["client_id"] = app["appId"]
self.results["client_secret"] = password self.results["client_secret"] = password
@ -736,7 +737,7 @@ class Client:
raise Exception("unknown error deploying") raise Exception("unknown error deploying")
def assign_scaleset_identity_role(self) -> None: def assign_scaleset_identity_role(self) -> None:
if self.upgrade: if self.skip_aad_setup:
logger.info("Upgrading: skipping assignment of the managed identity role") logger.info("Upgrading: skipping assignment of the managed identity role")
return return
logger.info("assigning the user managed identity role") logger.info("assigning the user managed identity role")
@ -748,7 +749,7 @@ class Client:
) )
def assign_user_access(self) -> None: def assign_user_access(self) -> None:
if self.upgrade: if self.skip_aad_setup:
logger.info("Upgrading: Skipping assignment of current user to app role") logger.info("Upgrading: Skipping assignment of current user to app role")
return return
logger.info("assigning user access to service principal") logger.info("assigning user access to service principal")
@ -1275,9 +1276,9 @@ def main() -> None:
"password for the pool agent", "password for the pool agent",
) )
parser.add_argument( parser.add_argument(
"--upgrade", "--skip_aad_setup",
action="store_true", action="store_true",
help="Indicates that the instance is being upgraded", help="Assumes that AAD resources already exist, and they do not need to be upgraded.",
) )
parser.add_argument( parser.add_argument(
"--apply_migrations", "--apply_migrations",
@ -1359,7 +1360,7 @@ def main() -> None:
create_registration=args.create_pool_registration, create_registration=args.create_pool_registration,
migrations=args.apply_migrations, migrations=args.apply_migrations,
export_appinsights=args.export_appinsights, export_appinsights=args.export_appinsights,
upgrade=args.upgrade, skip_aad_setup=args.skip_aad_setup,
subscription_id=args.subscription_id, subscription_id=args.subscription_id,
admins=args.set_admins, admins=args.set_admins,
allowed_aad_tenants=args.allowed_aad_tenants or [], allowed_aad_tenants=args.allowed_aad_tenants or [],