Merge pull request #40 from istat-methodology/storage-account-removal

remove R and python storage account dependencies
istat-methodology · May 6, 2024 · 89a7167 · 89a7167
2 parents 3a62c48 + 2cad829
commit 89a7167
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/terra-update-batch/modules/cosmoUtility.py b/terra-update-batch/modules/cosmoUtility.py
@@ -200,16 +200,6 @@ def exportOutputs(logger):
         copyFileToAzure(params.SHARE_NAME['JSON'],"classification", OUTPUT_CLASS_FOLDER + "clsProductsGraphExtraNSTR.json" , logger)
         copyFileToAzure(params.SHARE_NAME['JSON'],"classification", OUTPUT_CLASS_FOLDER + "clsProductsGraphIntra.json" , logger)
 
-        # R-SERVER
-        copyFileToAzure(params.SHARE_NAME['R'], None, params.FILES["COMEXT_IMP_CSV"] , logger)
-        copyFileToAzure(params.SHARE_NAME['R'], None, params.FILES["COMEXT_EXP_CSV"] , logger)
-
-        # Python-SERVER
-        copyFileToAzure(params.SHARE_NAME['PYTHON'], None, params.FILES["CPA_INTRA_CSV"] , logger)
-        copyFileToAzure(params.SHARE_NAME['PYTHON'], None, params.FILES["CPA_TRIM_CSV"] , logger)
-        copyFileToAzure(params.SHARE_NAME['PYTHON'], None, params.FILES["TR_EXTRA_UE_CSV"] , logger)
-        copyFileToAzure(params.SHARE_NAME['PYTHON'], None, params.FILES["TR_EXTRA_UE_TRIMESTRALI_CSV"] , logger)
-
         # DB EXPORT
         copyFileToDb(params.DB_FILE_MAPPING, params.DB_SETTINGS, params.DB_SCHEMAS, params.DB_COLUMN_TYPE, logger)
 
@@ -262,7 +252,6 @@ def createAndSendBackupFiles(logger):
     else:
         logger.info("createAndSendBackupFiles: simulate only")
 
-
 def deleteFolder(folder , logger):
     logger.info("deleteFolder ... " + folder)
     shutil.rmtree(folder, ignore_errors=True)
@@ -286,17 +275,15 @@ def checkUPMicroservices(logger):
     logger.info("checkUPMicroservices START")
     resultCall = ""
     try:
-        call = urllib.request.urlopen(params.URL_RDATA_SERVER + "/hello", timeout=30).read()
-        logger.info(str(call))
-        resultCall += " Check UP R-SERVER OK<br/>\n"
         call = urllib.request.urlopen(params.URL_JSONDATA_SERVER + "/hello", timeout=30).read()
         logger.info(str(call))
         resultCall += " Check UP JSON-SERVER OK<br/>\n"
-        call = urllib.request.urlopen(
-            params.URL_PYTHONDATA_SERVER + "/hello", timeout=30
-        ).read()
+        call = urllib.request.urlopen(params.URL_PYTHON_SERVER_GRAPH + "/hello", timeout=30).read()
+        logger.info(str(call))
+        resultCall += " Check UP GRAPH ENDPOINT OK<br/>\n"
+        call = urllib.request.urlopen(params.URL_PYTHON_SERVER_TS + "/hello", timeout=30).read()
         logger.info(str(call))
-        resultCall += " Check UP PYTHON-SERVER OK<br/>\n"
+        resultCall += " Check UP TIME SERIES ENDPOINT OK<br/>\n"
     except BaseException as e:
         resultCall += " ERRROR Refresh: " + str(e) + "<br/>\n"
         logger.info(" ERRROR Refresh: " + str(e) + "<br/>\n")

diff --git a/terra-update-batch/resources/params.py b/terra-update-batch/resources/params.py
@@ -14,14 +14,12 @@
 KEY_VAULT_NAME        : str  = os.getenv("KEY_VAULT_NAME", "")
 SECRETNAME_ACCOUNTKEY : str  = "cosmostoragekey"
 
-URL_JSONDATA_SERVER   : str  = "https://api.cosmo.statlab.it/cls"
-URL_RDATA_SERVER      : str  = "https://api.cosmo.statlab.it/time-series"
-URL_PYTHONDATA_SERVER : str  = "https://api.cosmo.statlab.it/graph"
+URL_JSONDATA_SERVER         : str  = "https://api.cosmo.statlab.it/cls"
+URL_PYTHON_SERVER_TS        : str  = "https://api.cosmo.statlab.it/time-series"
+URL_PYTHON_SERVER_GRAPH     : str  = "https://api.cosmo.statlab.it/graph"
 
 SHARE_NAME : dict[str, str] = {
-    "JSON": os.getenv("SHARENAME_PREFIX", "istat-cosmo-data-") + "json",
-    "PYTHON": os.getenv("SHARENAME_PREFIX", 'istat-cosmo-data-') + "python",
-    "R": os.getenv("SHARENAME_PREFIX", 'istat-cosmo-data-') + "r"
+    "JSON": os.getenv("SHARENAME_PREFIX", "istat-cosmo-data-") + "json"
 }
 
 DB_SETTINGS : dict[str, str] = {