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

Docs/docusaurus publishing #715

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
4b8f5b6
Automatically create API spec
bcronin90 Jul 17, 2023
956da84
Bump
bcronin90 Jul 17, 2023
8205e4a
Bump
bcronin90 Jul 17, 2023
141335f
Bump
bcronin90 Jul 17, 2023
9751863
Bump
bcronin90 Jul 18, 2023
134435f
Bump
bcronin90 Jul 18, 2023
3659bfd
Bump
bcronin90 Jul 18, 2023
77a090c
Bump
bcronin90 Jul 18, 2023
381d370
Bump
bcronin90 Jul 18, 2023
e5858d8
Bump
bcronin90 Jul 18, 2023
7256ad0
Bump
bcronin90 Jul 18, 2023
2a15c9f
Bump
bcronin90 Jul 18, 2023
d0aaa7a
Bump
bcronin90 Jul 18, 2023
e0ce25e
Bump
bcronin90 Jul 18, 2023
864a577
Bump
bcronin90 Jul 18, 2023
c0ca639
Bump
bcronin90 Jul 19, 2023
4ab7e08
Bump
bcronin90 Jul 19, 2023
fe2d061
Bump
bcronin90 Jul 19, 2023
5c82692
Bump
bcronin90 Jul 20, 2023
50f1a6f
Bump
bcronin90 Jul 20, 2023
8e023ab
Bump
bcronin90 Jul 20, 2023
bc489f7
Bump
bcronin90 Jul 20, 2023
2b1eba4
Bump
bcronin90 Jul 20, 2023
27188ec
Bump
bcronin90 Jul 20, 2023
29f61c5
Allow for direct version input
bcronin90 Jul 24, 2023
a07845d
Add
bcronin90 Jul 24, 2023
94a6d42
Test
bcronin90 Jul 27, 2023
a2c49f5
Remove trigger
bcronin90 Jul 27, 2023
9098744
Add trigger
bcronin90 Jul 27, 2023
580e9e2
Remove trigger
bcronin90 Jul 27, 2023
c69769b
Restructure kits documentation
bcronin90 Aug 14, 2023
c835643
Debug
bcronin90 Aug 14, 2023
8fe5da7
Just publish OpenAPI yaml
bcronin90 Aug 18, 2023
8a9e6ae
Clean up documentation
bcronin90 Aug 18, 2023
79d7c4f
Clean up documentation
bcronin90 Aug 18, 2023
e4b9c4b
test
bcronin90 Aug 18, 2023
10b8a70
lint markdown
bcronin90 Aug 18, 2023
ed5e1f2
publish
bcronin90 Aug 18, 2023
83fe95d
publish
bcronin90 Aug 18, 2023
9075a65
publish
bcronin90 Aug 18, 2023
0ce0a29
add todo
bcronin90 Aug 18, 2023
43f734d
Fix linting problems
bcronin90 Sep 7, 2023
4f0ef01
Add publishing task
bcronin90 Sep 7, 2023
742f008
Fix pipeline inputs
bcronin90 Sep 8, 2023
13dae20
Fix pipeline inputs
bcronin90 Sep 8, 2023
11b93ee
Debug
bcronin90 Sep 8, 2023
c7640b9
Debug
bcronin90 Sep 8, 2023
5317501
Debug
bcronin90 Sep 8, 2023
11e7383
Debug
bcronin90 Sep 8, 2023
19d7fca
Permissions
bcronin90 Sep 8, 2023
d2bb6c9
Permissions
bcronin90 Sep 8, 2023
e6d483c
Remove trigger
bcronin90 Sep 8, 2023
4ed7653
Fix rebase issues
bcronin90 Sep 12, 2023
5d5bcff
Remove use of swaggerhub api
bcronin90 Sep 12, 2023
8b99c14
Remove unnecessary changes
bcronin90 Sep 13, 2023
68d0bad
Remove unnecessary changes
bcronin90 Sep 13, 2023
2c69835
Extract script
bcronin90 Sep 13, 2023
4821b78
Test
bcronin90 Sep 13, 2023
9d27be4
Test
bcronin90 Sep 13, 2023
018a824
Test
bcronin90 Sep 13, 2023
291cfd0
Test
bcronin90 Sep 13, 2023
33e78ce
Remove trigger
bcronin90 Sep 13, 2023
6a8611f
Revert helm doc file
bcronin90 Sep 14, 2023
c95adb8
Revert helm doc files
bcronin90 Sep 18, 2023
2df74fc
Add markdownlint rules
bcronin90 Sep 18, 2023
51d690e
Correct markdown errors
bcronin90 Sep 18, 2023
c6fb391
Correct markdown errors
bcronin90 Sep 18, 2023
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
68 changes: 68 additions & 0 deletions .github/workflows/publish-docusaurus.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#
# Copyright (c) 2023 Mercedes Benz Tech Innovation GmbH
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

