Fix Issues notice from APERTUREDB_KEY work (#593)

Author: drewaogle

aperturedb/CommonLibrary.py

@@ -164,11 +164,12 @@ def create_connector(
     This function chooses a configuration in the folowing order:
     1. The configuration named by the `name` parameter or `key` parameter
     2. The configuration described in the `APERTUREDB_KEY` environment variable.
-    3. The configuration described in the `APERTUREDB_JSON` environment variable.
-    4. The configuration described in the `APERTUREDB_JSON` Google Colab secret.
-    5. The configuration described in the `APERTUREDB_JSON` secret in a `.env` file.
-    6. The configuration named by the `APERTUREDB_CONFIG` environment variable.
-    7. The active configuration.
+    3. The configuration described in the `APERTUREDB_KEY` Google Colab secret.
+    4. The configuration described in the `APERTUREDB_JSON` environment variable.
+    5. The configuration described in the `APERTUREDB_JSON` Google Colab secret.
+    6. The configuration described in the `APERTUREDB_JSON` secret in a `.env` file.
+    7. The configuration named by the `APERTUREDB_CONFIG` environment variable.
+    8. The active configuration.
 
     If there are both global and local configurations with the same name, the global configuration is preferred.
 
@@ -214,6 +215,14 @@ def lookup_config_by_name(name: str, source: str) -> Configuration:
         logger.info(
             f"Using configuration from APERTUREDB_KEY environment variable")
         config = Configuration.reinflate(data)
+    elif (data := _get_colab_secret("APERTUREDB_KEY")) is not None and data != "":
+        logger.info(
+            f"Using configuration from APERTUREDB_KEY Google Colab secret")
+        config = Configuration.reinflate(data)
+        if create_config_for_colab_secret:
+            logger.info(
+                f"Creating and activating configuration from APERTUREDB_KEY Google Colab secret")
+            _store_config(config, 'google_colab')
     elif (data := os.environ.get("APERTUREDB_JSON")) is not None and data != "":
         logger.info(
             f"Using configuration from APERTUREDB_JSON environment variable")

aperturedb/cli/configure.py

@@ -198,12 +198,12 @@ def check_for_overwrite(name):
         gen_config = _create_configuration_from_json(
             json_str, name=name, name_required=True)
         check_for_overwrite(gen_config.name)
-        name = gen_config.name
+        name = name if name is not None else gen_config.name
     elif from_key:
         assert interactive, "Interactive mode must be enabled for --from-key"
         encoded_str = typer.prompt("Enter encoded string", hide_input=True)
         gen_config = Configuration.reinflate(encoded_str)
-        name = gen_config.name
+        name = name if name is not None else gen_config.name
 
     else:
         if interactive:

test/adb_timing_tests.py

@@ -13,4 +13,4 @@
         os.system(command)
         diff = datetime.now() - start
         print(diff)
-        assert diff.total_seconds() <= 0.9, f"Command {command} took too long"
+        assert diff.total_seconds() <= 1.0, f"Command {command} took too long"

test/run_test_container.sh

@@ -46,6 +46,9 @@ if ! [ -z ${1+x} ]
 then
      REPOSITORY="$1"
 fi
+
+sleep 20 # wait for the containers to be up and running
+
 echo "running tests on docker image $REPOSITORY with $GATEWAY_HTTP and $GATEWAY_NON_HTTP"
 docker run \
     -v $(pwd)/output:/aperturedata/test/output \