docs: add minor docs improvements (#5106)

This commit is contained in:
Marion Schleifer 2020-06-18 12:06:34 +02:00 committed by GitHub
parent 3c76ddf493
commit 268aa46df2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 52 additions and 23 deletions

View File

@ -65,6 +65,21 @@ community [Discord](https://discord.gg/vBPpJkS).
[main contributing guide](../CONTRIBUTING.md#common-guidelines).
- Push the changes to your fork and submit a pull request.
### Changelog
In order for all the checks to pass on Github, it's required to do one of the following:
- Make an entry to the `CHANGELOG.md` file (under "Next release") to describe the change from a user's perspective.
- Add the `no-changelog-required` label.
For docs, a changelog entry is required for the following:
- Entire new docs pages
- Considerable changes in the overall structure
For small changes (such as fixes, adding examples, UI changes etc.), the `no-changelog-required` label will suffice.
## Some guidelines while adding docs
### Header section

View File

@ -31,6 +31,8 @@ Examples:
| | user's data | |
+-----------+-----------------------------------+---------------------------------------+
See :ref:`this page <permission_rules>` on how to configure permission rules.
.. admonition:: Role-based schemas
For every role that you create, Hasura automatically publishes a different GraphQL schema that represents the

View File

@ -143,7 +143,7 @@ The configuration file can be configured with the following config keys:
.. note::
The above structure is for ``config v2`` file which is supported since ``v1.2.0``
The above structure is for the ``config v2`` file which is supported since ``v1.2.0``. Refer to :ref:`this page <migrations_upgrade_v2>` on how to upgrade to ``config v2``.
A ``config v1`` file of your Hasura project would look like:

View File

@ -55,6 +55,8 @@ Step 1: Install the Hasura CLI
Follow the instructions in :ref:`Installing the Hasura CLI <install_hasura_cli>`.
.. _migrations_project_init:
Step 2: Set up a project directory
----------------------------------
@ -74,10 +76,8 @@ Let's set up a project directory by executing the following command:
cd my-project
This will create a new directory called ``my-project`` with a ``config.yaml``
file, a ``migrations`` directory and a ``metadata`` directory. This directory structure is mandatory to use
Hasura migrations.
These directories can be committed to version control.
file, a ``migrations`` directory and a ``metadata`` directory. This directory structure
is mandatory to use Hasura migrations.
.. note::
@ -86,7 +86,25 @@ These directories can be committed to version control.
machine and the CLI will use it. You can also use it as a flag to CLI commands:
``--admin-secret '<your-admin-secret>'``.
.. _migrations_setup_initialize:
Step 2.1: Set up version control for your project directory
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
The project directory created above can be committed to version control.
Set up version control and commit the project status:
.. code-block:: bash
# in project dir
# initialize version control
git init
# commit initial project status
git add .
git commit -m "hasura project init"
.. _migrations_initialize:
Step 3: Initialize the migrations and metadata as per your current state
------------------------------------------------------------------------
@ -143,22 +161,20 @@ This command will export the current Hasura metadata as a bunch of YAML files in
If you'd like to read more about the format of metadata files, check out the :ref:`metadata_format_v2`.
Step 3.3: Set up version control for your project directory
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Step 3.3: Add a checkpoint to version control
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Set up version control and commit the project status.
Commit the current project state to version control:
.. code-block:: bash
# in project dir
# initialize version control
git init
# commit initial project status
git add .
git commit -m "init"
git commit -m "initialize migrations and metadata"
.. note::
The version control set up should typically be done right after :ref:`Step 2 <migrations_project_init>`
Step 4: Use the console from the CLI
------------------------------------
@ -193,8 +209,8 @@ The related metadata changes will automatically be exported into the ``metadata`
Migrations are only created when using the console through the CLI.
Step 6: Squash migrations and add checkpoints
---------------------------------------------
Step 6: Squash migrations and add checkpoints to version control
----------------------------------------------------------------
As you keep using the console via the CLI to make changes to the schema, new
migration files will keep getting generated and the metadata files will keep getting
@ -223,17 +239,13 @@ Commit the project status into version control.
.. code-block:: bash
# initialize version control if not done already
git init
# commit project status
# in project dir
git add .
git commit -m "<feature-name>"
.. note::
The version control set up should typically be done right after :ref:`Step 3 <migrations_setup_initialize>`
The version control set up should typically be done right after :ref:`Step 2 <migrations_project_init>`
Step 7: Apply the migrations and metadata on another instance of the GraphQL engine
-----------------------------------------------------------------------------------