omnata-plugin-devkit 0.14.0a220__tar.gz → 0.14.1__tar.gz

{omnata_plugin_devkit-0.14.0a220 → omnata_plugin_devkit-0.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omnata-plugin-devkit
-Version: 0.14.0a220
+Version: 0.14.1
 Summary: 
 License-File: LICENSE
 Author: James Weakley

{omnata_plugin_devkit-0.14.0a220 → omnata_plugin_devkit-0.14.1}/pyproject.toml

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

{omnata_plugin_devkit-0.14.0a220 → omnata_plugin_devkit-0.14.1}/src/omnata_plugin_devkit/jinja_templates/SET_CONNECTION_OBJECTS.sql.jinja

@@ -23,7 +23,10 @@ Expected keys on PARAMETERS:
                                                 oauth_grant, oauth_token_endpoint,
                                                 oauth_authorization_endpoint,
                                                 oauth_allowed_scopes, oauth_client_id,
-                                                oauth_client_secret)
+                                                oauth_client_secret, and optionally
+                                                oauth_client_auth_method — either
+                                                CLIENT_SECRET_POST (the default when absent
+                                                or null) or CLIENT_SECRET_BASIC)
   oauth_secret_name                            (optional; unqualified — DATA schema is prepended; requires oauth SI)
   oauth_secret_configuration_name              (optional; application-scope, no schema; requires oauth_secret_name)
   other_secrets_name                           (required; unqualified — DATA schema is prepended)
@@ -65,6 +68,12 @@ class OAuthParameters(BaseModel):
    oauth_allowed_scopes: Optional[List[str]] = None
    oauth_client_id: Optional[str] = None
    oauth_client_secret: Optional[str] = None
+   # Where Snowflake puts the client credentials in the token request: CLIENT_SECRET_POST in
+   # the request body, CLIENT_SECRET_BASIC in an Authorization: Basic header. Declared rather
+   # than left to extra='allow' so callers that never send the key resolve to the default
+   # instead of raising AttributeError, and Literal because the value goes into DDL as a bare
+   # keyword — unlike the endpoints and credentials it cannot be quoted and escaped.
+   oauth_client_auth_method: Optional[Literal['CLIENT_SECRET_POST', 'CLIENT_SECRET_BASIC']] = None
 
 
 class SetConnectionParameters(BaseModel):
@@ -175,11 +184,12 @@ def run(session, parameters):
          oauth_scopes = op.oauth_allowed_scopes or []
          oauth_client_id = op.oauth_client_id
          oauth_client_secret = op.oauth_client_secret
+         oauth_client_auth = op.oauth_client_auth_method or 'CLIENT_SECRET_POST'
 
          clauses = [
             "TYPE = API_AUTHENTICATION",
             "AUTH_TYPE = OAUTH2",
-            "OAUTH_CLIENT_AUTH_METHOD = CLIENT_SECRET_POST",
+            f"OAUTH_CLIENT_AUTH_METHOD = {oauth_client_auth}",
             f"OAUTH_GRANT = {oauth_grant.upper()}",
          ]
          if oauth_grant == 'authorization_code' and oauth_auth_ep:

{omnata_plugin_devkit-0.14.0a220 → omnata_plugin_devkit-0.14.1}/src/omnata_plugin_devkit/snowcli/cli/plugins/snowpark/package_utils.py

@@ -325,15 +325,7 @@ def check_if_package_is_avaiable_in_conda(package: Requirement, packages: dict)
     if package.specs:
         try:
             latest_ver = parse(packages[package_name]["version"])
-            for op, ver in package.specs:
-                spec_ver = parse(ver)
-                if op == ">=" and not (latest_ver >= spec_ver): return False
-                if op == ">" and not (latest_ver > spec_ver): return False
-                if op == "<=" and not (latest_ver <= spec_ver): return False
-                if op == "<" and not (latest_ver < spec_ver): return False
-                if op == "==" and not (latest_ver == spec_ver): return False
-                if op == "!=" and not (latest_ver != spec_ver): return False
-            return True
+            return all([parse(spec[1]) <= latest_ver for spec in package.specs])
         except InvalidVersion:
             log.warning("Invalid version for package %s: %s, unable to verify anaconda version compatibility", package_name,packages[package_name]["version"])
     return True