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 2023/03/08 14:13:59 UTC
[camel-k] branch 4080-1.10.x created (now 3fa990c99)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch 4080-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
at 3fa990c99 Regen docs
This branch includes the following new commits:
new 55abc91c1 Secret managers parsing errors - AWS Secrets Manager
new 72bb313b4 Secret managers parsing errors - GCP Secret Manager
new 0ea2c16da Secret managers parsing errors - Azure Key Vault
new 3fa990c99 Regen docs
The 4 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.
[camel-k] 02/04: Secret managers parsing errors - GCP Secret Manager
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 4080-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 72bb313b4314b84f39a15a3d3bb5b038bcd24724
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 15:09:40 2023 +0100
Secret managers parsing errors - GCP Secret Manager
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
addons/vault/gcp/gcp_secret_manager.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/vault/gcp/gcp_secret_manager.go b/addons/vault/gcp/gcp_secret_manager.go
index 0b832d682..b423058cc 100644
--- a/addons/vault/gcp/gcp_secret_manager.go
+++ b/addons/vault/gcp/gcp_secret_manager.go
@@ -43,11 +43,11 @@ type Trait struct {
// Enables automatic configuration of the trait.
Auto *bool `property:"auto" json:"auto,omitempty"`
// The Project Id from Google Cloud
- ProjectID string `property:"project-id,omitempty"`
+ ProjectID string `property:"project-id" json:"projectId,omitempty"`
// The Path to a service account Key File to use secrets from Google Secret Manager
- ServiceAccountKey string `property:"service-account-key,omitempty"`
+ ServiceAccountKey string `property:"service-account-key" json:"serviceAccountKey,omitempty"`
// Define if we want to use the Default Instance approach for accessing the Google Secret Manager service
- UseDefaultInstance *bool `property:"use-default-instance,omitempty"`
+ UseDefaultInstance *bool `property:"use-default-instance" json:"useDefaultInstance,omitempty"`
}
type gcpSecretManagerTrait struct {
[camel-k] 04/04: Regen docs
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 4080-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 3fa990c9967c408331791a306be4e58bc4f34687
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 15:13:43 2023 +0100
Regen docs
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
docs/modules/traits/pages/aws-secrets-manager.adoc | 11 +++++----
docs/modules/traits/pages/azure-key-vault.adoc | 8 +++----
docs/modules/traits/pages/gcp-secret-manager.adoc | 6 ++---
resources/traits.yaml | 26 +++++++++++-----------
4 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/docs/modules/traits/pages/aws-secrets-manager.adoc b/docs/modules/traits/pages/aws-secrets-manager.adoc
index 6911af603..3f2d40e95 100644
--- a/docs/modules/traits/pages/aws-secrets-manager.adoc
+++ b/docs/modules/traits/pages/aws-secrets-manager.adoc
@@ -37,22 +37,21 @@ The following configuration options are available:
| bool
| Enables automatic configuration of the trait.
-| aws-secrets-manager.access-key,omitempty
+| aws-secrets-manager.access-key
| string
| The AWS Access Key to use
-| aws-secrets-manager.secret-key,omitempty
+| aws-secrets-manager.secret-key
| string
| The AWS Secret Key to use
-| aws-secrets-manager.region,omitempty
+| aws-secrets-manager.region
| string
| The AWS Region to use
-| aws-secrets-manager.use-default-credentials-provider,omitempty
+| aws-secrets-manager.use-default-credentials-provider
| bool
-| The adapter-specific policy to use when filling the cache (use: minimizing / maximizing). Check
-the component documentation if unsure
+| Define if we want to use the Default Credentials Provider chain as authentication method
|===
diff --git a/docs/modules/traits/pages/azure-key-vault.adoc b/docs/modules/traits/pages/azure-key-vault.adoc
index cef504219..fe36370da 100644
--- a/docs/modules/traits/pages/azure-key-vault.adoc
+++ b/docs/modules/traits/pages/azure-key-vault.adoc
@@ -37,19 +37,19 @@ The following configuration options are available:
| bool
| Enables automatic configuration of the trait.
-| azure-key-vault.tenant-id,omitempty
+| azure-key-vault.tenant-id
| string
| The Azure Tenant Id for accessing Key Vault
-| azure-key-vault.client-id,omitempty
+| azure-key-vault.client-id
| string
| The Azure Client Id for accessing Key Vault
-| azure-key-vault.client-secret,omitempty
+| azure-key-vault.client-secret
| string
| The Azure Client Secret for accessing Key Vault
-| azure-key-vault.vault-name,omitempty
+| azure-key-vault.vault-name
| string
| The Azure Vault Name for accessing Key Vault
diff --git a/docs/modules/traits/pages/gcp-secret-manager.adoc b/docs/modules/traits/pages/gcp-secret-manager.adoc
index bcf73ea8d..c2de64b05 100644
--- a/docs/modules/traits/pages/gcp-secret-manager.adoc
+++ b/docs/modules/traits/pages/gcp-secret-manager.adoc
@@ -37,15 +37,15 @@ The following configuration options are available:
| bool
| Enables automatic configuration of the trait.
-| gcp-secret-manager.project-id,omitempty
+| gcp-secret-manager.project-id
| string
| The Project Id from Google Cloud
-| gcp-secret-manager.service-account-key,omitempty
+| gcp-secret-manager.service-account-key
| string
| The Path to a service account Key File to use secrets from Google Secret Manager
-| gcp-secret-manager.use-default-instance,omitempty
+| gcp-secret-manager.use-default-instance
| bool
| Define if we want to use the Default Instance approach for accessing the Google Secret Manager service
diff --git a/resources/traits.yaml b/resources/traits.yaml
index 130fcd44d..1467392a3 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -86,19 +86,19 @@ traits:
- name: auto
type: bool
description: Enables automatic configuration of the trait.
- - name: access-key,omitempty
+ - name: access-key
type: string
description: The AWS Access Key to use
- - name: secret-key,omitempty
+ - name: secret-key
type: string
description: The AWS Secret Key to use
- - name: region,omitempty
+ - name: region
type: string
description: The AWS Region to use
- - name: use-default-credentials-provider,omitempty
+ - name: use-default-credentials-provider
type: bool
- description: 'The adapter-specific policy to use when filling the cache (use:
- minimizing / maximizing). Check the component documentation if unsure'
+ description: Define if we want to use the Default Credentials Provider chain as
+ authentication method
- name: azure-key-vault
platform: false
profiles:
@@ -120,16 +120,16 @@ traits:
- name: auto
type: bool
description: Enables automatic configuration of the trait.
- - name: tenant-id,omitempty
+ - name: tenant-id
type: string
description: The Azure Tenant Id for accessing Key Vault
- - name: client-id,omitempty
+ - name: client-id
type: string
description: The Azure Client Id for accessing Key Vault
- - name: client-secret,omitempty
+ - name: client-secret
type: string
description: The Azure Client Secret for accessing Key Vault
- - name: vault-name,omitempty
+ - name: vault-name
type: string
description: The Azure Vault Name for accessing Key Vault
- name: builder
@@ -496,14 +496,14 @@ traits:
- name: auto
type: bool
description: Enables automatic configuration of the trait.
- - name: project-id,omitempty
+ - name: project-id
type: string
description: The Project Id from Google Cloud
- - name: service-account-key,omitempty
+ - name: service-account-key
type: string
description: The Path to a service account Key File to use secrets from Google
Secret Manager
- - name: use-default-instance,omitempty
+ - name: use-default-instance
type: bool
description: Define if we want to use the Default Instance approach for accessing
the Google Secret Manager service
[camel-k] 01/04: Secret managers parsing errors - AWS Secrets Manager
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 4080-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 55abc91c1ef91989fd3dce3cecb2f0b304edbd4f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 15:08:27 2023 +0100
Secret managers parsing errors - AWS Secrets Manager
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
addons/vault/aws/aws_secrets_manager.go | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/addons/vault/aws/aws_secrets_manager.go b/addons/vault/aws/aws_secrets_manager.go
index d7794f2a9..263db2c95 100644
--- a/addons/vault/aws/aws_secrets_manager.go
+++ b/addons/vault/aws/aws_secrets_manager.go
@@ -43,14 +43,13 @@ type Trait struct {
// Enables automatic configuration of the trait.
Auto *bool `property:"auto" json:"auto,omitempty"`
// The AWS Access Key to use
- AccessKey string `property:"access-key,omitempty"`
+ AccessKey string `property:"access-key" json:"accessKey,omitempty"`
// The AWS Secret Key to use
- SecretKey string `property:"secret-key,omitempty"`
+ SecretKey string `property:"secret-key" json:"secretKey,omitempty"`
// The AWS Region to use
- Region string `property:"region,omitempty"`
- // The adapter-specific policy to use when filling the cache (use: minimizing / maximizing). Check
- // the component documentation if unsure
- UseDefaultCredentialsProvider *bool `property:"use-default-credentials-provider,omitempty"`
+ Region string `property:"region" json:"region,omitempty"`
+ // Define if we want to use the Default Credentials Provider chain as authentication method
+ UseDefaultCredentialsProvider *bool `property:"use-default-credentials-provider" json:"useDefaultCredentialsProvider,omitempty"`
}
type awsSecretsManagerTrait struct {
[camel-k] 03/04: Secret managers parsing errors - Azure Key Vault
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 4080-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0ea2c16da93c4ca321846aa9f201e748bbc0c2b8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 15:10:30 2023 +0100
Secret managers parsing errors - Azure Key Vault
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
addons/vault/azure/azure_key_vault.go | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/addons/vault/azure/azure_key_vault.go b/addons/vault/azure/azure_key_vault.go
index 2bec04985..b9bd5dc2d 100644
--- a/addons/vault/azure/azure_key_vault.go
+++ b/addons/vault/azure/azure_key_vault.go
@@ -41,13 +41,13 @@ type Trait struct {
// Enables automatic configuration of the trait.
Auto *bool `property:"auto" json:"auto,omitempty"`
// The Azure Tenant Id for accessing Key Vault
- TenantID string `property:"tenant-id,omitempty"`
+ TenantID string `property:"tenant-id" json:"tenantId,omitempty"`
// The Azure Client Id for accessing Key Vault
- ClientID string `property:"client-id,omitempty"`
+ ClientID string `property:"client-id" json:"clientId,omitempty"`
// The Azure Client Secret for accessing Key Vault
- ClientSecret string `property:"client-secret,omitempty"`
+ ClientSecret string `property:"client-secret" json:"clientSecret,omitempty"`
// The Azure Vault Name for accessing Key Vault
- VaultName string `property:"vault-name,omitempty"`
+ VaultName string `property:"vault-name" json:"vaultName,omitempty"`
}
type azureKeyVaultTrait struct {