omnata-plugin-devkit 0.10.15a101__tar.gz → 0.10.15a115__tar.gz

{omnata_plugin_devkit-0.10.15a101 → omnata_plugin_devkit-0.10.15a115}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-devkit
-Version: 0.10.15a101
+Version: 0.10.15a115
 Summary: 
 Author: James Weakley
 Author-email: james.weakley@omnata.com

{omnata_plugin_devkit-0.10.15a101 → omnata_plugin_devkit-0.10.15a115}/pyproject.toml

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

{omnata_plugin_devkit-0.10.15a101 → omnata_plugin_devkit-0.10.15a115}/src/omnata_plugin_devkit/jinja_templates/TUNNEL_TEST.sql.jinja

@@ -48,6 +48,7 @@ def run(session,tunnel_type:str,other_secrets_name:str):
       url = f'https://{ngrok_endpoint_host}/'
       try:
          response=http.request('GET',url)
+         return_data['mtls_success'] = True
       except urllib3.exceptions.MaxRetryError as max_retry_error:
          if isinstance(max_retry_error.reason, urllib3.exceptions.SSLError):
             ssl_error:urllib3.exceptions.SSLError = max_retry_error.reason

{omnata_plugin_devkit-0.10.15a101 → omnata_plugin_devkit-0.10.15a115}/src/omnata_plugin_devkit/jinja_templates/manifest.yml.jinja

@@ -25,6 +25,3 @@ configuration:
     - type: DEBUG_LOGS
       sharing: OPTIONAL
 
-privileges:
-  - CREATE INTEGRATION:
-      description: "To connect to external application endpoints, as configured by the user (required)"

{omnata_plugin_devkit-0.10.15a101 → omnata_plugin_devkit-0.10.15a115}/src/omnata_plugin_devkit/plugin_uploader.py

@@ -20,6 +20,7 @@ import sys
 import typing
 import zipfile
 import copy
+import uuid
 from pathlib import Path
 from typing import Any, Dict, List, Literal, Optional
 
@@ -470,7 +471,6 @@ class PluginUploader:
                 "PENDING_API_CONFIGURATION",
                 "TEST_CALLBACK",
                 "LIST_STAGES",
-                "CREATE_EXTERNAL_ACCESS_INTEGRATION",
                 "CREATE_GENERIC_SECRET_OBJECT",
                 "CREATE_GENERIC_SECRET_OBJECT_FROM_EXISTING",
                 "UPDATE_GENERIC_SECRET_OBJECT_OLD",
@@ -618,6 +618,28 @@ $${}$$;
 FROM '/streamlit'
 MAIN_FILE = '/plugin_configuration.py';"""
             )
+            
+            setup_script.write("""
+WITH CREATE_TOKEN_FUNCTION AS PROCEDURE()
+RETURNS BOOLEAN
+LANGUAGE JAVASCRIPT
+AS
+$$
+    var uuidStatement = snowflake.createStatement({ sqlText: 
+        `select UUID_STRING();`
+    });
+    var uuidResult = uuidStatement.execute();
+    uuidResult.next();
+    var uuid = uuidResult.getColumnValue(1);
+    var twoDollars='$' + '$';
+    snowflake.createStatement({ sqlText: 
+        `create or replace function PLUGIN.TOKEN() returns string as ${twoDollars}'${uuid}'${twoDollars} `
+    }).execute();
+    return true;
+$$
+CALL CREATE_TOKEN_FUNCTION();
+GRANT USAGE ON FUNCTION PLUGIN.TOKEN() TO application role OMNATA_MANAGEMENT;
+""")
 
             setup_script.write(
                 """GRANT USAGE ON STREAMLIT UI."Plugin Configuration" TO application role OMNATA_MANAGEMENT;\n"""
@@ -652,6 +674,15 @@ MAIN_FILE = '/plugin_configuration.py';"""
                 }
             )
             manifest_file.write(content)
+            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_section.yml")
+                with open(
+                    custom_manifest_privileges, "r", encoding="utf-8"
+                ) as custom_manifest_privileges_stream:
+                    manifest_file.write(custom_manifest_privileges_stream.read() + "\n")
+
+        
         print("Uploading app manifest to stage")
         self.session.sql(
             (

omnata_plugin_devkit-0.10.15a101/src/omnata_plugin_devkit/jinja_templates/CREATE_EXTERNAL_ACCESS_INTEGRATION.sql.jinja

@@ -1,61 +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 = $$
-   This procedure is deprecated, as the user must create the OAuth secrets themselves in order to be able to bind them correctly.
-   $$
-   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 appsResults = snowflake.createStatement( {
-        sqlText: `select 
-                    APPLICATION_NAME,
-                    EXTERNAL_ACCESS_INTEGRATIONS
-                from DATA.OMNATA_REGISTRATION`,
-        binds:[]
-   } ).execute();
-   if (!appsResults.next())  {
-      throw new Error('Plugin must be registered to a sync engine instance before calling this procedure');
-   }
-   const applicationName = appsResults.getColumnValue(1);
-
-   var bindings = [EAI_NAME].concat(NETWORK_RULE_NAMES).concat(SECRET_NAMES);
-   const secretNamesClauses = SECRET_NAMES.map(()=>{return 'IDENTIFIER(?)'}).join(',');
-   const networkRuleNamesClauses = NETWORK_RULE_NAMES.map(()=>{return 'IDENTIFIER(?)'}).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 IDENTIFIER(?)`,
-      binds:[EAI_NAME, applicationName]
-   } ).execute();
-    return {
-        "success": true,
-        "data": null
-    }
-}
-catch(e){
-   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;