From b3977d59166784475f33a39f7b23652bbc1fe005 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Tue, 11 Jan 2022 22:12:23 +0100
Subject: [PATCH] fix: fix auto_tag behavior to avoid unexpected publishing

---
 cmd/drone-docker/config.go |  1 -
 plugin/impl.go             |  4 ++--
 plugin/tags_test.go        | 14 +++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/cmd/drone-docker/config.go b/cmd/drone-docker/config.go
index 2a3ec30..280a52a 100644
--- a/cmd/drone-docker/config.go
+++ b/cmd/drone-docker/config.go
@@ -111,7 +111,6 @@ func settingsFlags(settings *plugin.Settings) []cli.Flag {
 			Name:        "tags",
 			EnvVars:     []string{"PLUGIN_TAG", "PLUGIN_TAGS"},
 			Usage:       "sets repository tags to use for the image",
-			Value:       cli.NewStringSlice([]string{"latest"}...),
 			FilePath:    ".tags",
 			Destination: &settings.Build.Tags,
 		},
diff --git a/plugin/impl.go b/plugin/impl.go
index 8d49f6c..c0936b1 100644
--- a/plugin/impl.go
+++ b/plugin/impl.go
@@ -92,12 +92,12 @@ func (p *Plugin) Validate() error {
 				p.settings.Build.TagsSuffix,
 			)
 			if err != nil {
-				logrus.Printf("cannot build docker image for %s, invalid semantic version", p.settings.Build.Ref)
+				logrus.Printf("cannot generate tags from %s, invalid semantic version", p.settings.Build.Ref)
 				return err
 			}
 			p.settings.Build.Tags = *cli.NewStringSlice(tag...)
 		} else {
-			logrus.Printf("skipping automated docker build for %s", p.settings.Build.Ref)
+			logrus.Printf("skip auto-tagging for %s, not on default branch or tag", p.settings.Build.Ref)
 			return nil
 		}
 	}
diff --git a/plugin/tags_test.go b/plugin/tags_test.go
index 89b65da..296b91a 100644
--- a/plugin/tags_test.go
+++ b/plugin/tags_test.go
@@ -29,7 +29,7 @@ func TestDefaultTags(t *testing.T) {
 		After  []string
 	}{
 		{"", []string{"latest"}},
-		{"refs/heads/master", []string{"latest"}},
+		{"refs/heads/main", []string{"latest"}},
 		{"refs/tags/0.9.0", []string{"0.9", "0.9.0"}},
 		{"refs/tags/1.0.0", []string{"1", "1.0", "1.0.0"}},
 		{"refs/tags/v1.0.0", []string{"1", "1.0", "1.0.0"}},
@@ -142,9 +142,9 @@ func Test_stripHeadPrefix(t *testing.T) {
 	}{
 		{
 			args: args{
-				ref: "refs/heads/master",
+				ref: "refs/heads/main",
 			},
-			want: "master",
+			want: "main",
 		},
 	}
 	for _, tt := range tests {
@@ -167,8 +167,8 @@ func TestUseDefaultTag(t *testing.T) {
 		{
 			name: "latest tag for default branch",
 			args: args{
-				ref:           "refs/heads/master",
-				defaultBranch: "master",
+				ref:           "refs/heads/main",
+				defaultBranch: "main",
 			},
 			want: true,
 		},
@@ -176,7 +176,7 @@ func TestUseDefaultTag(t *testing.T) {
 			name: "build from tags",
 			args: args{
 				ref:           "refs/tags/v1.0.0",
-				defaultBranch: "master",
+				defaultBranch: "main",
 			},
 			want: true,
 		},
@@ -184,7 +184,7 @@ func TestUseDefaultTag(t *testing.T) {
 			name: "skip build for not default branch",
 			args: args{
 				ref:           "refs/heads/develop",
-				defaultBranch: "master",
+				defaultBranch: "main",
 			},
 			want: false,
 		},