Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fixes #11316] external pyCSW Service breaks upload of Documents and Datasets #11319

Conversation

mwallschlaeger
Copy link
Member

@mwallschlaeger mwallschlaeger commented Aug 3, 2023

This PR is related to #11316 . In my working of trying to bring an external pyCSW service to the geonode-k8s (zalf-rdm/geonode-k8s#34). I'm using the geonode.settings variables: CATALOGUE_ENGINE=geonode.catalogue.backends.pycsw_http and CATALOGUE_URL=http://my-external-pycsw:8000

I stumbled on uploading of documents and datasets wasn't working anymore like described in issue #11316.

So I tracked this down and found some datatype expectations made in geonode/catalgue/backends/generic.py are not working properly. Further I found out that for some reason the contextprocessor for the CATALOG_METADATA_TEMPLATE isn't working inside of the transaction_delete.xml, transaction_update.xml and transaction_insert.xml which lead to a template rendering issue when using an external pyCSW service. So I added this variable through the template context.

This are overall very minor changes.

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

For all pull requests:

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in the documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemption is, changes not visible to end-users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • New unit tests have been added covering the changes, unless there is an explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: black geonode && flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates
  • Commits adding new texts do use gettext and have updated .po / .mo files (without location infos)

Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.

@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Aug 3, 2023
@codecov
Copy link

codecov bot commented Aug 3, 2023

Codecov Report

Merging #11319 (09c8a0f) into master (4620143) will not change coverage.
Report is 1 commits behind head on master.
The diff coverage is 0.00%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #11319   +/-   ##
=======================================
  Coverage   60.61%   60.61%           
=======================================
  Files         867      867           
  Lines       52597    52597           
  Branches     6724     6724           
=======================================
  Hits        31882    31882           
  Misses      19180    19180           
  Partials     1535     1535           

@mwallschlaeger mwallschlaeger self-assigned this Aug 14, 2023
@mwallschlaeger mwallschlaeger linked an issue Aug 14, 2023 that may be closed by this pull request
@mwallschlaeger mwallschlaeger added the minor A low priority issue which might affect only some users and /or not the main functionality label Aug 14, 2023
@gitguardian
Copy link

gitguardian bot commented Aug 23, 2023

⚠️ GitGuardian has uncovered 1 secret following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secret in your pull request
GitGuardian id Secret Commit Filename
- Django Secret Key 09c8a0f .env.sample View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secret safely. Learn here the best practices.
  3. Revoke and rotate this secret.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!

@afabiani afabiani requested a review from etj August 23, 2023 08:21
@afabiani afabiani merged commit 029a0bf into GeoNode:master Aug 23, 2023
16 of 17 checks passed
@afabiani afabiani added this to the 4.2.0 milestone Aug 23, 2023
@mwallschlaeger mwallschlaeger deleted the issue#11316_external_pycsw_service_breaks_upload_of_documents_and_datasets branch August 23, 2023 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed CLA Bot: community license agreement signed minor A low priority issue which might affect only some users and /or not the main functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

external pyCSW Service breaks upload of Documents and Datasets
2 participants