You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2023/01/19 16:15:24 UTC
[flink] branch master updated (2698078ea47 -> 7f7b030d72f)
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
from 2698078ea47 [FLINK-30749][security][docs] Fix delegation token provider enabled flag key
new 8d5cfe60335 [FLINK-30378][docs] Load data/ directory from externalized connector docs
new 7f7b030d72f [FLINK-30378][docs] Load sql connector data from any data file
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/config.toml | 3 +++
docs/layouts/shortcodes/sql_connector_download_table.html | 14 +++++++-------
docs/setup_docs.sh | 11 ++---------
3 files changed, 12 insertions(+), 16 deletions(-)
[flink] 01/02: [FLINK-30378][docs] Load data/ directory from externalized connector docs
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 8d5cfe60335f655f7196a0e744d7bbbf8f10ca8a
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Mon Dec 12 13:10:16 2022 +0100
[FLINK-30378][docs] Load data/ directory from externalized connector docs
---
docs/config.toml | 3 +++
docs/setup_docs.sh | 11 ++---------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/docs/config.toml b/docs/config.toml
index d72d9322fba..2e9057d4a2b 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -124,3 +124,6 @@ pygmentsUseClasses = true
[[module.imports.mounts]]
source = 'layouts'
target = 'layouts'
+[[module.imports.mounts]]
+ source = 'data'
+ target = 'data'
diff --git a/docs/setup_docs.sh b/docs/setup_docs.sh
index b0c48ba6883..0a75d0fdf17 100755
--- a/docs/setup_docs.sh
+++ b/docs/setup_docs.sh
@@ -27,19 +27,12 @@ function integrate_connector_docs {
local connector ref additional_folders
connector=$1
ref=$2
- additional_folders=( "${@:3}" )
git clone --single-branch --branch ${ref} https://github.com/apache/flink-connector-${connector}
theme_dir="../themes/connectors"
mkdir -p "${theme_dir}"
- for rsync_folder_subpath in "docs/content" "docs/content.zh" "${additional_folders[@]}"; do
- local rsync_source_path="flink-connector-${connector}/${rsync_folder_subpath}"
-
- if [ -e "${rsync_source_path}" ]; then
- rsync -a "flink-connector-${connector}/${rsync_folder_subpath}" "${theme_dir}/"
- fi
- done
+ rsync -a flink-connector-${connector}/docs/* "${theme_dir}/"
}
@@ -53,7 +46,7 @@ cd tmp
integrate_connector_docs elasticsearch v3.0.0
integrate_connector_docs aws v4.0
integrate_connector_docs cassandra v3.0.0
-integrate_connector_docs pulsar main "docs/layouts"
+integrate_connector_docs pulsar main
integrate_connector_docs jdbc v3.0.0
integrate_connector_docs rabbitmq v3.0.0
[flink] 02/02: [FLINK-30378][docs] Load sql connector data from any data file
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 7f7b030d72f5f824254d83572092a34891ceff8d
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Mon Dec 12 13:10:55 2022 +0100
[FLINK-30378][docs] Load sql connector data from any data file
---
docs/layouts/shortcodes/sql_connector_download_table.html | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/layouts/shortcodes/sql_connector_download_table.html b/docs/layouts/shortcodes/sql_connector_download_table.html
index 22c058edbf4..17e96f479ca 100644
--- a/docs/layouts/shortcodes/sql_connector_download_table.html
+++ b/docs/layouts/shortcodes/sql_connector_download_table.html
@@ -21,10 +21,11 @@
IMPORTANT: the whitespace is relevant. Do not change without looking at the
rendered documentation.
*/}}
- {{ $artifactId := .Get 0 }}
- {{ $version := .Get 1 }}
- {{ $connectors := .Site.Data.sql_connectors }}
- {{ $connector := index $connectors $artifactId }}
+ {{ $name := .Get 0 }}
+ {{ $connector_version := .Get 1 }}
+ {{ $connector := index .Site.Data $name }}
+ {{ $flink_version := .Site.Params.VersionTitle }}
+ {{ $full_version := printf "%s-%s" $connector_version $flink_version }}
{{ $path := .Page.Path }}
@@ -37,14 +38,14 @@
<th style="text-align:left">SQL Client</th>
</thead>
<tbody>
- {{ range $connector.versions }}
+ {{ range $connector.variants }}
<tr>
<td style="text-align: left">
<div id="{{ $hash }}" onclick="selectTextAndCopy('{{ $hash }}')"class="highlight">
<pre class="chroma"><code class="language-xml" data-lang="xml"><span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.flink<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>{{- .maven -}}<span class="nt"></artifactId></span>
- <span class="nt"><version></span>{{- .version -}}-{{- site.Params.VersionTitle -}}<span class="nt"></version></span>
+ <span class="nt"><version></span>{{- $full_version -}}<span class="nt"></version></span>
<span class="nt"></dependency></span></code></pre></div>
<div class="book-hint info" style="text-align:center;display:none" copyable="flink-module" copyattribute="{{ $hash }}">
Copied to clipboard!
@@ -62,4 +63,3 @@
{{ end }}
-
\ No newline at end of file