Minor fixes and refactoring

Author: Gavin Aguiar

tests/endtoend/cosmosdb_functions/cosmosdb_v3_functions_stein/function_app.py

@@ -0,0 +1,47 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+import azure.functions as func
+
+app = func.FunctionApp()
+
+
+@app.route()
+@app.cosmos_db_input_v3(
+    arg_name="docs", database_name="test",
+    collection_name="items",
+    id="cosmosdb-input-test",
+    connection_string_setting="AzureWebJobsCosmosDBConnectionString")
+def cosmosdb_input(req: func.HttpRequest, docs: func.DocumentList) -> str:
+    return func.HttpResponse(docs[0].to_json(), mimetype='application/json')
+
+
+@app.cosmos_db_trigger_v3(
+    arg_name="docs", database_name="test",
+    collection_name="items",
+    lease_collection_name="leases",
+    connection_string_setting="AzureWebJobsCosmosDBConnectionString",
+    create_lease_collection_if_not_exists=True)
+@app.blob_output(arg_name="$return", connection="AzureWebJobsStorage",
+                 path="python-worker-tests/test-cosmosdb-triggered.txt")
+def cosmosdb_trigger(docs: func.DocumentList) -> str:
+    return docs[0].to_json()
+
+
+@app.route()
+@app.blob_input(arg_name="file", connection="AzureWebJobsStorage",
+                path="python-worker-tests/test-cosmosdb-triggered.txt")
+def get_cosmosdb_triggered(req: func.HttpRequest,
+                           file: func.InputStream) -> str:
+    return file.read().decode('utf-8')
+
+
+@app.route()
+@app.cosmos_db_output_v3(
+    arg_name="doc", database_name="test",
+    collection_name="items",
+    create_if_not_exists=True,
+    connection_string_setting="AzureWebJobsCosmosDBConnectionString")
+def put_document(req: func.HttpRequest, doc: func.Out[func.Document]):
+    doc.set(func.Document.from_json(req.get_body()))
+
+    return 'OK'

tests/endtoend/cosmosdb_functions/cosmosdb_v3_functions_stein/generic/function_app.py

@@ -0,0 +1,62 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+import azure.functions as func
+
+app = func.FunctionApp()
+
+
+@app.generic_trigger(arg_name="req", type="httpTrigger")
+@app.generic_output_binding(arg_name="$return", type="http")
+@app.generic_input_binding(
+    arg_name="docs",
+    type="cosmosDB",
+    database_name="test",
+    collection_name="items",
+    id="cosmosdb-input-test",
+    connection_string_setting="AzureWebJobsCosmosDBConnectionString")
+def cosmosdb_input(req: func.HttpRequest, docs: func.DocumentList) -> str:
+    return func.HttpResponse(docs[0].to_json(), mimetype='application/json')
+
+
+@app.generic_trigger(
+    arg_name="docs",
+    type="cosmosDBTrigger",
+    database_name="test",
+    collection_name="items",
+    lease_collection_name="leases",
+    connection_string_setting="AzureWebJobsCosmosDBConnectionString",
+    create_lease_collection_if_not_exists=True)
+@app.generic_output_binding(
+    arg_name="$return",
+    type="blob",
+    connection="AzureWebJobsStorage",
+    path="python-worker-tests/test-cosmosdb-triggered.txt")
+def cosmosdb_trigger(docs: func.DocumentList) -> str:
+    return docs[0].to_json()
+
+
+@app.generic_trigger(arg_name="req", type="httpTrigger")
+@app.generic_output_binding(arg_name="$return", type="http")
+@app.generic_input_binding(
+    arg_name="file",
+    connection="AzureWebJobsStorage",
+    type="blob",
+    path="python-worker-tests/test-cosmosdb-triggered.txt")
+def get_cosmosdb_triggered(req: func.HttpRequest,
+                           file: func.InputStream) -> str:
+    return file.read().decode('utf-8')
+
+
+@app.generic_trigger(arg_name="req", type="httpTrigger")
+@app.generic_output_binding(arg_name="$return", type="http")
+@app.generic_output_binding(
+    arg_name="doc",
+    database_name="test",
+    type="cosmosDB",
+    collection_name="items",
+    create_if_not_exists=True,
+    connection_string_setting="AzureWebJobsCosmosDBConnectionString")
+def put_document(req: func.HttpRequest, doc: func.Out[func.Document]):
+    doc.set(func.Document.from_json(req.get_body()))
+
+    return 'OK'

tests/endtoend/test_dependency_isolation_functions.py

@@ -16,6 +16,9 @@
 REQUEST_TIMEOUT_SEC = 5
 
 
+@skipIf(is_envvar_true(DEDICATED_DOCKER_TEST)
+        or is_envvar_true(CONSUMPTION_DOCKER_TEST),
+        'Docker tests do not work with dependency isolation ')
 class TestGRPCandProtobufDependencyIsolationOnDedicated(
         testutils.WebHostTestCase):
     """Test the dependency manager E2E scenario via Http Trigger.
@@ -76,10 +79,6 @@ def test_feature_flag_is_turned_on(self):
         flag_value = environments['PYTHON_ISOLATE_WORKER_DEPENDENCIES']
         self.assertEqual(flag_value, '1')
 
-    @skipIf(is_envvar_true(DEDICATED_DOCKER_TEST)
-            or is_envvar_true(CONSUMPTION_DOCKER_TEST),
-            "Docker test expects dependencies derived from agents folder"
-            )
     def test_working_directory_resolution(self):
         """Check from the dependency manager and see if the current working
         directory is resolved correctly
@@ -93,9 +92,7 @@ def test_working_directory_resolution(self):
             os.path.join(dir, 'dependency_isolation_functions').lower()
         )
 
-    @skipIf(is_envvar_true(PYAZURE_INTEGRATION_TEST)
-            or is_envvar_true(DEDICATED_DOCKER_TEST)
-            or is_envvar_true(CONSUMPTION_DOCKER_TEST),
+    @skipIf(is_envvar_true(PYAZURE_INTEGRATION_TEST),
             'Integration test expects dependencies derived from core '
             'tools folder')
     def test_paths_resolution(self):
@@ -121,9 +118,6 @@ def test_paths_resolution(self):
             ).lower()
         )
 
-    @skipIf(is_envvar_true(DEDICATED_DOCKER_TEST)
-            or is_envvar_true(CONSUMPTION_DOCKER_TEST),
-            'Docker tests do not work with dependency isolation ')
     def test_loading_libraries_from_customers_package(self):
         """Since the Python now loaded the customer's dependencies, the
         libraries version should match the ones in