Move connecting socket to client: network

Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>

pkg/dagger.io/dagger/plan.cue

@@ -23,6 +23,11 @@ package dagger
 			}
 		}
 
+		// Access client network endpoints
+		network: [address=#Address]: _#clientNetwork & {
+			"address": address
+		}
+
 		// Access client environment variables
 		env: _#clientEnv
 
@@ -65,13 +70,6 @@ _#clientFilesystemRead: {
 		// Filename patterns to exclude
 		// Example: ["node_modules"]
 		exclude?: [...string]
-	} | {
-		// CUE type defines expected content:
-		//     #Socket: unix socket or npipe
-		contents: #Socket
-
-		// Type of service
-		type: *"unix" | "npipe"
 	}
 }
 
@@ -93,6 +91,22 @@ _#clientFilesystemWrite: {
 	}
 }
 
+_#clientNetwork: {
+	$dagger: task: _name: "ClientNetwork"
+
+	// URL to the socket
+	// Example: unix:///var/run/docker.sock
+	address: #Address
+
+	{
+		// unix socket or npipe
+		connect: #Socket
+		// } | {
+		//  // FIXME: not yet implemented
+		//  listen: #Socket
+	}
+}
+
 _#clientEnv: {
 	$dagger: task: _name: "ClientEnv"
 

pkg/dagger.io/dagger/types.cue

@@ -34,4 +34,5 @@ package dagger
 }
 
 // A network service address
-#Address: string & =~"^(tcp://|unix://|udp://).*"
+#Address: string & =~"^(unix://|npipe://).+"
+// TODO: #Address: string & =~"^(tcp://|unix://|npipe://|udp://).+"

pkg/universe.dagger.io/docker/cli/test/load.cue

@@ -10,7 +10,7 @@ import (
 )
 
 dagger.#Plan & {
-	client: filesystem: "/var/run/docker.sock": read: contents: dagger.#Socket
+	client: network: "unix:///var/run/docker.sock": connect: dagger.#Socket
 
 	actions: test: {
 		_cli: alpine.#Build & {
@@ -30,14 +30,14 @@ dagger.#Plan & {
 
 		load: cli.#Load & {
 			image: _image.output
-			host:  client.filesystem."/var/run/docker.sock".read.contents
+			host:  client.network."unix:///var/run/docker.sock".connect
 			tag:   "dagger:load"
 		}
 
 		verify: bash.#Run & {
 			input: _cli.output
 			mounts: docker: {
-				contents: client.filesystem."/var/run/docker.sock".read.contents
+				contents: client.network."unix:///var/run/docker.sock".connect
 				dest:     "/var/run/docker.sock"
 			}
 			env: {

pkg/universe.dagger.io/docker/cli/test/run.cue

@@ -9,11 +9,11 @@ import (
 )
 
 dagger.#Plan & {
-	client: filesystem: "/var/run/docker.sock": read: contents: dagger.#Socket
+	client: network: "unix:///var/run/docker.sock": connect: dagger.#Socket
 
 	actions: test: {
 		run: cli.#Run & {
-			host: client.filesystem."/var/run/docker.sock".read.contents
+			host: client.network."unix:///var/run/docker.sock".connect
 			command: name: "info"
 		}
 
@@ -33,7 +33,7 @@ dagger.#Plan & {
 			}
 			run: cli.#Run & {
 				input: _cli.output
-				host:  client.filesystem."/var/run/docker.sock".read.contents
+				host:  client.network."unix:///var/run/docker.sock".connect
 				command: {
 					name: "docker"
 					args: ["info"]