docs: Fix incorrect policy rule in tutorial (#1930)

Fixes #1927 Signed-off-by: Charith Ellawala <charith@cerbos.dev> Signed-off-by: Charith Ellawala <charith@cerbos.dev>
cerbos · Jan 2, 2024 · 4194f6e · 4194f6e
1 parent 73e1971
commit 4194f6e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/.github/actions/antora-docs/action.yaml b/.github/actions/antora-docs/action.yaml
@@ -3,7 +3,7 @@ name: 'antora-docs'
 description: 'Build the docs using Antora'
 runs:
   using: 'docker'
-  image: 'docker://docker.io/antora/antora:3.1.2'
+  image: 'docker://docker.io/antora/antora:3.1.6'
   args:
     - 'antora'
     - '--stacktrace'

diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
@@ -9,7 +9,7 @@ site:
 content:
   sources:
     - url: ./../
-      branches: [HEAD, 'v*']
+      branches: [HEAD, 'v{0..9}*']
       edit_url: 'https://github.com/cerbos/cerbos/tree/main/{path}'
       start_path: docs
     - url: https://github.com/cerbos/cloud-docs.git
@@ -25,7 +25,7 @@ asciidoc:
     experimental: true
     page-pagination: true
   extensions:
-  - ./supplemental-ui/tabs-block/extension.js
+    - ./supplemental-ui/tabs-block/extension.js
 ui:
   bundle:
     url: https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/master/raw/build/ui-bundle.zip?job=bundle-stable

diff --git a/docs/build.sh b/docs/build.sh
@@ -7,7 +7,7 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 SOURCE_DIR=$(cd "${SCRIPT_DIR}/.." && pwd)
 WORKSPACE="/github/workspace"
-ANTORA_VERSION=${ANTORA_VERSION:-"3.1.2"}
+ANTORA_VERSION=${ANTORA_VERSION:-"3.1.6"}
 
 rm -rf "${SCRIPT_DIR}/build"
 docker run -v "$SOURCE_DIR":"${WORKSPACE}/cerbos":Z --rm -t "docker.io/antora/antora:${ANTORA_VERSION}" antora --stacktrace --clean "${WORKSPACE}/cerbos/docs/antora-playbook.yml"
@@ -18,7 +18,7 @@ UNAME=$(uname -s)
 OPEN_CMD=xdg-open
 
 if [[ "$UNAME" == "Darwin" ]]; then
-    OPEN_CMD=open
+	OPEN_CMD=open
 fi
 
 $OPEN_CMD "${SCRIPT_DIR}/build/cerbos/prerelease/index.html"
diff --git a/docs/modules/ROOT/examples/tutorial/03-resource-definition/cerbos/policies/company.yaml b/docs/modules/ROOT/examples/tutorial/03-resource-definition/cerbos/policies/company.yaml
@@ -8,7 +8,6 @@ resourcePolicy:
         - create
         - read
         - update
-        - delete
       effect: EFFECT_ALLOW
       roles:
         - user

diff --git a/docs/modules/ROOT/examples/tutorial/03-resource-definition/cerbos/policies/contact.yaml b/docs/modules/ROOT/examples/tutorial/03-resource-definition/cerbos/policies/contact.yaml
@@ -8,7 +8,6 @@ resourcePolicy:
         - create
         - read
         - update
-        - delete
       effect: EFFECT_ALLOW
       roles:
         - user

diff --git a/hack/scripts/prep-release.sh b/hack/scripts/prep-release.sh
@@ -33,7 +33,7 @@ update_version() {
 
 set_branch() {
 	local BRANCH="$1"
-	sed -i -E "s#branches:.*#branches: [${BRANCH}, 'v*']#g" "${DOCS_DIR}/antora-playbook.yml"
+	sed -i -E "s#branches:.*#branches: [${BRANCH}, 'v{0..9}*']#g" "${DOCS_DIR}/antora-playbook.yml"
 }
 
 # Generate NOTICE.txt