This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 7a85024ded60ee16f6a22d73bc5aca412755a1bb Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Thu Sep 29 12:27:48 2022 +0200 Fix findings of validate job --- addons/vault/gcp/gcp_secret_manager.go | 4 ++-- addons/vault/gcp/gcp_secret_manager_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/vault/gcp/gcp_secret_manager.go b/addons/vault/gcp/gcp_secret_manager.go index 42b59cf08..5b3693bb3 100644 --- a/addons/vault/gcp/gcp_secret_manager.go +++ b/addons/vault/gcp/gcp_secret_manager.go @@ -43,7 +43,7 @@ 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,omitempty"` // The Path to a service account Key File to use secrets from Google Secret Manager ServiceAccountKey string `property:"service-account-key,omitempty"` // Define if we want to use the Default Instance approach for accessing the Google Secret Manager service @@ -85,7 +85,7 @@ func (t *gcpSecretManagerTrait) Apply(environment *trait.Environment) error { } if environment.IntegrationInRunningPhases() { - environment.ApplicationProperties["camel.vault.gcp.projectId"] = t.ProjectId + environment.ApplicationProperties["camel.vault.gcp.projectId"] = t.ProjectID environment.ApplicationProperties["camel.vault.gcp.serviceAccountKey"] = t.ServiceAccountKey environment.ApplicationProperties["camel.vault.gcp.useDefaultInstance"] = strconv.FormatBool(*t.UseDefaultInstance) } diff --git a/addons/vault/gcp/gcp_secret_manager_test.go b/addons/vault/gcp/gcp_secret_manager_test.go index 3407ed751..77a580ad8 100644 --- a/addons/vault/gcp/gcp_secret_manager_test.go +++ b/addons/vault/gcp/gcp_secret_manager_test.go @@ -36,7 +36,7 @@ func TestGcpSecretManagerTraitApply(t *testing.T) { secrets, _ := gcp.(*gcpSecretManagerTrait) secrets.Enabled = pointer.Bool(true) secrets.UseDefaultInstance = pointer.Bool(false) - secrets.ProjectId = "project-gcp" + secrets.ProjectID = "project-gcp" secrets.ServiceAccountKey = "file:////usr/local/serviceaccount.json" ok, err := secrets.Configure(e) assert.Nil(t, err) @@ -56,7 +56,7 @@ func TestGcpSecretManagerTraitNoDefaultCreds(t *testing.T) { secrets, _ := gcp.(*gcpSecretManagerTrait) secrets.Enabled = pointer.Bool(true) secrets.UseDefaultInstance = pointer.Bool(false) - secrets.ProjectId = "project-gcp" + secrets.ProjectID = "project-gcp" secrets.ServiceAccountKey = "file:////usr/local/serviceaccount.json" ok, err := secrets.Configure(e) assert.Nil(t, err)