recommended changes

Author: Matt Sokoloff

Makefile

@@ -12,7 +12,7 @@ test-local: build
 test-staging: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \
 		-e LABELBOX_TEST_ENVIRON="staging" \
-		-e LABELBOX_TEST_API_KEY_STAGING=${LLT} \
+		-e LABELBOX_TEST_API_KEY_STAGING=${LABELBOX_TEST_API_KEY_STAGING} \
 		local/labelbox-python:test pytest $(PATH_TO_TEST) -svvx
 
 test-prod: build

labelbox/schema/iam_integration.py

@@ -1,30 +1,20 @@
-from labelbox.utils import camel_case
-from pydantic import BaseModel
+from dataclasses import dataclass
 
+from labelbox.utils import snake_case
 from labelbox.orm.db_object import DbObject
 from labelbox.orm.model import Field
 
 
-
-
-
-class AwsIamIntegrationSettings(BaseModel):
+@dataclass
+class AwsIamIntegrationSettings:
     role_arn: str
 
-    class Config:
-        allow_population_by_field_name = True
-        alias_generator = camel_case
-
 
-class GcpIamIntegrationSettings(BaseModel):
+@dataclass
+class GcpIamIntegrationSettings:
     service_account_email_id: str
     read_bucket: str
 
-    class Config:
-        allow_population_by_field_name = True
-        alias_generator = camel_case
-
-
 
 class IAMIntegration(DbObject):
     """ Represents an IAM integration for delegated access
@@ -41,13 +31,18 @@ class IAMIntegration(DbObject):
     """
 
     def __init__(self, client, data):
-        settings = data.pop('settings', {})
-        type_name = settings.pop('__typename')
-        if type_name == "GcpIamIntegrationSettings":
-            self.settings = GcpIamIntegrationSettings(**settings)
-        elif type_name == "AwsIamIntegrationSettings":
-            self.settings = AwsIamIntegrationSettings(**settings)
-
+        settings = data.pop('settings', None)
+        if settings is not None:
+            type_name = settings.pop('__typename')
+            settings = {snake_case(k): v for k, v in settings.items()}
+            if type_name == "GcpIamIntegrationSettings":
+                self.settings = GcpIamIntegrationSettings(**settings)
+            elif type_name == "AwsIamIntegrationSettings":
+                self.settings = AwsIamIntegrationSettings(**settings)
+            else:
+                self.settings = None
+        else:
+            self.settings = None
         super().__init__(client, data)
 
     _DEFAULT = "DEFAULT"

tests/integration/test_delegated_access.py

@@ -2,7 +2,7 @@
 import pytest
 
 
-#@pytest.mark.skip("Can only be tested in specific organizations.")
+@pytest.mark.skip("Can only be tested in specific organizations.")
 def test_default_integration(client):
     # This tests assumes the following:
     # 1. gcp delegated access is configured to work with utkarsh-da-test-bucket
@@ -17,7 +17,7 @@ def test_default_integration(client):
     ds.delete()
 
 
-#@pytest.mark.skip("Can only be tested in specific organizations.")
+@pytest.mark.skip("Can only be tested in specific organizations.")
 def test_non_default_integration(client):
     # This tests assumes the following:
     # 1. aws delegated access is configured to work with lbox-test-bucket