up fim version and upgrade scripts

Author: kthare10

authority.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-docker exec -i $1 psql am fabric < psql.upgrade
+docker exec -i $1-am-db psql am fabric < psql.upgrade

broker.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-docker exec -i $1 psql broker fabric < psql.upgrade
+docker exec -i broker-db psql broker fabric < psql.upgrade

fabric_cf/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.2"
+__VERSION__ = "1.2.1"

fabric_cf/actor/core/proxies/kafka/translate.py

@@ -104,7 +104,7 @@ def translate_slice_to_avro(*, slice_obj: ABCSlice) -> SliceAvro:
         avro_slice.config_properties = slice_obj.get_config_properties()
         avro_slice.set_lease_end(lease_end=slice_obj.get_lease_end())
         avro_slice.set_lease_start(lease_start=slice_obj.get_lease_start())
-        if slice_obj.__dict__.get('project_id') is not None:
+        if hasattr(slice_obj, 'project_id') is not None:
             avro_slice.set_project_id(project_id=slice_obj.get_project_id())
 
         if slice_obj.get_resource_type() is not None:
@@ -124,7 +124,7 @@ def translate_auth_to_avro(*, auth: AuthToken) -> AuthAvro:
         result.guid = str(auth.get_guid())
         result.oidc_sub_claim = auth.get_oidc_sub_claim()
         result.email = auth.get_email()
-        if AuthToken.__dict__.get('token') is not None:
+        if hasattr(auth, 'token') is not None:
             result.token = auth.get_token()
         return result
 

orchestrator.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-docker exec -i $1 psql orchestrator fabric < psql.upgrade
+docker exec -i orchestrator-db psql orchestrator fabric < psql.upgrade

requirements.txt

@@ -13,4 +13,4 @@ typing-extensions==3.7.4.3
 six==1.15.0
 wrapt==1.12.1
 fabric-message-bus==1.2.3
-fabric-fim==1.2.3
+fabric-fim==1.2.4