---
name: "Publish docusaurus documentation"

on:
workflow_dispatch:
inputs:
downstream-version:
required: false
type: string
workflow_call:
inputs:
downstream-version:
required: false
type: string

jobs:
publish-docusaurus:
permissions:
contents: write
packages: write
name: "Publish docusaurus documentation as zip file"
runs-on: ubuntu-latest
env:
SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}
SWAGGERHUB_USER: ${{ secrets.SWAGGERHUB_USER }}
steps:
- uses: actions/checkout@v3

- name: "Extract version"
id: extract_version
run: |
if [ -z ${{ inputs.downstream-version }} ]; then
echo "DOWNSTREAM_VERSION=$(grep "version" gradle.properties | awk -F= '{print $2}')" >> "$GITHUB_OUTPUT"
else
echo "DOWNSTREAM_VERSION=${{ inputs.downstream-version }}" >> "$GITHUB_OUTPUT"
fi

- name: "Gather documentation files"
run: |
chmod +x ./resources/create_kit_documentation.sh
./resources/create_kit_documentation.sh ${{ runner.temp }} $(pwd) ${{ steps.extract_version.outputs.DOWNSTREAM_VERSION }}

- name: Publish zip to GitHub Release
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{ runner.temp }}/tractusx-edc-docusaurus-${{ steps.extract_version.outputs.DOWNSTREAM_VERSION }}.zip
tag: ${{ steps.extract_version.outputs.DOWNSTREAM_VERSION }}
11 changes: 11 additions & 0 deletions .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,3 +249,14 @@ jobs:
with:
downstream-version: ${{ needs.release-version.outputs.RELEASE_VERSION }}
secrets: inherit

publish-docusaurus:
name: Publish docusaurus docs
permissions:
contents: write
packages: write
needs: [ secret-presence, publish-to-swaggerhub, github-release ]
with:
downstream-version: ${{ needs.release-version.outputs.RELEASE_VERSION }}
uses: ./.github/workflows/publish-docusaurus.yaml
secrets: inherit
9 changes: 8 additions & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,11 @@ jobs:
needs: [ secret-presence ]
if: needs.secret-presence.outputs.HAS_SWAGGER
uses: ./.github/workflows/publish-swaggerhub.yaml
secrets: inherit

