diff --git a/.github/workflows/validate-and-process.yml b/.github/workflows/validate-and-process.yml index 0d528a6..26d3bbc 100644 --- a/.github/workflows/validate-and-process.yml +++ b/.github/workflows/validate-and-process.yml @@ -65,6 +65,13 @@ on: type: string description: Path where to deploy the viewer default: '.' + secrets: + sparql_username: + description: SPARQL Graph Store Protocol user name for push authentication + required: false + sparql_password: + description: SPARQL Graph Store Protocol password for push authentication + required: false permissions: diff --git a/full/action.yml b/full/action.yml index 7ea2db2..7968537 100644 --- a/full/action.yml +++ b/full/action.yml @@ -41,6 +41,12 @@ inputs: viewer_path: description: Path where to deploy the viewer default: '.' + sparql_username: + description: SPARQL GSP push user name + default: '' + sparql_password: + description: SPARQL GSP push password + default: '' runs: using: composite @@ -60,6 +66,8 @@ runs: github_base_url: ${{ inputs.github_base_url }} deploy_viewer: ${{ inputs.deploy_viewer }} viewer_path: ${{ inputs.viewer_path }} + sparql_username: ${{ inputs.SPARQL_USERNAME }} + sparql_password: ${{ inputs.SPARQL_PASSWORD }} - name: Generate Slate documentation continue-on-error: true run: | diff --git a/ogc/bblocks/entrypoint.py b/ogc/bblocks/entrypoint.py index 8f64d57..09e147b 100644 --- a/ogc/bblocks/entrypoint.py +++ b/ogc/bblocks/entrypoint.py @@ -182,7 +182,7 @@ if register_name: register_additional_metadata['name'] = register_name - sparql_conf = bb_config.get('sparql') + sparql_conf = bb_config.get('sparql', {}) base_url = args.base_url github_base_url = args.github_base_url @@ -249,11 +249,13 @@ # 4. Push to triplestore sparql_gsp = sparql_conf.get('push') if sparql_gsp: - print(f"Pushing {register_ttl_fn} to SPARQL GSP at {sparql_gsp}", file=sys.stderr) + print(os.environ.items()) if os.environ.get('SPARQL_USERNAME'): auth = (os.environ['SPARQL_USERNAME'], os.environ.get('SPARQL_PASSWORD')) + print(f"Pushing {register_ttl_fn} to SPARQL GSP at {sparql_gsp} (user {auth[0]})", file=sys.stderr) else: auth = None + print(f"Pushing {register_ttl_fn} to SPARQL GSP at {sparql_gsp}", file=sys.stderr) sparql_graph = sparql_conf.get('graph') or base_url update_vocabs.load_vocab(register_ttl_fn, graph_store=sparql_gsp, diff --git a/postprocess/action.yml b/postprocess/action.yml index 03a576a..d4fd27a 100644 --- a/postprocess/action.yml +++ b/postprocess/action.yml @@ -41,10 +41,19 @@ inputs: viewer_path: description: Path where to deploy the viewer default: '.' + sparql_username: + description: SPARQL GSP push user name + default: '' + sparql_password: + description: SPARQL GSP push password + default: '' runs: using: docker image: docker://ghcr.io/opengeospatial/bblocks-postprocess + env: + SPARQL_USERNAME: ${{ inputs.sparql_username }} + SPARQL_PASSWORD: ${{ inputs.sparql_password }} args: - '--register-file' - ${{ inputs.register_file }}