Skip to content

PILOT-3002: Add support for API Key - #66

Merged
vmoshynskyi merged 6 commits into
developfrom
PILOT-3002
Jun 7, 2023
Merged

PILOT-3002: Add support for API Key#66
vmoshynskyi merged 6 commits into
developfrom
PILOT-3002

Conversation

@vmoshynskyi

Copy link
Copy Markdown
Member

Summary

Add support for API Key

JIRA Issues

PILOT-3002

Type of Change

  • New feature (non-breaking change which adds functionality)

Testing

Are there any new or updated tests to validate the changes?

  • Yes
  • No

Test Directions

  • Login using pilotcli user login --api-key <paste-api-key>
  • API Key can be obtained from Portal User Profile page.
  • Check if existing CLI functionality works as expected (even after some period after first token is expired).

@vmoshynskyi vmoshynskyi self-assigned this Jun 7, 2023
@vmoshynskyi
vmoshynskyi requested a review from colorzzr June 7, 2023 18:33
@github-actions

github-actions Bot commented Jun 7, 2023

Copy link
Copy Markdown
Contributor

Coverage

Coverage Report
FileStmtsMissCoverMissing
__init__.py00100% 
pilotcli.py0290%5–6, 8–12, 15–19, 21–26, 29–37, 40–41
commands
   __init__.py00100% 
   container_registry.py0470%5, 7–10, 13–14, 16, 19–24, 27–33, 36–44, 47–53, 56–65
   dataset.py04844%19, 36–38, 41–48, 50–60, 78–80, 83–91, 93–103, 123, 127
   entry_point.py01020%5, 7, 9–10, 12–25, 28–39, 41–42, 45–51, 54–56, 59–63, 66–70, 73–77, 80–83, 86–88, 91–94, 97–114, 117, 119–121, 123–129, 131, 133–135, 137
   file.py06168%36, 133, 137, 155–156, 198, 273–280, 282, 284, 298–304, 306, 335, 337, 340, 376–382, 385–386, 388–389, 391–403, 405–407, 409, 412–414, 416–418
   hpc.py01230%5, 7–17, 20–21, 23, 26–29, 36–40, 42–45, 47–49, 51, 53–61, 64–72, 75–84, 87–100, 103–117, 120–132, 134–137, 140–153, 155–157
   kg_resource.py0130%5, 7–9, 12–13, 15, 18–23
   project.py0390%5–6, 8–11, 14–15, 17, 20–23, 31, 39, 48–52, 55–62, 64–74
   use_config.py0130%5, 7–9, 12–13, 15, 18–20, 27–29
   user.py0685%23, 40, 48, 56, 72–73
configs
   __init__.py00100% 
   app_config.py00100% 
   user_config.py01779%49, 60, 67, 71, 75, 79, 83, 87, 91, 95, 99, 103, 107, 111, 115, 119, 123
models
   __init__.py00100% 
   convert_type.py080%5, 7, 10–15
   enums.py00100% 
   service_meta_class.py0280%9, 16
   singleton.py00100% 
   upload_form.py02661%10, 25, 29, 33, 37, 41, 45, 49, 53, 57, 61, 65, 69, 73, 77, 81, 85, 89, 93, 97, 122, 134–138
resources
   custom_error.py00100% 
   custom_help.py00100% 
services
   __init__.py00100% 
services/crypto
   __init__.py00100% 
   crypto.py01940%35, 43–47, 49, 59–61, 69–75, 77, 79
services/dataset_manager
   dataset_detail.py02370%42, 44, 61, 68–73, 75–77, 79–88, 90
   dataset_download.py01983%56, 71–72, 83, 95, 97–98, 100–101, 103, 105–107, 115–118, 152, 164
   dataset_list.py0683%37, 43–44, 46–48
   model.py00100% 
services/file_manager
   __init__.py00100% 
   file_list.py01971%29, 48, 50, 57–58, 63–65, 73–76, 78, 84–89
   file_manifests.py09525%19–24, 39–43, 47–48, 51–59, 61, 65–68, 71–75, 77, 81–82, 85–87, 91–92, 95–102, 104, 107, 109–110, 112–113, 115–118, 123–129, 134–139, 142–148, 150–152, 155–161, 163–165, 167–170
   file_tag.py03931%23, 27–31, 33, 36–48, 50–52, 54–55, 59–61, 64–68, 70–73, 75–76
