fix(dir): use version v0.1.4 of directory and update test to support new extensions (#24)

Signed-off-by: Peter Balogh <p.balogh.sa@gmail.com>

Author: pbalogh-sa

integrations/Taskfile.yaml

@@ -12,7 +12,7 @@ vars:
   ## Image config
   IMAGE_REPO: '{{ .IMAGE_REPO | default "ghcr.io/agntcy" }}'
   GATEWAY_IMAGE_TAG: '{{ .GATEWAY_IMAGE_TAG | default "0.3.2" }}'
-  DIRECTORY_IMAGE_TAG: '{{ .DIRECTORY_IMAGE_TAG | default "v0.1.2" }}'
+  DIRECTORY_IMAGE_TAG: '{{ .DIRECTORY_IMAGE_TAG | default "v0.1.4" }}'
 
   IMAGE_BAKE_OPTS: '{{ .IMAGE_BAKE_OPTS | default "--set *.platform=linux/arm64" }}'
   TEST_APP_TAG: '{{ .TEST_APP_TAG | default "v0.0.2" }}'

integrations/agntcy-dir/components/helm/Chart.yaml

@@ -28,5 +28,5 @@ appVersion: "0.1.0"
 
 dependencies:
   - name: dir
-    version: "v0.1.2"
+    version: "v0.1.4"
     repository: oci://ghcr.io/agntcy/dir/helm-charts

integrations/agntcy-dir/examples/dir

@@ -9,6 +9,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/google/go-cmp/cmp"
 	ginkgo "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 
@@ -21,37 +22,31 @@ var _ = ginkgo.Describe("Agntcy compiler tests", func() {
 		dockerImage            string
 		mountDest              string
 		mountString            string
+		modelConfigFilePath    string
 		expectedAgentModelFile string
 	)
 
 	ginkgo.BeforeEach(func() {
 		examplesDir := "../examples/"
-		marketingStrategyPath, err := filepath.Abs(filepath.Join(examplesDir, "dir/e2e/testdata/marketing-strategy"))
+		testDataPath, err := filepath.Abs(filepath.Join(examplesDir, "dir/e2e/testdata"))
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 		tempAgentPath = filepath.Join(os.TempDir(), "agent.json")
 		dockerImage = fmt.Sprintf("%s/dir-ctl:%s", os.Getenv("IMAGE_REPO"), os.Getenv("DIRECTORY_IMAGE_TAG"))
-		mountDest = "/opt/marketing-strategy"
-		mountString = fmt.Sprintf("%s:%s", marketingStrategyPath, mountDest)
+		mountDest = "/testdata"
+		mountString = fmt.Sprintf("%s:%s", testDataPath, mountDest)
 
-		testdataDir, err := filepath.Abs(filepath.Join(examplesDir, "testdata"))
-		gomega.Expect(err).NotTo(gomega.HaveOccurred())
-
-		expectedAgentModelFile = filepath.Join(testdataDir, "expected_agent.json")
+		modelConfigFilePath = filepath.Join(mountDest, "build.config.yaml")
+		expectedAgentModelFile = filepath.Join(testDataPath, "agent.json")
 	})
 
 	ginkgo.Context("agent compilation", func() {
 		ginkgo.It("should compile an agent", func() {
 
 			dirctlArgs := []string{
 				"build",
-				"--name=marketing-strategy",
-				"--version=v1.0.0",
-				"--created-at=2025-01-01T00:00:00Z",
-				"--artifact-type=python-package",
-				"--artifact-url=http://ghcr.io/agntcy/marketing-strategy",
-				"--author=author1",
-				"--author=author2",
+				"--config",
+				modelConfigFilePath,
 				mountDest,
 			}
 
@@ -80,8 +75,20 @@ var _ = ginkgo.Describe("Agntcy compiler tests", func() {
 			err = json.Unmarshal([]byte(compiledModelJSON), &compiled)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
-			// Check the compiled agent model without extensions field
-			gomega.Expect(expected).To(gomega.BeComparableTo(compiled))
+			// Filter "created_at" field
+			filter := cmp.FilterPath(func(p cmp.Path) bool {
+				// Ensure the path is deep enough
+				if len(p) >= 3 {
+					if mapStep, ok := p[len(p)-3].(cmp.MapIndex); ok {
+						if key, ok := mapStep.Key().Interface().(string); ok && key == "created_at" {
+							return true // Ignore these paths
+						}
+					}
+				}
+				return false // Include all other paths
+			}, cmp.Ignore())
+
+			gomega.Expect(expected).To(gomega.BeComparableTo(compiled, filter))
 		})
 	})
 })

integrations/agntcy-dir/tests/compiler_test.go

@@ -27,14 +27,14 @@ var _ = ginkgo.Describe("Agntcy agent push tests", func() {
 
 	ginkgo.BeforeEach(func() {
 		examplesDir := "../examples/"
-		testDataDir, err := filepath.Abs(filepath.Join(examplesDir, "testdata"))
+		testDataPath, err := filepath.Abs(filepath.Join(examplesDir, "dir/e2e/testdata"))
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 		dockerImage = fmt.Sprintf("%s/dir-ctl:%s", os.Getenv("IMAGE_REPO"), os.Getenv("DIRECTORY_IMAGE_TAG"))
-		mountDest = "/opt/testdata"
-		mountString = fmt.Sprintf("%s:%s", testDataDir, mountDest)
+		mountDest = "/testdata"
+		mountString = fmt.Sprintf("%s:%s", testDataPath, mountDest)
 
-		agentModelFile = filepath.Join(mountDest, "expected_agent.json")
+		agentModelFile = filepath.Join(mountDest, "agent.json")
 	})
 
 	ginkgo.Context("agent push and pull", func() {