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

Feature/393 readme improvements #456

Merged
Merged
Show file tree
Hide file tree
Changes from 66 commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
f785ee8
chore(docs): #393: improvements and TODOs
dsmf Feb 27, 2024
0d749c8
chore(docs): #393: move "Vision and Mission Statement" and "What is t…
dsmf Feb 27, 2024
96a5d2f
chore(docs): #393: link / update READMEs
dsmf Feb 27, 2024
b840cc0
chore(docs): #393: update READMEs
dsmf Feb 27, 2024
89547da
chore(docs): #393: Correct spelling
dsmf Feb 27, 2024
0485e21
chore(docs): #393: Update README for Tavern tests
dsmf Feb 27, 2024
917c80e
chore(docs): #393: Correct broken link
dsmf Feb 27, 2024
a81e078
chore(docs): #393: Add back-link to main IRS README
dsmf Feb 27, 2024
e911a2a
chore(docs): #393: Add FAQ.md and link mutually with README.md
dsmf Feb 27, 2024
8ec9686
chore(docs): #393: Format link
dsmf Feb 27, 2024
0c7d974
chore(docs): #393: Add reference to LICENSE.md in README.md as
dsmf Feb 27, 2024
ae80eae
chore(docs): #393: Add reference to CODE_OF_CONDUCT.md in CONTRIBUTIN…
dsmf Feb 27, 2024
c5d22b4
chore(docs): #393: Deduplicate section "Contact" by referencing the "…
dsmf Feb 27, 2024
e1c4f09
chore(docs): #393: Add further TODOs to address / clarify
dsmf Feb 27, 2024
036e4b6
chore(docs): #393: Add some inspiration to "General contribution to t…
dsmf Feb 27, 2024
bdaf845
Merge remote-tracking branch 'origin/main' into chore/393_readme_impr…
dsmf Feb 27, 2024
a30d28d
chore(docs):[#393] Add README for .config folder
dsmf Feb 28, 2024
c5dfe2d
chore(docs):[#393] Move section "Notice for Docker Image" down to hav…
dsmf Feb 28, 2024
a3d476d
chore(docs):[#393] Further improve / enhance section "Source Layout"
dsmf Feb 28, 2024
eea3a1a
chore(docs):[#393] Improve / enhance section "Installation"
dsmf Feb 28, 2024
5698a2d
chore(docs):[#393] Link FAQ
dsmf Feb 28, 2024
58e22dd
chore(docs):[#393] Improve section "Licenses"
dsmf Feb 28, 2024
69225fe
chore(docs):[#393] Add sections "Reporting Bugs and Vulnerabilities" …
dsmf Feb 28, 2024
50dc51a
chore(docs):[#393] Remove TODO code comments in the documentation
dsmf Feb 28, 2024
4375796
chore(docs):[#393] Improve section "Local Deployment" condering "Loca…
dsmf Feb 28, 2024
a1020a0
chore(docs):[#393] Unify handling of case in headings
dsmf Feb 28, 2024
6f922fe
chore(docs):[#393] Extract "Getting in Touch" to CONTACT.md and link …
dsmf Feb 28, 2024
6eab8f5
chore(docs):[#393] Cleanup link titles
dsmf Feb 28, 2024
0a04e49
chore(docs):[#393] Correct reference to ess-demo.py README
dsmf Feb 28, 2024
24d4cf4
chore(docs):[#393] Cleanup
dsmf Feb 28, 2024
d1eecaa
chore(docs):[#393] Correct "IRS Load Tests" README
dsmf Feb 28, 2024
1adef1d
chore(docs):[#393] Improve formatting and wording of Insomnia REST re…
dsmf Feb 28, 2024
2b0918d
chore(docs):[#393] Formatting
dsmf Feb 28, 2024
b67953c
chore(docs):[#393] Extract section "Usage" to a dedicated file to kee…
dsmf Feb 28, 2024
e791fdc
chore(docs):[#393] Remove obsolete sentence (already addressed in NOT…
dsmf Feb 28, 2024
4497a0b
chore(docs):[#393] Add section "Iteration Notes and Discussions"
dsmf Feb 28, 2024
72c2f1d
chore(docs):[#393] Clean link title
dsmf Feb 28, 2024
872f164
chore(docs):[#393] Move IRS request collection to subdirectory
dsmf Feb 28, 2024
666dcb8
chore(docs):[#393] Reorder and enhance the FAQ
dsmf Feb 29, 2024
0a4ac5a
chore(docs):[#393] Some corrections and added links and references in…
dsmf Feb 29, 2024
e2ee4bd
chore(docs):[#393] Add link to wiremock and testcontainers
dsmf Feb 29, 2024
5982d83
chore(docs):[#393] fix order in FAQ
dsmf Feb 29, 2024
723127d
chore(docs):[#393] some formatting in README
dsmf Feb 29, 2024
ba31187
chore(docs):[#393] Add section / reference concerning monitoring
dsmf Feb 29, 2024
22d8ca6
chore(docs):[#393] Add section / reference concerning tests
dsmf Feb 29, 2024
9a17e96
chore(docs):[#393] Improve section "Integration Tests"
dsmf Feb 29, 2024
7d5412a
chore(docs):[#393] Improvements concerning "Create a Release"
dsmf Feb 29, 2024
8eeb322
chore(docs):[#393] Unify handling of case in headings
dsmf Feb 29, 2024
770e81f
chore(docs):[#393] Correct spelling, unify case of trademark, improve…
dsmf Feb 29, 2024
bd5aead
chore(docs):[#393] Cleanup spaces
dsmf Feb 29, 2024
eec7d3b
chore(docs):[#393] Extract section "Tests" to separate file and add n…
dsmf Feb 29, 2024
8fd32ac
Merge remote-tracking branch 'origin/main' into chore/393_readme_impr…
dsmf Feb 29, 2024
9e94015
chore(docs):[#393] Remove duplicate line
dsmf Feb 29, 2024
3aa45a9
chore(docs):[#393] Improve readability, add coverage badge
dsmf Feb 29, 2024
0b88ed3
chore(docs):[#393] Add note concerning GitHub issue number in CHANGEL…
dsmf Mar 1, 2024
a74d252
Merge pull request #799 from eclipse-tractusx/main
ds-jhartmann Mar 4, 2024
8f2710c
Merge branch 'main' into chore/393_readme_improvements
dsmf Mar 4, 2024
c07fcd9
feat(impl):[#393] Improved glossary by splitting abbreviation and ter…
dsmf Mar 4, 2024
b899dcc
chore(docs):[#393] Unify case in glossary
dsmf Mar 4, 2024
61d6509
chore(docs):[#393] Add link to .config README
dsmf Mar 4, 2024
b785eb6
chore(docs):[#393] Add ds-psosnowski to AUTHORS.md
dsmf Mar 4, 2024
bf6a959
chore(docs):[#393] Removed catenax-ng
dsmf Mar 4, 2024
c7746ac
chore(docs):[#393] improvement
dsmf Mar 4, 2024
6996e27
chore(docs):[#393] Add link to USAGE.md
dsmf Mar 4, 2024
5a87e99
chore(docs):[#393] Remove link to catena-ng
dsmf Mar 4, 2024
e835a9c
chore(docs):[#393] Fixed glossary table
dsmf Mar 4, 2024
89e38ef
Update irs-cucumber-tests/README.md
dsmf Mar 5, 2024
8aec98d
chore(docs):[#393] Remove link to spring boot documentation that incl…
dsmf Mar 5, 2024
900ef0b
Merge remote-tracking branch 'origin/feature/393_readme_improvements'…
dsmf Mar 5, 2024
0e449de
chore(docs):[#393] Fix typo
dsmf Mar 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .config/README.md
mkanal marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

[[Back to main IRS README](../README.md)]

# .config Folder

This folder contains configuration, rules and suppression files for code quality check tools etc.

| File / Folder | Description | Further information |
|-----------------------------|-------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------|
| spectral | | |
| .trivyignore | Ignore file for [Trivy](https://trivy.dev/) to configure which false positives to ignore. | [Trivy ignorefile documentation](https://aquasecurity.github.io/trivy/v0.49/docs/configuration/filtering/#trivyignore) |
| checkstyle.xml | [Checkstyle](https://checkstyle.sourceforge.io) configuration. | [Checkstyle configuration](https://checkstyle.sourceforge.io/config.html) |
| checkstyle-suppressions.xml | [Checkstyle](https://checkstyle.sourceforge.io/) suppressions. | [Checkstyle suppressions documentation](https://checkstyle.sourceforge.io/filters/suppressionfilter.html) |
| irs.header | Copyright header definition for the checkstyle module RegexpHeader. | see checkstyle.xml file |
| owasp-suppressions.xml | [OWASP dependendy check](https://owasp.org/www-project-dependency-check/) suppressions. | [OWASP suppressions documentation](https://jeremylong.github.io/DependencyCheck/general/suppression.html) |
| pmd-rules.xml | [PMD Source Code Analyzer](https://pmd.github.io/) rules. | [PMD rules documentation](https://pmd.github.io/pmd/pmd_userdocs_making_rulesets.html) |
| spotbugs-excludes.xml | [Spotbugs](https://spotbugs.github.io/) excludes. | [Spotbugs excludes documentation](https://spotbugs.readthedocs.io/en/stable/filter.html) |


1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ The following people have contributed to this repository:
- Sebastian Bezold, Mercedes Benz AG, https://github.com/SebastianBezold
- Zied Belkhiria, MHP, https://github.com/Zied-Belkhiria-Mhp
- Adam Bugajewski, doubleSlash Net-Business GmbH, https://github.com/ds-ext-abugajewski
- Pawel Sosnowski, doubleSlash Net-Business GmbH, https://github.com/ds-psosnowski
- Matthias Fischer, doubleSlash Net-Business GmbH, https://github.com/dsmf
- Sebastian Ceronik, doubleSlash Net-Business GmbH, https://github.com/ds-ext-sceronik
- Maximilian Wesener, doubleSlash Net-Business GmbH, https://github.com/ds-mwesener
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

_**For better traceability add the corresponding GitHub issue number in each changelog entry, please.**_

## [Unreleased]
### Added
- DigitalTwinRegistryCreateShellService in irs-registry-client for creating shells in DTR directly
Expand Down
7 changes: 7 additions & 0 deletions CONTACT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

# Getting in Touch

Contact the [project developers](AUTHORS.md) via the project's "dev" list.
mkanal marked this conversation as resolved.
Show resolved Hide resolved

* [Mailing List](https://accounts.eclipse.org/mailing-list/tractusx-dev)
* [Eclipse Matrix Chat](https://chat.eclipse.org/#/room/#tractusx-irs:matrix.eclipse.org)
71 changes: 41 additions & 30 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ Thanks for your interest in this project.
2. [Developer resources](#developer-resources)
3. [Eclipse Development Process](#eclipse-development-process)
4. [Eclipse Contributor Agreement](#eclipse-contributor-agreement)
5. [General contribution to the project](#general-contribution-to-the-project)
6. [Contributing as a Consultant](#contributing-as-a-consultant)
7. [Contributing as a Developer](#contributing-as-a-developer)
5. [Code of Conduct](#code-of-conduct)
6. [General contribution to the project](#general-contribution-to-the-project)
7. [Contributing as a Consultant](#contributing-as-a-consultant)
8. [Contributing as a Developer](#contributing-as-a-developer)
9. [Contact](#contact)

## Project description
## Project Description
mkanal marked this conversation as resolved.
Show resolved Hide resolved

The companies involved want to increase the automotive industry's
competitiveness, improve efficiency through industry-specific cooperation and
Expand All @@ -26,9 +27,8 @@ Catena-X alliance focusing on parts traceability.

* https://projects.eclipse.org/projects/automotive.tractusx
* https://github.com/eclipse-tractusx/item-relationship-service
* https://github.com/catenax-ng/tx-item-relationship-service

## Developer resources
## Developer Resources
dsmf marked this conversation as resolved.
Show resolved Hide resolved

Information regarding source code management, builds, coding standards, and
more.
Expand Down Expand Up @@ -63,6 +63,10 @@ fulfills the DCO's requirement that you sign-off on your contributions.
For more information, please see the Eclipse Committer Handbook:
https://www.eclipse.org/projects/handbook/#resources-commit

## Code of Conduct

See [CODE_OF_CONDUCT](CODE_OF_CONDUCT.md).

## Eclipse Dependency License Check

In case of new dependencies or version updates, it might be necessary to have the new library checked and accepted by the Eclipse foundation. Do create new tickets for this, you can use this command:
Expand All @@ -72,20 +76,23 @@ mvn org.eclipse.dash:license-tool-plugin:license-check -Ddash.iplab.token=$ECLIP

For more information on the tool and how to acquire the token, check https://github.com/eclipse/dash-licenses.

## General contribution to the project
## General Contribution to the Project

General contributions e.g. contributions to improve documentation are welcome.
Copy link
Contributor

Choose a reason for hiding this comment

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

I would not focus on documentation - general contribution is not limited to this. I would not recommend explaining this too deeply. General link to issues and discussions are sufficient. In case labels or other things change these links were useless.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @mkanal, What else would you see as a "General Contribution"? I mean there are also the sections "Contributing as a Consultant" and "Contributing as a Developer" which cover all other kind of contributions I can think of at the moment. If we remove what I have added here we would end up with an empty section as it was before (see branch main)... so IMHO we should remove the heading "General Contribution to the Project" completely or add something meaningful here.

If you need ideas for contributions, you can check the following links:
- [open documentation stories](https://github.com/orgs/eclipse-tractusx/projects/8/views/4?filterQuery=label%3Adocumentation++status%3Ainbox%2Cbacklog)
Copy link
Contributor

Choose a reason for hiding this comment

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

see above

- [discussion page concerning documentation improvements](https://github.com/eclipse-tractusx/item-relationship-service/discussions/407)


## Contributing as a Consultant

### Conceptual work and specification guidelines
1. The prerequisite for a concept is always a github issue that defines the business value and the acceptance criteria that are to be implemented with the concept
1. The prerequisite for a concept is always a GitHub issue that defines the business value and the acceptance criteria that are to be implemented with the concept
2. Copy and rename directory /docs/#000-concept-name-template /docs/#<DDD>-<target-name>
3. Copy file /docs/Concept_TEMPLATE.md into new directory /docs/#<DDD>-<target-name>
3. Copy the template file [/docs/concept/TEMPLATE_Concept.md](docs/concept/TEMPLATE_Concept.md) into new directory `/docs/#<DDD>-<target-name>`.

### Diagrams
PlantUML and Mermaid is used for conceptual work.
https://mermaid.js.org/
https://plantuml.com/
[PlantUML](https://plantuml.com/) and [Mermaid](https://mermaid.js.org/) is used for conceptual work.


#### PlantUML
Expand All @@ -111,7 +118,8 @@ sequenceDiagram

## Contributing as a Developer

### Commit messages
### Commit Messages

The commit messages have to match a pattern in the form of:
``< type >(scope):[<Ticket_ID>] < description >``
where type is: `build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test`
Expand All @@ -122,14 +130,15 @@ Example:

Detailed pattern can be found here: [commit-msg](local/development/commit-msg)

#### How to use
#### How to Use
```shell
cp local/development/commit-msg .git/hooks/commit-msg && chmod 500 .git/hooks/commit-msg
```

For further information please see https://github.com/hazcod/semantic-commit-hook

### Code formatting
### Code Formatting

#### Deprecated soon:
Please use the following code formatter: [.idea/codeStyles](.idea/codeStyles)

Expand All @@ -150,19 +159,23 @@ The plugin will be disabled by default. To enable it in the current project, go
More info:
https://github.com/google/google-java-format/blob/master/README.md#intellij-jre-config

### Create a release

1. Choose a release version. Use semantic versioning! Create a respective branch e.g. `chore/prepare-release-2.6.1`.
2. Add release notes for new version in [CHANGELOG.md](CHANGELOG.md) and [charts/irs-helm/CHANGELOG.md](charts/irs-helm/CHANGELOG.md) (e.g. https://github.com/catenax-ng/tx-item-relationship-service/pull/328)
3. Update [COMPATIBILITY_MATRIX.md](COMPATIBILITY_MATRIX.md) (see [catena-x-environments](https://github.com/catenax-ng/tx-item-relationship-service/tree/catena-x-environments/charts/irs-environments))
4. Create pull request and merge to main
### Create a Release

1. Choose a release version using [semantic versioning](https://semver.org/spec/v2.0.0.html)
and create a corresponding branch according to the template: `chore/prepare-release-x.x.x`.
2. Add release notes for new version in [CHANGELOG.md](CHANGELOG.md)
and [charts/irs-helm/CHANGELOG.md](charts/irs-helm/CHANGELOG.md)
(for an example [see here](https://github.com/eclipse-tractusx/item-relationship-service/pull/429))
- Check if the changelog entries for the release are complete.
- Add the corresponding GitHub issue numbers to each entry if missing.
3. Update [COMPATIBILITY_MATRIX.md](COMPATIBILITY_MATRIX.md).
4. Create pull request from [release preparation branch to main](https://github.com/eclipse-tractusx/item-relationship-service/compare/chore/prepare-release-x.x.x) and merge to main.
5. Create Git tag for the desired release version `git tag x.x.x`
(the irs-helm tag will be created by the github workflow based on the version in the irs-helm changelog)
6. Push Git tag to repository `git push origin x.x.x`
7. Wait for release workflow to complete
8. Merge the automatically opened PR by github-actions bot
9. Create pull request to eclipse-tractusx
10. Notify about the release in IRS Matrix Chat. Template:
(note: the irs-helm tag will be created automatically by the GitHub workflow based on the version in the irs-helm changelog).
6. Push Git tag to repository `git push origin x.x.x` (this will trigger the GitHub release workflow).
7. Wait for release workflow to complete.
8. Merge the automatically opened PR by GitHub actions bot.
9. Notify about the release in IRS Matrix Chat using the following template:

> **IRS Release x.x.x**
>
Expand All @@ -177,7 +190,5 @@ https://github.com/google/google-java-format/blob/master/README.md#intellij-jre-

## Contact

Contact the project developers via the project's "dev" list.
See [CONTACT](CONTACT.md)

* https://accounts.eclipse.org/mailing-list/tractusx-dev
* Eclipse Matrix Chat https://chat.eclipse.org/#/room/#tractusx-irs:matrix.eclipse.org
113 changes: 113 additions & 0 deletions FAQ.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@

[[Back to main IRS README](README.md)]
Copy link
Contributor

Choose a reason for hiding this comment

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

GitHub provided navigation within the project - this is not necessery IMHO.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes but not the IDE, developers will probably navigate in the IDE and not on github, at least that's what I do

Copy link
Contributor

Choose a reason for hiding this comment

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

What do you mean by GitHub provided navigation in the Project? I like the reference to the parent document. This makes navigation in the browser as well as in the IDE easier.



# IRS FAQ


## Documentation and Getting Help

-----
**Q: Where do I find documentation that helps me understand the big picture?**

A: The following resources will help to understand the big picture:
- [README - Introduction](README.md#introduction)
- [More information describing the big picture](https://eclipse-tractusx.github.io/docs-kits/kits/Data%20Chain%20Kit/Adoption%20View%20Data%20Chain%20Kit/)
including the two main flows IRS Iterative and IRS Recursive and involved components and services.

Further information can be found in the IRS Architecture Documentation, for example:
- [Architecture Documentation - Business Context](https://eclipse-tractusx.github.io/item-relationship-service/docs/arc42/full.html#_business_context)
- [Architecture Documentation - Structure](https://eclipse-tractusx.github.io/item-relationship-service/docs/arc42/full.html#_structure)
- [Architecture Documentation - Building block view](https://eclipse-tractusx.github.io/item-relationship-service/docs/arc42/full.html#_building_block_view)
- [Architecture Documentation - Runtime view](https://eclipse-tractusx.github.io/item-relationship-service/docs/arc42/full.html#_runtime_view)
- [Iterative Flow](https://eclipse-tractusx.github.io/item-relationship-service/docs/arc42/full.html#_irs_iterative)
- [Recursive Flow](https://eclipse-tractusx.github.io/item-relationship-service/docs/arc42/full.html#_irs_recursive)


-----
**Q: Where do I find the main documentation?**

A: See [Item Relationship Service Documentation](https://eclipse-tractusx.github.io/item-relationship-service/docs/).


-----
**Q: Is there a glossary?**

A: Yes, see [Item Relationship Service Documentation](https://eclipse-tractusx.github.io/item-relationship-service/docs/arc42/full.html#_glossary).


-----
**Q: Where do I get help?**

A: Please read the documentation and tests first.
If that does not answer your questions, ask the developers (see [CONTACT](CONTACT.md)).

## Limitations, Bugs and Vulnerabilities

-----
**Q: Are there any known issues and limitation?**

A: See [Known Issues and Limitations](README.md#known-issues-and-limitations).


-----
**Q: Where can I report a vulnerability?**

A: See [SECURITY](SECURITY.md#reporting-a-vulnerability).


-----
**Q: Where can I report a bug?**

A: Normal bugs may be reported as [public github issues](https://github.com/orgs/eclipse-tractusx/projects/8/views/10).
For reporting vulnerabilities see [SECURITY](SECURITY.md#reporting-a-vulnerability) please.


## Usage

-----
**Q: Where do I find information concerning compatibility of dependencies?**

A: See [COMPATIBILITY-MATRIX](COMPATIBILITY_MATRIX.md).

## Contributing

-----
**Q: How can I contribute?**

A: See [CONTRIBUTING](CONTRIBUTING.md).


-----
**Q: How do I create a release?**

A: See [CONTRIBUTING](CONTRIBUTING.md#create-a-release).


-----
**Q: How do I format the code?**

A: See [CONTRIBUTING](CONTRIBUTING.md#code-formatting).


## Testing

-----
**Q: Where can I find more information concerning the type of tests and used technologies and libraries?**

A: See [README - Tests](README.md#tests).

-----
**Q: Where do I find test data?**

A: Testdata is located under [local/testing/testdata](local/testing/testdata).
For more information see the [test data README](local/testing/testdata/README.md).


## Monitoring

-----
**Q: Where do I find information concerning monitoring?**

See [README - Monitoring](README.md#monitoring).

6 changes: 5 additions & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,8 @@ A detailed instruction on how to configure the IRS and EDC can be found here: [A
IRS provides a local setup which can be deployed to kubernetes.
This setup includes all third-party services which IRS uses and interacts with.

Instructions can be found here [README.md](README.md).
Instructions can be found here [README](README.md).

## Sample Calls

Sample calls can be found here [USAGE](USAGE.md).
Loading
Loading