Skip to content

Conversation

@phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Mar 4, 2023

Description

This is a rebase of PR #40577 to go to release-10.12.0 branch.

I have left the changelog linking to #40577 because that PR actually has all the discussion etc., so it will be more useful to be linked in the changelog.

Related Issue

Motivation and Context

This is needed for OC-10 instances that want to join https://sciencemesh.io

How Has This Been Tested?

  • test environment:
    • GitPod from https://github.com/cs3org/ocm-test-suite
    • run ./gitpod-init.sh
    • run ./scripts/clean.sh
    • run ./scripts/orro-testing.sh
    • go the Firefox browser-in-a-browser that is exposed to port 5800
    • in there, navigate to https://oc1.docker (einstein / relativity)
    • create a local user 'john'
    • using the ScienceMesh app, generate an invite
    • accept the invite on oc2.docker (marie / radioactivity)
    • confirm that marie is now a ScienceMesh contact of einstein on oc1.docker
  • test case 1: sharing via ScienceMesh
    • as einstein on oc1.docker, share a file and start typing "m..." as the sharee
    • as marie on oc2.docker, accept the share
    • check the revaoc1.docker logs and see that the sharing happened via oc1 -> revaoc1 -> revaoc2 -> oc2
  • test case 2: sharing via local
    • as einstein on oc1.docker, share a file and start typing "jo..." as the sharee
    • it should offer to share with John as a local user

Screenshots (if appropriate):

Screenshot 2023-01-13 at 13 53 37

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:
  • Changelog item, see TEMPLATE

@phil-davis
Copy link
Contributor Author

Note: there is no unit test that covers the new code in ShareesController getRemote

Someone needs to decide if that is OK or not.

@michielbdejong
Copy link
Contributor

Yeah, the existing unit test covers the case where the config variable is not set.

@jvillafanez
Copy link
Member

We'll likely need time to check if we can mock the service. If this is expected to be in the release, unless the test is added today, I think it's better to leave it as technical debt and fix it later.

The problem is that we need to register a service with the mock, and then unregister it after the test. Not sure if this is planned or not.

@sonarqubecloud
Copy link

sonarqubecloud bot commented Mar 6, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@jvillafanez
Copy link
Member

Test added. It should be ready now.

@phil-davis phil-davis merged commit 03f0f45 into release-10.12.0 Mar 6, 2023
@delete-merged-branch delete-merged-branch bot deleted the ocm-via-sciencemesh-for-10.12 branch March 6, 2023 11:50
@ghost
Copy link

ghost commented Mar 13, 2023

Testing cannot currently be performed as the test build is failing.

@jnweiger
Copy link
Contributor

Testing cannot currently be performed as the test build is failing.

Thanks for trying. not a release blocker, anyhow. We are pretty confident, it does not break anything else.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants