Merge branch 'main' into DOC-4825

Author: cmilesb

.github/workflows/main-staging.yml

@@ -60,6 +60,7 @@ jobs:
         setBaseUrl
         kubernetes_versions=($(find content/operate/kubernetes/ -maxdepth 1 -type d -regex ".*[0-9-]" | awk -F/ '{print $NF}'))
         rs_versions=($(find content/operate/rs/ -maxdepth 1 -type d -regex ".*[0-9-]" | awk -F/ '{print $NF}'))
+        rdi_versions=($(find content/integrate/redis-data-integration/ -maxdepth 1 -type d -regex ".*[0-9-]" | awk -F/ '{print $NF}'))
 
         # build latest
         for version in "${kubernetes_versions[@]}"; do
@@ -68,6 +69,9 @@ jobs:
         for version in "${rs_versions[@]}"; do
           rm -r "content/operate/rs/${version}"
         done
+        for version in "${rdi_versions[@]}"; do
+          rm -r "content/integrate/redis-data-integration/${version}"
+        done
         make all
 
         git checkout .
@@ -89,7 +93,7 @@ jobs:
           sed -i 's/linkTitle: '"${version}"'/linkTitle: Redis for Kubernetes/' content/operate/kubernetes/_index.md
 
           # inject replace command in meta-links to make sure editURL and issuesURL point to right version
-          sed -i "11i \{\{ \$gh_file = replaceRE \`\^operate\/kubernetes\/\` \"operate\/kubernetes\/$version\/\" \$gh_file }}" layouts/partials/meta-links.html
+          sed -i "12i \{\{ \$gh_file = replaceRE \`\^operate\/kubernetes\/\` \"operate\/kubernetes\/$version\/\" \$gh_file }}" layouts/partials/meta-links.html
 
           hugo -d "kubernetes-${version}"
 
@@ -112,13 +116,36 @@ jobs:
           sed -i 's/linkTitle: '"${version}"'/linkTitle: Redis Software/' content/operate/rs/_index.md
 
           # inject replace command in meta-links to make sure editURL and issuesURL point to right version
-          sed -i "11i \{\{ \$gh_file = replaceRE \`\^operate\/rs\/\` \"operate\/rs\/$version\/\" \$gh_file }}" layouts/partials/meta-links.html
+          sed -i "12i \{\{ \$gh_file = replaceRE \`\^operate\/rs\/\` \"operate\/rs\/$version\/\" \$gh_file }}" layouts/partials/meta-links.html
 
           hugo -d "rs-${version}"
 
           git checkout .
         done
 
+        for version in "${rdi_versions[@]}"; do
+
+          setBaseUrl
+
+          # for each version, remove all other versions before building
+          versions_to_remove=($(echo "${rdi_versions[@]}" "${version}" | tr ' ' '\n' | sort | uniq -u))
+          for version_to_remove in "${versions_to_remove[@]}"; do
+            rm -r "content/integrate/redis-data-integration/${version_to_remove}"
+          done
+
+          cp -r "content/integrate/redis-data-integration/${version}"/* content/integrate/redis-data-integration/
+          rm -r "content/integrate/redis-data-integration/${version}"
+          sed -i 's/id="versionSelectorRedis-Data-IntegrationValue" class="version-selector-control">latest/id="versionSelectorRedis-Data-IntegrationValue" class="version-selector-control">v'"${version}"'/' layouts/partials/docs-nav.html
+          sed -i 's/linkTitle: '"${version}"'/linkTitle: Redis Data Integration/' content/integrate/redis-data-integration/_index.md
+
+          # inject replace command in meta-links to make sure editURL and issuesURL point to right version
+          sed -i "12i \{\{ \$gh_file = replaceRE \`\^integrate\/redis-data-integration\/\` \"integrate\/redis-data-integration\/$version\/\" \$gh_file }}" layouts/partials/meta-links.html
+
+          hugo -d "redis-data-integration-${version}"
+
+          git checkout .
+        done
+
     - name: List client examples
       run: ls "${{ github.workspace }}/examples"
     - name: List files to be published
@@ -152,8 +179,12 @@ jobs:
 
           versioned_builds=($(find . -type d -regex ".*[0-9-]" -maxdepth 1 | sed -E 's/^.\///'))
           for versioned_build in "${versioned_builds[@]}"; do
-            product=$(grep -Eo '[a-zA-Z]+' <<< $versioned_build)
-            gsutil -m rsync -r -c -j html -d "${{ github.workspace }}/${versioned_build}/operate/${product}" "gs://${BUCKET}/${versioned_build}/operate/${product}"
+            product=$(awk 'BEGIN{FS=OFS="-"}{NF--; print}' <<< $versioned_build)
+            if [[ "${product}" == "redis-data-integration" ]]; then
+              gsutil -m rsync -r -c -j html -d "${{ github.workspace }}/${versioned_build}/integrate/${product}" "gs://${BUCKET}/${versioned_build}/integrate/${product}"
+            else
+              gsutil -m rsync -r -c -j html -d "${{ github.workspace }}/${versioned_build}/operate/${product}" "gs://${BUCKET}/${versioned_build}/operate/${product}"
+            fi
           done
 
     - name: End

.github/workflows/main.yml

@@ -60,6 +60,7 @@ jobs:
         setBaseUrl
         kubernetes_versions=($(find content/operate/kubernetes/ -maxdepth 1 -type d -regex ".*[0-9-]" | awk -F/ '{print $NF}'))
         rs_versions=($(find content/operate/rs/ -maxdepth 1 -type d -regex ".*[0-9-]" | awk -F/ '{print $NF}'))
+        rdi_versions=($(find content/integrate/redis-data-integration/ -maxdepth 1 -type d -regex ".*[0-9-]" | awk -F/ '{print $NF}'))
 
         # build latest
         for version in "${kubernetes_versions[@]}"; do
@@ -68,6 +69,9 @@ jobs:
         for version in "${rs_versions[@]}"; do
           rm -r "content/operate/rs/${version}"
         done
+        for version in "${rdi_versions[@]}"; do
+          rm -r "content/integrate/redis-data-integration/${version}"
+        done
         make all
 
         git checkout .
@@ -89,7 +93,7 @@ jobs:
           sed -i 's/linkTitle: '"${version}"'/linkTitle: Redis for Kubernetes/' content/operate/kubernetes/_index.md
 
           # inject replace command in meta-links to make sure editURL and issuesURL point to right version
-          sed -i "11i \{\{ \$gh_file = replaceRE \`\^operate\/kubernetes\/\` \"operate\/kubernetes\/$version\/\" \$gh_file }}" layouts/partials/meta-links.html
+          sed -i "12i \{\{ \$gh_file = replaceRE \`\^operate\/kubernetes\/\` \"operate\/kubernetes\/$version\/\" \$gh_file }}" layouts/partials/meta-links.html
 
           hugo -d "kubernetes-${version}"
 
@@ -112,13 +116,36 @@ jobs:
           sed -i 's/linkTitle: '"${version}"'/linkTitle: Redis Software/' content/operate/rs/_index.md
 
           # inject replace command in meta-links to make sure editURL and issuesURL point to right version
-          sed -i "11i \{\{ \$gh_file = replaceRE \`\^operate\/rs\/\` \"operate\/rs\/$version\/\" \$gh_file }}" layouts/partials/meta-links.html
+          sed -i "12i \{\{ \$gh_file = replaceRE \`\^operate\/rs\/\` \"operate\/rs\/$version\/\" \$gh_file }}" layouts/partials/meta-links.html
 
           hugo -d "rs-${version}"
 
           git checkout .
         done
 
+        for version in "${rdi_versions[@]}"; do
+
+          setBaseUrl
+
+          # for each version, remove all other versions before building
+          versions_to_remove=($(echo "${rdi_versions[@]}" "${version}" | tr ' ' '\n' | sort | uniq -u))
+          for version_to_remove in "${versions_to_remove[@]}"; do
+            rm -r "content/integrate/redis-data-integration/${version_to_remove}"
+          done
+
+          cp -r "content/integrate/redis-data-integration/${version}"/* content/integrate/redis-data-integration/
+          rm -r "content/integrate/redis-data-integration/${version}"
+          sed -i 's/id="versionSelectorRedis-Data-IntegrationValue" class="version-selector-control">latest/id="versionSelectorRedis-Data-IntegrationValue" class="version-selector-control">v'"${version}"'/' layouts/partials/docs-nav.html
+          sed -i 's/linkTitle: '"${version}"'/linkTitle: Redis Data Integration/' content/integrate/redis-data-integration/_index.md
+
+          # inject replace command in meta-links to make sure editURL and issuesURL point to right version
+          sed -i "12i \{\{ \$gh_file = replaceRE \`\^integrate\/redis-data-integration\/\` \"integrate\/redis-data-integration\/$version\/\" \$gh_file }}" layouts/partials/meta-links.html
+
+          hugo -d "redis-data-integration-${version}"
+
+          git checkout .
+        done
+
     - name: List client examples
       run: ls "${{ github.workspace }}/examples"
     - name: List files to be published
@@ -154,17 +181,25 @@ jobs:
           then
             versioned_builds=($(find . -type d -regex ".*[0-9-]" -maxdepth 1 | sed -E 's/^.\///'))
             for versioned_build in "${versioned_builds[@]}"; do
-              product=$(grep -Eo '[a-zA-Z]+' <<< $versioned_build)
-              gsutil -m rsync -r -c -j html -d "${{ github.workspace }}/${versioned_build}/operate/${product}" "gs://${BUCKET}/${versioned_build}/operate/${product}"
+              product=$(awk 'BEGIN{FS=OFS="-"}{NF--; print}' <<< $versioned_build)
+              if [[ "${product}" == "redis-data-integration" ]]; then
+                gsutil -m rsync -r -c -j html -d "${{ github.workspace }}/${versioned_build}/integrate/${product}" "gs://${BUCKET}/${versioned_build}/integrate/${product}"
+              else
+                gsutil -m rsync -r -c -j html -d "${{ github.workspace }}/${versioned_build}/operate/${product}" "gs://${BUCKET}/${versioned_build}/operate/${product}"
+              fi
             done
           fi
 
           if [[ "$bucket_path" == staging/* ]]
           then
             versioned_builds=($(find . -type d -regex ".*[0-9-]" -maxdepth 1 | sed -E 's/^.\///'))
             for versioned_build in "${versioned_builds[@]}"; do
-              product=$(grep -Eo '[a-zA-Z]+' <<< $versioned_build)
-              gsutil -m rsync -r -c -j html -d "${{ github.workspace }}/${versioned_build}/operate/${product}" "gs://${BUCKET}/${bucket_path}/${versioned_build}/operate/${product}"
+              product=$(awk 'BEGIN{FS=OFS="-"}{NF--; print}' <<< $versioned_build)
+              if [[ "${product}" == "redis-data-integration" ]]; then
+                gsutil -m rsync -r -c -j html -d "${{ github.workspace }}/${versioned_build}/integrate/${product}" "gs://${BUCKET}/${bucket_path}/${versioned_build}/integrate/${product}"
+              else
+                gsutil -m rsync -r -c -j html -d "${{ github.workspace }}/${versioned_build}/operate/${product}" "gs://${BUCKET}/${bucket_path}/${versioned_build}/operate/${product}"
+              fi
             done
           fi
 

assets/css/index.css

@@ -102,6 +102,11 @@ select {
   @apply relative block text-redis-pen-600 hover:text-redis-pen-300 -my-0.5 py-1 pl-6 transition-colors leading-6;
 }
 
+/* Increase indentation for deeper nested items */
+#TableOfContents ul ul a {
+  @apply pl-10; /* Second level */
+}
+
 #TableOfContents a:before {
   content: '';
   @apply w-1 h-full bg-redis-pencil-250 absolute left-0 top-0 rounded-sm transition;

config.toml

@@ -55,7 +55,7 @@ rdi_redis_gears_version = "1.2.6"
 rdi_debezium_server_version = "2.3.0.Final"
 rdi_db_types = "cassandra|mysql|oracle|postgresql|sqlserver"
 rdi_cli_latest = "latest"
-rdi_current_version = "v1.6.0"
+rdi_current_version = "v1.6.1"
 
 [params.clientsConfig]
 "Python"={quickstartSlug="redis-py"}

content/commands/acl-setuser/index.md

@@ -131,7 +131,7 @@ This is a list of all the supported Redis ACL rules:
 * `#<hashedpassword>`: Adds the specified hashed password to the list of user passwords. A Redis hashed password is hashed with SHA256 and translated into a hexadecimal string. Example: `#c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2`.
 * `<password`: Like `>password` but removes the password instead of adding it.
 * `!<hashedpassword>`: Like `#<hashedpassword>` but removes the password instead of adding it.
-* `(<rule list>)`: (Available in Redis 7.0 and later) Creates a new selector to match rules against. Selectors are evaluated after the user permissions, and are evaluated according to the order they are defined. If a command matches either the user permissions or any selector, it is allowed. See [selectors]({{< baseurl >}}/operate/oss_and_stack/management/security/acl#selectors) for more information.
+* `(<rule list>)`: (Available in Redis 7.0 and later) Creates a new selector to match rules against. Selectors are evaluated after the user permissions, and are evaluated according to the order they are defined. If a command matches either the user permissions or any selector, it is allowed. See [selectors]({{< baseurl >}}operate/oss_and_stack/management/security/acl#selectors) for more information.
 * `clearselectors`: (Available in Redis 7.0 and later) Deletes all of the selectors attached to the user.
 * `reset`: Removes any capability from the user. They are set to off, without passwords, unable to execute any command, unable to access any key.
 

content/commands/bf.add/index.md

@@ -29,15 +29,15 @@ title: BF.ADD
 ---
 Adds an item to a Bloom filter.
 
-This command is similar to [`BF.MADD`]({{< baseurl >}}/commands/bf.madd/), except that only one item can be added.
+This command is similar to [`BF.MADD`]({{< baseurl >}}commands/bf.madd/), except that only one item can be added.
 
 ## Required arguments
 
 <details open><summary><code>key</code></summary>
 
 is key name for a Bloom filter to add the item to.
 
-If `key` does not exist - a new Bloom filter is created with default error rate, capacity, and expansion (see [`BF.RESERVE`]({{< baseurl >}}/commands/bf.reserve/)).
+If `key` does not exist - a new Bloom filter is created with default error rate, capacity, and expansion (see [`BF.RESERVE`]({{< baseurl >}}commands/bf.reserve/)).
 </details>
 
 <details open><summary><code>item</code></summary>

content/commands/bf.exists/index.md

@@ -29,7 +29,7 @@ title: BF.EXISTS
 ---
 Determines whether a given item was added to a Bloom filter.
 
-This command is similar to [`BF.MEXISTS`]({{< baseurl >}}/commands/bf.mexists/), except that only one item can be checked.
+This command is similar to [`BF.MEXISTS`]({{< baseurl >}}commands/bf.mexists/), except that only one item can be checked.
 
 ## Required arguments
 

content/commands/bf.insert/index.md

@@ -58,7 +58,7 @@ title: BF.INSERT
 ---
 Creates a new Bloom filter if the `key` does not exist using the specified error rate, capacity, and expansion, then adds all specified items to the Bloom Filter.
 
-This command is similar to [`BF.MADD`]({{< baseurl >}}/commands/bf.madd/), except that the error rate, capacity, and expansion can be specified. It is a sugarcoated combination of [`BF.RESERVE`]({{< baseurl >}}/commands/bf.reserve/) and [`BF.MADD`]({{< baseurl >}}/commands/bf.madd/).
+This command is similar to [`BF.MADD`]({{< baseurl >}}commands/bf.madd/), except that the error rate, capacity, and expansion can be specified. It is a sugarcoated combination of [`BF.RESERVE`]({{< baseurl >}}commands/bf.reserve/) and [`BF.MADD`]({{< baseurl >}}commands/bf.madd/).
 
 ## Required arguments
 
@@ -89,14 +89,14 @@ It is an error to specify `NOCREATE` together with either `CAPACITY` or `ERROR`.
 Specifies the desired `capacity` for the filter to be created.
 This parameter is ignored if the filter already exists.
 If the filter is automatically created and this parameter is absent, then the module-level `capacity` is used.
-See [`BF.RESERVE`]({{< baseurl >}}/commands/bf.reserve/) for more information about the impact of this value.
+See [`BF.RESERVE`]({{< baseurl >}}commands/bf.reserve/) for more information about the impact of this value.
 </details>
 
 <details open><summary><code>ERROR error</code></summary>
 
 Specifies the `error` ratio of the newly created filter if it does not yet exist.
 If the filter is automatically created and `error` is not specified then the module-level error rate is used.
-See [`BF.RESERVE`]({{< baseurl >}}/commands/bf.reserve/) for more information about the format of this value.
+See [`BF.RESERVE`]({{< baseurl >}}commands/bf.reserve/) for more information about the format of this value.
 </details>
 
 <details open><summary><code>NONSCALING</code></summary>

content/commands/bf.loadchunk/index.md

@@ -29,9 +29,9 @@ syntax_fmt: BF.LOADCHUNK key iterator data
 syntax_str: iterator data
 title: BF.LOADCHUNK
 ---
-Restores a Bloom filter previously saved using [`BF.SCANDUMP`]({{< baseurl >}}/commands/bf.scandump/).
+Restores a Bloom filter previously saved using [`BF.SCANDUMP`]({{< baseurl >}}commands/bf.scandump/).
 
-See the [`BF.SCANDUMP`]({{< baseurl >}}/commands/bf.scandump/) command for example usage.
+See the [`BF.SCANDUMP`]({{< baseurl >}}commands/bf.scandump/) command for example usage.
 
 <note><b>Notes</b>
 
@@ -49,12 +49,12 @@ is key name for a Bloom filter to restore.
 
 <details open><summary><code>iterator</code></summary>
 
-Iterator value associated with `data` (returned by [`BF.SCANDUMP`]({{< baseurl >}}/commands/bf.scandump/))
+Iterator value associated with `data` (returned by [`BF.SCANDUMP`]({{< baseurl >}}commands/bf.scandump/))
 </details>
 
 <details open><summary><code>data</code></summary>
 
-Current data chunk (returned by [`BF.SCANDUMP`]({{< baseurl >}}/commands/bf.scandump/))
+Current data chunk (returned by [`BF.SCANDUMP`]({{< baseurl >}}commands/bf.scandump/))
 </details>
 
 ## Return value
@@ -66,4 +66,4 @@ Returns one of these replies:
 
 ## Examples
 
-See [`BF.SCANDUMP`]({{< baseurl >}}/commands/bf.scandump/) for an example.
+See [`BF.SCANDUMP`]({{< baseurl >}}commands/bf.scandump/) for an example.

content/commands/bf.madd/index.md

@@ -33,17 +33,17 @@ title: BF.MADD
 ---
 Adds one or more items to a Bloom filter.
 
-This command is similar to [`BF.ADD`]({{< baseurl >}}/commands/bf.add/), except that you can add more than one item.
+This command is similar to [`BF.ADD`]({{< baseurl >}}commands/bf.add/), except that you can add more than one item.
 
-This command is similar to [`BF.INSERT`]({{< baseurl >}}/commands/bf.insert/), except that the error rate, capacity, and expansion cannot be specified.
+This command is similar to [`BF.INSERT`]({{< baseurl >}}commands/bf.insert/), except that the error rate, capacity, and expansion cannot be specified.
 
 ## Required arguments
 
 <details open><summary><code>key</code></summary>
 
 is key name for a Bloom filter to add the items to.
 
-If `key` does not exist - a new Bloom filter is created with default error rate, capacity, and expansion (see [`BF.RESERVE`]({{< baseurl >}}/commands/bf.reserve/)).
+If `key` does not exist - a new Bloom filter is created with default error rate, capacity, and expansion (see [`BF.RESERVE`]({{< baseurl >}}commands/bf.reserve/)).
 </details>
 
 <details open><summary><code>item...</code></summary>