You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/03/01 10:23:01 UTC
[camel] 06/07: CAMEL-16274 - Camel-google-storage:
serviceAccountKey should be supported as file, classpath, remote etc.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ca8b137f92d29bd7d0b2fdcc042ab2bf948af472
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 1 09:37:51 2021 +0100
CAMEL-16274 - Camel-google-storage: serviceAccountKey should be supported as file, classpath, remote etc.
---
.../camel/catalog/docs/google-storage-component.adoc | 4 ++--
.../camel/component/google/storage/google-storage.json | 4 ++--
.../src/main/docs/google-storage-component.adoc | 4 ++--
.../storage/GoogleCloudStorageConfiguration.java | 4 +++-
.../dsl/GoogleStorageComponentBuilderFactory.java | 6 ++++--
.../dsl/GoogleCloudStorageEndpointBuilderFactory.java | 18 ++++++++++++------
.../modules/ROOT/pages/google-storage-component.adoc | 4 ++--
7 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-storage-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-storage-component.adoc
index ee5dec8..c1064cb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-storage-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-storage-component.adoc
@@ -87,7 +87,7 @@ The Google Storage component supports 16 options, which are listed below.
| Name | Description | Default | Type
| *autoCreateBucket* (common) | Setting the autocreation of the bucket bucketName. | true | boolean
| *configuration* (common) | The component configuration | | GoogleCloudStorageConfiguration
-| *serviceAccountKey* (common) | Service account key to authenticate an application as a service account | | String
+| *serviceAccountKey* (common) | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *storageClass* (common) | The Cloud Storage class to use when creating the new buckets | STANDARD | StorageClass
| *storageClient* (common) | *Autowired* The storage client | | Storage
| *storageLocation* (common) | The Cloud Storage location to use when creating the new buckets | US-EAST1 | String
@@ -130,7 +130,7 @@ with the following path and query parameters:
|===
| Name | Description | Default | Type
| *autoCreateBucket* (common) | Setting the autocreation of the bucket bucketName. | true | boolean
-| *serviceAccountKey* (common) | Service account key to authenticate an application as a service account | | String
+| *serviceAccountKey* (common) | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *storageClass* (common) | The Cloud Storage class to use when creating the new buckets | STANDARD | StorageClass
| *storageClient* (common) | *Autowired* The storage client | | Storage
| *storageLocation* (common) | The Cloud Storage location to use when creating the new buckets | US-EAST1 | String
diff --git a/components/camel-google-storage/src/generated/resources/org/apache/camel/component/google/storage/google-storage.json b/components/camel-google-storage/src/generated/resources/org/apache/camel/component/google/storage/google-storage.json
index e34e885..b16b742 100644
--- a/components/camel-google-storage/src/generated/resources/org/apache/camel/component/google/storage/google-storage.json
+++ b/components/camel-google-storage/src/generated/resources/org/apache/camel/component/google/storage/google-storage.json
@@ -24,7 +24,7 @@
"componentProperties": {
"autoCreateBucket": { "kind": "property", "displayName": "Auto Create Bucket", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "Setting the autocreation of the bucket bucketName." },
"configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "The component configuration" },
- "serviceAccountKey": { "kind": "property", "displayName": "Service Account Key", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "Service account key to authenticate an application as a service account" },
+ "serviceAccountKey": { "kind": "property", "displayName": "Service Account Key", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "The Service account key that can be used as credentials for the Storage client. It can b [...]
"storageClass": { "kind": "property", "displayName": "Storage Class", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "com.google.cloud.storage.StorageClass", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "STANDARD", "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "The Cloud Storage class to use when creating the n [...]
"storageClient": { "kind": "property", "displayName": "Storage Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.cloud.storage.Storage", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "The storage client" },
"storageLocation": { "kind": "property", "displayName": "Storage Location", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "US-EAST1", "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "The Cloud Storage location to use when creating the new buckets" },
@@ -42,7 +42,7 @@
"properties": {
"bucketName": { "kind": "path", "displayName": "Bucket Name", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "Bucket name or ARN" },
"autoCreateBucket": { "kind": "parameter", "displayName": "Auto Create Bucket", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "Setting the autocreation of the bucket bucketName." },
- "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "Service account key to authenticate an application as a service account" },
+ "serviceAccountKey": { "kind": "parameter", "displayName": "Service Account Key", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "The Service account key that can be used as credentials for the Storage client. It can [...]
"storageClass": { "kind": "parameter", "displayName": "Storage Class", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "com.google.cloud.storage.StorageClass", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "STANDARD", "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "The Cloud Storage class to use when creating the [...]
"storageClient": { "kind": "parameter", "displayName": "Storage Client", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.cloud.storage.Storage", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "The storage client" },
"storageLocation": { "kind": "parameter", "displayName": "Storage Location", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "US-EAST1", "configurationClass": "org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration", "configurationField": "configuration", "description": "The Cloud Storage location to use when creating the new buckets" },
diff --git a/components/camel-google-storage/src/main/docs/google-storage-component.adoc b/components/camel-google-storage/src/main/docs/google-storage-component.adoc
index ee5dec8..c1064cb 100644
--- a/components/camel-google-storage/src/main/docs/google-storage-component.adoc
+++ b/components/camel-google-storage/src/main/docs/google-storage-component.adoc
@@ -87,7 +87,7 @@ The Google Storage component supports 16 options, which are listed below.
| Name | Description | Default | Type
| *autoCreateBucket* (common) | Setting the autocreation of the bucket bucketName. | true | boolean
| *configuration* (common) | The component configuration | | GoogleCloudStorageConfiguration
-| *serviceAccountKey* (common) | Service account key to authenticate an application as a service account | | String
+| *serviceAccountKey* (common) | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *storageClass* (common) | The Cloud Storage class to use when creating the new buckets | STANDARD | StorageClass
| *storageClient* (common) | *Autowired* The storage client | | Storage
| *storageLocation* (common) | The Cloud Storage location to use when creating the new buckets | US-EAST1 | String
@@ -130,7 +130,7 @@ with the following path and query parameters:
|===
| Name | Description | Default | Type
| *autoCreateBucket* (common) | Setting the autocreation of the bucket bucketName. | true | boolean
-| *serviceAccountKey* (common) | Service account key to authenticate an application as a service account | | String
+| *serviceAccountKey* (common) | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *storageClass* (common) | The Cloud Storage class to use when creating the new buckets | STANDARD | StorageClass
| *storageClient* (common) | *Autowired* The storage client | | Storage
| *storageLocation* (common) | The Cloud Storage location to use when creating the new buckets | US-EAST1 | String
diff --git a/components/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConfiguration.java b/components/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConfiguration.java
index bd8d1f2..651e004 100644
--- a/components/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConfiguration.java
+++ b/components/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConfiguration.java
@@ -31,7 +31,9 @@ public class GoogleCloudStorageConfiguration implements Cloneable {
@Metadata(required = true)
private String bucketName;
- @UriParam(label = "common", description = "Service account key to authenticate an application as a service account")
+ @UriParam(label = "common",
+ description = "The Service account key that can be used as credentials for the Storage client. It can be loaded by default from "
+ + " classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems.")
private String serviceAccountKey;
@UriParam(label = "producer",
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleStorageComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleStorageComponentBuilderFactory.java
index 231abe2..4ac1b7f 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleStorageComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleStorageComponentBuilderFactory.java
@@ -85,8 +85,10 @@ public interface GoogleStorageComponentBuilderFactory {
return this;
}
/**
- * Service account key to authenticate an application as a service
- * account.
+ * The Service account key that can be used as credentials for the
+ * Storage client. It can be loaded by default from classpath, but you
+ * can prefix with classpath:, file:, or http: to load the resource from
+ * different systems.
*
* The option is a: <code>java.lang.String</code> type.
*
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudStorageEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudStorageEndpointBuilderFactory.java
index 235c0e7..3005376 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudStorageEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudStorageEndpointBuilderFactory.java
@@ -81,8 +81,10 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
return this;
}
/**
- * Service account key to authenticate an application as a service
- * account.
+ * The Service account key that can be used as credentials for the
+ * Storage client. It can be loaded by default from classpath, but you
+ * can prefix with classpath:, file:, or http: to load the resource from
+ * different systems.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -1078,8 +1080,10 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
return this;
}
/**
- * Service account key to authenticate an application as a service
- * account.
+ * The Service account key that can be used as credentials for the
+ * Storage client. It can be loaded by default from classpath, but you
+ * can prefix with classpath:, file:, or http: to load the resource from
+ * different systems.
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -1328,8 +1332,10 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
return this;
}
/**
- * Service account key to authenticate an application as a service
- * account.
+ * The Service account key that can be used as credentials for the
+ * Storage client. It can be loaded by default from classpath, but you
+ * can prefix with classpath:, file:, or http: to load the resource from
+ * different systems.
*
* The option is a: <code>java.lang.String</code> type.
*
diff --git a/docs/components/modules/ROOT/pages/google-storage-component.adoc b/docs/components/modules/ROOT/pages/google-storage-component.adoc
index af10d7e..b0f432e 100644
--- a/docs/components/modules/ROOT/pages/google-storage-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-storage-component.adoc
@@ -89,7 +89,7 @@ The Google Storage component supports 16 options, which are listed below.
| Name | Description | Default | Type
| *autoCreateBucket* (common) | Setting the autocreation of the bucket bucketName. | true | boolean
| *configuration* (common) | The component configuration | | GoogleCloudStorageConfiguration
-| *serviceAccountKey* (common) | Service account key to authenticate an application as a service account | | String
+| *serviceAccountKey* (common) | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *storageClass* (common) | The Cloud Storage class to use when creating the new buckets | STANDARD | StorageClass
| *storageClient* (common) | *Autowired* The storage client | | Storage
| *storageLocation* (common) | The Cloud Storage location to use when creating the new buckets | US-EAST1 | String
@@ -132,7 +132,7 @@ with the following path and query parameters:
|===
| Name | Description | Default | Type
| *autoCreateBucket* (common) | Setting the autocreation of the bucket bucketName. | true | boolean
-| *serviceAccountKey* (common) | Service account key to authenticate an application as a service account | | String
+| *serviceAccountKey* (common) | The Service account key that can be used as credentials for the Storage client. It can be loaded by default from classpath, but you can prefix with classpath:, file:, or http: to load the resource from different systems. | | String
| *storageClass* (common) | The Cloud Storage class to use when creating the new buckets | STANDARD | StorageClass
| *storageClient* (common) | *Autowired* The storage client | | Storage
| *storageLocation* (common) | The Cloud Storage location to use when creating the new buckets | US-EAST1 | String