omnata-plugin-devkit 0.13.5a193__tar.gz → 0.13.6__tar.gz

{omnata_plugin_devkit-0.13.5a193 → omnata_plugin_devkit-0.13.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omnata-plugin-devkit
-Version: 0.13.5a193
+Version: 0.13.6
 Summary: 
 License-File: LICENSE
 Author: James Weakley

{omnata_plugin_devkit-0.13.5a193 → omnata_plugin_devkit-0.13.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-devkit"
-version = "0.13.5a193"
+version = "0.13.6"
 description = ""
 authors = ["James Weakley <james.weakley@omnata.com>"]
 readme = "README.md"

{omnata_plugin_devkit-0.13.5a193 → omnata_plugin_devkit-0.13.6}/src/omnata_plugin_devkit/jinja_templates/CONFIGURE_APIS.sql.jinja

@@ -108,9 +108,11 @@ try{
         }
     }
 
-    // Collect all visible EAIs. V2 EAIs contain "__" and are always considered.
-    // V1 EAIs (no "__") are only included if present in the registration record,
-    // filtering out stale or deleted connections.
+    // Collect all visible EAIs. V2 EAIs contain "__" and are included only when their
+    // COMMENT is exactly 'Active' — the comment is the binding-inclusion signal, not the
+    // ENABLED flag (the flag is left TRUE so SET_CONNECTION_OBJECTS stays callable while
+    // it has stale bindings to a connection's EAI). V1 EAIs (no "__") are still filtered
+    // through the registration record, which catches stale or deleted connections.
     // Column order for 'show external access integrations': name(1), type(2), category(3), enabled(4), comment(5), created_on(6)
     var showEaiResults = snowflake.createStatement( {
         sqlText: `show external access integrations`,
@@ -119,19 +121,18 @@ try{
     var candidateEais = [];
     while (showEaiResults.next()) {
         var eaiName = showEaiResults.getColumnValue(1);
-        var eaiEnabled = showEaiResults.getColumnValue(4);
-        if (eaiEnabled === false || String(eaiEnabled).toLowerCase() === 'false'){
-            snowflake.log("warn", `Excluding EAI ${eaiName} because it is disabled (enabled=false)`);
-            continue;
-        }
-        if (eaiName.includes('__') || registeredV1EaiNames.has(eaiName)) {
-            if (registeredV1EaiNames.has(eaiName)){
-                snowflake.log("warn",`Legacy EAI still in use: ${eaiName}`)
-            };
+        var eaiComment = showEaiResults.getColumnValue(5);
+        if (eaiName.includes('__')) {
+            if (eaiComment !== 'Active') {
+                snowflake.log("warn", `Excluding V2 EAI ${eaiName} because comment is '${eaiComment}' (not 'Active')`);
+                continue;
+            }
             candidateEais.push(eaiName);
-        }
-        else{
-            snowflake.log("warn",`Excluding EAI ${eaiName} as it is a V1 connection but not registered locally`)
+        } else if (registeredV1EaiNames.has(eaiName)) {
+            snowflake.log("warn", `Legacy EAI still in use: ${eaiName}`);
+            candidateEais.push(eaiName);
+        } else {
+            snowflake.log("warn", `Excluding EAI ${eaiName} as it is a V1 connection but not registered locally`);
         }
     }
     snowflake.log("info", `Candidate EAIs: ${candidateEais.join(',')}`);

{omnata_plugin_devkit-0.13.5a193 → omnata_plugin_devkit-0.13.6}/src/omnata_plugin_devkit/jinja_templates/SET_CONNECTION_OBJECTS.sql.jinja

@@ -252,11 +252,15 @@ def run(session, parameters):
       # bound to this proc by CONFIGURE_APIS — the alias is the unqualified name.
       seed_secrets = {}
       if merge_with_secret_name:
-         raw = _snowflake.get_generic_secret_string(merge_with_secret_name)
-         if raw and len(raw) > 2:
-            decoded = json.loads(raw)
-            if isinstance(decoded, dict):
-               seed_secrets = decoded
+         try:
+            raw = _snowflake.get_generic_secret_string(merge_with_secret_name)
+            if raw and len(raw) > 2:
+               decoded = json.loads(raw)
+               if isinstance(decoded, dict):
+                  seed_secrets = decoded
+         except Exception as secret_merge_exception:
+            # there are various reasons that the secret may no longer be accessible
+            log_exception(secret_merge_exception, logger)
       if connection_secrets:
          seed_secrets.update(connection_secrets)
       _call_proc(
@@ -277,11 +281,13 @@ def run(session, parameters):
       eai_secrets_clause = ''
       if eai_secrets:
          eai_secrets_clause = f"\n  ALLOWED_AUTHENTICATION_SECRETS = ({', '.join(eai_secrets)})"
+      # ENABLED is always TRUE; binding inclusion is gated by COMMENT='Inactive' until the consumer activates via SET_EAI_ACTIVE.
       eai_sql = (
          f"CREATE OR REPLACE EXTERNAL ACCESS INTEGRATION IDENTIFIER(?)\n"
          f"  ALLOWED_NETWORK_RULES = ({eai_rules_sql})"
          f"{eai_secrets_clause}\n"
-         f"  ENABLED = FALSE"
+         f"  ENABLED = TRUE\n"
+         f"  COMMENT = 'Inactive'"
       )
       logger.info(f"Executing SQL: {eai_sql}")
       session.sql(eai_sql, params=[eai_name]).collect()

omnata_plugin_devkit-0.13.6/src/omnata_plugin_devkit/jinja_templates/SET_EAI_ACTIVE.sql.jinja

@@ -0,0 +1,38 @@
+create or replace procedure PLUGIN.SET_EAI_ACTIVE(EAI_NAME VARCHAR, ACTIVE BOOLEAN)
+   returns object
+   language javascript
+   COMMENT = $$
+   Marks an External Access Integration as 'Active' or 'Inactive' via
+   ALTER EXTERNAL ACCESS INTEGRATION <name> SET COMMENT = '...'.
+   This drives binding inclusion in CONFIGURE_APIS; the EAI's ENABLED flag is left at TRUE.
+   $$
+   execute as owner
+as
+$$
+try{
+    if (typeof EAI_NAME !== 'string' || EAI_NAME.length === 0 || EAI_NAME.length > 255){
+        throw `SET_EAI_ACTIVE: EAI_NAME must be a non-empty string`;
+    }
+    var commentSql = ACTIVE ? "'Active'" : "'Inactive'";
+    var sql = `ALTER EXTERNAL ACCESS INTEGRATION IDENTIFIER(?) SET COMMENT = ${commentSql}`;
+    snowflake.log("info", `Executing SQL: ${sql}`);
+    snowflake.createStatement({sqlText: sql, binds: [EAI_NAME]}).execute();
+    return {
+        "success": true,
+        "data": {
+            "name": EAI_NAME,
+            "active": ACTIVE
+        }
+    };
+}
+catch(e){
+    return {
+        "success": false,
+        "error": `SET_EAI_ACTIVE: ${String(e)}`
+    };
+}
+$$
+;
+
+grant usage on procedure PLUGIN.SET_EAI_ACTIVE(VARCHAR, BOOLEAN)
+to application role OMNATA_MANAGEMENT;

{omnata_plugin_devkit-0.13.5a193 → omnata_plugin_devkit-0.13.6}/src/omnata_plugin_devkit/plugin_uploader.py

@@ -493,7 +493,7 @@ class PluginUploader:
                 "CHECK_CONNECTION_PROGRESS",
                 "DROP_SECRETS",
                 "DROP_NETWORK_RULES",
-                "SET_EAI_ENABLED",
+                "SET_EAI_ACTIVE",
                 "GET_MISSING_APP_PRIVILEGES"
             ]:
                 template = environment.get_template(f"{proc_template}.sql.jinja")

omnata_plugin_devkit-0.13.5a193/src/omnata_plugin_devkit/jinja_templates/SET_EAI_ENABLED.sql.jinja

@@ -1,43 +0,0 @@
-create or replace procedure PLUGIN.SET_EAI_ENABLED(EAI_NAME VARCHAR, ENABLED BOOLEAN)
-   returns object
-   language javascript
-   COMMENT = $$
-   Enables or disables an External Access Integration owned by this application via
-   ALTER EXTERNAL ACCESS INTEGRATION <name> SET ENABLED = TRUE|FALSE.
-   $$
-   execute as owner
-as
-$$
-try{
-    if (typeof EAI_NAME !== 'string' || EAI_NAME.length === 0 || EAI_NAME.length > 255){
-        throw `SET_EAI_ENABLED: EAI_NAME must be a non-empty string`;
-    }
-    /*
-    From docs:
-    The values true and false are represented by 1 and 0 respectively. 
-    Note that this behavior may change in future releases, so you should rely 
-    on JavaScript truthiness rather than direct value comparisons.
-    */
-    var enabledSql = ENABLED ? 'TRUE' : 'FALSE';
-    var sql = `ALTER EXTERNAL ACCESS INTEGRATION IDENTIFIER(?) SET ENABLED = ${enabledSql}`;
-    snowflake.log("info", `Executing SQL: ${sql}`);
-    snowflake.createStatement({sqlText: sql, binds: [EAI_NAME]}).execute();
-    return {
-        "success": true,
-        "data": {
-            "name": EAI_NAME,
-            "enabled": ENABLED
-        }
-    };
-}
-catch(e){
-    return {
-        "success": false,
-        "error": `SET_EAI_ENABLED: ${String(e)}`
-    };
-}
-$$
-;
-
-grant usage on procedure PLUGIN.SET_EAI_ENABLED(VARCHAR, BOOLEAN)
-to application role OMNATA_MANAGEMENT;