Merge pull request #1168 from aluzzardi/dagger-secret-service

Migrate dagger.#Secret and dagger.#Stream to new format

stdlib/dagger/dagger.cue

@@ -24,13 +24,18 @@ import (
 	...
 }
 
-// Dagger stream. Can be mounted as a UNIX socket.
-#Stream: {
-	@dagger(stream)
-
-	id: string
+// A reference to a network service endpoint, for example:
+//  - A TCP or UDP port
+//  - A unix or npipe socket
+//  - An HTTPS endpoint
+#Service: {
+	_service: id: string
 }
 
+// Dagger stream. Can be mounted as a UNIX socket.
+// FIXME: Deprecated. For backward compatibility only, use #Service instead.
+#Stream: #Service
+
 // A reference to an external secret, for example:
 //  - A password
 //  - A SSH private key
@@ -38,9 +43,7 @@ import (
 // Secrets are never merged in the Cue tree. They can only be used
 // by a special filesystem mount designed to minimize leak risk.
 #Secret: {
-	@dagger(secret)
-
-	id: string
+	_secret: id: string
 }
 
 #Input: {

stdlib/stdlib.go

@@ -17,8 +17,9 @@ var (
 	//go:embed **/*.cue **/*/*.cue
 	FS embed.FS
 
-	PackageName  = "alpha.dagger.io"
-	Path         = path.Join("cue.mod", "pkg", PackageName)
+	ModuleName   = "alpha.dagger.io"
+	PackageName  = fmt.Sprintf("%s/dagger", ModuleName)
+	Path         = path.Join("cue.mod", "pkg", ModuleName)
 	lockFilePath = path.Join("cue.mod", "dagger.lock")
 )