From 86366b1f11f03930565cfce970dc7c84eb6cf1cb Mon Sep 17 00:00:00 2001
From: Joel Longtine <joel@dagger.io>
Date: Thu, 16 Dec 2021 15:33:37 -0700
Subject: [PATCH] Change Europa Core types ids

Signed-off-by: Joel Longtine <joel@dagger.io>
---
 plancontext/fs.go                     | 5 +++--
 plancontext/secret.go                 | 5 +++--
 plancontext/service.go                | 5 +++--
 stdlib/europa/dagger/engine/types.cue | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/plancontext/fs.go b/plancontext/fs.go
index 4d3bef88..fd094724 100644
--- a/plancontext/fs.go
+++ b/plancontext/fs.go
@@ -13,8 +13,9 @@ import (
 
 var (
 	fsIDPath = cue.MakePath(
-		cue.Hid("_fs", stdlib.EnginePackage),
-		cue.Str("id"),
+		cue.Str("$dagger"),
+		cue.Str("fs"),
+		cue.Hid("_id", stdlib.EnginePackage),
 	)
 )
 
diff --git a/plancontext/secret.go b/plancontext/secret.go
index 7e7d0ad3..e2e3a136 100644
--- a/plancontext/secret.go
+++ b/plancontext/secret.go
@@ -11,8 +11,9 @@ import (
 
 var (
 	secretIDPath = cue.MakePath(
-		cue.Hid("_secret", stdlib.EnginePackage),
-		cue.Str("id"),
+		cue.Str("$dagger"),
+		cue.Str("secret"),
+		cue.Hid("_id", stdlib.EnginePackage),
 	)
 )
 
diff --git a/plancontext/service.go b/plancontext/service.go
index 33561e54..1bcc0cd7 100644
--- a/plancontext/service.go
+++ b/plancontext/service.go
@@ -11,8 +11,9 @@ import (
 
 var (
 	serviceIDPath = cue.MakePath(
-		cue.Hid("_service", stdlib.EnginePackage),
-		cue.Str("id"),
+		cue.Str("$dagger"),
+		cue.Str("service"),
+		cue.Hid("_id", stdlib.EnginePackage),
 	)
 )
 
diff --git a/stdlib/europa/dagger/engine/types.cue b/stdlib/europa/dagger/engine/types.cue
index 5a0a2c27..7296f3fb 100644
--- a/stdlib/europa/dagger/engine/types.cue
+++ b/stdlib/europa/dagger/engine/types.cue
@@ -7,7 +7,7 @@ package engine
 //  - A directory containing binary artifacts
 // Rule of thumb: if it fits in a tar archive, it fits in a #FS.
 #FS: {
-	_fs: id: string
+	$dagger: fs: _id: string
 }
 
 // A reference to an external secret, for example:
@@ -17,7 +17,7 @@ package engine
 // Secrets are never merged in the Cue tree. They can only be used
 // by a special filesystem mount designed to minimize leak risk.
 #Secret: {
-	_secret: id: string
+	$dagger: secret: _id: string
 }
 
 // A reference to a network service endpoint, for example:
@@ -25,5 +25,5 @@ package engine
 //  - A unix or npipe socket
 //  - An HTTPS endpoint
 #Service: {
-	_service: id: string
+	$dagger: service: _id: string
 }