diff --git a/atrium/vestibulum/trcdb/trcplgtoolbase/trcplgtoolbase.go b/atrium/vestibulum/trcdb/trcplgtoolbase/trcplgtoolbase.go index 2a485655b..d9e28de65 100644 --- a/atrium/vestibulum/trcdb/trcplgtoolbase/trcplgtoolbase.go +++ b/atrium/vestibulum/trcdb/trcplgtoolbase/trcplgtoolbase.go @@ -539,6 +539,7 @@ func CommonMain(envDefaultPtr *string, } } + // Move into function (both if and else) in ecrcommon... and call directly from azrcr.. if pluginToolConfig["trcsha256"] != nil && pluginToolConfig["imagesha256"] != nil && pluginToolConfig["trcsha256"].(string) == pluginToolConfig["imagesha256"].(string) { @@ -577,6 +578,7 @@ func CommonMain(envDefaultPtr *string, } } + // Create a file from deployPath and make copy the reader directly into file pointing at deployPath... err = os.WriteFile(deployPath, pluginToolConfig["rawImageFile"].([]byte), 0644) if err != nil { fmt.Println(err.Error()) diff --git a/pkg/core/util/repository/azrcr.go b/pkg/core/util/repository/azrcr.go index e5b76a114..20b47d53c 100644 --- a/pkg/core/util/repository/azrcr.go +++ b/pkg/core/util/repository/azrcr.go @@ -146,6 +146,10 @@ func GetImageShaFromLayer(blobClient *azcontainerregistry.BlobClient, name strin sha256 := hex.EncodeToString(hash.Sum(nil)) + // Do sha256 here... If it matches and wantblob is set on the map, then goto 131.... repeat and write to file.... + // If we do want the blob, pull deploypath logic from trcplgtool. and write to the expected location... + // Call new function with reader and pluginToolConfig to make the file... + return sha256, nil }