Merge remote-tracking branch 'origin/main' into feat/2025-cors-settings-module-and-gen

Author: AshokThangavel

CHANGELOG.md

@@ -5,29 +5,41 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.10.5] - Unreleased
+## [0.10.6] - Unreleased
+
+## Added
+- #973: Enables CORS and JWT configuration for WebApplications in module xml
+
+### Fixed
+- #996: Ensure COS commands execute in exec under a dedicated, isolated context
+- #1002: When listing configured repositories, only show the TokenAuthMethod when a token is defined.
+
+## [0.10.5] - 2026-01-15
 
 ### Added
-- #938 Added flag -export-python-deps to package command
+- #938: Added flag -export-python-deps to package command
 - #462: The `repo` command for repository configuration now supports secret input terminal mode for passwords with the `-password-stdin` flag
 - #935: Adding a generic JFrog Artifactory tarball resource processor for bundling artifact with a package and deploying it to a final location on install.
 - #950: Added support for listing installed Python packages using `list -python`, `list -py` and `list-installed -python`
 - #822: The CPF resource processor now supports system expressions and macros in CPF merge files
-- #578 Added functionality to record and display IPM history of install, uninstall, load, and update
+- #578: Added functionality to record and display IPM history of install, uninstall, load, and update
 - #961: Adding creation of a lock file for a module by using the `-create-lockfile` flag on install.
+- #959: In ORAS repos, external name can now be used interchangeably with (default) name for `install` and `update`, i.e. a module published with its (default) name can be installed using its external name.
+- #951: The `unpublish` command will skip user confirmation prompt if the `-force` flag is provided.
+- #1018: Require module name for uninstall when not using the -all flag
 - #973: Enables CORS and JWT configuration for WebApplications in module xml
 ### Changed
 - #316: All parameters, except developer mode, included with a `load`, `install` or `update` command will be propagated to dependencies
 - #885: Always synchronously load dependencies and let each module do multi-threading as needed
 to load using multicompile instead of trying to do own multi-threading of item load which causes
 lock contention by bypassing IRIS compiler.
 - #481: Improve BuildDependencyGraph performance by doing the following:
- - Eliminate recursion and use iteration.
- - Remove depth first search and do pure breadth first search.
- - Have better caching of results for module searches by collapsing search expressions (reducing expressions that are intersections).
+    - Eliminate recursion and use iteration.
+    - Remove depth first search and do pure breadth first search.
+    - Have better caching of results for module searches by collapsing search expressions (reducing expressions that are intersections).
 
 ### Removed
-- #938 Removed secret flag NewVersion handling in %Publish()
+- #938: Removed secret flag NewVersion handling in %Publish()
 
 ### Fixed
 - #943: The `load` command when used with a GitHub repository URL accepts a `branch` argument again
@@ -37,11 +49,19 @@ lock contention by bypassing IRIS compiler.
 - #965: FileCopy on a directory with a Name without the leading slash now works
 - #937: Publishing a module with a `<WebApplication>` containing a `Path` no longer errors out
 - #957: Improved error messages for OS command execution. Now, when a command fails, the error message includes the full command and its return code. Also fixed argument separation for the Windows `attrib` command and removed misleading error handling for missing commands.
+- #789: Fix error when listing modules for an ORAS repo with a specified namespace.
+- #999, #1000: Installing IPM cleans up stale mappings used in old versions of IPM
+- #1007: The `${ipmDir}` expression now works in the `<Arg>` of an `<Invoke>`
+- #1015: Fix dependency resolution bugs where `*` as the version requirement and intersecting ranges wouldn't work properly.
+- #1036: The `update` command no longer propagates developer mode to dependencies
 
 ### Deprecated
 - #828: The `CheckStatus` flag for `<Invoke>` action has been deprecated. Default behavior is now to always check the status of the method if and only if the method signature returns %Library.Status
 - #885: `-synchronous` flag since loading dependencies synchronously is now the default behavior.
 
+### Security
+- urllib3 wheel has been updated to 2.6.3
+
 ## [0.10.4] - 2025-10-21
 
 ### Added
@@ -65,6 +85,8 @@ lock contention by bypassing IRIS compiler.
 - #924: Make "module" parameter not required for "uninstall" command so -all modifier works
 - #928: `zpm "info"` now recognizes existence of configured ORAS registries
 - #930: Fix issue where `load` didn't work on GitHub URLs
+- #1011: Hidden flags IgnoreInstalled and UpdateSnapshots cause redundant calling of BuildDependencyGraph()
+- #1014: After FileCopy respects scope change #864, compileable resources with specified Scope cause Compile phase to fail on install
 
 ### Changed
 - #639: All modules installed in developer mode can now be edited, even if they do not contain "snapshot" in the version string

module.xml

@@ -3,7 +3,7 @@
   <Document name="ZPM.ZPM">
     <Module>
       <Name>ZPM</Name>
-      <Version>0.10.5-SNAPSHOT</Version>
+      <Version>0.10.6-SNAPSHOT</Version>
       <ExternalName>IPM</ExternalName>
       <Description>InterSystems Package Manager (IPM) provides development tools and
         infrastructure for defining, building, distributing, and installing modules and
@@ -45,7 +45,7 @@
       <PythonWheel Name="referencing-0.36.2-py3-none-any.whl" ExtraPipFlags="--no-deps" />
       <PythonWheel Name="requests-2.32.4-py3-none-any.whl" ExtraPipFlags="--no-deps" />
       <PythonWheel Name="typing_extensions-4.12.2-py3-none-any.whl" ExtraPipFlags="--no-deps" />
-      <PythonWheel Name="urllib3-2.6.0-py3-none-any.whl" ExtraPipFlags="--no-deps" />
+      <PythonWheel Name="urllib3-2.6.3-py3-none-any.whl" ExtraPipFlags="--no-deps" />
 
       <!-- Pure python implementation of rpds-py for offline installation or behind a
             firewall.
@@ -54,4 +54,4 @@
       <FileCopy Name="modules/python/rpds.py" Target="${mgrdir}python/rpds.py" />
     </Module>
   </Document>
-</Export>
+</Export>

preload/cls/IPM/Installer.cls

@@ -23,6 +23,7 @@ XData PM [ XMLNamespace = INSTALLER ]
     <ClassMapping Package="%IPM" From="${CURNSRoutineDB}" />
     <RoutineMapping Routines="%IPM.*" Type="ALL" From="${CURNSRoutineDB}" />
   </Configuration>
+  <Invoke Class="IPM.Installer" Method="CleanupOldMappings"/>
   <Import File="${SRCDIR}" Recurse="1"/>
   <Invoke Class="%IPM.Main" Method="UpdateLanguageExtensions" CheckStatus="true" />
   <Invoke Class="IPM.Installer" Method="ZPMInit" CheckStatus="true">
@@ -416,4 +417,63 @@ ClassMethod CreateTempDir() As %String
     return ##class(%File).NormalizeDirectory(tDir)
 }
 
+/// When installing a new version of IPM, make sure any old mappings are cleaned up
+ClassMethod CleanupOldMappings() As %Status
+{
+    set sc = $$$OK
+    // Get list of all namespaces
+    new $namespace
+    set $namespace = "%SYS"
+    set status = ##class(%SYS.Namespace).ListAll(.nsList)
+    if $$$ISERR(status) {
+        return status
+    }
+
+    // Iterate through each namespace and remove old mappings
+    set namespace = ""
+    for {
+        set namespace = $order(nsList(namespace))
+        if namespace = "" {
+            quit
+        }
+        set $namespace = namespace
+        // check if IPM is installed in this namespace
+        if '$$$comClassDefined("%IPM.Main") {
+            continue
+        }
+
+        // Cleanup old mappings from oddStudioDocument
+        set key = ""
+        for {
+            set key = $order(^oddStudioDocument(key))
+            quit:key=""
+            if (key["%ZPM.PackageManager") || (key["%ZHSLIB.PackageManager") {
+                kill ^oddStudioDocument(key)
+            }
+        }
+
+        // These mappings were suggested as a temporary workaround for IRIS 2023.x,
+        // but whose underlying issues have been resolved in 2024.1 and later.
+        set status = ##class(%IPM.Utils.Module).RemoveGlobalMapping($namespace,"oddStudioDocument:(BEGIN):(""%ZP"")","IRISLIB")
+        if $$$ISERR(status) {
+            set sc = $$$ADDSC(sc, status)
+        }
+        set status = ##class(%IPM.Utils.Module).RemoveGlobalMapping($namespace,"oddStudioDocument:(""%ZP""):(""A"")","IRISSYS")
+        if $$$ISERR(status) {
+            set sc = $$$ADDSC(sc, status)
+        }
+        set status = ##class(%IPM.Utils.Module).RemoveGlobalMapping($namespace,"oddStudioDocument:(""Ens""):(""Ent"")","ENSLIB")
+        if $$$ISERR(status) {
+            set sc = $$$ADDSC(sc, status)
+        }
+        set status = ##class(%IPM.Utils.Module).RemoveGlobalMapping($namespace,"oddStudioDocument",namespace)
+        if $$$ISERR(status) {
+            // this mapping deletion will fail if there are still sub-mappings present
+            // so we can ignore errors here
+        }
+    }
+
+    return sc
+}
+
 }

src/cls/IPM/General/SemanticVersionExpression/Range.cls

@@ -339,16 +339,26 @@ ClassMethod CompareVersions(
 	comp2 As %IPM.General.SemanticVersionExpression.Comparator) As %Integer [ Internal, Private ]
 {
     // Create semantic versions for comparison
+    // For range intersection purposes, we need to compare versions numerically
+    // to determine which bound is more restrictive, ignoring prerelease semantics
     set v1 = comp1.ExtractToSemanticVersion()
     set v2 = comp2.ExtractToSemanticVersion()
 
-    // Compare versions
-    if v1.Follows(v2) {
+    // Compare major.minor.patch numerically
+    if (v1.Major > v2.Major) {
         set result = 1
-    } elseif v2.Follows(v1) {
+    } elseif (v1.Major < v2.Major) {
+        set result = -1
+    } elseif (v1.Minor > v2.Minor) {
+        set result = 1
+    } elseif (v1.Minor < v2.Minor) {
+        set result = -1
+    } elseif (v1.Patch > v2.Patch) {
+        set result = 1
+    } elseif (v1.Patch < v2.Patch) {
         set result = -1
     } else {
-        // Versions are equal, compare operators
+        // Major.minor.patch are equal: compare operators
         // For lower bounds: > is more restrictive than >=
         // For upper bounds: < is more restrictive than <=
         if (comp1.Operator = ">") && (comp2.Operator = ">=") {

src/cls/IPM/Lifecycle/Base.cls

@@ -751,7 +751,6 @@ Method InstallOrDownloadPythonRequirements(
             throw ##class(%Exception.General).%New("Embedded Python is not available in this instance.")
         }
         set processType = ""
-        set stdout = ""
         set tSysModule = ##class(%SYS.Python).Import("sys")
         set tPyMajor = tSysModule."version_info".major
         set tPyMinor = tSysModule."version_info".minor
@@ -967,7 +966,7 @@ Method %Compile(ByRef pParams) As %Status
             set tResource = orderedResourceList.GetNext(.tKey)
             quit:tKey=""
 
-            if '$data(tHandledMap(tResource.Name)) && $isobject(tResource.Processor) {
+            if '$data(tHandledMap(tResource.Name)) && $isobject(tResource.Processor) && tResource.IsInScope("Compile") {
                 if tResource.Processor.%IsA("%IPM.ResourceProcessor.AbstractCompilable") && tResource.Processor.CompileFromProject {
                     if tVerbose {
                         write !, tResource.Name_" was loaded as deployed code, so compilation isn't needed."

src/cls/IPM/Main.cls

@@ -179,10 +179,10 @@ This command is an alias for `module-action module-name makedeployed`
 Delete package from repository
 </description>
 <example description="Delete all versions of the package &quot;MyModuleName&quot; from the repository">unpublish MyModuleName all</example>
-<example description="Delete version &quot;1.0.0&quot; of the package &quot;MyModuleName&quot; from the repository">unpublish MyModuleName 1.0.0</example>
+<example description="Delete version &quot;1.0.0&quot; of the package &quot;MyModuleName&quot; from the repository named MyRepo">unpublish MyRepo/MyModuleName 1.0.0</example>
 <parameter name="module" required="true" description="Name of module on which to perform unpublish actions" />
 <parameter name="version" required="true" description="Version of module on which to perform unpublish actions. Use &quot;all&quot; to delete all versions of the package" />
-
+<modifier name="force" aliases="f" value="false" description="Will delete module from the repository without prompting user for confirmation. Still requires authorization from the repository" />
 <modifier name="quiet" aliases="q" dataAlias="Verbose" dataValue="0" description="Produces minimal output from the command." />
 <modifier name="verbose" aliases="v" dataAlias="Verbose" dataValue="1" description="Produces verbose output from the command." />
 </command>
@@ -983,8 +983,7 @@ ClassMethod ShellInternal(
             } elseif (tCommandInfo = "load") {
                 do ..Load(.tCommandInfo)
             } elseif (tCommandInfo = "exec") {
-                write !
-                xecute tCommandInfo("parameters","expression")
+                do ..ExecuteCOS(.tCommandInfo)
             } elseif (tCommandInfo = "install") {
                 do ..Install(.tCommandInfo)
             } elseif (tCommandInfo = "reinstall") {
@@ -2193,6 +2192,8 @@ ClassMethod ShowModulesForRepository(
             set list(list, "AllVersions") = tRes.AllVersions
         }
     }
+    // Throw an error if there are no results and tSC is set
+    $$$ThrowOnError(tSC)
     set list("width") = width
     write !
     do ..DisplayModules(.list)
@@ -2255,6 +2256,13 @@ ClassMethod Load(
 	$$$ThrowOnError(log.Finalize($$$OK, devMode))
 }
 
+ClassMethod ExecuteCOS(ByRef commandInfo)
+{
+    new $namespace
+    write !
+    xecute commandInfo("parameters","expression")
+}
+
 ClassMethod LoadInternal(
 	ByRef pCommandInfo,
 	pLog As %IPM.General.AbstractHistory) [ Internal ]
@@ -2487,7 +2495,10 @@ ClassMethod Uninstall(ByRef pCommandInfo) [ Internal ]
         $$$ThrowOnError(##class(%IPM.Utils.Module).UninstallAll(tForce,.tParams))
         return
     } else {
-        set tModuleName = pCommandInfo("parameters","module")
+        set tModuleName = $get(pCommandInfo("parameters","module"))
+        if (tModuleName = "") {
+            $$$ThrowOnError($$$ERROR($$$GeneralError, "A module name must be specified for uninstall unless the -all flag is used."))
+        }
         if (tModuleName = $$$IPMModuleName) {
             $$$ThrowOnError(..CheckModuleNamespace())
         }
@@ -2545,25 +2556,29 @@ ClassMethod Unpublish(ByRef pCommandInfo) [ Internal ]
 
         if (isEnabled) {
             set tResult = 0
-            if ($$$lcase(tVersion)="all") {
-                write $$$FormattedLine($$$Red, "Deleting a package and all its versions is an irreversible action")
-                set tHelp = "Enter ""Yes"" if you want to delete all package versions."
-                set tMsg = "Are you sure you want to delete all versions of the package """_tModuleName_""" from registry """_tServer.Name_""" ("_tServer.URL_")?"
-            } else {
-                write $$$FormattedLine($$$Red, "Deleting a package version is an irreversible action")
-                set tHelp = "Enter ""Yes"" if you want to delete selected package version."
-                set tMsg = "Are you sure you want to delete the package """_tModuleName_" "_tVersion_""" from registry """_tServer.Name_""" ("_tServer.URL_")?"
-            }
+            set force = $data(pCommandInfo("modifiers","force"))
+            if 'force {
+                if ($$$lcase(tVersion)="all") {
+                    write $$$FormattedLine($$$Red, "Deleting a package and all its versions is an irreversible action!")
+                    set tHelp = "Enter ""Yes"" if you want to delete all package versions."
+                    set tMsg = "Are you sure you want to delete all versions of the package """_tModuleName_""" from registry """_tServer.Name_""" ("_tServer.URL_")?"
+                } else {
+                    write $$$FormattedLine($$$Red, "Deleting a package version is an irreversible action!")
+                    set tHelp = "Enter ""Yes"" if you want to delete selected package version."
+                    set tMsg = "Are you sure you want to delete the package """_tModuleName_" version "_tVersion_""" from registry """_tServer.Name_""" ("_tServer.URL_")?"
+                }
 
-            set tResponse = ##class(%Library.Prompt).GetYesNo(tMsg,.tResult,.tHelp)
+                set tResponse = ##class(%Library.Prompt).GetYesNo(tMsg,.tResult,.tHelp)
 
-            if (tResponse '= $$$SuccessResponse) {
-                $$$ThrowStatus($$$ERROR($$$GeneralError,"Operation cancelled."))
+                if (tResponse '= $$$SuccessResponse) {
+                    $$$ThrowStatus($$$ERROR($$$GeneralError,"Operation cancelled."))
+                }
             }
 
-            if (tResult) {
+            if (tResult || force) {
                 $$$ThrowOnError(tManager.Unpublish(tServer.Name, tModuleName, tVersion))
-                write !!,"Package deleted"
+                set msg = "Package deleted" _ $case(force, 1:" forcefully without user confirmation", :"")
+                write !!, msg
             }
         } else {
             write !,"The package could not be deleted (the registry denied the request)",!

src/cls/IPM/Repo/Http/Definition.cls

@@ -90,8 +90,6 @@ Method Display()
     }
     if (..Token '= "") {
         write !,$char(9),"Token: ",..Padding(0),$case(..Token,"":"<unset>",:"<set>")
-    }
-    if (..Token '= "") || (..Password '= "") || (..Username '= "") {
         write !,$char(9),"Token Auth Method: ",..Padding(2),..TokenAuthMethod
     }
 }