services/file_manager/file_download
   __init__.py00100% 
   download_client.py018717%29–41, 44–45, 47–53, 56–57, 59–60, 69, 71–72, 76–79, 86, 91–94, 96, 98–106, 108, 110, 114–119, 121, 124–125, 128–130, 132–134, 136–137, 139–141, 145–153, 156–161, 165–174, 182–184, 186–193, 195–199, 204–214, 216–217, 220–221, 226–227, 231–236, 240–241, 244–246, 248–259, 263–266, 269–273, 275–277, 279–281, 283–284, 286, 290–292, 294–307, 309
   model.py0187%15
services/file_manager/file_upload
   __init__.py00100% 
   exception.py0175%10
   file_upload.py03081%33–40, 74, 104, 135–136, 140, 145, 176, 184–186, 190, 207, 209, 213, 224–225, 227–229, 307, 310, 314
   models.py0591%23, 41, 147–149
   upload_client.py07556%98–101, 163–165, 179–185, 187–191, 193–205, 207, 250, 253, 257, 259–262, 266–271, 273, 277, 279, 281, 283, 301, 326–327, 332, 336–339, 343, 359, 361–363, 370, 375–376, 378, 380–381, 383–386, 388
   upload_validator.py02452%26–28, 31–36, 39–48, 51–52, 57, 59, 61
services/hpc_manager
   hpc_auth.py00100% 
   hpc_cluster.py06832%34–37, 39–40, 42, 46–58, 60–64, 66–67, 72–74, 76–77, 81–93, 95–99, 101–102, 106–118, 120–121, 123
services/kg_manager
   kg_resource.py01185%33–34, 36–37, 65–66, 81–82, 87–89
services/logger_services
   __init__.py00100% 
   log_functions.py00100% 
services/output_manager
   __init__.py00100% 
   error_handler.py0198%104
   help_page.py01089%36–37, 46–47, 107–108, 117–118, 130–131
   message_handler.py05666%23, 45, 50, 65–67, 72, 77, 82, 87, 100, 105, 112, 117, 122, 126, 142, 162, 172, 182, 201, 223–234, 245–250, 252–258, 269, 273–274, 278–279, 281–282, 286, 290, 294
   response_handler.py0530%5–6, 9–12, 14–15, 17–21, 23–24, 26–34, 36–39, 42–45, 47–48, 50–56, 58–59, 61–63, 65–68, 71–73
services/project_manager
   __init__.py00100% 
   project.py0683%38, 44–45, 47–49
services/user_authentication
   __init__.py00100% 
   decorator.py01075%29, 32, 51–53, 59–62, 64
   token_manager.py01575%24, 39–40, 71, 74, 81–82, 88–89, 91–94, 96, 101
   user_login_logout.py04266%29–30, 40, 123, 127–133, 135–137, 141–142, 146–153, 155–157, 161–162, 169–174, 176–178, 182–185
   user_set_config.py0947%15–18, 22–24, 26–27
utils
   __init__.py00100% 
   aggregated.py03166%22, 46, 71–73, 75–76, 83–84, 86, 90–93, 95–96, 115–117, 119, 124–131, 133–135
TOTAL3106138955% 

Comment thread app/configs/app_config.py
url_validation = ConfigClass.url_validation
url_keycloak = ConfigClass.url_keycloak
url_keycloak_token = f'{ConfigClass.url_keycloak}/token'
url_keycloak_realm = ConfigClass.url_keycloak.rstrip('/').replace('/protocol/openid-connect', '')

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this case, we don't need to update the env variable of the keycloak right?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. We've discussed with Samantha that for now let's reuse the existing one.

@vmoshynskyi
vmoshynskyi merged commit 561bb83 into develop Jun 7, 2023
@vmoshynskyi
vmoshynskyi deleted the PILOT-3002 branch June 7, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants