omnata-plugin-devkit 0.13.6a194__tar.gz → 0.13.7__tar.gz

{omnata_plugin_devkit-0.13.6a194 → omnata_plugin_devkit-0.13.7}/PKG-INFO

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

{omnata_plugin_devkit-0.13.6a194 → omnata_plugin_devkit-0.13.7}/pyproject.toml

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

omnata_plugin_devkit-0.13.7/src/omnata_plugin_devkit/jinja_templates/DROP_CONFIGURATION_DEFINITION.sql.jinja

@@ -0,0 +1,38 @@
+create or replace procedure PLUGIN.DROP_CONFIGURATION_DEFINITION(CONFIG_NAME VARCHAR)
+   returns object
+   language javascript
+   COMMENT = $$
+   Drops an application configuration definition by name via
+   ALTER APPLICATION DROP CONFIGURATION DEFINITION <name>.
+   Intended to roll back a partially-created connection when the consumer cancels.
+   $$
+   execute as owner
+as
+$$
+try{
+    // CONFIG_NAME is interpolated into the SQL (DROP CONFIGURATION DEFINITION does not
+    // accept IDENTIFIER(?) binding), so validate it as a simple identifier.
+    if (typeof CONFIG_NAME !== 'string' || !/^[A-Za-z_][A-Za-z0-9_$]*$/.test(CONFIG_NAME) || CONFIG_NAME.length > 255){
+        throw `DROP_CONFIGURATION_DEFINITION: invalid CONFIG_NAME`;
+    }
+    var sql = `ALTER APPLICATION DROP CONFIGURATION DEFINITION ${CONFIG_NAME}`;
+    snowflake.log("info", `Executing SQL: ${sql}`);
+    snowflake.createStatement({sqlText: sql, binds: []}).execute();
+    return {
+        "success": true,
+        "data": {
+            "name": CONFIG_NAME
+        }
+    };
+}
+catch(e){
+    return {
+        "success": false,
+        "error": `DROP_CONFIGURATION_DEFINITION: ${String(e)}`
+    };
+}
+$$
+;
+
+grant usage on procedure PLUGIN.DROP_CONFIGURATION_DEFINITION(VARCHAR)
+to application role OMNATA_MANAGEMENT;

omnata_plugin_devkit-0.13.7/src/omnata_plugin_devkit/jinja_templates/DROP_INTEGRATION.sql.jinja

@@ -0,0 +1,36 @@
+create or replace procedure PLUGIN.DROP_INTEGRATION(INTEGRATION_NAME VARCHAR)
+   returns object
+   language javascript
+   COMMENT = $$
+   Drops an integration (security or external access) by name via
+   DROP INTEGRATION <name>. Intended to roll back a partially-created
+   connection when the consumer cancels.
+   $$
+   execute as owner
+as
+$$
+try{
+    if (typeof INTEGRATION_NAME !== 'string' || INTEGRATION_NAME.length === 0 || INTEGRATION_NAME.length > 255){
+        throw `DROP_INTEGRATION: INTEGRATION_NAME must be a non-empty string`;
+    }
+    var sql = `DROP INTEGRATION IDENTIFIER(?)`;
+    snowflake.log("info", `Executing SQL: ${sql} (${INTEGRATION_NAME})`);
+    snowflake.createStatement({sqlText: sql, binds: [INTEGRATION_NAME]}).execute();
+    return {
+        "success": true,
+        "data": {
+            "name": INTEGRATION_NAME
+        }
+    };
+}
+catch(e){
+    return {
+        "success": false,
+        "error": `DROP_INTEGRATION: ${String(e)}`
+    };
+}
+$$
+;
+
+grant usage on procedure PLUGIN.DROP_INTEGRATION(VARCHAR)
+to application role OMNATA_MANAGEMENT;

omnata_plugin_devkit-0.13.7/src/omnata_plugin_devkit/jinja_templates/DROP_SPECIFICATION.sql.jinja

@@ -0,0 +1,38 @@
+create or replace procedure PLUGIN.DROP_SPECIFICATION(SPEC_NAME VARCHAR)
+   returns object
+   language javascript
+   COMMENT = $$
+   Drops an application specification by name via
+   ALTER APPLICATION DROP SPECIFICATION <name>.
+   Intended to roll back a partially-created connection when the consumer cancels.
+   $$
+   execute as owner
+as
+$$
+try{
+    // SPEC_NAME is interpolated into the SQL (DROP SPECIFICATION does not accept
+    // IDENTIFIER(?) binding), so validate it as a simple identifier.
+    if (typeof SPEC_NAME !== 'string' || !/^[A-Za-z_][A-Za-z0-9_$]*$/.test(SPEC_NAME) || SPEC_NAME.length > 255){
+        throw `DROP_SPECIFICATION: invalid SPEC_NAME`;
+    }
+    var sql = `ALTER APPLICATION DROP SPECIFICATION ${SPEC_NAME}`;
+    snowflake.log("info", `Executing SQL: ${sql}`);
+    snowflake.createStatement({sqlText: sql, binds: []}).execute();
+    return {
+        "success": true,
+        "data": {
+            "name": SPEC_NAME
+        }
+    };
+}
+catch(e){
+    return {
+        "success": false,
+        "error": `DROP_SPECIFICATION: ${String(e)}`
+    };
+}
+$$
+;
+
+grant usage on procedure PLUGIN.DROP_SPECIFICATION(VARCHAR)
+to application role OMNATA_MANAGEMENT;

{omnata_plugin_devkit-0.13.6a194 → omnata_plugin_devkit-0.13.7}/src/omnata_plugin_devkit/jinja_templates/SET_CONNECTION_OBJECTS.sql.jinja

@@ -243,7 +243,17 @@ def run(session, parameters):
             f"  APPLICATION_ROLES = (OMNATA_MANAGEMENT)"
          )
          logger.info(f"Executing SQL: {cfg_sql}")
-         session.sql(cfg_sql).collect()
+         try:
+            session.sql(cfg_sql).collect()
+         except Exception as cfg_exc:
+            # A leftover configuration definition with conflicting state can block SET; drop it and retry once.
+            # If the drop or retry fails, re-raise the original error rather than the follow-up failure.
+            logger.warning(f"SET CONFIGURATION DEFINITION failed ({cfg_exc}); dropping and retrying")
+            try:
+               session.sql(f"ALTER APPLICATION DROP CONFIGURATION DEFINITION {oauth_secret_config_name}").collect()
+               session.sql(cfg_sql).collect()
+            except Exception:
+               raise cfg_exc
 
       # (6) Other secrets — read the seed directly via _snowflake.get_generic_secret_string
       # rather than going through RETRIEVE_SECRETS / CREATE_GENERIC_SECRET_OBJECT_FROM_EXISTING.
@@ -252,11 +262,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(

{omnata_plugin_devkit-0.13.6a194 → omnata_plugin_devkit-0.13.7}/src/omnata_plugin_devkit/plugin_uploader.py

@@ -494,6 +494,9 @@ class PluginUploader:
                 "DROP_SECRETS",
                 "DROP_NETWORK_RULES",
                 "SET_EAI_ACTIVE",
+                "DROP_CONFIGURATION_DEFINITION",
+                "DROP_SPECIFICATION",
+                "DROP_INTEGRATION",
                 "GET_MISSING_APP_PRIVILEGES"
             ]:
                 template = environment.get_template(f"{proc_template}.sql.jinja")