Skip to content

Commit 79e3ae7

Browse files
committed
feat(chore): updated whisk-system.sh
Updated login action dependencies in whisk-system.sh
1 parent 839ff8f commit 79e3ae7

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

tests/kind/userdb_util_test.ipy

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
# under the License.
1717
#
1818

19-
2019
!kubectl -n nuvolaris delete all --all
2120
!kubectl -n nuvolaris delete pvc --all
2221

@@ -49,38 +48,41 @@ assert(db.configure_single_node())
4948
assert(db.configure_no_reduce_limit())
5049
assert(cdb.init_users_metadata(db))
5150

51+
# test user metadata creation
5252
!kubectl apply -f tests/kind/whisk-user.yaml
5353
wsku = kube.get("wsku/franztt")
5454
ucfg = user_config.UserConfig(wsku['spec'])
5555
metadata = user_metadata.UserMetadata(ucfg)
5656
assert(userdb.save_user_metadata(metadata))
5757

58+
# test user metadata retrieve
5859
selector = {"selector":{"login": {"$eq": ucfg.get('namespace') }}}
5960
response = db.find_doc("users_metadata", json.dumps(selector))
60-
6161
assert(response)
6262
docs = list(response['docs'])
6363
assert(len(docs) > 0)
6464

65+
# test password verification
6566
doc = docs[0]
6667
assert(bu.verify_password(ucfg.get('password'),doc['password']))
6768

6869
# test password change
6970
new_password = 'test123'
70-
7171
userdb.update_user_metadata_password(ucfg.get('namespace'), new_password)
7272
response = db.find_doc("users_metadata", json.dumps(selector))
7373
assert(response)
7474
docs = list(response['docs'])
7575
doc = docs[0]
7676
assert(bu.verify_password(new_password,doc['password']))
7777

78+
# test delete metadata
7879
assert(userdb.delete_user_metadata(ucfg.get('namespace')))
7980
response = db.find_doc("users_metadata", json.dumps(selector))
8081
assert(response)
8182
docs = list(response['docs'])
8283
assert(len(docs) == 0)
8384

85+
# cleanup
8486
!kubectl -n nuvolaris delete all --all
8587
!kubectl -n nuvolaris delete pvc --all
8688

whisk-system.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ echo preparing nuvolaris system actions....
2323

2424
mkdir -p ${HOME}/actions/login/nuvolaris
2525
mkdir -p ${HOME}/deploy/whisk-system
26-
cp ${HOME}/nuvolaris/config.py ${HOME}/nuvolaris/couchdb_util.py ${HOME}/actions/login/nuvolaris
26+
cp ${HOME}/nuvolaris/config.py ${HOME}/nuvolaris/couchdb_util.py ${HOME}/nuvolaris/bcrypt_util.py ${HOME}/actions/login/nuvolaris
2727
cd ${HOME}/actions/login
2828
rm -f ${HOME}/deploy/whisk-system/login.zip
2929
zip -r ${HOME}/deploy/whisk-system/login.zip *

0 commit comments

Comments
 (0)