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

doc(tutorials): adapt tutorial description to fit new structure/basis #885

Merged
merged 57 commits into from
Aug 2, 2024

Conversation

stephanbcbauer
Copy link
Member

@stephanbcbauer stephanbcbauer commented May 15, 2024

Description

Since the basis of the tutorial was switched from tutorial-resources to tractus-x-umbrella also the description has to be adpated.

Since the changes on this PR are really huge ... here is a small description

  1. Main change is switching from terraform to umbrella helm charts. Before, we were using the MXD (within this repository tutorial-resources as a basis to deploy a minimal dataspace related to our reference implementation. Now we switched to tractus-x-umbrella. This relates in many changes in setting up the dataspace and also in using the cURL command. No functional change here.
  2. Adding DTR to step by step manual to describe the usage of the related components. Before, we had only edc-edc communication. WIth adding the DTR the providers edc provides everything which is needed to provide DTRs, submodels aso.
  3. Fixing some typos and keep nameings consistant

Important We didnt change any functionality. The changes were done within an external team in the tractus-x-umbrella. We are just using the new provided infrastructure.

Pre-review checks

Please ensure to do as many of the following checks as possible, before asking for committer review:

stephanbcbauer and others added 10 commits May 13, 2024 21:12
adapt the new curl commands
match them to the new umbrella infrastructure
Updated list of required installations
configuration and installation information updated for the new approach using helm charts for the deployment
doc(tutorials): update e2e tutorials to work with umbrella helm charts and minikube
doc(tutorials): update prerequisites on use of minikube and helm charts
- updated architecture section
@stephanbcbauer stephanbcbauer added the documentation Improvements or additions to documentation label May 15, 2024
@stephanbcbauer stephanbcbauer self-assigned this May 15, 2024
@stephanbcbauer
Copy link
Member Author

stephanbcbauer commented May 15, 2024

@jkbquabeck @drandarov-io not sure who created the Step1.png pictures… but we definitely have to store also the sources here. Since it looks like mermaid, maybe we can add the mermaid code directly into the md files.

And since the tutorial is not versioned via docusaurus, we could also think about storing our assets in the static folder of docusaurus.

@stephanbcbauer
Copy link
Member Author

@drandarov-io can you please check the linter issues? And I am not sure if the header hierarchy is correct?

@arnoweiss
Copy link
Contributor

Please fix dependencies file by either rebasing on main or using the dash licences tool [1], follow these instructions [2] or try executing this [3] command.

[1] https://repo.eclipse.org/content/repositories/dash-licenses/org/eclipse/dash/org.eclipse.dash.licenses/
[2] Eclipse Dash License Tool and Package Lock Files | Wayne Beaton
[3] java -jar ./org.eclipse.dash.licenses-1.0.2.jar package-lock.json -project automotive.tractusx -summary ./DEPENDENCIES

stephanbcbauer and others added 8 commits June 4, 2024 12:53
Fixed typos and rewrote certain parts of the section for clearer explaination.

Implemented a new logic for using info-section:
Info-sections provide information which account to the architecture of the tutorial setup. The general text provides information on the overall architecture of Catena-X
Reworked ot the chapter also introducing aspects for a user setup, which also to run the tutorial without root privileges
minor corrections - spelling
Rework for the usage of Umbrella Helm Charts instead of terraform  and usenig minikube instead of kind
Changeing MXD to TXD
Rework for using Umbrella Helm Charts and minikube
@stephanbcbauer
Copy link
Member Author

This is hard to review due to

  • the PR's size
  • lack of expressive commit messages
  • lack of elaborate description

Please adjust the PR's description with an overview of the most significant changes introduced by this PR.

Thanks @arnoweiss adapted the description. Please have a look. I am still waiting for the eclipse itself because of the big number of changes.

tunacicek
tunacicek previously approved these changes Jul 2, 2024
Copy link
Contributor

@tunacicek tunacicek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@arnoweiss arnoweiss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some things aren't right, others inconsistent. For detailed explanations, feel free to reach out.

docs/tutorials/e2e/boost/dtrTutorial.md Outdated Show resolved Hide resolved
docs/tutorials/e2e/boost/dtrTutorial.md Outdated Show resolved Hide resolved
"edc":"https://w3id.org/edc/v0.0.1/ns/",
"cx-common":"https://w3id.org/catenax/ontology/common#",
"cx-taxo":"https://w3id.org/catenax/taxonomy#",
"dct":"https://purl.org/dc/terms/"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"dct":"https://purl.org/dc/terms/"
"dct":"http://purl.org/dc/terms/"

This will come up multiple times, there used to be an error in a spec somewhere that spread. For reference, check https://www.dublincore.org/specifications/dublin-core/dcmi-terms/#type

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tunacicek and I adapted the URLs together

docs/tutorials/e2e/boost/dtrTutorial.md Show resolved Hide resolved
docs/tutorials/e2e/boost/dtrTutorial.md Outdated Show resolved Hide resolved
docs/tutorials/e2e/boost/restrictData.md Outdated Show resolved Hide resolved
"dcat:accessService": "7b76c9c5-d7f9-42c1-8784-a2820a60bb0f"
}
],
"edc:type": "data.core.digitalTwinRegistry",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again: it shouldn't look like this

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This asset was created by the seeedData function from the umbrella chart. What do you mean? This asset was created like this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might make sense to include the specific queryspec somewhere. it's not in the text either.

