Merge pull request #507 from ddps-lab/azure-sps-for-PR

Fix the azure sps collector, azure collector workflows issue.

Author: krtaiyang

Diff for: .github/workflows/azure-lambda-sync.yml

@@ -27,17 +27,19 @@ jobs:
       - name: Zip Lambda function code
         run: |
           rm -f azure_lambda.zip
-          zip -j azure_lambda.zip \
-            collector/spot-dataset/azure/lambda/current_collector/compare_data.py \
-            collector/spot-dataset/azure/lambda/current_collector/lambda_function.py \
-            collector/spot-dataset/azure/lambda/current_collector/load_if.py \
-            collector/spot-dataset/azure/lambda/current_collector/load_price.py \
-            collector/spot-dataset/azure/lambda/current_collector/merge_df.py \
-            collector/spot-dataset/azure/lambda/current_collector/upload_data.py \
-            const_config.py
+          zip -j ./collector/spot-dataset/azure/lambda/current_collector/azure_lambda.zip \
+          ./collector/spot-dataset/azure/lambda/current_collector/compare_data.py \
+          ./collector/spot-dataset/azure/lambda/current_collector/lambda_function.py \
+          ./collector/spot-dataset/azure/lambda/current_collector/load_if.py \
+          ./collector/spot-dataset/azure/lambda/current_collector/load_price.py \
+          ./collector/spot-dataset/azure/lambda/current_collector/merge_df.py \
+          ./collector/spot-dataset/azure/lambda/current_collector/upload_data.py \
+          ./const_config.py
           
-            cd collector/spot-dataset/azure/lambda/current_collector
-            zip -r ../../../azure_lambda.zip utill
+          cd ./collector/spot-dataset/azure/lambda/current_collector/
+          zip -r azure_lambda.zip ./utill/*
+          cd ../../../../../
+          mv ./collector/spot-dataset/azure/lambda/current_collector/azure_lambda.zip ./
 
       - name: Deploy to AWS Lambda
         run: |

Diff for: .github/workflows/azure-sps-lambda-sync.yml

@@ -34,8 +34,11 @@ jobs:
             collector/spot-dataset/azure/lambda/current_collector/load_sps.py \
             const_config.py
 
-          cd collector/spot-dataset/azure/lambda/current_collector
-          zip -r ../../../azure_sps_lambda.zip utill sps_module
+          cd ./collector/spot-dataset/azure/lambda/current_collector/
+          zip -r azure_sps_lambda.zip ./utill/*
+          zip -r azure_sps_lambda.zip ./sps_module/*
+          cd ../../../../../
+          mv ./collector/spot-dataset/azure/lambda/current_collector/azure_sps_lambda.zip ./
 
       - name: Deploy to AWS Lambda
         run: |

Diff for: collector/spot-dataset/azure/lambda/current_collector/load_price.py

@@ -14,7 +14,6 @@
 event = threading.Event()
 lock = threading.Lock()
 
-
 # get instancetier from armSkuName
 def get_instaceTier(armSkuName):
     split_armSkuName = armSkuName.split('_')