Do not allow pipeline failures for IBM

.gitlab-ci.yml

@@ -199,8 +199,3 @@ osdu-gcp-test:
 
 ibm-deploy:
   allow_failure: true
-
-# Allow failure on integration tests
-
-ibm-test:
-  allow_failure: true

app/injector/ibm_injector.py

@@ -6,7 +6,7 @@ from app.utils import Context
 from .app_injector import AppInjector, AppInjectorModule
 from app.bulk_persistence import resolve_tenant
 from app.bulk_persistence.dask.dask_bulk_storage import DaskBulkStorage
-from osdu_ibm.storage.dask_storage_parameters import get_dask_storage_parameters as ibm_parameters
+from osdu_ibm.storage.dask_storage_parameters import DaskStorageParametersFactoryIBM
 
 
 class IBMInjector(AppInjectorModule):
@@ -26,8 +26,8 @@ class IBMInjector(AppInjectorModule):
 
     @staticmethod
     async def build_ibm_dask_blob_storage() -> DaskBulkStorage:
-        # raise NotImplementedError()
+        daskstoragefactory = DaskStorageParametersFactoryIBM()
         ctx: Context = Context.current()
         tenant = await resolve_tenant(ctx.partition_id)
-        params = await ibm_parameters(tenant)
+        params = await daskstoragefactory.get_dask_storage_parameters(tenant)
         return await DaskBulkStorage.create(params)

requirements.in

@@ -24,6 +24,8 @@ dask[distributed]==2021.7.2
 fsspec
 python-ulid
 s3fs==2021.8.0
+aiobotocore[boto3]
+
 --extra-index-url \
 https://community.opengroup.org/api/v4/projects/465/packages/pypi/simple/
 
@@ -32,8 +34,8 @@ osdu-log-recognition-lib>=0.0.9
 osdu-data-ecosystem-storage~=1.2.0
 osdu-data-ecosystem-search>=0.3.2, <0.4
 
-osdu-core-lib-python-ibm~=1.2.0
+osdu-core-lib-python-ibm==1.3.0
 osdu-core-lib-python-gcp~=1.1.0
 osdu-core-lib-python-azure~=1.2.1
 osdu-core-lib-python-aws>=0.0.3, <0.1
-osdu-core-lib-python~=1.1.0
\ No newline at end of file
+osdu-core-lib-python~=1.1.0

requirements.txt

@@ -10,8 +10,10 @@ adal==1.2.7
     # via azure-datalake-store
 adlfs==0.7.7
     # via osdu-core-lib-python-azure
-aiobotocore==1.4.1
-    # via s3fs
+aiobotocore[boto3]==1.4.1
+    # via
+    #   -r requirements.in
+    #   s3fs
 aiohttp==3.7.4.post0
     # via
     #   -r requirements.in
@@ -70,7 +72,9 @@ azure-storage-blob==12.8.1
 backoff==1.11.1
     # via -r requirements.in
 boto3==1.17.106
-    # via osdu-core-lib-python-ibm
+    # via
+    #   aiobotocore
+    #   osdu-core-lib-python-ibm
 botocore==1.20.106
     # via
     #   aiobotocore
@@ -103,6 +107,8 @@ cloudpickle==1.6.0
     # via
     #   dask
     #   distributed
+colorama==0.4.4
+    # via click
 cryptography==3.4.7
     # via
     #   -r requirements.in
@@ -251,7 +257,7 @@ osdu-core-lib-python-azure==1.2.1
     # via -r requirements.in
 osdu-core-lib-python-gcp==1.1.0
     # via -r requirements.in
-osdu-core-lib-python-ibm==1.2.0
+osdu-core-lib-python-ibm==1.3.0
     # via -r requirements.in
 osdu-data-ecosystem-search==0.3.3
     # via -r requirements.in
@@ -317,6 +323,8 @@ pytz==2021.1
     # via
     #   google-api-core
     #   pandas
+	#	pywin32==301
+    # via portalocker
 pyyaml==5.4.1
     # via
     #   dask