Commit 81d515af authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch '56-pass-oidc-token-to-object-store' into 'dev' 

Resolve "pass OIDC token to object store"

Closes #56

See merge request !44
parents 407ff0b4 5933b102

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
stages:

  - build

  - build-base

  - test

  - deploy

  - test



variables:

  GIT_STRATEGY: clone

lib/galaxy/objectstore/rucio.py

+3 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import rucio.common 


import shutil





log = logging.getLogger(__name__)
@@ -202,7 +203,7 @@ def parse_config_xml(config_xml): 
            _config_xml_error("extra_dir")

        extra_dirs = [{k: e.get(k) for k in attrs} for e in e_xml]



        attrs = ("rse", "scheme")

        attrs = ("rse", "scheme", "ignore_checksum")

        e_xml = config_xml.findall("rucio_download_scheme")

        rucio_download_schemes = []

        if e_xml:
@@ -313,6 +314,7 @@ class RucioBroker(): 
                        "force_scheme": rse_scheme['scheme'],

                        "rse": rse_scheme['rse'],

                        "base_dir": base_dir,

                        "ignore_checksum": string_as_bool(rse_scheme['ignore_checksum']),

                        "no_subdir": True,

                    }

                    break

packages/objectstore/setup.cfg

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ long_description = file: README.rst, HISTORY.rst 
long_description_content_type = text/x-rst

name = galaxy-objectstore

url = https://github.com/galaxyproject/galaxy

version = 22.5.0.dev0

version = 22.5.0.dev2



[options]

include_package_data = True