From d55088c612b1108ef566ec47e40fb8d1050f7451 Mon Sep 17 00:00:00 2001
From: Helder Correia <174525+helderco@users.noreply.github.com>
Date: Mon, 4 Apr 2022 15:19:36 +0000
Subject: [PATCH] refactor!: Move image definitions to `dagger/core`

BREAKING CHANGE: Adjust imports for for `#Ref`, `#ImageConfig` and `#HealthCheck`.

Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>
---
 pkg/dagger.io/dagger/core/image.cue     | 55 ++++++++++++++++++++-----
 pkg/dagger.io/dagger/image.cue          | 36 ----------------
 pkg/universe.dagger.io/docker/image.cue |  5 ++-
 pkg/universe.dagger.io/docker/set.cue   |  3 +-
 4 files changed, 49 insertions(+), 50 deletions(-)
 delete mode 100644 pkg/dagger.io/dagger/image.cue

diff --git a/pkg/dagger.io/dagger/core/image.cue b/pkg/dagger.io/dagger/core/image.cue
index 345be094..0a459ff6 100644
--- a/pkg/dagger.io/dagger/core/image.cue
+++ b/pkg/dagger.io/dagger/core/image.cue
@@ -5,18 +5,53 @@ import (
 	"dagger.io/dagger"
 )
 
+// A ref is an address for a remote container image
+//
+// Examples:
+//   - "index.docker.io/dagger"
+//   - "dagger"
+//   - "index.docker.io/dagger:latest"
+//   - "index.docker.io/dagger:latest@sha256:a89cb097693dd354de598d279c304a1c73ee550fbfff6d9ee515568e0c749cfe"
+#Ref: string
+
+// Container image config. See [OCI](https://www.opencontainers.org/).
+#ImageConfig: {
+	user?: string
+	expose?: [string]: {}
+	env?: [string]: string
+	entrypoint?: [...string]
+	cmd?: [...string]
+	volume?: [string]: {}
+	workdir?: string
+	label?: [string]: string
+	stopsignal?:  string
+	healthcheck?: #HealthCheck
+	argsescaped?: bool
+	onbuild?: [...string]
+	stoptimeout?: int
+	shell?: [...string]
+}
+
+#HealthCheck: {
+	test?: [...string]
+	interval?:    int
+	timeout?:     int
+	startperiod?: int
+	retries?:     int
+}
+
 // Upload a container image to a remote repository
 #Push: {
 	$dagger: task: _name: "Push"
 
 	// Target repository address
-	dest: dagger.#Ref
+	dest: #Ref
 
 	// Filesystem contents to push
 	input: dagger.#FS
 
 	// Container image config
-	config: dagger.#ImageConfig
+	config: #ImageConfig
 
 	// Authentication
 	auth?: {
@@ -25,7 +60,7 @@ import (
 	}
 
 	// Complete ref of the pushed image, including digest
-	result: dagger.#Ref
+	result: #Ref
 }
 
 // Download a container image from a remote repository
@@ -33,7 +68,7 @@ import (
 	$dagger: task: _name: "Pull"
 
 	// Repository source ref
-	source: dagger.#Ref
+	source: #Ref
 
 	// Authentication
 	auth?: {
@@ -48,7 +83,7 @@ import (
 	digest: string
 
 	// Downloaded container image config
-	config: dagger.#ImageConfig
+	config: #ImageConfig
 }
 
 // Build a container image using a Dockerfile
@@ -80,7 +115,7 @@ import (
 	output: dagger.#FS
 
 	// Container image config produced
-	config: dagger.#ImageConfig
+	config: #ImageConfig
 }
 
 // Export an image as a tar archive
@@ -91,7 +126,7 @@ import (
 	input: dagger.#FS
 
 	// Container image config
-	config: dagger.#ImageConfig
+	config: #ImageConfig
 
 	// Name and optionally a tag in the 'name:tag' format
 	tag: string
@@ -112,13 +147,13 @@ import (
 // Change image config
 #Set: {
 	// The source image config
-	input: dagger.#ImageConfig
+	input: #ImageConfig
 
 	// The config to merge
-	config: dagger.#ImageConfig
+	config: #ImageConfig
 
 	// Resulting config
-	output: dagger.#ImageConfig & {
+	output: #ImageConfig & {
 		let structs = ["env", "label", "volume", "expose"]
 		let lists = ["onbuild"]
 
diff --git a/pkg/dagger.io/dagger/image.cue b/pkg/dagger.io/dagger/image.cue
deleted file mode 100644
index 66a6e508..00000000
--- a/pkg/dagger.io/dagger/image.cue
+++ /dev/null
@@ -1,36 +0,0 @@
-package dagger
-
-// A ref is an address for a remote container image
-//
-// Examples:
-//   - "index.docker.io/dagger"
-//   - "dagger"
-//   - "index.docker.io/dagger:latest"
-//   - "index.docker.io/dagger:latest@sha256:a89cb097693dd354de598d279c304a1c73ee550fbfff6d9ee515568e0c749cfe"
-#Ref: string
-
-// Container image config. See [OCI](https://www.opencontainers.org/).
-#ImageConfig: {
-	user?: string
-	expose?: [string]: {}
-	env?: [string]: string
-	entrypoint?: [...string]
-	cmd?: [...string]
-	volume?: [string]: {}
-	workdir?: string
-	label?: [string]: string
-	stopsignal?:  string
-	healthcheck?: #HealthCheck
-	argsescaped?: bool
-	onbuild?: [...string]
-	stoptimeout?: int
-	shell?: [...string]
-}
-
-#HealthCheck: {
-	test?: [...string]
-	interval?:    int
-	timeout?:     int
-	startperiod?: int
-	retries?:     int
-}
diff --git a/pkg/universe.dagger.io/docker/image.cue b/pkg/universe.dagger.io/docker/image.cue
index dbb46683..8fed4327 100644
--- a/pkg/universe.dagger.io/docker/image.cue
+++ b/pkg/universe.dagger.io/docker/image.cue
@@ -2,6 +2,7 @@ package docker
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 // A container image
@@ -10,7 +11,7 @@ import (
 	rootfs: dagger.#FS
 
 	// Image config
-	config: dagger.#ImageConfig
+	config: core.#ImageConfig
 }
 
 // A ref is an address for a remote container image
@@ -20,4 +21,4 @@ import (
 //   - "index.docker.io/dagger:latest"
 //   - "index.docker.io/dagger:latest@sha256:a89cb097693dd354de598d279c304a1c73ee550fbfff6d9ee515568e0c749cfe"
 // FIXME: add formatting constraints
-#Ref: dagger.#Ref
+#Ref: core.#Ref
diff --git a/pkg/universe.dagger.io/docker/set.cue b/pkg/universe.dagger.io/docker/set.cue
index 2f34a94f..0276cd12 100644
--- a/pkg/universe.dagger.io/docker/set.cue
+++ b/pkg/universe.dagger.io/docker/set.cue
@@ -1,7 +1,6 @@
 package docker
 
 import (
-	"dagger.io/dagger"
 	"dagger.io/dagger/core"
 )
 
@@ -11,7 +10,7 @@ import (
 	input: #Image
 
 	// The image config to change
-	config: dagger.#ImageConfig
+	config: core.#ImageConfig
 
 	_set: core.#Set & {
 		"input":  input.config