omnata-plugin-devkit 0.10.16a110__tar.gz → 0.10.17__tar.gz

{omnata_plugin_devkit-0.10.16a110 → omnata_plugin_devkit-0.10.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-devkit
-Version: 0.10.16a110
+Version: 0.10.17
 Summary: 
 Author: James Weakley
 Author-email: james.weakley@omnata.com

{omnata_plugin_devkit-0.10.16a110 → omnata_plugin_devkit-0.10.17}/pyproject.toml

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

omnata_plugin_devkit-0.10.17/src/omnata_plugin_devkit/jinja_templates/FETCH_CONNECTIONS.sql.jinja

@@ -0,0 +1,26 @@
+CREATE or replace PROCEDURE PLUGIN.FETCH_CONNECTIONS()
+RETURNS TABLE()
+LANGUAGE SQL
+as
+DECLARE
+
+CONNECTIONS resultset;
+SYNC_ENGINE_DATABASE_NAME varchar;
+PROC_NAME varchar;
+PLUGIN_REGISTRATION_EXCEPTION EXCEPTION (-20001, 'Plugin is not registered to a sync engine instance');
+c1 CURSOR FOR select min(APPLICATION_NAME) from DATA.OMNATA_REGISTRATION;
+BEGIN
+
+OPEN c1;
+FETCH c1 INTO SYNC_ENGINE_DATABASE_NAME;
+IF (:SYNC_ENGINE_DATABASE_NAME = null) THEN
+   RAISE PLUGIN_REGISTRATION_EXCEPTION;
+END IF;
+
+select CONCAT(:SYNC_ENGINE_DATABASE_NAME,'.API.PLUGIN_FETCH_CONNECTIONS') into :PROC_NAME;
+
+CONNECTIONS:= (call IDENTIFIER(:PROC_NAME)(current_database(),PLUGIN.TOKEN()));
+
+RETURN TABLE(CONNECTIONS);
+
+END;

omnata_plugin_devkit-0.10.17/src/omnata_plugin_devkit/jinja_templates/FETCH_SYNCS.sql.jinja

@@ -0,0 +1,26 @@
+CREATE or replace PROCEDURE PLUGIN.FETCH_SYNCS(CONNECTION_ID NUMERIC(38,0) DEFAULT NULL)
+RETURNS TABLE()
+LANGUAGE SQL
+as
+DECLARE
+
+SYNCS resultset;
+SYNC_ENGINE_DATABASE_NAME varchar;
+PROC_NAME varchar;
+PLUGIN_REGISTRATION_EXCEPTION EXCEPTION (-20001, 'Plugin is not registered to a sync engine instance');
+c1 CURSOR FOR select min(APPLICATION_NAME) from DATA.OMNATA_REGISTRATION;
+BEGIN
+
+OPEN c1;
+FETCH c1 INTO SYNC_ENGINE_DATABASE_NAME;
+IF (:SYNC_ENGINE_DATABASE_NAME = null) THEN
+   RAISE PLUGIN_REGISTRATION_EXCEPTION;
+END IF;
+
+select CONCAT(:SYNC_ENGINE_DATABASE_NAME,'.API.PLUGIN_FETCH_SYNCS') into :PROC_NAME;
+
+SYNCS:= (call IDENTIFIER(:PROC_NAME)(current_database(),PLUGIN.TOKEN(),:CONNECTION_ID));
+
+RETURN TABLE(SYNCS);
+
+END;

omnata_plugin_devkit-0.10.17/src/omnata_plugin_devkit/jinja_templates/FETCH_SYNC_BRANCHES.sql.jinja

@@ -0,0 +1,26 @@
+CREATE or replace PROCEDURE PLUGIN.FETCH_SYNC_BRANCHES(SYNC_ID numeric)
+RETURNS TABLE()
+LANGUAGE SQL
+as
+DECLARE
+
+SYNC_BRANCHES resultset;
+SYNC_ENGINE_DATABASE_NAME varchar;
+PROC_NAME varchar;
+PLUGIN_REGISTRATION_EXCEPTION EXCEPTION (-20001, 'Plugin is not registered to a sync engine instance');
+c1 CURSOR FOR select min(APPLICATION_NAME) from DATA.OMNATA_REGISTRATION;
+BEGIN
+
+OPEN c1;
+FETCH c1 INTO SYNC_ENGINE_DATABASE_NAME;
+IF (:SYNC_ENGINE_DATABASE_NAME = null) THEN
+   RAISE PLUGIN_REGISTRATION_EXCEPTION;
+END IF;
+
+select CONCAT(:SYNC_ENGINE_DATABASE_NAME,'.API.PLUGIN_FETCH_SYNC_BRANCHES') into :PROC_NAME;
+
+SYNC_BRANCHES:= (call IDENTIFIER(:PROC_NAME)(current_database(),PLUGIN.TOKEN(),:SYNC_ID));
+
+RETURN TABLE(SYNC_BRANCHES);
+
+END;

{omnata_plugin_devkit-0.10.16a110 → omnata_plugin_devkit-0.10.17}/src/omnata_plugin_devkit/jinja_templates/manifest.yml.jinja

@@ -25,8 +25,3 @@ configuration:
     - type: DEBUG_LOGS
       sharing: OPTIONAL
 
-privileges:
-  - CREATE EXTERNAL ACCESS INTEGRATION:
-      description: "To connect to external application endpoints, as configured by the user (required)"
-  - CREATE SECURITY INTEGRATION:
-      description: "To create OAuth integration, as configured by the user (optional, only required if OAuth connectivity is needed)"

{omnata_plugin_devkit-0.10.16a110 → omnata_plugin_devkit-0.10.17}/src/omnata_plugin_devkit/plugin_uploader.py

@@ -469,12 +469,13 @@ class PluginUploader:
                 "CONFIGURE_APIS",
                 "UPDATE_API_CONFIGURATION",
                 "PENDING_API_CONFIGURATION",
+                "FETCH_CONNECTIONS",
+                "FETCH_SYNCS",
+                "FETCH_SYNC_BRANCHES",
                 "TEST_CALLBACK",
                 "LIST_STAGES",
-                "CREATE_EXTERNAL_ACCESS_INTEGRATION",
                 "CREATE_GENERIC_SECRET_OBJECT",
                 "CREATE_GENERIC_SECRET_OBJECT_FROM_EXISTING",
-                "DROP_EXTERNAL_ACCESS_OBJECTS",
                 "UPDATE_GENERIC_SECRET_OBJECT_OLD",
                 "CREATE_OAUTH_SECRET_OBJECT",
                 "CREATE_NETWORK_RULE_OBJECT",
@@ -576,9 +577,14 @@ $${}$$;
                 os.chdir(direct_imports_path)
                 # upload all files in the directory to the stage
                 for path in sorted(Path(".").rglob("*")):
-                    print(f"Uploading {path} to stage")
+                    # don't try to upload directories, only files
+                    if path.is_dir():
+                        continue
+                    # figure out the path
+                    relative_path = str(f"/{path.parent}") if path.parent != Path(".") else ""
+                    print(f"Uploading {path} to stage under {relative_path}")
                     self.session.sql(
-                        f"put file://{path} @{database_name}.{schema_name}.{stage_name} AUTO_COMPRESS=FALSE OVERWRITE=TRUE"
+                        f"put file://{path} @{database_name}.{schema_name}.{stage_name}{relative_path} AUTO_COMPRESS=FALSE OVERWRITE=TRUE"
                     ).collect()
                 os.chdir(cwd)
 
@@ -676,13 +682,13 @@ GRANT USAGE ON FUNCTION PLUGIN.TOKEN() TO application role OMNATA_MANAGEMENT;
                 }
             )
             manifest_file.write(content)
