Fix ipmDir expression in Invoke Args

Author: isc-dchui

CHANGELOG.md

@@ -38,6 +38,7 @@ lock contention by bypassing IRIS compiler.
 - #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.
 - #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>`
 
 ### 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

src/cls/IPM/Storage/Module.cls

@@ -1777,6 +1777,7 @@ Method %Evaluate(
     set customParams("packagename") = ..Name
     set customParams("version") = ..VersionString
     set customParams("verbose") = +$get(pParams("Verbose"))
+    set customParams("ipmDir") = ##class(%Library.File).NormalizeDirectory($system.Util.DataDirectory() _ "ipm/" _ ..Name _ "/" _ ..VersionString)
     set tAttrValue = ##class(%IPM.Utils.Module).%EvaluateMacro(tAttrValue)
     set tAttrValue = ##class(%IPM.Storage.ModuleSetting.Default).EvaluateAttribute(tAttrValue,.customParams)
     set attrValue = ##class(%IPM.Utils.Module).%EvaluateSystemExpression(tAttrValue)

tests/integration_tests/Test/PM/Integration/Invoke.cls

@@ -24,4 +24,37 @@ Method TestInvokeCheckStatus()
     }
 }
 
+Method TestInvokeIpmDirExpression()
+{
+    set sc = $$$OK
+    try {
+        // Clear any previous test data
+        kill ^IRIS.Temp.Test.IpmDir
+
+        // Load module that invokes with ${ipmdir} argument
+        set moduleDir = ..GetModuleDir("invoke-ipmdir")
+        set sc = ##class(%IPM.Main).Shell("load -verbose " _ moduleDir)
+        do $$$AssertStatusOK(sc, "Module loaded successfully")
+
+        // Verify the invoke was called and stored the path
+        do $$$AssertTrue($data(^IRIS.Temp.Test.IpmDir), "Invoke.IpmDirTest method was called")
+
+        // Verify the path is correct
+        set receivedPath = $get(^IRIS.Temp.Test.IpmDir)
+        set expectedPath = ##class(%Library.File).NormalizeDirectory(
+            $system.Util.DataDirectory() _ "ipm/invoke-ipmdir-test/1.0.0/")
+        do $$$AssertEquals(receivedPath, expectedPath, "ipmDir expression correctly evaluated to: " _ expectedPath)
+
+        // Clean up - uninstall module
+        set sc = ##class(%IPM.Main).Shell("uninstall -verbose invoke-ipmdir-test")
+        do $$$AssertStatusOK(sc, "Module uninstalled successfully")
+
+        // Clean up temp global
+        kill ^IRIS.Temp.Test.IpmDir
+
+    } catch ex {
+        do $$$AssertStatusOK(ex.AsStatus(), "Exception in TestInvokeIpmDirExpression")
+    }
+}
+
 }

tests/integration_tests/Test/PM/Integration/_data/invoke-ipmdir/module.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="25">
+  <Document name="invoke-ipmdir-test.ZPM">
+    <Module>
+      <Name>invoke-ipmdir-test</Name>
+      <Version>1.0.0</Version>
+      <Packaging>module</Packaging>
+      <SourcesRoot>src</SourcesRoot>
+      <Resource Name="Invoke.IpmDirTest.CLS"/>
+      <Invoke Class="Invoke.IpmDirTest" Method="ValidateIpmDir">
+        <Arg>${ipmdir}</Arg>
+      </Invoke>
+    </Module>
+  </Document>
+</Export>

tests/integration_tests/Test/PM/Integration/_data/invoke-ipmdir/src/Invoke/IpmDirTest.cls

@@ -0,0 +1,28 @@
+Class Invoke.IpmDirTest
+{
+
+/// Validates that the passed ipmDir argument matches the expected path
+ClassMethod ValidateIpmDir(ipmDir As %String) As %Status
+{
+    set sc = $$$OK
+    try {
+        // Calculate expected path
+        set expectedDir = ##class(%Library.File).NormalizeDirectory($system.Util.DataDirectory() _ "ipm/invoke-ipmdir-test/1.0.0/")
+
+        // Normalize received path for comparison
+        set normalizedIpmDir = ##class(%Library.File).NormalizeDirectory(ipmDir)
+
+        // Store in temp global for test validation
+        set ^IRIS.Temp.Test.IpmDir = normalizedIpmDir
+
+        // Validate the path matches
+        if (normalizedIpmDir '= expectedDir) {
+            set sc = $$$ERROR($$$GeneralError, "${ipmDir} mismatch: expected '" _ expectedDir _ "' but got '" _ normalizedIpmDir _ "'")
+        }
+    } catch ex {
+        set sc = ex.AsStatus()
+    }
+    quit sc
+}
+
+}