publish-docusaurus:
name: Publish docusaurus docs
permissions:
contents: read
needs: [ secret-presence, publish-to-swaggerhub ]
if: needs.secret-presence.outputs.HAS_SWAGGER
uses: ./.github/workflows/publish-docusaurus.yaml
11 changes: 10 additions & 1 deletion .markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand All @@ -19,7 +21,14 @@
"default": true
# Do not restrict line length: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD013
"MD013": false
"MD034":
# Do not restrict inline HTML: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD033
"MD033": false
# Allow same content on headlines on siblings: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD024
"MD024":
"siblings_only": true
"MD032": false
# Allow lists without empty lines around them: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD032
# Necessary for Helm docs
"MD004": false
# Allow for more unordered lists: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD004
# Necessary for Helm docs
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ This Code applies within all Project, Working Group, and Interest Group spaces a

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Conduct Committee via [email protected]. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Without the explicit consent of the reporter, the Conduct Committee is obligated to maintain confidentiality with regard to the reporter of an incident. The Conduct Committee is further obligated to ensure that the respondent is provided with sufficient information about the complaint to reply. If such details cannot be provided while maintaining confidentiality, the Conduct Committee will take the respondent‘s inability to provide a defense into account in its deliberations and decisions. Further details of enforcement guidelines may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Conduct Committee via <[email protected]>. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Without the explicit consent of the reporter, the Conduct Committee is obligated to maintain confidentiality with regard to the reporter of an incident. The Conduct Committee is further obligated to ensure that the respondent is provided with sufficient information about the complaint to reply. If such details cannot be provided while maintaining confidentiality, the Conduct Committee will take the respondent‘s inability to provide a defense into account in its deliberations and decisions. Further details of enforcement guidelines may be posted separately.

Staff, Committers and Project Leads have the right to report, remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code, or to block temporarily or permanently any Contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. Any such actions will be reported to the Conduct Committee for transparency and record keeping.

Expand Down
2 changes: 1 addition & 1 deletion core/edr-core/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# EDR core extension
# EDR Core Extension

This extension provide a base implementation of `EdrManager` and `EdrService` both
required for interacting with the EDR APIs and state machine
Expand Down
6 changes: 0 additions & 6 deletions docs/development/Release.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,5 @@ The Eclipse Bot is able to approve dependencies automatically, if the license ca
from maven central.
2. Create the Eclipse IP Issues or ask an Eclipse Commiter to do this for you.

## 4. Update OpenAPI docs

