From d6e463bf7c576e4ab18f83e82ca0cc67d53e3864 Mon Sep 17 00:00:00 2001
From: dariog <dgrana@unc.edu.ar>
Date: Wed, 9 Feb 2022 09:23:13 +0100
Subject: [PATCH 1/3] documentation update
---
README.md | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/README.md b/README.md
index 27d1a52..c51a9ca 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,43 @@ The `user` (username), `pwd` (password) and `url` (endpoint), can be passed by c
option or storing the information in the `$HOME/.dcacheclientrc` file. Also an `oidc account` can be used.
For more information type `bulkrequests -h`
+## Setup
+The config file has this format with an `oidc-agent-account`
+
+```
+[DEFAULT]
+url=https://endpoint.io:4521
+oidc-agent-account=dcache-client
+ca-directory=/etc/ssl/certs
+no-check-certificate=False
+```
+
+The config file has this format using `user` and `pwd`
+
+```
+[DEFAULT]
+user=john
+pass=doe
+url=https://endpoint.io:4525
+no-check-certificate=True
+```
+
+Also all this parameters can be set by environment variables; the variables names are:
+```
+BULKREQUESTS_USER
+BULKREQUESTS_PASS
+BULKREQUESTS_URL
+BULKREQUESTS_OIDC_AGENT_ACC
+BULKREQUESTS_CERTIFICATE
+BULKREQUESTS_PRIVATE_KEY
+BULKREQUESTS_X509_PROXY
+BULKREQUESTS_CA_CERTIFICATE
+BULKREQUESTS_CA_DIRECTORY
+BULKREQUESTS_NO_CHECK_CERT
+```
+
+All this parameters can also be passed through the cli options.
+
## Usage
The use cases are the following
--
GitLab
From 39ab1f22cf38720384a07e3ddcd4c7b4efb5e02d Mon Sep 17 00:00:00 2001
From: dariog <dgrana@unc.edu.ar>
Date: Wed, 9 Feb 2022 09:24:20 +0100
Subject: [PATCH 2/3] password environment variable renamed
---
README.md | 2 +-
bulkrequests/parser.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index c51a9ca..75b1137 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ no-check-certificate=True
Also all this parameters can be set by environment variables; the variables names are:
```
BULKREQUESTS_USER
-BULKREQUESTS_PASS
+BULKREQUESTS_PWD
BULKREQUESTS_URL
BULKREQUESTS_OIDC_AGENT_ACC
BULKREQUESTS_CERTIFICATE
diff --git a/bulkrequests/parser.py b/bulkrequests/parser.py
index 8a1a1d7..5432e78 100644
--- a/bulkrequests/parser.py
+++ b/bulkrequests/parser.py
@@ -30,7 +30,7 @@ DEFAULT_RC_PATH = '$HOME/.bulkrequestsrc'
# get environment variables
ENV_USER = os.getenv('BULKREQUESTS_USER')
-ENV_PASS = os.getenv('BULKREQUESTS_PASS')
+ENV_PWD = os.getenv('BULKREQUESTS_PWD')
ENV_URL = os.getenv('BULKREQUESTS_URL')
ENV_OIDC_AGENT_ACC = os.getenv('BULKREQUESTS_OIDC_AGENT_ACC')
ENV_CERTIFICATE = os.getenv('BULKREQUESTS_CERTIFICATE')
@@ -149,10 +149,10 @@ class BulkRequestsParser():
# load necessary variables for oidc_agent_account
self.params['oidc_agent_account'] = self.args.oidc_agent_account
- elif ENV_USER is not None and ENV_PASS is not None:
+ elif ENV_USER is not None and ENV_PWD is not None:
# load necessary variables from environment
self.params['user'] = ENV_USER
- self.params['pwd'] = ENV_PASS
+ self.params['pwd'] = ENV_PWD
elif ENV_OIDC_AGENT_ACC is not None:
# load oidc agent account from environment variables
--
GitLab
From 865a8503d101c1de43e92871eebc3151188fdb12 Mon Sep 17 00:00:00 2001
From: dariog <dgrana@unc.edu.ar>
Date: Wed, 9 Feb 2022 09:28:31 +0100
Subject: [PATCH 3/3] removing unnecessary files
---
test-files/files.txt | 24 ------------------------
1 file changed, 24 deletions(-)
delete mode 100644 test-files/files.txt
diff --git a/test-files/files.txt b/test-files/files.txt
deleted file mode 100644
index 7b00181..0000000
--- a/test-files/files.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/tape/raw/production/COLA/COLA_N1024_L1536_zi9_T10_lina_pm3.iso
-/tape/raw/production/COLA/COLA_N1536_L1536_zi9_T10_lina_pm3.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi100_T40_lina_pm3.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi19_T40_lina_pm2.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi19_T40_lina_pm3_fof10.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi19_T40_lina_pm3.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi19_T40_lina_pm3_z1p5.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi19_T80_lina_pm2.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi19_T80_lina_pm3.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi39_T40_lina_pm3.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi39_T40_loga_pm3.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi39_T40_mystep_pm3.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi9_T10_lina_pm2.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi9_T10_lina_pm3.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi9_T20_lina_pm3.iso
-/tape/raw/production/COLA/COLA_N2048_L1536_zi9_T40_lina_pm3.iso
-/tape/raw/production/COLA/COLA_N2048_L768_zi19_T40_lina_pm3.iso
-/tape/raw/production/COLA/cov_N1536_L1500.iso
-/tape/raw/production/COLA/L2dCOLA_N1024_L1536_zi19_T40_lina_pm3_r1.iso
-/tape/raw/production/COLA/L2dCOLA_N2048_L1536_zi19_T20_lina_pm2_nside1024.iso
-/tape/raw/production/COLA/L2dCOLA_N2048_L1536_zi19_T20_lina_pm3_nside1024.iso
-/tape/raw/production/COLA/L2dCOLA_N2048_L1536_zi19_T40_lina_pm2_nside1024.iso
-/tape/raw/production/COLA/L2dCOLA_N2048_L1536_zi19_T80_lina_pm2_nside1024.iso
-/tape/raw/production/COLA/L2dCOLA_N2048_L1536_zi19_T80_lina_pm3_nside1024.iso
--
GitLab