-            custom_manifest_privileges = os.path.join(plugin_directory, "custom_manifest_privileges.yml")
+            custom_manifest_privileges = os.path.join(plugin_directory, "custom_manifest_section.yml")
             if os.path.exists(custom_manifest_privileges):
-                print("Adding manifest privileges from custom_manifest_privileges.yml")
+                print("Adding manifest privileges from custom_manifest_section.yml")
                 with open(
                     custom_manifest_privileges, "r", encoding="utf-8"
                 ) as custom_manifest_privileges_stream:
-                    setup_script.write(custom_manifest_privileges_stream.read() + "\n")
+                    manifest_file.write(custom_manifest_privileges_stream.read() + "\n")
 
         
         print("Uploading app manifest to stage")

omnata_plugin_devkit-0.10.16a110/src/omnata_plugin_devkit/jinja_templates/CREATE_EXTERNAL_ACCESS_INTEGRATION.sql.jinja

@@ -1,52 +0,0 @@
-create or replace procedure PLUGIN.CREATE_EXTERNAL_ACCESS_INTEGRATION(
-      EAI_NAME varchar,
-      SECRET_NAMES ARRAY,
-      NETWORK_RULE_NAMES ARRAY)
-   returns object
-   language javascript
-   COMMENT = $$
-   Creates an external access integration, bound to the provided secret(s) and network rule(s)
-   $$
-   execute as owner
-as
-$$
-try{
-   if (SECRET_NAMES === null || SECRET_NAMES === undefined || SECRET_NAMES.length==0){
-      throw new Error('Secret names parameter must contain at least one secret');
-   }
-   if (NETWORK_RULE_NAMES === null || NETWORK_RULE_NAMES === undefined || NETWORK_RULE_NAMES.length==0){
-      throw new Error('Network rule names parameter must contain at least one secret');
-   }
-   var bindings = [EAI_NAME];
-   const secretNamesClauses = SECRET_NAMES.map((s)=>{return `'${s}'`}).join(',');
-   const networkRuleNamesClauses = NETWORK_RULE_NAMES.map((n)=>{return `'${n}'`}).join(',');
-   snowflake.createStatement( {
-      sqlText: `CREATE OR REPLACE EXTERNAL ACCESS INTEGRATION IDENTIFIER(?)
-                           ALLOWED_NETWORK_RULES = (${networkRuleNamesClauses})
-                           ALLOWED_AUTHENTICATION_SECRETS = (${secretNamesClauses})
-                           ENABLED = true`,
-      binds:bindings
-   } ).execute();
-   snowflake.createStatement( {
-      sqlText: `GRANT USAGE ON INTEGRATION IDENTIFIER(?) TO APPLICATION ROLE OMNATA_MANAGEMENT`,
-      binds:[EAI_NAME]
-   } ).execute();
-    return {
-        "success": true,
-        "data": null
-    }
-}
-catch(e){
-   if (String(e).indexOf('Insufficient privileges to operate on account') > -1){
-      e = 'You must grant the plugin application the CREATE EXTERNAL ACCESS INTEGRATION privilege in order to proceed';
-   }
-   return {
-      "success": false,
-      "error": `CREATE_EXTERNAL_ACCESS_INTEGRATION: ${String(e)}`
-   }
-}
-$$
-;
-
-grant usage on procedure PLUGIN.CREATE_EXTERNAL_ACCESS_INTEGRATION(VARCHAR,ARRAY,ARRAY)
-to application role OMNATA_MANAGEMENT;

omnata_plugin_devkit-0.10.16a110/src/omnata_plugin_devkit/jinja_templates/DROP_EXTERNAL_ACCESS_OBJECTS.sql.jinja

@@ -1,82 +0,0 @@
-create or replace procedure PLUGIN.DROP_EXTERNAL_ACCESS_OBJECTS(
-      EAI_NAME varchar,
-      SECRET_NAMES ARRAY,
-      NETWORK_RULE_NAMES ARRAY)
-   returns object
-   language javascript
-   COMMENT = $$
-   Drops an external access integration, and associated secrets/network rules.
-   Due to Snowflake privilege model changes over time, this is an opportunistic deletion. 
-   Instead of erroring it will create event log 
-   errors and provide successflags back to the caller.
-   $$
-   execute as owner
-as
-$$
-try{
-   var droppedEai = false;
-   try{
-      snowflake.createStatement( {
-         sqlText: `DROP EXTERNAL ACCESS INTEGRATION IDENTIFIER(?)`,
-         binds:[EAI_NAME]
-      } ).execute();
-      droppedEai = true;
-   }
-   catch(e){
-      snowflake.log("error", e.message);
-   }
-
-   var droppedSecrets = false;
-   try{
-      if (SECRET_NAMES !== null && SECRET_NAMES !== undefined && SECRET_NAMES.length > 0){
-         for (let i = 0; i < SECRET_NAMES.length; i++) {
-            const secretName = SECRET_NAMES[i];
-            snowflake.createStatement( {
-               sqlText: `DROP SECRET IDENTIFIER(?)`,
-               binds:[secretName]
-            } ).execute();
-         }
-         droppedSecrets = true;
-      }
-   }
-   catch(e){
-      snowflake.log("error", e.message);
-   }
-   
-   var droppedNetworkRules=false;
-   try{
-      if (NETWORK_RULE_NAMES !== null && NETWORK_RULE_NAMES !== undefined && NETWORK_RULE_NAMES.length > 0){
-         for (let i = 0; i < NETWORK_RULE_NAMES.length; i++) {
-            const ruleName = NETWORK_RULE_NAMES[i];
-            snowflake.createStatement( {
-               sqlText: `DROP NETWORK RULE IDENTIFIER(?)`,
-               binds:[ruleName]
-            } ).execute();
-         }
-         droppedNetworkRules = true;
-      }
-   }
-   catch(e){
-      snowflake.log("error", e.message);
-   }
-
-   return {
-      "success": true,
-      "data": {
-         "droppedEai":droppedEai,
-         "droppedSecrets":droppedSecrets,
-         "droppedNetworkRules": droppedNetworkRules
-      }
-    }
-}
-catch(e){
-   return {
-      "success": false,
-      "error": `DROP_EXTERNAL_ACCESS_OBJECTS: ${String(e)}`
-   }
-}
-$$
-;
-
-grant usage on procedure PLUGIN.DROP_EXTERNAL_ACCESS_OBJECTS(VARCHAR,ARRAY,ARRAY)
-to application role OMNATA_MANAGEMENT;