Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4080 release 1.12.x #4110

Merged
merged 10 commits into from
Mar 8, 2023
16 changes: 8 additions & 8 deletions addons/vault/aws/aws_secrets_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:"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"`
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:"useDefaultCredentialsProvider,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"`
}

type awsSecretsManagerTrait struct {
Expand Down
24 changes: 12 additions & 12 deletions addons/vault/azure/azure_key_vault.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
16 changes: 8 additions & 8 deletions addons/vault/gcp/gcp_secret_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions addons/vault/hashicorp/hashicorp_vault.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
16 changes: 8 additions & 8 deletions docs/modules/traits/pages/aws-secrets-manager.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
24 changes: 12 additions & 12 deletions docs/modules/traits/pages/azure-key-vault.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 8 additions & 8 deletions docs/modules/traits/pages/gcp-secret-manager.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions docs/modules/traits/pages/hashicorp-vault.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions pkg/resources/resources.go

Large diffs are not rendered by default.

Loading