As part of the [kits documentation provided for docusaurus](../kit/development-view/page00_development_view.md) we provide an OpenAPI reference.
This refers to the [EDC API](https://github.com/eclipse-edc/Connector/tree/main/resources/openapi) and needs to be updated to the current release.
The yaml files found there are then converted with the [docusaurus openapi plugin](https://www.npmjs.com/package/docusaurus-plugin-openapi-docs).

[maven-shield]: https://img.shields.io/badge/Apache%20Maven-URL-blue
[maven-url]: https://maven.apache.org
2 changes: 0 additions & 2 deletions docs/development/postman/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,5 @@ The postman collection contains the most common API calls. Please note that the
- Policy & Negotiation calls come in pairs for the different kinds of policies
- the 'Data' call only works when using the All-In-One Deployment of this repository

![screenshot](./images/screenshot.png)

[postman-shield]: https://img.shields.io/badge/Postman-URL-orange
[postman-url]: https://www.postman.com
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
---
id: Adoption View
title: Adoption View
description: 'Connector Kit'
sidebar_position: 1
---
# Adoption View

The ConnectorKit provides a connector framework, based on the [Eclipse Dataspace Connector][edc-url] for sovereign, cross-enterprise data exchange.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
---
id: Domain Model
title: Domain Model
description: 'Connector Kit'
sidebar_position: 2
---
# Domain Model

![domain-model](images/domain-model.png)

Expand Down
3 changes: 3 additions & 0 deletions docs/kit/Development View/02_OpenAPI/00_open_api.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# OpenAPI

The following is an automatically generated OpenAPI spec for the TractusX EDC.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# EDC Extensions
# EDC Extensions Overview

The following extensions provide additional functionality to the core EDC.
They are currently only available in Tractus-X EDC.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## API Spec

The API spec of the EDC is constantly evolving.
The full API documentation for each release can be viewed on [management-api](../development-view/openAPI/management-api/management-api.info.mdx).
The full API documentation for each release can be viewed on [management-api](../Development View/02_OpenAPI/management-api/management-api.info.mdx).
The following are some example API calls for common use cases.
They assume the default parameters from the previous local setup.

Expand Down
24 changes: 0 additions & 24 deletions docs/kit/development-view/page00_development_view.md

This file was deleted.

35 changes: 0 additions & 35 deletions docs/kit/development-view/page01_eclipse_foundation.md

This file was deleted.

22 changes: 0 additions & 22 deletions docs/kit/operation-view/page06_kubernetes_setup.md

This file was deleted.

4 changes: 2 additions & 2 deletions docs/migration/Version_0.4.x_0.5.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ out [this documentation](https://github.com/eclipse-tractusx/tractusx-edc/blob/m

If you are using the MIW and KeyCloak instances deployed to `INT`, the following values apply:

- MIW Url: https://managed-identity-wallets-new.int.demo.catena-x.net
- KeyCloak Token URL: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token
- MIW Url: <https://managed-identity-wallets-new.int.demo.catena-x.net>
- KeyCloak Token URL: <https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token>
- Authority BPN: `BPNL00000003CRHK`

> Please be aware that the above values are *only* valid for the Catena-X INT environment and *will* change on other
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

An EDC Control Plane using memory-based storage, and HashiCorp Vault as secret store.

DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-memory-hashicorp-vault
DockerHub: <https://hub.docker.com/r/tractusx/edc-controlplane-memory-hashicorp-vault>

Eclipse Tractus-X product(s) installed within the image:

## Tractus-X-EDC Control Plane

- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
- Project home: https://projects.eclipse.org/projects/automotive.tractusx
- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
- GitHub: <https://github.com/eclipse-tractusx/tractusx-edc>
- Project home: <https://projects.eclipse.org/projects/automotive.tractusx>
- Dockerfile: <https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile>
- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)

## Used base image

- [eclipse-temurin:17.0.8_7-jre-alpine](https://github.com/adoptium/containers)
- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
- Official Eclipse Temurin DockerHub page: <https://hub.docker.com/_/eclipse-temurin>
- Eclipse Temurin Project: <https://projects.eclipse.org/projects/adoptium.temurin>
- Additional information about the Eclipse Temurin
images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
images: <https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin>

As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# EDC Control-Plane backed by [Postgresql](https://www.postgresql.org/)
# EDC Control-Plane PostgreSQL & Azure Key Vault

This verison of the EDC Control-Plane is backed by [PostgreSQL](https://www.postgresql.org/) and [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview).

## Building

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

An EDC Control Plane using PostgreSQL as persistence backend, and Azure KeyVault as secret store.

DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql-azure-vault
DockerHub: <https://hub.docker.com/r/tractusx/edc-controlplane-postgresql-azure-vault>

Eclipse Tractus-X product(s) installed within the image:

## Tractus-X EDC Control Plane

- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
- Project home: https://projects.eclipse.org/projects/automotive.tractusx
- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
- GitHub: <https://github.com/eclipse-tractusx/tractusx-edc>
- Project home: <https://projects.eclipse.org/projects/automotive.tractusx>
- Dockerfile: <https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile>
- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)

## Used base image

- [eclipse-temurin:17.0.8_7-jre-alpine](https://github.com/adoptium/containers)
- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
- Official Eclipse Temurin DockerHub page: <https://hub.docker.com/_/eclipse-temurin>
- Eclipse Temurin Project: <https://projects.eclipse.org/projects/adoptium.temurin>
- Additional information about the Eclipse Temurin
images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
images: <https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin>

As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# EDC Control-Plane backed by [Postgresql](https://www.postgresql.org/) and [HashiCorp vault](https://www.vaultproject.io/docs)
# EDC Control-Plane PostgreSQL & Hashicorp Vault

This version of the EDC Control-Plane is backed by [PostgreSQL](https://www.postgresql.org/) and [HashiCorp Vault](https://www.vaultproject.io/docs).

## Building

Expand Down
Loading