Update credentials.json.enc and testDB2Service.py. (#102)

* Update credentials.json.enc and testDB2Service.py.

* Switch decode credentials, fix test cases.
  - Switch decoding key for credentials.
  - Adapt tests to changes in openwhisk repository.

* Revert change.

* Build binary artifacts required for the tests.

* Use generated python.zip.

* Provide Path instead of File.

* Switch to getAbsolutePath().

* Explicitly call :tests:buildArtifacts.

* Switch back to python.zip from open.

* Remove buildArtifacts.

* Remove python.zip resources.

* Add test resources removed from openwhisk.

* Remove unused import.

* Add missing File import.

* Move actions to resources directory.

* Also build openwhisk test artifacts.

* Cleanup scripts.

* Some cleanup.

* Change username/password in watson tests to apikey.
- Watson updated its instances to IAM. Therefore they now use apikey instead of username/password.

Author: falkzoll

.travis.yml

@@ -12,7 +12,7 @@ notifications:
       secure: Yc9ZlTaxhcZT3GWkYyiKpREEORBDLNoTHRqBJNOKvIF1oOCZPH0E9KqaJewwcoSno9G8yhd239kzYtv34moAxYdyKe89SomiH+9wFFpjlS7Ge28+VTWv8yr1EL6pUMW7rJDDODeKxwEHMkdCMARFLrYlQ8xM9quWrc98zqULwusIZpGyVwT3K/4PpWL1OH7D9d0Ain3jods1t7hEzlt8XykLhxpu20bKtxo/0rBJre7f6oCCjEARsHJkvx31VuuZAp5cCLOXPc22Fsd7kqOzzGpsLQICURwUqf7DR8qWyFyXT3QnfJwc2uYXE1yj6SOGxHV1jXOSIymiUFD+8afHlm4SBnqo0UhAIf1z3AJ7r+MSsCTLK7w7kY1WjfOXCK74hiNzS8WmzZJ7C3cVCKYEaxYDDbpUqx9b1+gRaf+acJEuvkMLlkJo5Rze+njdeR9RZbR7i0KR3OCLjXDlu87P2orq6iMNCTDs1FtXlOFeeL42o1YcL1CCKnVXr9feGDSmpZ7Y1ypih+yoeFRYrdG/rPEcgppPXCZBbCWqlzAoRMDrFck+weHTCyMzm16moz2dAxCulm8TrUlb5z4ClbasD6sfdaSFskQtpnW6JtG9gIQt6pfJGkHzMV3Js06sUTNhRWtiLXyUJAftN2xq1skFoMR5beg2a1H9+OKeS03a45E=
 
 before_install:
-  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_10110adb91b4_key -iv $encrypted_10110adb91b4_iv -in tests/credentials.json.enc -out tests/credentials.json -d; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K "$encrypted_8D2E480FC532_key" -iv "$encrypted_8D2E480FC532_iv" -in tests/credentials.json.enc -out tests/credentials.json -d; fi'
   - "./tools/travis/setup.sh"
 install: true
 script:

tests/build.gradle

@@ -38,3 +38,14 @@ dependencies {
 tasks.withType(ScalaCompile) {
     scalaCompileOptions.additionalParameters = gradle.scala.compileFlags
 }
+
+task buildArtifacts(type:Exec) {
+    workingDir 'src/test/resources'
+    commandLine './build.sh'
+}
+
+tasks.withType(Test) {
+    dependsOn buildArtifacts
+}
+
+testClasses.dependsOn(buildArtifacts)

tests/credentials.json.enc

@@ -11,8 +11,18 @@ def main(args):
         print ("Connection failed.")
         return {"error":"Error connecting to db2"}
 
-        # Select from TestTable (the row just inserted)
-    cmd = "SELECT HISP_DESC FROM SAMPLES.HISPANIC_ORIGIN WHERE HISP_CODE='03'"
+    # Select from TestTable (the row just inserted).
+    #
+    # Due to the db2 lite plan we use, the schema name is fixed to be
+    # the same as the username. We cut the value of the UID field
+    # in the ssldsn to get it and insert it in the select statement.
+    # The ssldsn looks like this:
+    # ssldsn="DATABASE=BLUDB;HOSTNAME=dashdb-xxxx.services.dal.bluemix.net;PORT=50001;PROTOCOL=TCPIP;UID=yyyyyyy;PWD=<hidden>;"
+    #
+    ssldsndict = dict(x.split("=") for x in ssldsn.rstrip(";").split(";"))
+    print("user={}".format(ssldsndict["UID"]))
+
+    cmd = "SELECT HISP_DESC FROM {}.HISPANIC_ORIGIN WHERE HISP_CODE='03'".format(ssldsndict["UID"])
     result = ibm_db.exec_immediate(conn, cmd)
 
     if not result:
@@ -27,4 +37,4 @@ def main(args):
 if __name__ == "__main__":
     # execute only if run as a script
     input = {"__bx_creds":{"dashDB":{"ssldsn":"<ssldsn from credentials>"}}}
-    print(main(input))
+    print(main(input))

tests/dat/db2/testDB2Service.py

@@ -8,8 +8,8 @@ def main(args):
     language_translator = LanguageTranslatorV3(
         version="2018-05-01",
         url=args.get("url"),
-        username=args.get("username"),
-        password=args.get("password"))
+        username="APIKey",
+        password=args.get("apikey"))
 
     translation = language_translator.translate(text='Hello', model_id='en-es')
     if LooseVersion(sdk_version) < LooseVersion('2.0.0'):
@@ -20,6 +20,5 @@ def main(args):
 if __name__ == "__main__":
     # execute only if run as a script
     input = {"url":"<url from credentials>",
-             "username":"<username from credentials>",
-             "password":"<password from credentials>"}
+             "apikey":"<apikey from credentials>"}
     print(main(input))

tests/dat/watson/testWatsonService.py

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+# build the necessary resources for the testcases
+# this is not implemented, yet
+# it will look like this:
+# (cd python-zip && zip ../python.zip -r .)