Moving the cloud and HTTP tests outside of Base_Tests (#13857)

- to unlock #13570
- I'd like to move cloud related tests outside of `Base_Tests`
- they are [accessing internals](#13570 (comment)) of `Standard.Base` (caches, keys, etc.)
- they would have to be significantly rewritten to run the the "dual JVM" mode
- easier to split them out and run them with [special options](#13857 (comment))

Author: JaroslavTulach

test/AWS_Tests/src/Inter_Backend_File_Operations_Spec.enso

@@ -14,7 +14,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 
 from Standard.Test import all
 
-import enso_dev.Base_Tests.Network.Enso_Cloud.Cloud_Tests_Setup.Cloud_Tests_Setup
+import enso_dev.Cloud_Tests.Network.Enso_Cloud.Cloud_Tests_Setup.Cloud_Tests_Setup
 
 from project.S3_Spec import api_pending, writable_root, with_default_credentials
 

test/AWS_Tests/src/S3_Spec.enso

@@ -19,10 +19,10 @@ import enso_dev.Table_Tests.Util
 from Standard.Test import all
 
 import enso_dev.Base_Tests.Data.Data_Spec
-import enso_dev.Base_Tests.Network.Enso_Cloud.Cloud_Tests_Setup.Cloud_Tests_Setup
-import enso_dev.Base_Tests.Network.Enso_Cloud.Cloud_Tests_Setup.Temporary_Directory
+import enso_dev.Cloud_Tests.Network.Enso_Cloud.Cloud_Tests_Setup.Cloud_Tests_Setup
+import enso_dev.Cloud_Tests.Network.Enso_Cloud.Cloud_Tests_Setup.Temporary_Directory
 import enso_dev.Base_Tests.System.File_Spec as Local_File_Spec
-from enso_dev.Base_Tests.Network.Enso_Cloud.Cloud_Data_Link_Spec import Symlink_Test_Setup, create_data_link_to_cloud, add_symlink_spec
+from enso_dev.Cloud_Tests.Network.Enso_Cloud.Cloud_Data_Link_Spec import Symlink_Test_Setup, create_data_link_to_cloud, add_symlink_spec
 
 test_credentials -> AWS_Credential ! Illegal_State =
     access_key_id = Environment.get "ENSO_LIB_S3_AWS_ACCESS_KEY_ID" ""

test/Base_Internal_Tests/src/Cloud_Credentials_Spec.enso

@@ -2,8 +2,8 @@ from Standard.Base import all
 
 from Standard.Test import all
 
-import enso_dev.Base_Tests.Network.Enso_Cloud.Cloud_Tests_Setup.Cloud_Tests_Setup
-import enso_dev.Base_Tests.Network.Enso_Cloud.Cloud_Tests_Setup.Temporary_Directory
+import enso_dev.Cloud_Tests.Network.Enso_Cloud.Cloud_Tests_Setup.Cloud_Tests_Setup
+import enso_dev.Cloud_Tests.Network.Enso_Cloud.Cloud_Tests_Setup.Temporary_Directory
 
 from project.Cloud_Helpers.Credentials import create_example_credential
 

test/Base_Tests/README.md

@@ -24,25 +24,6 @@ You can stop the server via Ctrl-C.
 See [the server's documentation](../../tools/http-test-helper/README.md) for
 more information.
 
-## Cloud tests
-
-By default, a subset of cloud tests runs whenever the
-`ENSO_HTTP_TEST_HTTPBIN_URL` environment variable is set, using a mock of parts
-of the cloud logic running on the helper server.
-
-To run a full set of cloud tests against a real deployment, you need to set the
-following 3 environment variables:
-
-- `ENSO_CLOUD_API_URL` to point to the root of the cloud API,
-- `ENSO_CLOUD_CREDENTIALS_FILE` to be a path to a file containing the
-  credentials to use, e.g. `~/.enso/credentials`,
-- `ENSO_RUN_REAL_CLOUD_TEST=1` to tell the test suite to run against a real
-  cloud deployment.
-
-Note that some cloud tests (e.g. testing secrets in HTTP requests) still require
-the `ENSO_HTTP_TEST_HTTPBIN_URL` setup, even if running against a real cloud
-deployment.
-
 ### Testing audit log batching
 
 Currently, we only have a manual scenario for testing that log messages are

test/Base_Tests/src/Main.enso

@@ -63,8 +63,6 @@ import project.Data.XML.XML_Spec
 
 import project.Data.Vector.Slicing_Helpers_Spec
 
-import project.Network.Enso_Cloud.Main as Enso_Cloud_Main
-
 import project.Network.Http.Header_Spec as Http_Header_Spec
 import project.Network.Http.Request_Spec as Http_Request_Spec
 import project.Network.Http.Http_Auto_Parse_Spec
@@ -126,7 +124,6 @@ main filter=Nothing =
         Http_Spec.add_specs suite_builder
         Http_Auto_Parse_Spec.add_specs suite_builder
         Http_Data_Link_Spec.add_specs suite_builder
-        Enso_Cloud_Main.add_specs suite_builder
         Import_Loop_Spec.add_specs suite_builder
         Interval_Spec.add_specs suite_builder
         Java_Interop_Spec.add_specs suite_builder

test/Base_Tests/src/Network/URI_Spec.enso

@@ -1,16 +1,10 @@
 from Standard.Base import all
-import Standard.Base.Enso_Cloud.Enso_Secret.Enso_Secret_Error
 import Standard.Base.Errors.Common.Syntax_Error
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
-import Standard.Base.Network.HTTP.Request.Request
 import Standard.Base.Network.URI.Invalid_Query_String
 
 from Standard.Test import all
 
-import project.Network.Enso_Cloud.Cloud_Tests_Setup.Cloud_Tests_Setup
-
-polyglot java import org.enso.base.enso_cloud.EnsoSecretHelper
-
 add_specs suite_builder =
     ## To run this test locally:
        $ sbt 'http-test-helper/run localhost 8080'
@@ -308,73 +302,6 @@ add_specs suite_builder =
             uri2.fragment . should_equal "FRAG"
             uri2.to_text . should_equal "https://example.com/path#FRAG"
 
-        cloud_setup = Cloud_Tests_Setup.prepare
-
-        group_builder.specify "will not convert back to URI if secrets are present in the query arguments" pending=cloud_setup.pending <| Test.with_retries <|
-            cloud_setup.with_prepared_environment <|
-                secret1 = Enso_Secret.create "my_test_secret-uri-1-"+Random.uuid "My Value"
-                secret1.should_succeed
-                Panic.with_finalizer secret1.delete <|
-                    uri = URI.from "https://example.com/"
-                        . add_query_argument "arg1" secret1
-                        . add_query_argument "arg2" "plain value"
-
-                    uri.to_text . should_equal ("https://example.com/?arg1=__SECRET__&arg2=plain+value")
-                    uri.to_java_uri . should_fail_with Enso_Secret_Error
-                    uri.raw_query . should_fail_with Enso_Secret_Error
-
-        group_builder.specify "should allow to use secrets in query arguments, containing all kinds of various characters" pending=cloud_setup.httpbin_pending <| Test.with_retries <|
-            cloud_setup.with_prepared_environment <|
-                secret1 = Enso_Secret.create "my_test_secret-uri-4-"+Random.uuid "My Very Secret Value"
-                secret1.should_succeed
-                Panic.with_finalizer secret1.delete <|
-                    s2 = "Another Secret Value containing Emoji 😊❤️ and ąęś AND [a=b]:[b=c][d=e]++++!?&->#...__(){}@///\\\|%%%100*^, ]]] ==> <br>a"
-                    secret2 = Enso_Secret.create "my_test_secret-uri-5"+Random.uuid s2
-                    secret2.should_succeed
-                    Panic.with_finalizer secret2.delete <|
-                        uri = (cloud_setup.httpbin_secure_uri / "get")
-                            . add_query_argument "arg1" secret1
-                            . add_query_argument "arg2" "plain value"
-                            . add_query_argument "arg3" secret2
-
-                        uri.to_text . should_equal (cloud_setup.httpbin_secure_uri.to_text + "get?arg1=__SECRET__&arg2=plain+value&arg3=__SECRET__")
-                        uri.raw_query . should_fail_with Enso_Secret_Error
-
-                        response = cloud_setup.httpbin_secure_client.request (Request.get uri)
-                        decode_query_params response.decode_as_json . should_equal [["arg1", "My Very Secret Value"], ["arg2", "plain value"], ["arg3", s2]]
-
-        group_builder.specify "does not allow secrets in non-https requests" pending=cloud_setup.pending <| Test.with_retries <|
-            cloud_setup.with_prepared_environment <|
-                secret1 = Enso_Secret.create "my_test_secret-uri-8-"+Random.uuid "My Value"
-                secret1.should_succeed
-                Panic.with_finalizer secret1.delete <|
-                    uri1 = URI.from "http://example.com/"
-                        . add_query_argument "arg1" secret1
-                        . add_query_argument "arg2" "plain value"
-
-                    uri1.to_text . should_equal ("http://example.com/?arg1=__SECRET__&arg2=plain+value")
-                    r1 = uri1.fetch
-                    r1.should_fail_with Illegal_Argument
-                    r1.catch.to_display_text . should_contain "Secrets are not allowed in HTTP connections, use HTTPS instead."
-
-        with_secret ~action =
-            secret = Enso_Secret.create "my_test_secret-clear-cache-1-"+Random.uuid "My Value"
-            secret.should_succeed
-            Panic.with_finalizer secret.delete (action secret)
-
-        group_builder.specify "EnsoSecreetReader cache should be cleared when a reload is detected" pending=cloud_setup.pending <| Test.with_retries <|
-            cloud_setup.with_prepared_environment <|
-                with_secret secret1-> with_secret secret2->
-                    base_uri = URI.from 'https://httpbin.org/bytes/50'
-                    uri1 = base_uri . add_query_argument "arg1" secret1
-                    uri2 = base_uri . add_query_argument "arg1" secret2
-                    uri1.fetch . should_succeed
-                    uri2.fetch . should_succeed
-                    (EnsoSecretHelper.getEnsoSecretReaderCacheSize >= 2) . should_be_true
-                    EnsoSecretHelper.simulateEnsoSecretReaderReload
-                    uri1.fetch . should_succeed
-                    (EnsoSecretHelper.getEnsoSecretReaderCacheSize == 1) . should_be_true
-
 main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder

test/Base_Tests/src/System/File_Spec.enso

@@ -16,7 +16,6 @@ from Standard.Test import all
 import Standard.Test.Test_Environment
 
 import project.Data.Data_Spec
-import project.Network.Enso_Cloud.Cloud_Tests_Setup.Cloud_Tests_Setup
 
 ## We rely on a less strict equality for `File` as it is fine if a relative file gets resolved to absolute.
 File.should_equal self other = Frame_Hider.hide <|
@@ -392,37 +391,6 @@ add_specs suite_builder =
                 f.read_text . should_equal txt
                 Data.read "abc/def.txt" . should_equal txt
 
-        cloud_setup = Cloud_Tests_Setup.prepare
-        with_temporary_cloud_root ~action =
-            subdir = (Enso_File.home / ("my_test_CWD-" + Random.uuid.take 5)).create_directory
-            subdir.should_succeed
-            cleanup =
-                Enso_User.flush_caches
-                subdir.delete recursive=True
-            Panic.with_finalizer cleanup <|
-                Test_Environment.unsafe_with_environment_override "ENSO_CLOUD_PROJECT_DIRECTORY_PATH" subdir.path <|
-                    # Flush caches to ensure fresh dir is used
-                    Enso_User.flush_caches
-                    Test.with_clue "(running with ENSO_CLOUD_PROJECT_DIRECTORY_PATH set to "+subdir.path+") " <|
-                        action
-
-        group_builder.specify "will resolve relative paths as Cloud paths if running in the Cloud" pending=cloud_setup.real_cloud_pending <|
-            with_temporary_cloud_root <|
-                root = File.new "."
-                root.should_be_a Enso_File
-                root.should_equal Enso_File.current_working_directory
-
-                f = File.new "abc/def.txt"
-                f.should_be_a Enso_File
-                f.should_equal (Enso_File.current_working_directory / "abc" / "def.txt")
-
-                # Data.read should be consistent too
-                txt = "test-content"+Random.uuid
-                (File.new "abc").create_directory . should_succeed
-                txt.write f . should_succeed
-                Panic.with_finalizer f.delete_if_exists <|
-                    Data.read "abc/def.txt" . should_equal txt
-
         group_builder.specify "will resolve empty path to the current working directory" <|
             File.new "" . should_equal File.current_directory
 

test/Cloud_Tests/README.md

@@ -0,0 +1,55 @@
+This is a set of tests for the Enso Cloud functionality of the `Standard.Base`
+library of Enso.
+
+## HTTP tests
+
+The run test suite for the HTTP component requires an active helper server on
+the localhost. If it is present, the port it listens to should be provided by
+setting the `ENSO_HTTP_TEST_HTTPBIN_URL` environment variable to a value like
+`http://localhost:8080`. The URL may contain a trailing slash.
+
+To run the test server, you may use the following command:
+
+```bash
+sbt 'http-test-helper/run localhost 8080'
+```
+
+Then execute the tests in another terminal as
+
+```bash
+sbt 'runEngineDistribution --env ENSO_HTTP_TEST_HTTPBIN_URL=http://localhost:8080 --run test/Cloud_Tests'
+```
+
+You can stop the server via Ctrl-C.
+
+See [the server's documentation](../../tools/http-test-helper/README.md) for
+more information.
+
+## Cloud tests
+
+By default, a subset of cloud tests runs whenever the
+`ENSO_HTTP_TEST_HTTPBIN_URL` environment variable is set, using a mock of parts
+of the cloud logic running on the helper server.
+
+To run a full set of cloud tests against a real deployment, you need to set the
+following 3 environment variables:
+
+- `ENSO_CLOUD_API_URL` to point to the root of the cloud API,
+- `ENSO_CLOUD_CREDENTIALS_FILE` to be a path to a file containing the
+  credentials to use, e.g. `~/.enso/credentials`,
+- `ENSO_RUN_REAL_CLOUD_TEST=1` to tell the test suite to run against a real
+  cloud deployment.
+
+Note that some cloud tests (e.g. testing secrets in HTTP requests) still require
+the `ENSO_HTTP_TEST_HTTPBIN_URL` setup, even if running against a real cloud
+deployment.
+
+### Testing audit log batching
+
+Currently, we only have a manual scenario for testing that log messages are
+actually batched.
+
+To test it, launch the `http-test-helper` with additional
+`--enable-manual-log-batching-test` flag. For more information, see the comment
+on `batchingTestModeEnabled` in
+[PostLogHandler.java](../../tools/http-test-helper/src/main/java/org/enso/shttp/cloud_mock/PostLogHandler.java).

test/Cloud_Tests/data/books.json

@@ -0,0 +1,23 @@
+[
+  {
+    "title": "Lord of the Rings",
+    "author": {
+      "name": "J. R. R. Tolkien",
+      "year_of_birth": 1892
+    }
+  },
+  {
+    "title": "The Little Prince",
+    "author": {
+      "name": "Antoine de Saint-Exupéry",
+      "year_of_birth": 1900
+    }
+  },
+  {
+    "title": "And Then There Were None",
+    "author": {
+      "name": "Agatha Christie",
+      "year_of_birth": 1890
+    }
+  }
+]

test/Cloud_Tests/data/datalinks/example-enso-file.datalink

@@ -0,0 +1,5 @@
+{
+    "type": "Enso_File",
+    "libraryName": "Standard.Base",
+    "path": "enso://Teams/PLACEHOLDER_TEAM_NAME/PLACEHOLDER_PATH"
+}