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 2019/11/27 10:46:21 UTC
[flink] branch release-1.9 updated (c1f2294 -> 1663c21)
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a change to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git.
from c1f2294 [FLINK-14817][doc] Fix misleading documentation using method chaining of Configuration (#10323)
new 49cc9fe [FLINK-14930][fs][oss] Fix shading prefix
new 1663c21 [FLINK-14930][fs][oss] Document credential providers
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/ops/filesystems/oss.md | 9 +++++++++
.../java/org/apache/flink/fs/osshadoop/OSSFileSystemFactory.java | 2 +-
.../org/apache/flink/fs/osshadoop/HadoopOSSFileSystemITCase.java | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
[flink] 02/02: [FLINK-14930][fs][oss] Document credential providers
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 1663c21f71c76d6fe16dc4637372f77c20ad1197
Author: Konstantin Knauf <kn...@gmail.com>
AuthorDate: Fri Nov 22 22:00:32 2019 +0100
[FLINK-14930][fs][oss] Document credential providers
---
docs/ops/filesystems/oss.md | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/docs/ops/filesystems/oss.md b/docs/ops/filesystems/oss.md
index e2af733..6b2be11 100644
--- a/docs/ops/filesystems/oss.md
+++ b/docs/ops/filesystems/oss.md
@@ -77,4 +77,13 @@ fs.oss.accessKeyId: Aliyun access key ID
fs.oss.accessKeySecret: Aliyun access key secret
{% endhighlight %}
+An alternative `CredentialsProvider` can also be configured in the `flink-conf.yaml`, e.g.
+{% highlight yaml %}
+# Read Credentials from OSS_ACCESS_KEY_ID and OSS_ACCESS_KEY_SECRET
+fs.oss.credentials.provider: com.aliyun.oss.common.auth.EnvironmentVariableCredentialsProvider
+{% endhighlight %}
+Other credential providers can be found under https://github.com/aliyun/aliyun-oss-java-sdk/tree/master/src/main/java/com/aliyun/oss/common/auth.
+
+
+
{% top %}
[flink] 01/02: [FLINK-14930][fs][oss] Fix shading prefix
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 49cc9fe2e4ce56bcc348c14d17b2f8466caa34be
Author: Konstantin Knauf <kn...@gmail.com>
AuthorDate: Fri Nov 22 21:12:20 2019 +0100
[FLINK-14930][fs][oss] Fix shading prefix
The OSS filesystem only supports OSS credential providers, which use the "com.aliyun" relocation and not the hadoop one.
---
.../main/java/org/apache/flink/fs/osshadoop/OSSFileSystemFactory.java | 2 +-
.../java/org/apache/flink/fs/osshadoop/HadoopOSSFileSystemITCase.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/flink-filesystems/flink-oss-fs-hadoop/src/main/java/org/apache/flink/fs/osshadoop/OSSFileSystemFactory.java b/flink-filesystems/flink-oss-fs-hadoop/src/main/java/org/apache/flink/fs/osshadoop/OSSFileSystemFactory.java
index 52335f5..d18ca97 100644
--- a/flink-filesystems/flink-oss-fs-hadoop/src/main/java/org/apache/flink/fs/osshadoop/OSSFileSystemFactory.java
+++ b/flink-filesystems/flink-oss-fs-hadoop/src/main/java/org/apache/flink/fs/osshadoop/OSSFileSystemFactory.java
@@ -45,7 +45,7 @@ public class OSSFileSystemFactory implements FileSystemFactory {
private static final Set<String> CONFIG_KEYS_TO_SHADE = Collections.singleton("fs.oss.credentials.provider");
- private static final String FLINK_SHADING_PREFIX = "org.apache.flink.fs.shaded.hadoop3.";
+ private static final String FLINK_SHADING_PREFIX = "org.apache.flink.fs.osshadoop.shaded.";
/**
* In order to simplify, we make flink oss configuration keys same with hadoop oss module.
diff --git a/flink-filesystems/flink-oss-fs-hadoop/src/test/java/org/apache/flink/fs/osshadoop/HadoopOSSFileSystemITCase.java b/flink-filesystems/flink-oss-fs-hadoop/src/test/java/org/apache/flink/fs/osshadoop/HadoopOSSFileSystemITCase.java
index 4dd5e34..eaf722a 100644
--- a/flink-filesystems/flink-oss-fs-hadoop/src/test/java/org/apache/flink/fs/osshadoop/HadoopOSSFileSystemITCase.java
+++ b/flink-filesystems/flink-oss-fs-hadoop/src/test/java/org/apache/flink/fs/osshadoop/HadoopOSSFileSystemITCase.java
@@ -66,7 +66,7 @@ public class HadoopOSSFileSystemITCase extends AbstractHadoopFileSystemITTest {
ossfsFactory.configure(conf);
org.apache.hadoop.conf.Configuration configuration = ossfsFactory.getHadoopConfiguration();
// shaded
- assertEquals("org.apache.flink.fs.shaded.hadoop3.org.apache.hadoop.fs.aliyun.oss.AliyunCredentialsProvider",
+ assertEquals("org.apache.flink.fs.osshadoop.shaded.org.apache.hadoop.fs.aliyun.oss.AliyunCredentialsProvider",
configuration.get("fs.oss.credentials.provider"));
// should not shaded
assertEquals(OSSTestCredentials.getOSSEndpoint(), configuration.get("fs.oss.endpoint"));