Skip to content

Commit 8b98b06

Browse files
author
Mr Goran
committed
DK-1665 read write to vault path - fix username
1 parent a94f5ae commit 8b98b06

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

common/vault.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func NewVault(host string) (*Vault, error) {
3535
}, nil
3636
}
3737

38-
func (v *Vault) Get(cred *DatabaseCredential, databaseName string, logger logr.Logger) (VaultResponse, error) {
38+
func (v *Vault) Get(cred *DatabaseCredential, username string, logger logr.Logger) (VaultResponse, error) {
3939

4040
// goran vault
4141
//h, err := FromCredential(binding, logger)
@@ -47,7 +47,7 @@ func (v *Vault) Get(cred *DatabaseCredential, databaseName string, logger logr.L
4747
SecretField: cred.Vault.SecretField,
4848
}
4949

50-
data, response, err := processRequest(h, r, databaseName)
50+
data, response, err := processRequest(h, r, username)
5151

5252
if err != nil {
5353
return response, err

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
44
kind: Kustomization
55
images:
66
- name: controller
7-
newName: nexus-docker.minikube/kubedb
7+
newName: nexus-docker.minikube/docker-hosted/kubedb
88
newTag: goran-test

controllers/mongodbdatabase_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func (r *MongoDBDatabaseReconciler) Reconcile(req ctrl.Request) (ctrl.Result, er
131131
})
132132
// get user credentials from vault
133133
vault := common.Vault{}
134-
vaultResponse, err := vault.Get(common.ConvertMongoDBDatabaseCredential(credential), database.Name, log)
134+
vaultResponse, err := vault.Get(common.ConvertMongoDBDatabaseCredential(credential), username, log)
135135
if err != nil {
136136
mongodbCredentialStatus.SetCredentialsStatus(infrav1beta1.Unavailable, err.Error())
137137
continue

controllers/postgresqldatabase_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func (r *PostgreSQLDatabaseReconciler) Reconcile(req ctrl.Request) (ctrl.Result,
150150
})
151151
// get user credentials from vault
152152
vault := common.Vault{}
153-
vaultResponse, err := vault.Get(common.ConvertPostgreSQLDatabaseCredential(credential), database.Name, log)
153+
vaultResponse, err := vault.Get(common.ConvertPostgreSQLDatabaseCredential(credential), username, log)
154154
if err != nil {
155155
postgreSQLCredentialStatus.SetCredentialsStatus(infrav1beta1.Unavailable, err.Error())
156156
continue

0 commit comments

Comments
 (0)