fix: Remove unnecessary warning

radiofrance · Jan 6, 2022 · 60d42df · 60d42df
1 parent c05cbf1
commit 60d42df
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 35 deletions.
diff --git a/dag/dag.go b/dag/dag.go
@@ -41,19 +41,14 @@ func (dag *DAG) GenerateDAG(buildPath string, registryPrefix string) {
 			if !hasSkipLabel {
 				return fmt.Errorf("missing label \"image\" in Dockerfile at path \"%s\"", filePath)
 			}
-			version, hasSkipLabel := dockerfile.Labels["version"]
-			if !hasSkipLabel {
-				logrus.Warnf("missing label \"version\" in Dockerfile at path \"%s\"", filePath)
-			}
 			img := &Image{
-				Name:          fmt.Sprintf("%s/%s", registryPrefix, imageShortName),
-				ShortName:     imageShortName,
-				InlineVersion: version,
-				Dockerfile:    dockerfile,
-				RebuildCond:   sync.NewCond(&sync.Mutex{}),
-				Builder:       dag.Builder,
-				Registry:      dag.Registry,
-				TestRunners:   dag.TestRunners,
+				Name:        fmt.Sprintf("%s/%s", registryPrefix, imageShortName),
+				ShortName:   imageShortName,
+				Dockerfile:  dockerfile,
+				RebuildCond: sync.NewCond(&sync.Mutex{}),
+				Builder:     dag.Builder,
+				Registry:    dag.Registry,
+				TestRunners: dag.TestRunners,
 			}
 
 			allParents[img.Name] = dockerfile.From

diff --git a/dag/dag_test.go b/dag/dag_test.go
@@ -14,9 +14,8 @@ import (
 
 func newImage(name string, contextPath string) *dag.Image {
 	return &dag.Image{
-		Name:          name,
-		ShortName:     path.Base(contextPath),
-		InlineVersion: "v1",
+		Name:      name,
+		ShortName: path.Base(contextPath),
 		Dockerfile: &dockerfile.Dockerfile{
 			ContextPath: contextPath,
 			Filename:    "Dockerfile",

diff --git a/dag/image.go b/dag/image.go
@@ -23,7 +23,6 @@ var rateLimit = make(chan struct{}, maxGoroutines)
 type Image struct {
 	Name            string
 	ShortName       string
-	InlineVersion   string
 	Dockerfile      *dockerfile.Dockerfile
 	Children        []*Image
 	Parents         []*Image
@@ -233,22 +232,8 @@ func (img *Image) doRetag(newTag, oldTag string) error {
 		if previousTagExists {
 			return img.retagRemote(oldTag, newTag)
 		} else {
-			inlineVersionTagExists, err := img.Registry.RefExists(img.dockerRef(img.InlineVersion))
-			if err != nil {
-				return err
-			}
-			if inlineVersionTagExists {
-				logrus.Warnf(
-					"Previous tag \"%s:%s\" missing, image will be retagged with inline version \"%s\"",
-					img.Name,
-					oldTag,
-					img.InlineVersion,
-				)
-				return img.retagRemote(img.InlineVersion, newTag)
-			} else {
-				logrus.Warnf("Previous tag \"%s:%s\" missing, image will be rebuilt", img.Name, oldTag)
-				img.tagForRebuild()
-			}
+			logrus.Warnf("Previous tag \"%s:%s\" missing, image will be rebuilt", img.Name, oldTag)
+			img.tagForRebuild()
 		}
 	}
 	return nil

diff --git a/dag/image_test.go b/dag/image_test.go
@@ -79,9 +79,8 @@ func createImage(registry *mock.Registry, builder *mock.Builder, tester *mock.Te
 	}
 
 	return dag.Image{
-		Name:          "eu.gcr.io/my-test-repository/test",
-		ShortName:     "test",
-		InlineVersion: "",
+		Name:      "eu.gcr.io/my-test-repository/test",
+		ShortName: "test",
 		Dockerfile: &dockerfile.Dockerfile{
 			ContextPath: "../test/fixtures",
 			Filename:    "Dockerfile",