Skip to content

Commit 866dcbb

Browse files
authored
Fixing the rotation root test and updated the examples to have username template (#4)
1 parent 07bb787 commit 866dcbb

6 files changed

Lines changed: 25 additions & 10 deletions

couchbasecapella_test.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,12 @@ func testCouchbaseCapellaDBRotateRootCredentials(t *testing.T) {
252252
// rotate back
253253
t.Logf("Rotating back to original adminUserAccessKey: %s", adminUserSecretKey)
254254
rotatePasswordBack := adminUserSecretKey
255+
connectionDetails["password"] = rotatePassword
255256
adminUserSecretKey = rotatePassword
257+
db, err = setupCouchbaseCapellaDBInitialize(t)
258+
if err != nil {
259+
t.Fatalf("err: %s", err)
260+
}
256261

257262
updateReq = dbplugin.UpdateUserRequest{
258263
Username: adminUserAccessKey,
@@ -265,8 +270,8 @@ func testCouchbaseCapellaDBRotateRootCredentials(t *testing.T) {
265270
if err != nil {
266271
t.Fatalf("err: %s", err)
267272
}
268-
269-
adminUserSecretKey = rotatePassword
273+
adminUserSecretKey = rotatePasswordBack
274+
connectionDetails["password"] = rotatePasswordBack
270275

271276
db.Close()
272277

scripts/renew_lease.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vault lease renew database/creds/mydynamicrole3/H6oTjPt1LwW0sVa5lzamDWMa

scripts/run_tests.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
go test -v \
2+
-apiUrl='https://cloudapi.dev.nonprod-project-avengers.com/v4' \
3+
-orgId='6af08c0a-8cab-4c1c-b257-b521575c16d0' \
4+
-projectId='d352361d-8de1-445b-9969-873b6decb63a' \
5+
-clusterId='1b40279a-6c27-44f1-bc7b-8d216563978e' \
6+
-adminUserAccessKey='B749cMAAYxxJLU8BnD31J4WXoOGq4TW4' \
7+
-adminUserSecretKey='sUZcQyfL4X61IeS#JR7mObOzXWrb8RoH%80VFf%ITx%yXH2EONNkUplwEc0zYBqC'

scripts/set_db_config_example.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ vault write database/config/couchbasecapella-database \
33
cloud_api_base_url="https://cloudapi.dev.nonprod-project-avengers.com/v4" \
44
organization_id="6af08c0a-8cab-4c1c-b257-b521575c16d0" \
55
project_id="d352361d-8de1-445b-9969-873b6decb63a" \
6-
cluster_id="3f1d7f58-6095-4785-9877-7dd4485d84ba" \
7-
username="a3LxE9HwU7BlnOKK7TYcKEoaaFCJEdIy" \
8-
password='kFsu0H9Zw1WXQB#ZlBh3AemjRAUFf#RUAKE7Zo5@s7Q%0ZvsLTAMn7v!eAv4BtBJ' \
6+
cluster_id="1b40279a-6c27-44f1-bc7b-8d216563978e" \
7+
username="B749cMAAYxxJLU8BnD31J4WXoOGq4TW4" \
8+
password='sUZcQyfL4X61IeS#JR7mObOzXWrb8RoH%80VFf%ITx%yXH2EONNkUplwEc0zYBqC' \
99
password_policy="couchbasecapella" \
10-
allowed_roles="*"
10+
allowed_roles="*" \
11+
username_template='{{printf "VC_%s_%s_%s_%s" (printf "%s" .DisplayName | uppercase | truncate 64) (printf "%s" .RoleName | uppercase | truncate 64) (random 20 | uppercase) (unix_time) | truncate 128}}'
12+

scripts/set_dynamic_role_all_scopes_example.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ vault write database/roles/mydynamicrole2 db_name="couchbasecapella-database" cr
66
"resources": {
77
"buckets": [
88
{
9-
"name": "db-cred-test-12Qj",
9+
"name": "vault-bucket-1",
1010
"scopes": [
1111
{ "name": "*" }
1212
]
1313
},
1414
{
15-
"name": "db-cred-test-3zRb",
15+
"name": "vault-bucket-2",
1616
"scopes": [
1717
{ "name": "*" }
1818
]
1919
},
2020
{
21-
"name": "db-cred-test-FcAv",
21+
"name": "vault-bucket-3",
2222
"scopes": [
2323
{ "name": "*" }
2424
]

scripts/set_dynamic_role_example.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ vault write database/roles/mydynamicrole1 db_name="couchbasecapella-database" cr
1111
{
1212
"name": "vault-bucket-1-scope-1",
1313
"collections": [
14-
"*"
14+
"vault-bucket-1-scope-1-collect-1"
1515
]
1616
}
1717
]

0 commit comments

Comments
 (0)