From 1c6824cd43b369e973d27618fba8bd7df0c413ff Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 22 Apr 2024 16:45:45 +0200 Subject: [PATCH 1/3] main view updated and README include now steps to change documentation --- README.md | 129 ++++++++++++++++++++++++--------------------------- doc/index.md | 24 +++++++++- 2 files changed, 83 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index c44afa1..2dd929d 100644 --- a/README.md +++ b/README.md @@ -1,92 +1,83 @@ -# documentation +# Documentation +This respository contains the documentation of OpenCAPIF. +## How it works? -## Getting started +There are 2 ways to upgrade documentation published on [OCF Documentation]: +* Push any change on **develop** branch will force update of **develop** version on [OCF Documentation]. +* Create a tag, this will create a version with tag name on [OCF Documentation]. -To make it easy for you to get started with GitLab, here's a list of recommended next steps. +## Repository Branches -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! +This documentation repository has 2 protected branches: -## Add your files +* **main** + * This branch will store the information stable. +* **develop** + * Any change uploaded on this branch will upgrade **develop** version on documentation published on [OCF Documentation] -- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: +## What should be the flow to add documentation during development -``` -cd existing_repo -git remote add origin https://labs.etsi.org/rep/ocf/documentation.git -git branch -M main -git push -uf origin main -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](https://labs.etsi.org/rep/ocf/documentation/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html) +The steps to upgrade documentation are: +1. Perform the development of functionality on capif code respository. +2. Create an issue on [Documentation Gitlab](https://labs.etsi.org/rep/ocf/documentation/-/issues) +3. Create new branch with source from **develop**. +4. Update documentation. +5. Check if all new documentation is ok using **mike** [Checking documentation with local deployment](#checking-documentation-with-local-deployment) section. +6. Push changes to branch. +7. Create Merge Request. +8. Send Merge Request to one TSC Member to approve it. -*** +## Release new version of documentation -# Editing this README +When **OpenCAPIF** code repository is ready to share a new release we need to follow next steps by a **TSC Member**: +1. Create a new branch with released version, and merge it to **develop**. +2. Create a Merge request from **develop** to **main**. +3. When develop is merged to **main**, then we need to **create a tag with released version.** -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template. -## Suggestions for a good README -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. +## Checking documentation with local deployment -## Name -Choose a self-explaining name for your project. +The easy way to check if documentation will be generated properly is check locally with [mike utility](https://github.com/jimporter/mike). -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. +## Requirements -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. +1. You will need python or any python virtual environment installed on your computer with **pip**. +2. Install mike and mkdocs-material: +``` +pip install -q mkdocs-material mike +``` +3. Run mike development server: +``` +mike deploy version1; mike serve +``` +4. Use any web browser to reach http://localhost:8000/version1/ -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. +> **To see changes on documentation you will need to restart mike server** -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. +## What is the documentation structure -## Contributing -State if you are open to contributions and what your requirements are for accepting them. +At mkdocs.yml you will have the navigation structure of documentation, there you can sections with sub-sections. after semicolon you can place the markdown to use on it. For example: +``` +nav: + - Overview: + - Introduction: index.md + - Getting Started: + - How to Run: ./gettingstarted/howtorun.md + - Testing: + - Test Plan: ./testing/testplan/README.md + - Robot Framework: ./testing/robotframework/README.md + - Postman: ./testing/postman/README.md + - FAQ: ./FAQ.md +``` -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. +## Main page -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. +The page shown on firt view is at doc/index.md. -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. +That page should be updated with latest changes on CAPIF, also including the version. -## License -For open source projects, say how it is licensed. -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. +[OCF Web]: https://ocf.etsi.org/ "OCF Web" +[OCF Documentation]: https://ocf.etsi.org/documentation/ "OCF Documentation" \ No newline at end of file diff --git a/doc/index.md b/doc/index.md index d7f5ddb..807b265 100644 --- a/doc/index.md +++ b/doc/index.md @@ -1,5 +1,26 @@ drawing +# Release X.X.X-rc + +This release includes next changes: +- New register flow to ensure: + - isolation between CCF and Register services. + - Improve security, with split resposability between administrator operations and common user. +- Improved Testing with Robot in order to cover: + - New Register flows. + - Allow different URLs for register, ccf and vault services. +- Improved security on DB: + - Credentials requested to access mongo databases. + - Credentials requested also by mongo-express. +- Scripts upgraded: + - docker compose version 2 used on them. + - New cleaning script developed. +- Cleanup of capif repository: + - Documentation is now on splitted repository [OCF Documentation Repository] + - Test plan was moved to [OCF Documentation Repository] + - Some obsolote data is removed. + + # Release 0.0 The APIs included in Release 0.0 are: @@ -133,4 +154,5 @@ Frequently asked questions can be found here: [FAQ Section] [Open API Descriptions of 3GPP 5G APIs]: https://forge.3gpp.org/rep/all/5G_APIs "Open API Descriptions of 3GPP 5G APIs" [OpenCAPIF Repository]: https://labs.etsi.org/rep/ocf/capif "OpenCAPIF Repository" -[POSTMAN Section]: ./testing/postman/README.md "POSTMAN Section" \ No newline at end of file +[POSTMAN Section]: ./testing/postman/README.md "POSTMAN Section" +[OCF Documentation Repository]: https://labs.etsi.org/rep/ocf/documentation "OCF Documentation Repository" \ No newline at end of file -- GitLab From 7df83206a080287be3be1b957dee22569a5c5862 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 22 Apr 2024 16:49:45 +0200 Subject: [PATCH 2/3] Adding a REMEMBER to update also highlights of new version if it's needed --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2dd929d..1318d1b 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The steps to upgrade documentation are: 1. Perform the development of functionality on capif code respository. 2. Create an issue on [Documentation Gitlab](https://labs.etsi.org/rep/ocf/documentation/-/issues) 3. Create new branch with source from **develop**. -4. Update documentation. +4. Update documentation. ***Remember to update index.md with new functionalities for latest version*** 5. Check if all new documentation is ok using **mike** [Checking documentation with local deployment](#checking-documentation-with-local-deployment) section. 6. Push changes to branch. 7. Create Merge Request. -- GitLab From 0003132f07178d6761286c7ac0c8539a1fcb62f6 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 22 Apr 2024 17:06:14 +0200 Subject: [PATCH 3/3] Adding some information of documenation structure --- README.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1318d1b..cf33d8b 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,9 @@ The steps to upgrade documentation are: 1. Perform the development of functionality on capif code respository. 2. Create an issue on [Documentation Gitlab](https://labs.etsi.org/rep/ocf/documentation/-/issues) 3. Create new branch with source from **develop**. -4. Update documentation. ***Remember to update index.md with new functionalities for latest version*** +4. Update documentation: + 1. ***Remember to update index.md with new functionalities for latest version*** + 2. New testplan is defined? **Update test plan documentation** 5. Check if all new documentation is ok using **mike** [Checking documentation with local deployment](#checking-documentation-with-local-deployment) section. 6. Push changes to branch. 7. Create Merge Request. @@ -72,9 +74,18 @@ nav: - FAQ: ./FAQ.md ``` +As you can see we have 4 main sections: +* Overview: + * Here we must place high level information like, version changelog, some inital scripts, ... +* Getting Started: + * This section must contain a simple way to start working with project. +* Testing: + * Detailed information of **how to test** OpenCAPIF, and test plan developed to ensure the code has all implemented functionallity checked. +* FAQ + ## Main page -The page shown on firt view is at doc/index.md. +The page shown on first view is at **doc/index.md** That page should be updated with latest changes on CAPIF, also including the version. -- GitLab