{
    "@context": {
        "edc": "https://w3id.org/edc/v0.0.1/ns/"
    },
    "@type": "CatalogRequest",
    "counterPartyAddress": "{{provider_dsp_url}}",
    "counterPartyId": "{{provider_bpn}}",
    "protocol": "dataspace-protocol-http",
    "querySpec": {
        "offset": 0,
        "limit": 200,
        "filterExpression": {
            "operandLeft": "'http://purl.org/dc/terms/type'.'@id'",
            "operator": "=",
            "operandRight": "https://w3id.org/catenax/taxonomy#DigitalTwinRegistry"
        }
    }
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tutorial was meant really as a basic description. It shouldn't be too complicated, that's why we didn't add any extra functionality.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might make sense to clarify what happens when you have to and-chain specificAssetIds as that's the usual case in industry-core-based scenarios

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, don't know you mean with this statement

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here. explain filter?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see comment

@stephanbcbauer
Copy link
Member Author

@arnoweiss thx will have a look. @tunacicek maybe we can collaborate here?

Co-authored-by: Arno Weiß <86715435+arnoweiss@users.noreply.github.com>
stephanbcbauer and others added 6 commits July 26, 2024 14:49
Co-authored-by: Arno Weiß <86715435+arnoweiss@users.noreply.github.com>
Co-authored-by: Arno Weiß <86715435+arnoweiss@users.noreply.github.com>
Co-authored-by: Arno Weiß <86715435+arnoweiss@users.noreply.github.com>
Co-authored-by: Arno Weiß <86715435+arnoweiss@users.noreply.github.com>
@arnoweiss arnoweiss self-requested a review July 31, 2024 16:06
Copy link
Contributor

@arnoweiss arnoweiss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If someone can give me push rights to the branch, I'll be happy to fix a couple of things in there.

docs/tutorials/e2e/boost/consumeData.md Outdated Show resolved Hide resolved
docs/tutorials/e2e/boost/consumeData.md Outdated Show resolved Hide resolved
docs/tutorials/e2e/boost/consumeData.md Outdated Show resolved Hide resolved
docs/tutorials/e2e/boost/consumeData.md Show resolved Hide resolved
docs/tutorials/e2e/boost/consumeData.md Show resolved Hide resolved
docs/tutorials/e2e/boost/provideData.md Show resolved Hide resolved
docs/tutorials/e2e/boost/provideData.md Show resolved Hide resolved
docs/tutorials/e2e/boost/provideData.md Outdated Show resolved Hide resolved
docs/tutorials/e2e/boost/provideData.md Show resolved Hide resolved
docs/tutorials/e2e/boost/provideData.md Show resolved Hide resolved
@stephanbcbauer
Copy link
Member Author

stephanbcbauer commented Jul 31, 2024

If someone can give me push rights to the branch, I'll be happy to fix a couple of things in there.

It would be great, the problem … we are working on @jkbquabeck fork/branch. Will try to contact him.

arnoweiss
arnoweiss previously approved these changes Aug 1, 2024
Copy link
Contributor

@arnoweiss arnoweiss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally overlooked that this tutorial operates on tractusx-edc 0.5.3 still. That's why the API changes I wanted to document aren't in effect yet. All looks good now, sorry for the confusion and thanks for the update!

Copy link
Contributor

@tunacicek tunacicek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@stephanbcbauer stephanbcbauer merged commit 2b8ac7a into eclipse-tractusx:main Aug 2, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants