Skip to content

Compact PTDs before import #999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
isc-pbarton wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Compact PTDs before import #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 85 additions & 6 deletions cls/SourceControl/Git/Production.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,31 @@ ClassMethod DeleteProductionDefinitionShards(productionClass As %String, deleteM
}

/// Exports a Studio project including both the provided PTD and export notes for the PTD
ClassMethod ExportProjectForPTD(productionClass As %String, ptdName As %String, exportPath As %String) As %Status
/// - productionClass: class name of the production
/// - ptdName: either string with the name of a single PTD, or array of PTD names to include in the project.
/// - exportPath: full path to export the project to
ClassMethod ExportProjectForPTD(productionClass As %String, ByRef ptdNames, exportPath As %String) As %Status
{
set st = $$$OK
try {
set project = ##class(%Studio.Project).%New()
set project.Name = $replace($replace(ptdName,".","_"),":","-")
if $data(ptdNames) = 1 { // single PTD passed as string
set ptdsToExport(ptdNames_".PTD") = ""
set projectName = $replace($replace(ptdNames,".","_"),":","-")
} else {
set key = $order(ptdNames(""))
while (key '= "") {
set ptdsToExport(key_".PTD") = ""
set key = $order(ptdNames(key))
}
set projectName = $replace(productionClass,".","_")_"-multiple-items"
}
if ##class(%Studio.Project).%ExistsId(projectName) {
$$$ThrowOnError(##class(%Studio.Project).%DeleteId(projectName))
}
set project.Name = projectName
kill projContentsList
set projContentsList(ptdName _ ".PTD") = ""
merge projContentsList = ptdsToExport
$$$ThrowOnError(##class(Ens.Deployment.Utils).CreateExportNotesPTD(project.Name,productionClass,,.projContentsList,0,.exportNotesPTDName))
// strip items from export notes that break our diff
set st = ##class(Ens.Util.ProjectTextDocument).GetStream(.notesStream, exportNotesPTDName)
Expand All @@ -104,7 +121,11 @@ ClassMethod ExportProjectForPTD(productionClass As %String, ptdName As %String,
quit:$$$ISERR(st)
// Internal/External naming logic relies on Export Notes being added to project first. If this is changed check for dependencies
do project.AddItem(exportNotesPTDName_".PTD")
do project.AddItem(ptdName_".PTD")
set key = $order(ptdsToExport(""))
while (key '= "") {
do project.AddItem(key)
set key = $order(ptdsToExport(key))
}
$$$ThrowOnError(project.%Save())
set projContentsList(exportNotesPTDName_".PTD") = ""
set projContentsList(project.Name_".PRJ") = ""
Expand Down Expand Up @@ -174,13 +195,70 @@ ClassMethod ImportPTD(externalName As %String, productionName As %String) As %St
return sc
}

/// Given a PTD's internal name as used by source control, returns the PTD's name
/// as used by the Deployment Manager.
ClassMethod PTDInternalNameToPTDName(ptdInternalName) As %String [ Private ]
{
// format is defined in Ens.Deployment.Utils
do ..ParseInternalName(ptdInternalName,,,.itemName,,.productionName,.isProdSettings)
return $select(
isProdSettings: "ProductionSettings:"_productionName,
1: "Settings:"_itemName
)
}

/// Imports multiple PTDs from a single production into the given production
/// - ptdList: array of external names of PTDs to import
/// - productionName: name of the production to import into
ClassMethod ImportPTDs(ByRef ptdList) As %Status
{
set st = $$$OK
try {
// TODO aaaaaugh this doesn't work if there are multiple ptds with da same name
// load each of the PTD documents without deploying, and sort by production.
kill ptdListByProduction // format: ptdListByProduction(production name, external name) = internal name
set externalName = $order(ptdList(""))
while (externalName '= "") {
set internalName = "", prodName = ""
$$$ThrowOnError(..ParseExternalName(externalName, .internalName, .prodName))
if internalName="" $$$ThrowStatus($$$ERROR($$$GeneralError,"Unable to determine internal name for "_externalName))
if prodName="" $$$ThrowStatus($$$ERROR($$$GeneralError,"Unable to determine production name for "_externalName))
set ptdListByProduction(prodName, externalName) = internalName
$$$ThrowOnError($System.OBJ.Load(externalName))
set externalName = $order(ptdList(externalName))
}
// for each production, export a new Studio Project including all of its PTD items and deploy it
set prodName = $order(ptdListByProduction(""))
while (prodName '= "") {
set tempFileName = ##class(%File).TempFilename()
kill ptdNames // format: ptdNames(ptd name) = ""
set externalName = $order(ptdListByProduction(prodName,""))
while (externalName '= "") {
set ptdName = ..PTDInternalNameToPTDName(ptdListByProduction(prodName,externalName))
// set ptdName = $piece(ptdListByProduction(prodName,externalName),".PTD",1,*-1)
set ptdNames(ptdName) = ""
set externalName = $order(ptdListByProduction(prodName,externalName))
}
break
$$$ThrowOnError(..ExportProjectForPTD(prodName, .ptdNames, tempFileName))
$$$ThrowOnError(..ImportPTD(tempFileName, prodName))
do ##class(%File).Delete(tempFileName)
set prodName = $order(ptdListByProduction(prodName))
}
} catch err {
set st = err.AsStatus()
}
return st
}

/// Imports all PTDs within a given directory. Also recursively imports from all subdirectories
ClassMethod ImportPTDsDir(directory As %String, isDecompMethod As %String = "") As %Status
{
set sc = $$$OK
set rs = ##class(%ResultSet).%New("%File:FileSet")
$$$ThrowOnError(rs.Execute(directory, "*.xml", "", 1))
throw:rs.%SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(rs.%SQLCODE, rs.%Message)
kill ptdList
while rs.Next() {
set path = rs.Data("Name")
set type = rs.Data("Type")
Expand All @@ -195,11 +273,12 @@ ClassMethod ImportPTDsDir(directory As %String, isDecompMethod As %String = "")
if ($extract(filename) = "P") && '$$$comClassDefined(prodName) {
$$$ThrowOnError(..CreateProduction(prodName))
}
set sc = ..ImportPTD(path, prodName)
// set sc = ..ImportPTD(path, prodName)
set ptdList(path) = ""
}
}
}
return sc
return ..ImportPTDs(.ptdList)
}

/// Export a single Production Config Item. For a given Ens.Config.Item, the
Expand Down
13 changes: 6 additions & 7 deletions cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Method OnPull() As %Status
}
}

kill ptdExternalNames
set nFiles = 0
for i=1:1:$get(..ModifiedFiles){
set internalName = ..ModifiedFiles(i).internalName
Expand All @@ -38,7 +39,8 @@ Method OnPull() As %Status
} else {
set nFiles = nFiles + 1
if (##class(SourceControl.Git.Utils).Type(internalName) = "ptd") {
set ptdList(internalName) = ""
// set ptdList(internalName) = ""
set ptdExternalNames(##class(SourceControl.Git.Utils).TempFolder()_tExternalName) = ""
} else {
set compilelist(internalName) = ""
set sc = $$$ADDSC(sc,##class(SourceControl.Git.Utils).ImportItem(internalName, 1))
Expand Down Expand Up @@ -69,14 +71,11 @@ Method OnPull() As %Status
}

#; Deploy any PTD items
if $data(ptdList) {
if $data(ptdExternalNames) {
write !,"Loading production items..."
set start = $zhorolog
set key = $order(ptdList(""))
while (key '= "") {
set sc = $$$ADDSC(sc, ##class(SourceControl.Git.Utils).ImportItem(key,1))
set key = $order(ptdList(key))
}
// TODO fix: need to do separately for each production
set sc = $$$ADDSC(sc, ##class(SourceControl.Git.Production).ImportPTDs(.ptdExternalNames))
write !,"Production items imported in ",($zhorolog-start),"s"
}

Expand Down
Loading