[PPML] change KMS appkey to apikey (#5658)

* change appkey to apikey * change APiKEY to APIKEY Co-authored-by: Heyang Sun <[email protected]>
intel-analytics · Sep 13, 2022 · fe8c652 · fe8c652
1 parent e14b080
commit fe8c652
Show file tree

Hide file tree

Showing 31 changed files with 127 additions and 127 deletions.
diff --git a/docs/readthedocs/source/doc/PPML/QuickStart/tpc-h_with_sparksql_on_k8s.md b/docs/readthedocs/source/doc/PPML/QuickStart/tpc-h_with_sparksql_on_k8s.md
@@ -181,7 +181,7 @@ export OUTPUT_DIR=xxx/output \
     --conf spark.ssl.trustStoreType=JKS \
     --conf spark.bigdl.kms.type=SimpleKeyManagementService \
     --conf spark.bigdl.kms.simple.id=simpleAPPID \
-    --conf spark.bigdl.kms.simple.key=simpleAPPKEY \
+    --conf spark.bigdl.kms.simple.key=simpleAPIKEY \
     --conf spark.bigdl.kms.key.primary=xxxx/primaryKey \
     --conf spark.bigdl.kms.key.data=xxxx/dataKey \
     --class com.intel.analytics.bigdl.ppml.examples.tpch.TpchQuery \

diff --git a/ppml/README.md b/ppml/README.md
@@ -171,7 +171,7 @@ you can use [generate_people_csv.py](https://github.com/analytics-zoo/ppml-e2e-e
 
 2. Encrypt `people.csv`
     ```
-    docker exec -i $KMSUTIL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh encrypt $appid $appkey $input_file_path"
+    docker exec -i $KMSUTIL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh encrypt $appid $apikey $input_file_path"
     ```
 #### Step 2. Build Big Data & AI applications
 To build your own Big Data & AI applications, refer to [develop your own Big Data & AI applications with BigDL PPML](#4-develop-your-own-big-data--ai-applications-with-bigdl-ppml). The code of SimpleQuery is in [here](https://github.com/intel-analytics/BigDL/blob/main/scala/ppml/src/main/scala/com/intel/analytics/bigdl/ppml/examples/SimpleQuerySparkExample.scala), it is already built into bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar, and the jar is put into PPML image.
@@ -287,7 +287,7 @@ Here we use **k8s client mode** and **PPML CLI** to run SimpleQuery. Check other
               --kmsServerIP your_ehsm_kms_server_ip \
               --kmsServerPort your_ehsm_kms_server_port \
               --ehsmAPPID your_ehsm_kms_appid \
-              --ehsmAPPKEY your_ehsm_kms_appkey
+              --ehsmAPIKEY your_ehsm_kms_apikey
       ```
 
 
@@ -313,7 +313,7 @@ Here we use **k8s client mode** and **PPML CLI** to run SimpleQuery. Check other
 When the job is done, you can decrypt and read result of the job. More details in [Decrypt Job Result](./services/kms-utils/docker/README.md#3-enroll-generate-key-encrypt-and-decrypt).
 
   ```
-  docker exec -i $KMSUTIL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh decrypt $appid $appkey $input_path"
+  docker exec -i $KMSUTIL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh decrypt $appid $apikey $input_path"
   ```
 
 https://user-images.githubusercontent.com/61072813/184758643-821026c3-40e0-4d4c-bcd3-8a516c55fc01.mp4

diff --git a/ppml/docs/examples.md b/ppml/docs/examples.md
@@ -175,7 +175,7 @@ bash bigdl-ppml-submit.sh \
         --kmsServerIP kms_server_ip \
         --kmsServerPort kms_server_port \
         --ehsmAPPID appid \
-        --ehsmAPPKEY apikey
+        --ehsmAPIKEY apikey
 ```
 
 spark native mode, sgx enabled
@@ -214,7 +214,7 @@ bash bigdl-ppml-submit.sh \
         --kmsServerIP kms_server_ip \
         --kmsServerPort kms_server_port \
         --ehsmAPPID appid \
-        --ehsmAPPKEY apikey
+        --ehsmAPIKEY apikey
 ```
 
 k8s client mode, sgx enabled
@@ -256,7 +256,7 @@ bash bigdl-ppml-submit.sh \
         --kmsServerIP kms_server_ip \
         --kmsServerPort kms_server_port \
         --ehsmAPPID appid \
-        --ehsmAPPKEY apikey
+        --ehsmAPIKEY apikey
 ```
 
 k8s cluster mode, sgx enabled
@@ -298,7 +298,7 @@ bash bigdl-ppml-submit.sh \
         --kmsServerIP kms_server_ip \
         --kmsServerPort kms_server_port \
         --ehsmAPPID appid \
-        --ehsmAPPKEY apikey
+        --ehsmAPIKEY apikey
 ```
 </details>
 

diff --git a/ppml/services/kms-utils/docker/README.md b/ppml/services/kms-utils/docker/README.md
@@ -67,24 +67,24 @@ INFO [main.cpp(159) -> main]: ehsm-kms enroll app end.
 
 
 export appid=your_appid
-export appkey=your_apikey
+export apikey=your_apikey
 export container_input_file_path=mounted_address_of_host_input_file_path
 export container_input_folder_path=mounted_address_of_host_input_folder_path
 
 
 # Generatekeys
-docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh generatekeys $appid $appkey"
+docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh generatekeys $appid $apikey"
 
 # Encrypt a single data file
 # encrpted data is next to $container_input_file_path
-docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh $kms_type encrypt $appid $appkey $container_input_file_path"
+docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh $kms_type encrypt $appid $apikey $container_input_file_path"
 
 # Decrypt a single data file
-docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh decrypt $appid $appkey $container_input_file_path"
+docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh decrypt $appid $apikey $container_input_file_path"
 
 # SplitAndEncrypt
 # encrpted data is in a directory next to $container_input_folder_path
-docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh encryptwithrepartition $appid $appkey $container_input_folder_path"
+docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh encryptwithrepartition $appid $apikey $container_input_folder_path"
 ```
 ## 4. Stop container:
 ```

diff --git a/ppml/services/kms-utils/docker/entrypoint.sh b/ppml/services/kms-utils/docker/entrypoint.sh
@@ -7,7 +7,7 @@ if [ "$action" = "enroll" ]; then
 		cd /home/ehsm/out/ehsm-kms_enroll_app/
 		./ehsm-kms_enroll_app -a http://$EHSM_KMS_IP:$EHSM_KMS_PORT/ehsm/
 	elif [ "$KMS_TYPE" = "simple" ]; then
-		echo "Simple KMS is dummy. You can choose any appid and appkey. If you want to generate the corresponding primarykey and datakey, the appid must be 12 characters long."
+		echo "Simple KMS is dummy. You can choose any appid and apikey. If you want to generate the corresponding primarykey and datakey, the appid must be 12 characters long."
 	elif [ "$KMS_TYPE" = "azure" ]; then
 	    keyVaultName=$2
 	    id=$3
@@ -20,7 +20,7 @@ if [ "$action" = "enroll" ]; then
 elif [ "$action" = "generatekeys" ]; then
 	if [ "$KMS_TYPE" = "ehsm" ]; then
 	    appid=$2
-	    appkey=$3
+	    apikey=$3
 		java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \
 		com.intel.analytics.bigdl.ppml.examples.GenerateKeys \
 		--primaryKeyPath /home/key/ehsm_encrypted_primary_key \
@@ -29,17 +29,17 @@ elif [ "$action" = "generatekeys" ]; then
 		--kmsServerIP $EHSM_KMS_IP \
 		--kmsServerPort $EHSM_KMS_PORT \
 		--ehsmAPPID $appid \
-		--ehsmAPPKEY $appkey
+		--ehsmAPIKEY $apikey
 	elif [ "$KMS_TYPE" = "simple" ]; then
 	    appid=$2
-	    appkey=$3
+	    apikey=$3
 		java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \
 		com.intel.analytics.bigdl.ppml.examples.GenerateKeys \
 		--primaryKeyPath /home/key/simple_encrypted_primary_key \
 		--dataKeyPath /home/key/simple_encrypted_data_key \
 		--kmsType SimpleKeyManagementService \
 		--simpleAPPID $appid \
-		--simpleAPPKEY $appkey
+		--simpleAPIKEY $apikey
 	elif [ "$KMS_TYPE" = "azure" ]; then
 	    keyVaultName=$2
 		java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \
@@ -54,11 +54,11 @@ elif [ "$action" = "generatekeys" ]; then
 	fi
 elif [ "$action" = "encrypt" ]; then
 	appid=$2
-	appkey=$3
+	apikey=$3
 	input_path=$4
 	if [ "$KMS_TYPE" = "ehsm" ]; then
 	    appid=$2
-	    appkey=$3
+	    apikey=$3
 		java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \
 		com.intel.analytics.bigdl.ppml.examples.Encrypt \
 		--inputPath $input_path \
@@ -68,18 +68,18 @@ elif [ "$action" = "encrypt" ]; then
 		--kmsServerIP $EHSM_KMS_IP \
                 --kmsServerPort $EHSM_KMS_PORT \
                 --ehsmAPPID $appid \
-                --ehsmAPPKEY $appkey
+                --ehsmAPIKEY $apikey
 	elif [ "$KMS_TYPE" = "simple" ]; then
 	    appid=$2
-	    appkey=$3
+	    apikey=$3
 		java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \
 		com.intel.analytics.bigdl.ppml.examples.Encrypt \
                 --inputPath $input_path \
                 --primaryKeyPath /home/key/simple_encrypted_primary_key \
                 --dataKeyPath /home/key/simple_encrypted_data_key \
                 --kmsType SimpleKeyManagementService \
 		--simpleAPPID $appid \
-                --simpleAPPKEY $appkey
+                --simpleAPIKEY $apikey
     elif [ "$KMS_TYPE" = "azure" ]; then
         keyVaultName=$2
 		java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \
@@ -96,7 +96,7 @@ elif [ "$action" = "encrypt" ]; then
 elif [ "$action" = "encryptwithrepartition" ]; then
 	if [ "$KMS_TYPE" = "ehsm" ]; then
 	    appid=$2
-            appkey=$3
+            apikey=$3
 	    input_path=$4
 	    output_path=$input_path.encrypted
 		java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \
@@ -112,10 +112,10 @@ elif [ "$action" = "encryptwithrepartition" ]; then
 		--kmsServerIP $EHSM_KMS_IP \
                 --kmsServerPort $EHSM_KMS_PORT \
                 --ehsmAPPID $appid \
-                --ehsmAPPKEY $appkey
+                --ehsmAPIKEY $apikey
 	elif [ "$KMS_TYPE" = "simple" ]; then
 	    appid=$2
-            appkey=$3
+            apikey=$3
 	    input_path=$4
 	    output_path=$input_path.encrypted
 		java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \
@@ -129,7 +129,7 @@ elif [ "$action" = "encryptwithrepartition" ]; then
                 --dataKeyPath /home/key/simple_encrypted_data_key \
 		--kmsType SimpleKeyManagementService \
                 --simpleAPPID $appid \
-                --simpleAPPKEY $appkey
+                --simpleAPIKEY $apikey
     elif [ "$KMS_TYPE" = "azure" ]; then
         keyVaultName=$2
         input_path=$3
@@ -152,7 +152,7 @@ elif [ "$action" = "encryptwithrepartition" ]; then
 elif [ "$action" = "decrypt" ]; then
 	if [ "$KMS_TYPE" = "ehsm" ]; then
 	appid=$2
-        appkey=$3
+        apikey=$3
         input_path=$4
 		java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \
 		com.intel.analytics.bigdl.ppml.examples.Decrypt \
@@ -167,10 +167,10 @@ elif [ "$action" = "decrypt" ]; then
 		--kmsServerIP $EHSM_KMS_IP \
                 --kmsServerPort $EHSM_KMS_PORT \
                 --ehsmAPPID $appid \
-                --ehsmAPPKEY $appkey
+                --ehsmAPIKEY $apikey
 	elif [ "$KMS_TYPE" = "simple" ]; then
 	appid=$2
-        appkey=$3
+        apikey=$3
         input_path=$4
 		java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \
 		com.intel.analytics.bigdl.ppml.examples.Decrypt \
@@ -183,7 +183,7 @@ elif [ "$action" = "decrypt" ]; then
                 --dataKeyPath /home/key/simple_encrypted_data_key \
                 --kmsType SimpleKeyManagementService \
                 --simpleAPPID $appid \
-                --simpleAPPKEY $appkey
+                --simpleAPIKEY $apikey
     elif [ "$KMS_TYPE" = "azure" ]; then
         keyVaultName=$2
         input_path=$3

diff --git a/ppml/services/kms-utils/docker/run-docker-container.sh b/ppml/services/kms-utils/docker/run-docker-container.sh
@@ -33,29 +33,29 @@ sudo docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh enr
 
 # 3. generate primary key and data key, save them to local paths
 export APPID=your_appid_obtained_from_enroll
-export APPKEY=your_appkey_obtained_from_enroll
+export APIKEY=your_apikey_obtained_from_enroll
 
-sudo docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh generatekeys $APPID $APPKEY" # keys to save in $local_key_folder_path
+sudo docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh generatekeys $APPID $APIKEY" # keys to save in $local_key_folder_path
 
 # 4. encrypt and decrypt binary file
 export DATA_FILE_NAME_TO_HANDLE=your_local_data_file_name_in_local_data_folder_path
 export APPID=your_appid_obtained_from_enroll
-export APPKEY=your_appkey_obtained_from_enroll
+export APIKEY=your_apikey_obtained_from_enroll
 
-sudo docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh localcrypto $APPID $APPKEY /home/data/$DATA_FILE_NAME_TO_HANDLE" # at local host side, a .encrypted and a .decrypted file will be generated
+sudo docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh localcrypto $APPID $APIKEY /home/data/$DATA_FILE_NAME_TO_HANDLE" # at local host side, a .encrypted and a .decrypted file will be generated
 
 
 # 5. SplitAndEncrypt a CSV data file
 export DATA_FILE_NAME_TO_HANDLE=your_local_csv_data_file_name_in_local_data_folder_path
 export APPID=your_appid_obtained_from_enroll
-export APPKEY=your_appkey_obtained_from_enroll
+export APIKEY=your_apikey_obtained_from_enroll
 
-sudo docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh splitandencrypt $APPID $APPKEY /home/data/$DATA_FILE_NAME_TO_HANDLE" # at local host side, a folder filled with encrypted data splits will be generated
+sudo docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh splitandencrypt $APPID $APIKEY /home/data/$DATA_FILE_NAME_TO_HANDLE" # at local host side, a folder filled with encrypted data splits will be generated
 
 
 # 6. Decrypt a encrypted CSV data file with SimpleQuery
 export DATA_FILE_NAME_TO_HANDLE=your_local_encrypted_csv_data_file_name_in_local_data_folder_path
 export APPID=your_appid_obtained_from_enroll
-export APPKEY=your_appkey_obtained_from_enroll
+export APIKEY=your_apikey_obtained_from_enroll
 
-sudo docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh simplequery $APPID $APPKEY /home/data/$DATA_FILE_NAME_TO_HANDLE" # at local host side, decrypted files will be generated
+sudo docker exec -i $ENROLL_CONTAINER_NAME bash -c "bash /home/entrypoint.sh simplequery $APPID $APIKEY /home/data/$DATA_FILE_NAME_TO_HANDLE" # at local host side, decrypted files will be generated
diff --git a/ppml/services/pccs-ehsm/kubernetes/README.md b/ppml/services/pccs-ehsm/kubernetes/README.md
@@ -131,7 +131,7 @@ cd ../kms-utils
 bash build-docker-image.sh
 ```
 
-If image is ready, you can run the container and enroll by using `run-docker-container.sh` in order to get a appid and appkey pair like below:
+If image is ready, you can run the container and enroll by using `run-docker-container.sh` in order to get a appid and apikey pair like below:
 
 ```bash
 export KMS_TYPE=an_optional_kms_type # KMS_TYPE can be (1) ehsm, (2) simple
@@ -197,7 +197,7 @@ ls ehsm-kms_enroll_app
 
 Then, you will find a new target file `ehsm-kms_enroll_app` generated.
 
-Now, you can enroll your app through command below, and you will receive a appid-appkey pair from the server:
+Now, you can enroll your app through command below, and you will receive a appid-apikey pair from the server:
 
 ```bash
 ./ehsm-kms_enroll_app -a http://<your_kms_external_ipaddr>:9000/ehsm/

diff --git a/python/ppml/src/bigdl/ppml/README.md b/python/ppml/src/bigdl/ppml/README.md
@@ -29,7 +29,7 @@ If you want to read/write encrypted files, then you need to provide more informa
 if the `kms_type` is `SimpleKeyManagementService`, then need
 
 - `simple_app_id`: the appId your KMS generated
-- `simple_app_key`: the appKey  your KMS generated
+- `simple_api_key`: the apiKey  your KMS generated
 - `primary_key_path`: the path of your primaryKey
 - `data_key_path`:  the path of your dataKey
 
@@ -38,7 +38,7 @@ if the `kms_type` is `EHSMKeyManagementService`, then need
 - `kms_server_ip`: the server ip of your KMS
 - `kms_server_port`: the server port of your KMS
 - `ehsm_app_id`: the appId your KMS generated
-- `ehsm_app_key`:  the appKey  your KMS generated
+- `ehsm_api_key`:  the apiKey  your KMS generated
 - `primary_key_path`: the path of your primaryKey
 - `data_key_path`:  the path of your dataKey
 
@@ -49,7 +49,7 @@ if the `kms_type` is `AzureKeyManagementService`, then need
 - `primary_key_path`: the path of your primaryKey
 - `data_key_path`:  the path of your dataKey
 
-> How to generate appId, appKey, primaryKey and dataKey, please refer to [this](https://github.com/intel-analytics/BigDL/blob/main/ppml/services/kms-utils/docker/README.md)
+> How to generate appId, apiKey, primaryKey and dataKey, please refer to [this](https://github.com/intel-analytics/BigDL/blob/main/ppml/services/kms-utils/docker/README.md)
 
 Example
 

diff --git a/scala/ppml/src/main/scala/com/intel/analytics/bigdl/ppml/PPMLContext.scala b/scala/ppml/src/main/scala/com/intel/analytics/bigdl/ppml/PPMLContext.scala
@@ -205,12 +205,12 @@ object PPMLContext{
         val ip = conf.get("spark.bigdl.kms.ehs.ip")
         val port = conf.get("spark.bigdl.kms.ehs.port")
         val appId = conf.get("spark.bigdl.kms.ehs.id")
-        val appKey = conf.get("spark.bigdl.kms.ehs.key")
-        new EHSMKeyManagementService(ip, port, appId, appKey)
+        val apiKey = conf.get("spark.bigdl.kms.ehs.key")
+        new EHSMKeyManagementService(ip, port, appId, apiKey)
       case KMS_CONVENTION.MODE_SIMPLE_KMS =>
         val id = conf.get("spark.bigdl.kms.simple.id", defaultValue = "simpleAPPID")
         // println(id + "=-------------------")
-        val key = conf.get("spark.bigdl.kms.simple.key", defaultValue = "simpleAPPKEY")
+        val key = conf.get("spark.bigdl.kms.simple.key", defaultValue = "simpleAPIKEY")
         // println(key + "=-------------------")
         SimpleKeyManagementService(id, key)
       case KMS_CONVENTION.MODE_AZURE_KMS =>
@@ -251,12 +251,12 @@ object PPMLContext{
         val ip = conf.get("spark.bigdl.kms.ehs.ip", defaultValue = "0.0.0.0")
         val port = conf.get("spark.bigdl.kms.ehs.port", defaultValue = "5984")
         val appId = conf.get("spark.bigdl.kms.ehs.id", defaultValue = "ehsmAPPID")
-        val appKey = conf.get("spark.bigdl.kms.ehs.key", defaultValue = "ehsmAPPKEY")
-        new EHSMKeyManagementService(ip, port, appId, appKey)
+        val apiKey = conf.get("spark.bigdl.kms.ehs.key", defaultValue = "ehsmAPIKEY")
+        new EHSMKeyManagementService(ip, port, appId, apiKey)
       case KMS_CONVENTION.MODE_SIMPLE_KMS =>
         val id = conf.get("spark.bigdl.kms.simple.id", defaultValue = "simpleAPPID")
         // println(id + "=-------------------")
-        val key = conf.get("spark.bigdl.kms.simple.key", defaultValue = "simpleAPPKEY")
+        val key = conf.get("spark.bigdl.kms.simple.key", defaultValue = "simpleAPIKEY")
         // println(key + "=-------------------")
         SimpleKeyManagementService(id, key)
       case KMS_CONVENTION.MODE_AZURE_KMS =>

diff --git a/scala/ppml/src/main/scala/com/intel/analytics/bigdl/ppml/attestation/AttestationCLI.scala b/scala/ppml/src/main/scala/com/intel/analytics/bigdl/ppml/attestation/AttestationCLI.scala
@@ -30,7 +30,7 @@ object AttestationCLI {
 
         val logger = LogManager.getLogger(getClass)
         case class CmdParams(appID: String = "test",
-                             appKey: String = "test",
+                             apiKey: String = "test",
                              asType: String = ATTESTATION_CONVENTION.MODE_EHSM_KMS,
                              asURL: String = "127.0.0.1:9000",
                              challenge: String = "",
@@ -40,9 +40,9 @@ object AttestationCLI {
             opt[String]('i', "appID")
               .text("app id for this app")
               .action((x, c) => c.copy(appID = x))
-            opt[String]('k', "appKey")
+            opt[String]('k', "apiKey")
               .text("app key for this app")
-              .action((x, c) => c.copy(appKey = x))
+              .action((x, c) => c.copy(apiKey = x))
             opt[String]('u', "asURL")
               .text("attestation service url, default is 127.0.0.1:9000")
               .action((x, c) => c.copy(asURL = x))
@@ -68,7 +68,7 @@ object AttestationCLI {
         val as = params.asType match {
             case ATTESTATION_CONVENTION.MODE_EHSM_KMS =>
                 new EHSMAttestationService(params.asURL.split(":")(0),
-                    params.asURL.split(":")(1), params.appID, params.appKey)
+                    params.asURL.split(":")(1), params.appID, params.apiKey)
             case ATTESTATION_CONVENTION.MODE_DUMMY =>
                 new DummyAttestationService()
             case _ => throw new AttestationRuntimeException("Wrong Attestation service type")