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 13:52:25 UTC
[camel-k] branch main updated (5467424e0 -> 33024c1ec)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 5467424e0 chore(olm): bump framework operator sdk from v1.16.0 to v1.26.1 in Makefile
new fe303c7a6 Secret managers parsing errors - AWS Secrets Manager
new d2b5fc4f1 Secret managers parsing errors - AWS Secrets Manager
new 0a94c376f Secret managers parsing errors - AWS Secrets Manager
new c3becabcc Secret managers parsing errors - GCP Secret Manager
new fa84ece46 Secret managers parsing errors - GCP Secret Manager
new 2c03dab48 Secret managers parsing errors - GCP Secret Manager
new d11b6771a Secret managers parsing errors - Azure Key Vault
new 30cf8705d Secret managers parsing errors - Azure Key Vault
new 3c13b77f8 Secret managers parsing errors - Hashicorp Vault
new 33024c1ec Secret managers parsing errors - Hashicorp Vault
The 10 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:
addons/vault/aws/aws_secrets_manager.go | 16 +++---
addons/vault/azure/azure_key_vault.go | 24 ++++----
addons/vault/gcp/gcp_secret_manager.go | 16 +++---
addons/vault/hashicorp/hashicorp_vault.go | 10 ++--
docs/modules/traits/pages/aws-secrets-manager.adoc | 16 +++---
docs/modules/traits/pages/azure-key-vault.adoc | 24 ++++----
docs/modules/traits/pages/gcp-secret-manager.adoc | 16 +++---
docs/modules/traits/pages/hashicorp-vault.adoc | 10 ++--
pkg/resources/resources.go | 4 +-
resources/traits.yaml | 66 +++++++++++-----------
10 files changed, 101 insertions(+), 101 deletions(-)
[camel-k] 08/10: 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 main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 30cf8705d520aa35cc0babf1bd22b80c1ab52eba
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 14:46:18 2023 +0100
Secret managers parsing errors - Azure Key Vault
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
docs/modules/traits/pages/azure-key-vault.adoc | 24 ++++++++++++------------
pkg/resources/resources.go | 4 ++--
resources/traits.yaml | 24 ++++++++++++------------
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/docs/modules/traits/pages/azure-key-vault.adoc b/docs/modules/traits/pages/azure-key-vault.adoc
index a6240dcba..48303a037 100644
--- a/docs/modules/traits/pages/azure-key-vault.adoc
+++ b/docs/modules/traits/pages/azure-key-vault.adoc
@@ -41,51 +41,51 @@ 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
-| azure-key-vault.context-reload-enabled,omitempty
+| azure-key-vault.context-reload-enabled
| bool
| Define if we want to use the Camel Context Reload feature or not
-| azure-key-vault.refresh-enabled,omitempty
+| azure-key-vault.refresh-enabled
| bool
| Define if we want to use the Refresh Feature for secrets
-| azure-key-vault.refresh-period,omitempty
+| azure-key-vault.refresh-period
| string
| If Refresh is enabled, this defines the interval to check the refresh event
-| azure-key-vault.refresh-period,omitempty
+| azure-key-vault.secrets
| string
| If Refresh is enabled, the regular expression representing the secrets we want to track
-| azure-key-vault.refresh-period,omitempty
+| azure-key-vault.eventhub-connection-string
| string
| If Refresh is enabled, the connection String to point to the Eventhub service used to track updates
-| azure-key-vault.refresh-period,omitempty
+| azure-key-vault.blob-account-name
| string
| If Refresh is enabled, the account name for Azure Storage Blob service used to save checkpoint while consuming from Eventhub
-| azure-key-vault.refresh-period,omitempty
+| azure-key-vault.blob-access-key
| string
| If Refresh is enabled, the access key for Azure Storage Blob service used to save checkpoint while consuming from Eventhub
-| azure-key-vault.refresh-period,omitempty
+| azure-key-vault.blob-container-name
| string
| If Refresh is enabled, the container name for Azure Storage Blob service used to save checkpoint while consuming from Eventhub
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index fc8764f5b..718650029 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -611,9 +611,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 64638,
+ uncompressedSize: 64554,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfd\x77\x1b\x37\x92\x28\xfa\xbb\xff\x0a\x1c\xee\xdb\x23\xc9\x4f\x24\x95\xcc\x66\x36\xab\xf7\xbc\x73\x15\xc7\xc9\x28\x89\x6d\x5d\x4b\xc9\xec\x1c\x5f\x9f\x21\xd8\x0d\x92\x30\x9b\x40\x0f\x80\xa6\xcc\xdc\xbd\xff\xfb\x3d\xa8\x2a\x7c\x74\xb3\x29\x91\xb6\x95\x1d\xed\x7c\x9c\x13\x8b\x64\x77\xa1\x50\x28\x14\x0a\xf5\xe9\x0c\x97\xce\x9e\x3f\x19\x32\xc5\x57\xe2\x9c\xfd\xce\x16\xbc\x12\x4f\x18\xab\x2b\xee\x66\xda\xac\xce\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfd\x77\x1b\x37\x92\x28\xfa\xbb\xff\x0a\x1c\xee\xdb\x23\xc9\x4f\x24\x95\xcc\x66\x36\xab\xf7\xbc\x73\x15\xc7\xc9\x28\x89\x6d\x5d\x4b\xc9\xec\x1c\x5f\x9f\x21\xd8\x0d\x92\x30\x9b\x40\x0f\x80\x96\xc4\xdc\xbd\xff\xfb\x3d\xa8\x2a\x7c\x74\xb3\x29\x91\xb6\x94\x1d\xed\x7c\x9c\x13\x8b\x64\x77\xa1\x50\x28\x14\x0a\xf5\xe9\x0c\x97\xce\x9e\x3e\x1b\x32\xc5\x57\xe2\x94\xfd\xce\x16\xbc\x12\xcf\x18\xab\x2b\xee\x66\xda\xac\x4e\x [...]
},
}
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
diff --git a/resources/traits.yaml b/resources/traits.yaml
index 13ec2ef93..9d3682627 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -147,45 +147,45 @@ 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: context-reload-enabled,omitempty
+ - name: context-reload-enabled
type: bool
description: Define if we want to use the Camel Context Reload feature or not
- - name: refresh-enabled,omitempty
+ - name: refresh-enabled
type: bool
description: Define if we want to use the Refresh Feature for secrets
- - name: refresh-period,omitempty
+ - name: refresh-period
type: string
description: If Refresh is enabled, this defines the interval to check the refresh
event
- - name: refresh-period,omitempty
+ - name: secrets
type: string
description: If Refresh is enabled, the regular expression representing the secrets
we want to track
- - name: refresh-period,omitempty
+ - name: eventhub-connection-string
type: string
description: If Refresh is enabled, the connection String to point to the Eventhub
service used to track updates
- - name: refresh-period,omitempty
+ - name: blob-account-name
type: string
description: If Refresh is enabled, the account name for Azure Storage Blob service
used to save checkpoint while consuming from Eventhub
- - name: refresh-period,omitempty
+ - name: blob-access-key
type: string
description: If Refresh is enabled, the access key for Azure Storage Blob service
used to save checkpoint while consuming from Eventhub
- - name: refresh-period,omitempty
+ - name: blob-container-name
type: string
description: If Refresh is enabled, the container name for Azure Storage Blob
service used to save checkpoint while consuming from Eventhub
[camel-k] 01/10: 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 main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit fe303c7a6b4eaac65258f102f709a4fba8b9024b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 14:21:24 2023 +0100
Secret managers parsing errors - AWS Secrets Manager
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
addons/vault/aws/aws_secrets_manager.go | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/addons/vault/aws/aws_secrets_manager.go b/addons/vault/aws/aws_secrets_manager.go
index 377df6073..18ac82e41 100644
--- a/addons/vault/aws/aws_secrets_manager.go
+++ b/addons/vault/aws/aws_secrets_manager.go
@@ -48,21 +48,21 @@ 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:"access-key,omitempty"`
// The AWS Secret Key to use
- SecretKey string `property:"secret-key,omitempty"`
+ SecretKey string `property:"secret-key" json:"secret-key,omitempty"`
// The AWS Region to use
- Region string `property:"region,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,omitempty"`
+ UseDefaultCredentialsProvider *bool `property:"use-default-credentials-provider" json:"use-default-credentials-provider,omitempty"`
// Define if we want to use the Camel Context Reload feature or not
- ContextReloadEnabled *bool `property:"context-reload-enabled,omitempty"`
+ ContextReloadEnabled *bool `property:"context-reload-enabled" json:"context-reload-enabled,omitempty"`
// Define if we want to use the Refresh Feature for secrets
- RefreshEnabled *bool `property:"refresh-enabled,omitempty"`
+ RefreshEnabled *bool `property:"refresh-enabled" json:"refresh-enabled,omitempty"`
// If Refresh is enabled, this defines the interval to check the refresh event
- RefreshPeriod string `property:"refresh-period,omitempty"`
+ RefreshPeriod string `property:"refresh-period" json:"refresh-period,omitempty"`
// If Refresh is enabled, the regular expression representing the secrets we want to track
- Secrets string `property:"refresh-period,omitempty"`
+ Secrets string `property:"secrets" json:"secrets,omitempty"`
}
type awsSecretsManagerTrait struct {
[camel-k] 04/10: 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 main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c3becabccbb129c1eab5cf042c207bf003cec0f6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 14:35:56 2023 +0100
Secret managers parsing errors - GCP Secret Manager
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
addons/vault/gcp/gcp_secret_manager.go | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/addons/vault/gcp/gcp_secret_manager.go b/addons/vault/gcp/gcp_secret_manager.go
index 1ba60df39..3eb6a94ec 100644
--- a/addons/vault/gcp/gcp_secret_manager.go
+++ b/addons/vault/gcp/gcp_secret_manager.go
@@ -47,21 +47,21 @@ 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"`
// Define if we want to use the Camel Context Reload feature or not
- ContextReloadEnabled *bool `property:"context-reload-enabled,omitempty"`
+ ContextReloadEnabled *bool `property:"context-reload-enabled" json:"contextReloadEnabled,omitempty"`
// Define if we want to use the Refresh Feature for secrets
- RefreshEnabled *bool `property:"refresh-enabled,omitempty"`
+ RefreshEnabled *bool `property:"refresh-enabled" json:"refreshEnabled,omitempty"`
// If Refresh is enabled, this defines the interval to check the refresh event
- RefreshPeriod string `property:"refresh-period,omitempty"`
+ RefreshPeriod string `property:"refresh-period" json:"refreshPeriod,omitempty"`
// If Refresh is enabled, the regular expression representing the secrets we want to track
- Secrets string `property:"refresh-period,omitempty"`
+ Secrets string `property:"secrets" json:"secrets,omitempty"`
// If Refresh is enabled, this defines the subscription name to the Google PubSub topic used to keep track of updates
- SubscriptionName string `property:"refresh-period,omitempty"`
+ SubscriptionName string `property:"subscription-name" json:"subscriptionName,omitempty"`
}
type gcpSecretManagerTrait struct {
[camel-k] 02/10: 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 main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d2b5fc4f18338b73988ce207d63db86aca028c83
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 14:27:23 2023 +0100
Secret managers parsing errors - AWS Secrets Manager
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
docs/modules/traits/pages/aws-secrets-manager.adoc | 16 ++++++++--------
resources/traits.yaml | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/docs/modules/traits/pages/aws-secrets-manager.adoc b/docs/modules/traits/pages/aws-secrets-manager.adoc
index f0fe202dd..03383744a 100644
--- a/docs/modules/traits/pages/aws-secrets-manager.adoc
+++ b/docs/modules/traits/pages/aws-secrets-manager.adoc
@@ -41,35 +41,35 @@ 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
| Define if we want to use the Default Credentials Provider chain as authentication method
-| aws-secrets-manager.context-reload-enabled,omitempty
+| aws-secrets-manager.context-reload-enabled
| bool
| Define if we want to use the Camel Context Reload feature or not
-| aws-secrets-manager.refresh-enabled,omitempty
+| aws-secrets-manager.refresh-enabled
| bool
| Define if we want to use the Refresh Feature for secrets
-| aws-secrets-manager.refresh-period,omitempty
+| aws-secrets-manager.refresh-period
| string
| If Refresh is enabled, this defines the interval to check the refresh event
-| aws-secrets-manager.refresh-period,omitempty
+| aws-secrets-manager.secrets
| string
| If Refresh is enabled, the regular expression representing the secrets we want to track
diff --git a/resources/traits.yaml b/resources/traits.yaml
index f2a4d85f6..6eec47d49 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -91,30 +91,30 @@ 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: Define if we want to use the Default Credentials Provider chain as
authentication method
- - name: context-reload-enabled,omitempty
+ - name: context-reload-enabled
type: bool
description: Define if we want to use the Camel Context Reload feature or not
- - name: refresh-enabled,omitempty
+ - name: refresh-enabled
type: bool
description: Define if we want to use the Refresh Feature for secrets
- - name: refresh-period,omitempty
+ - name: refresh-period
type: string
description: If Refresh is enabled, this defines the interval to check the refresh
event
- - name: refresh-period,omitempty
+ - name: secrets
type: string
description: If Refresh is enabled, the regular expression representing the secrets
we want to track
[camel-k] 03/10: 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 main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0a94c376fdcaca47a45ce0cd184978d608f965fe
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 14:29:45 2023 +0100
Secret managers parsing errors - AWS Secrets Manager
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
addons/vault/aws/aws_secrets_manager.go | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/addons/vault/aws/aws_secrets_manager.go b/addons/vault/aws/aws_secrets_manager.go
index 18ac82e41..bde547997 100644
--- a/addons/vault/aws/aws_secrets_manager.go
+++ b/addons/vault/aws/aws_secrets_manager.go
@@ -48,19 +48,19 @@ 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" json:"access-key,omitempty"`
+ AccessKey string `property:"access-key" json:"accessKey,omitempty"`
// The AWS Secret Key to use
- SecretKey string `property:"secret-key" json:"secret-key,omitempty"`
+ SecretKey string `property:"secret-key" json:"secretKey,omitempty"`
// The AWS Region to use
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:"use-default-credentials-provider,omitempty"`
+ UseDefaultCredentialsProvider *bool `property:"use-default-credentials-provider" json:"useDefaultCredentialsProvider,omitempty"`
// Define if we want to use the Camel Context Reload feature or not
- ContextReloadEnabled *bool `property:"context-reload-enabled" json:"context-reload-enabled,omitempty"`
+ ContextReloadEnabled *bool `property:"context-reload-enabled" json:"contextReloadEnabled,omitempty"`
// Define if we want to use the Refresh Feature for secrets
- RefreshEnabled *bool `property:"refresh-enabled" json:"refresh-enabled,omitempty"`
+ RefreshEnabled *bool `property:"refresh-enabled" json:"refreshEnabled,omitempty"`
// If Refresh is enabled, this defines the interval to check the refresh event
- RefreshPeriod string `property:"refresh-period" json:"refresh-period,omitempty"`
+ RefreshPeriod string `property:"refresh-period" json:"refreshPeriod,omitempty"`
// If Refresh is enabled, the regular expression representing the secrets we want to track
Secrets string `property:"secrets" json:"secrets,omitempty"`
}
[camel-k] 09/10: Secret managers parsing errors - Hashicorp Vault
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 3c13b77f85aaa97552c66e03042a9546e2fd6370
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 14:47:22 2023 +0100
Secret managers parsing errors - Hashicorp Vault
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
addons/vault/hashicorp/hashicorp_vault.go | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/addons/vault/hashicorp/hashicorp_vault.go b/addons/vault/hashicorp/hashicorp_vault.go
index fc2c639e3..b5f22c294 100644
--- a/addons/vault/hashicorp/hashicorp_vault.go
+++ b/addons/vault/hashicorp/hashicorp_vault.go
@@ -41,15 +41,15 @@ type Trait struct {
// Enables automatic configuration of the trait.
Auto *bool `property:"auto" json:"auto,omitempty"`
// The Host to use
- Host string `property:"host,omitempty"`
+ Host string `property:"host" json:"host,omitempty"`
// The Port to use
- Port string `property:"port,omitempty"`
+ Port string `property:"port" json:"port,omitempty"`
// The Hashicorp engine to use
- Engine string `property:"engine,omitempty"`
+ Engine string `property:"engine" json:"engine,omitempty"`
// The token to access Hashicorp Vault
- Token string `property:"token,omitempty"`
+ Token string `property:"token" json:"token,omitempty"`
// The scheme to access Hashicorp Vault
- Scheme string `property:"scheme,omitempty"`
+ Scheme string `property:"scheme" json:"scheme,omitempty"`
}
type hashicorpVaultTrait struct {
[camel-k] 07/10: 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 main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d11b6771a880d88f00c9fc0015ddedb65a456364
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 14:43:16 2023 +0100
Secret managers parsing errors - Azure Key Vault
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
addons/vault/azure/azure_key_vault.go | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/addons/vault/azure/azure_key_vault.go b/addons/vault/azure/azure_key_vault.go
index 87c428383..a0723744e 100644
--- a/addons/vault/azure/azure_key_vault.go
+++ b/addons/vault/azure/azure_key_vault.go
@@ -47,29 +47,29 @@ 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"`
// Define if we want to use the Camel Context Reload feature or not
- ContextReloadEnabled *bool `property:"context-reload-enabled,omitempty"`
+ ContextReloadEnabled *bool `property:"context-reload-enabled" json:"contextReloadEnabled,omitempty"`
// Define if we want to use the Refresh Feature for secrets
- RefreshEnabled *bool `property:"refresh-enabled,omitempty"`
+ RefreshEnabled *bool `property:"refresh-enabled" json:"refreshEnabled,omitempty"`
// If Refresh is enabled, this defines the interval to check the refresh event
- RefreshPeriod string `property:"refresh-period,omitempty"`
+ RefreshPeriod string `property:"refresh-period" json:"refreshPeriod,omitempty"`
// If Refresh is enabled, the regular expression representing the secrets we want to track
- Secrets string `property:"refresh-period,omitempty"`
+ Secrets string `property:"secrets" json:"secrets,omitempty"`
// If Refresh is enabled, the connection String to point to the Eventhub service used to track updates
- EventhubConnectionString string `property:"refresh-period,omitempty"`
+ EventhubConnectionString string `property:"eventhub-connection-string" json:"eventhubConnectionString,omitempty"`
// If Refresh is enabled, the account name for Azure Storage Blob service used to save checkpoint while consuming from Eventhub
- BlobAccountName string `property:"refresh-period,omitempty"`
+ BlobAccountName string `property:"blob-account-name" json:"blobAccountName,omitempty"`
// If Refresh is enabled, the access key for Azure Storage Blob service used to save checkpoint while consuming from Eventhub
- BlobAccessKey string `property:"refresh-period,omitempty"`
+ BlobAccessKey string `property:"blob-access-key" json:"blobAccessKey,omitempty"`
// If Refresh is enabled, the container name for Azure Storage Blob service used to save checkpoint while consuming from Eventhub
- BlobContainerName string `property:"refresh-period,omitempty"`
+ BlobContainerName string `property:"blob-container-name" json:"blobContainerName,omitempty"`
}
type azureKeyVaultTrait struct {
[camel-k] 05/10: 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 main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit fa84ece460316e38308fc92246f02395c16e4d38
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 14:37:35 2023 +0100
Secret managers parsing errors - GCP Secret Manager
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
pkg/resources/resources.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 56498b02f..fc8764f5b 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -611,9 +611,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 64725,
+ uncompressedSize: 64638,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xfd\x77\x1b\x37\x92\xe0\xef\xfe\x2b\xf0\xb8\xb7\x4f\x92\x4f\x24\x95\xcc\x66\x36\xab\x3b\xef\x9c\xe2\x38\x19\x25\xfe\xd0\x59\x4a\x66\xe7\xf9\xfc\x86\x60\x37\x48\xc2\x6c\x02\x3d\x00\x5a\x32\x73\x73\xff\xfb\x3d\x54\x15\x3e\xba\xd9\x94\x48\x5b\xca\x8e\x76\x32\xf3\x5e\x2c\x92\xdd\x85\x42\xa1\x50\x28\xd4\xa7\x33\x5c\x3a\x7b\xfa\x64\xc8\x14\x5f\x89\x53\xf6\x3b\x5b\xf0\x4a\x3c\x61\xac\xae\xb8\x9b\x69\xb3\x3a\x65\x33\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfd\x77\x1b\x37\x92\x28\xfa\xbb\xff\x0a\x1c\xee\xdb\x23\xc9\x4f\x24\x95\xcc\x66\x36\xab\xf7\xbc\x73\x15\xc7\xc9\x28\x89\x6d\x5d\x4b\xc9\xec\x1c\x5f\x9f\x21\xd8\x0d\x92\x30\x9b\x40\x0f\x80\xa6\xcc\xdc\xbd\xff\xfb\x3d\xa8\x2a\x7c\x74\xb3\x29\x91\xb6\x95\x1d\xed\x7c\x9c\x13\x8b\x64\x77\xa1\x50\x28\x14\x0a\xf5\xe9\x0c\x97\xce\x9e\x3f\x19\x32\xc5\x57\xe2\x9c\xfd\xce\x16\xbc\x12\x4f\x18\xab\x2b\xee\x66\xda\xac\xce\x [...]
},
}
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
[camel-k] 06/10: 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 main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 2c03dab4837452c88bea887895ab17f041863562
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 14:39:38 2023 +0100
Secret managers parsing errors - GCP Secret Manager
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
docs/modules/traits/pages/gcp-secret-manager.adoc | 16 ++++++++--------
resources/traits.yaml | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/docs/modules/traits/pages/gcp-secret-manager.adoc b/docs/modules/traits/pages/gcp-secret-manager.adoc
index 2b104035c..c544234e3 100644
--- a/docs/modules/traits/pages/gcp-secret-manager.adoc
+++ b/docs/modules/traits/pages/gcp-secret-manager.adoc
@@ -41,35 +41,35 @@ 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
-| gcp-secret-manager.context-reload-enabled,omitempty
+| gcp-secret-manager.context-reload-enabled
| bool
| Define if we want to use the Camel Context Reload feature or not
-| gcp-secret-manager.refresh-enabled,omitempty
+| gcp-secret-manager.refresh-enabled
| bool
| Define if we want to use the Refresh Feature for secrets
-| gcp-secret-manager.refresh-period,omitempty
+| gcp-secret-manager.refresh-period
| string
| If Refresh is enabled, this defines the interval to check the refresh event
-| gcp-secret-manager.refresh-period,omitempty
+| gcp-secret-manager.secrets
| string
| If Refresh is enabled, the regular expression representing the secrets we want to track
-| gcp-secret-manager.refresh-period,omitempty
+| gcp-secret-manager.subscription-name
| string
| If Refresh is enabled, this defines the subscription name to the Google PubSub topic used to keep track of updates
diff --git a/resources/traits.yaml b/resources/traits.yaml
index 6eec47d49..13ec2ef93 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -502,32 +502,32 @@ 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
- - name: context-reload-enabled,omitempty
+ - name: context-reload-enabled
type: bool
description: Define if we want to use the Camel Context Reload feature or not
- - name: refresh-enabled,omitempty
+ - name: refresh-enabled
type: bool
description: Define if we want to use the Refresh Feature for secrets
- - name: refresh-period,omitempty
+ - name: refresh-period
type: string
description: If Refresh is enabled, this defines the interval to check the refresh
event
- - name: refresh-period,omitempty
+ - name: secrets
type: string
description: If Refresh is enabled, the regular expression representing the secrets
we want to track
- - name: refresh-period,omitempty
+ - name: subscription-name
type: string
description: If Refresh is enabled, this defines the subscription name to the
Google PubSub topic used to keep track of updates
[camel-k] 10/10: Secret managers parsing errors - Hashicorp Vault
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 33024c1ec551077269bbffc302c655b674b7e187
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 14:50:06 2023 +0100
Secret managers parsing errors - Hashicorp Vault
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
docs/modules/traits/pages/hashicorp-vault.adoc | 10 +++++-----
pkg/resources/resources.go | 4 ++--
resources/traits.yaml | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/docs/modules/traits/pages/hashicorp-vault.adoc b/docs/modules/traits/pages/hashicorp-vault.adoc
index 7fa9b2cc1..ea64b34e8 100644
--- a/docs/modules/traits/pages/hashicorp-vault.adoc
+++ b/docs/modules/traits/pages/hashicorp-vault.adoc
@@ -37,23 +37,23 @@ The following configuration options are available:
| bool
| Enables automatic configuration of the trait.
-| hashicorp-vault.host,omitempty
+| hashicorp-vault.host
| string
| The Host to use
-| hashicorp-vault.port,omitempty
+| hashicorp-vault.port
| string
| The Port to use
-| hashicorp-vault.engine,omitempty
+| hashicorp-vault.engine
| string
| The Hashicorp engine to use
-| hashicorp-vault.token,omitempty
+| hashicorp-vault.token
| string
| The token to access Hashicorp Vault
-| hashicorp-vault.scheme,omitempty
+| hashicorp-vault.scheme
| string
| The scheme to access Hashicorp Vault
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 718650029..1f8538b5f 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -611,9 +611,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 64554,
+ uncompressedSize: 64448,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfd\x77\x1b\x37\x92\x28\xfa\xbb\xff\x0a\x1c\xee\xdb\x23\xc9\x4f\x24\x95\xcc\x66\x36\xab\xf7\xbc\x73\x15\xc7\xc9\x28\x89\x6d\x5d\x4b\xc9\xec\x1c\x5f\x9f\x21\xd8\x0d\x92\x30\x9b\x40\x0f\x80\x96\xc4\xdc\xbd\xff\xfb\x3d\xa8\x2a\x7c\x74\xb3\x29\x91\xb6\x94\x1d\xed\x7c\x9c\x13\x8b\x64\x77\xa1\x50\x28\x14\x0a\xf5\xe9\x0c\x97\xce\x9e\x3e\x1b\x32\xc5\x57\xe2\x94\xfd\xce\x16\xbc\x12\xcf\x18\xab\x2b\xee\x66\xda\xac\x4e\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfd\x77\x1b\x37\x92\x28\xfa\xbb\xff\x0a\x1c\xee\xdb\x23\xc9\x8f\x1f\xca\xcc\x66\x36\xab\xf7\xbc\x73\x15\xc7\xc9\x28\x89\x6d\x5d\x4b\xc9\xec\x1c\x5f\x9f\x21\xd8\x0d\x92\x30\x9b\x40\x0f\x80\x96\xcc\xdc\xbd\xff\xfb\x3d\xa8\x2a\x7c\x74\xb3\x29\x91\xb6\x95\x1d\xed\x64\xe6\x9c\x58\x24\xbb\x0b\x85\x42\xa1\x50\xa8\x4f\x67\xb8\x74\xf6\xec\xc9\x88\x29\xbe\x16\x67\xec\xf7\xb6\xe0\x95\x78\xc2\x58\x5d\x71\x37\xd7\x66\x7d\x [...]
},
}
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
diff --git a/resources/traits.yaml b/resources/traits.yaml
index 9d3682627..b65d6eba3 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -552,19 +552,19 @@ traits:
- name: auto
type: bool
description: Enables automatic configuration of the trait.
- - name: host,omitempty
+ - name: host
type: string
description: The Host to use
- - name: port,omitempty
+ - name: port
type: string
description: The Port to use
- - name: engine,omitempty
+ - name: engine
type: string
description: The Hashicorp engine to use
- - name: token,omitempty
+ - name: token
type: string
description: The token to access Hashicorp Vault
- - name: scheme,omitempty
+ - name: scheme
type: string
description: The scheme to access Hashicorp Vault
- name: health