Merge pull request #557 from Labelbox/jt/al-1707

[AL-1707] Update to Delegated Access Test Cases

Author: jtsodapop

.github/workflows/python-package.yml

@@ -17,12 +17,15 @@ jobs:
           - python-version: 3.6
             prod-key: LABELBOX_API_KEY
             staging-key: STAGING_LABELBOX_API_KEY
+            da-test-key: DA_GCP_LABELBOX_API_KEY
           - python-version: 3.7
             prod-key: PROD_LABELBOX_API_KEY_2
             staging-key: STAGING_LABELBOX_API_KEY_2
+            da-test-key: DA_GCP_LABELBOX_API_KEY
           - python-version: 3.8
             prod-key: PROD_LABELBOX_API_KEY_3
             staging-key: STAGING_LABELBOX_API_KEY_3
+            da-test-key: DA_GCP_LABELBOX_API_KEY
 
     steps:
       - name: Cancel previous workflow
@@ -83,5 +86,7 @@ jobs:
           LABELBOX_TEST_API_KEY_PROD: ${{ secrets[matrix.prod-key] }}
 
           LABELBOX_TEST_API_KEY_STAGING: ${{ secrets[matrix.staging-key] }}
+
+          DA_GCP_LABELBOX_API_KEY: ${{ secrets[matrix.da-test-key] }}
         run: |
           tox -e py -- -svv --reruns 5 --reruns-delay 10

Makefile

@@ -6,24 +6,28 @@ build:
 test-local: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \
 		-e LABELBOX_TEST_ENVIRON="local" \
+		-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
 		-e LABELBOX_TEST_API_KEY_LOCAL=${LABELBOX_TEST_API_KEY_LOCAL} \
 		local/labelbox-python:test pytest $(PATH_TO_TEST) 
 
 test-staging: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \
 		-e LABELBOX_TEST_ENVIRON="staging" \
+		-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
 		-e LABELBOX_TEST_API_KEY_STAGING=${LABELBOX_TEST_API_KEY_STAGING} \
 		local/labelbox-python:test pytest $(PATH_TO_TEST) 
 
 test-prod: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \
 		-e LABELBOX_TEST_ENVIRON="prod" \
+		-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
 		-e LABELBOX_TEST_API_KEY_PROD=${LABELBOX_TEST_API_KEY_PROD} \
 		local/labelbox-python:test pytest $(PATH_TO_TEST)
 
 test-onprem: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \
 		-e LABELBOX_TEST_ENVIRON="onprem" \
+		-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
 		-e LABELBOX_TEST_API_KEY_ONPREM=${LABELBOX_TEST_API_KEY_ONPREM} \
 		-e LABELBOX_TEST_ONPREM_HOSTNAME=${LABELBOX_TEST_ONPREM_HOSTNAME} \
 		local/labelbox-python:test pytest $(PATH_TO_TEST) 

README.md

@@ -121,3 +121,6 @@ make test-prod # with an optional flag: PATH_TO_TEST=tests/integration/...etc LA
 ```
 make -B {build|test-staging|test-prod}
 ```
+
+6. Testing against Delegated Access will be skipped unless the local env contains the key: 
+DA_GCP_LABELBOX_API_KEY. These tests will be included when run against a PR. If you would like to test it manually, please reach out to the Devops team for information on the key.

tests/integration/test_delegated_access.py

@@ -1,35 +1,56 @@
+import os
+
 import requests
 import pytest
 
+from labelbox import Client
+
 
-@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
-    # 2. the integration name is gcp test
-    # 3. This integration is the default
+@pytest.mark.skipif(os.environ.get("DA_GCP_LABELBOX_API_KEY") is None,
+                    reason="DA_GCP_LABELBOX_API_KEY not found")
+def test_default_integration():
+    """
+    This tests assumes the following:
+    1. gcp delegated access is configured to work with jtso-gcs-sdk-da-tests
+    2. the integration name is gcs sdk test bucket
+    3. This integration is the default
+    
+    Currently tests against:
+    Org ID: cl269lvvj78b50zau34s4550z
+    Email: jtso+gcp_sdk_tests@labelbox.com"""
+    client = Client(api_key=os.environ.get("DA_GCP_LABELBOX_API_KEY"))
     ds = client.create_dataset(name="new_ds")
     dr = ds.create_data_row(
         row_data=
-        "gs://utkarsh-da-test-bucket/mathew-schwartz-8rj4sz9YLCI-unsplash.jpg")
+        "gs://jtso-gcs-sdk-da-tests/nikita-samokhin-D6QS6iv_CTY-unsplash.jpg")
     assert requests.get(dr.row_data).status_code == 200
-    assert ds.iam_integration().name == "GCP Test"
+    assert ds.iam_integration().name == "gcs sdk test bucket"
     ds.delete()
 
 
-@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
-    # 2. an integration called aws is available to the org
+@pytest.mark.skipif(os.environ.get("DA_GCP_LABELBOX_API_KEY") is None,
+                    reason="DA_GCP_LABELBOX_API_KEY not found")
+def test_non_default_integration():
+    """
+    This tests assumes the following:
+    1. aws delegated access is configured to work with lbox-test-bucket
+    2. an integration called aws is available to the org
+
+    Currently tests against:
+    Org ID: cl26d06tk0gch10901m7jeg9v
+    Email: jtso+aws_sdk_tests@labelbox.com
+    """
+    client = Client(api_key=os.environ.get("DA_GCP_LABELBOX_API_KEY"))
     integrations = client.get_organization().get_iam_integrations()
-    integration = [inte for inte in integrations if 'aws' in inte.name][0]
+    integration = [
+        inte for inte in integrations if 'aws-da-test-bucket' in inte.name
+    ][0]
     assert integration.valid
     ds = client.create_dataset(iam_integration=integration, name="new_ds")
-    assert ds.iam_integration().name == "aws"
+    assert ds.iam_integration().name == "aws-da-test-bucket"
     dr = ds.create_data_row(
         row_data=
-        "https://lbox-test-bucket.s3.us-east-1.amazonaws.com/2021_09_08_0hz_Kleki.png"
+        "https://jtso-aws-da-sdk-tests.s3.us-east-2.amazonaws.com/adrian-yu-qkN4D3Rf1gw-unsplash.jpg"
     )
     assert requests.get(dr.row_data).status_code == 200
     ds.delete()

tox.ini

@@ -9,5 +9,5 @@ deps =
     pytest < 7.0.0
     pytest-cases
     pytest-rerunfailures
-passenv = LABELBOX_TEST_API_KEY_PROD LABELBOX_TEST_API_KEY_STAGING LABELBOX_TEST_ENVIRON
+passenv = LABELBOX_TEST_API_KEY_PROD LABELBOX_TEST_API_KEY_STAGING LABELBOX_TEST_ENVIRON DA_GCP_LABELBOX_API_KEY
 commands = pytest {posargs}