diff --git a/CHANGELOG.md b/CHANGELOG.md index 148d51f12..fa2614eec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ 8. [924] - Fix log messaging format in web server 9. [948] - Bug in getProjectId fixed, better handling of env variables in python. +10. [952] - Bug in globus cleanup python script fixed, was trying to use projects + instead of the auth_client. # v2023.10.23.15.50 ## MINOR Feature diff --git a/compose/README.md b/compose/README.md index c5a90ece2..d7514be30 100644 --- a/compose/README.md +++ b/compose/README.md @@ -127,21 +127,34 @@ included in the variables. This step is only required once, after which the necessary files should exist in DataFed/Compose/globus. These files will contain the Globus configuration needed for additional cycles of "docker compose up" and "docker compose down". +The following three things need to be done before the generate_globus_files.sh +should be run. -NOTE: You will need to have globus-connect-server54 installed to do this step. -On ubuntu this can be done with. +1. You will need to have globus-connect-server54 installed to do this step. +2. You will also need the Globus python developer kit globus_sdk. +3. In addition, your user account will need admin rights on the Globus subscription group. + +#### Step 1 +On Ubuntu this can be done with. ```bash sudo apt-get install globus-connect-server54 ``` -You will also need the Globus python developer kit globus_sdk. +#### Step 2 ```bash pip install globus_sdk ``` -In addition, you will also need admin rights on the Globus subscription group. +Finally, we can generate the globus files by running the script. + +```bash +./generate_globus_files.sh +``` + +You will be required to paste a url into a browser and provide a code back in +the terminal. ### 4. Building Repo Services @@ -154,6 +167,17 @@ services. ### 5. Running the Repo Compose file +WARNING: Before running compose file make sure that port 80 is open you can do +this using the command + +```bash +sudo netstat -tlupn | grep ':80' +``` + +It is very likely that when we installed globus-connect-server54 with apt it +started apache2 and started it running. You should disable it on the host +before launching the compose instance. + Stand up the repo services. ```bash diff --git a/scripts/globus/globus_cleanup.py b/scripts/globus/globus_cleanup.py index 3ca6a6965..e8704cd15 100644 --- a/scripts/globus/globus_cleanup.py +++ b/scripts/globus/globus_cleanup.py @@ -97,8 +97,7 @@ if project_exists: - projects = ac_rt.get_projects() - project_id = utils.getProjectId(projects, PROJECT_NAME) + project_id = utils.getProjectId(ac_rt, PROJECT_NAME) print(f"project id is {project_id}") clients_in_project = utils.getClientsInProject(ac_rt, project_id)