minor refactor to prep for cards

2022-01-12 11:18:55 -05:00
13 changed files with 37 additions and 263 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,39 +1,11 @@
 # Changelog

-## [v20.11.0](https://github.com/drone-plugins/drone-docker/tree/v20.11.0) (2022-01-19)
-
-[Full Changelog](https://github.com/drone-plugins/drone-docker/compare/v20.10.9.1...v20.11.0)
-
-**Merged pull requests:**
-
- \(feat\) publish docker data to create drone card [\#347](https://github.com/drone-plugins/drone-docker/pull/347) ([eoinmcafee00](https://github.com/eoinmcafee00))
-
-## [v20.10.9.1](https://github.com/drone-plugins/drone-docker/tree/v20.10.9.1) (2022-01-13)
-
-[Full Changelog](https://github.com/drone-plugins/drone-docker/compare/v20.10.9...v20.10.9.1)
-
-**Implemented enhancements:**
-
- Serialize windows 1809 pipelines [\#348](https://github.com/drone-plugins/drone-docker/pull/348) ([shubham149](https://github.com/shubham149))
- Support for windows images for tags [\#346](https://github.com/drone-plugins/drone-docker/pull/346) ([shubham149](https://github.com/shubham149))
-
-**Fixed bugs:**
-
- Fix ECR & GCR docker publish on windows [\#352](https://github.com/drone-plugins/drone-docker/pull/352) ([shubham149](https://github.com/shubham149))
- Fix windows docker builds [\#351](https://github.com/drone-plugins/drone-docker/pull/351) ([shubham149](https://github.com/shubham149))
- Fix powershell script to publish windows images [\#350](https://github.com/drone-plugins/drone-docker/pull/350) ([shubham149](https://github.com/shubham149))
-
-**Merged pull requests:**
-
- release prep for 20.10.9.1 [\#353](https://github.com/drone-plugins/drone-docker/pull/353) ([eoinmcafee00](https://github.com/eoinmcafee00))
-
-## [v20.10.9](https://github.com/drone-plugins/drone-docker/tree/v20.10.9) (2021-11-03)
+## [v20.10.9](https://github.com/drone-plugins/drone-docker/tree/v20.10.9) (2021-11-02)

 [Full Changelog](https://github.com/drone-plugins/drone-docker/compare/v19.03.9...v20.10.9)

 **Merged pull requests:**

- bump to version 20.10.9: [\#342](https://github.com/drone-plugins/drone-docker/pull/342) ([eoinmcafee00](https://github.com/eoinmcafee00))
 - Upgrade Docker dind to 20.10.9 for 64bit platforms [\#334](https://github.com/drone-plugins/drone-docker/pull/334) ([gzm0](https://github.com/gzm0))

 ## [v19.03.9](https://github.com/drone-plugins/drone-docker/tree/v19.03.9) (2021-10-13)
--- a/card.go
+++ b/card.go
@@ -3,16 +3,10 @@ package docker
 import (
 	"encoding/base64"
 	"encoding/json"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"time"
-
-	"github.com/drone/drone-go/drone"
-
-	"github.com/inhies/go-bytesize"
 )

 func (p Plugin) writeCard() error {
@@ -22,23 +16,14 @@ func (p Plugin) writeCard() error {
 		return err
 	}

-	out := Inspect{}
+	out := map[string]interface{}{} // replace with docker inspect struct
 	if err := json.Unmarshal(data, &out); err != nil {
 		return err
 	}

-	inspect := out[0]
-	inspect.SizeString = fmt.Sprint(bytesize.New(float64(inspect.Size)))
-	inspect.VirtualSizeString = fmt.Sprint(bytesize.New(float64(inspect.VirtualSize)))
-	inspect.Time = fmt.Sprint(inspect.Metadata.LastTagTime.Format(time.RFC3339))
-	cardData, _ := json.Marshal(inspect)
+	card := map[string]interface{}{} // replace with card struct, populate with docker inspect output

-	card := drone.CardInput{
-		Schema: "https://drone-plugins.github.io/drone-docker/card.json",
-		Data:   cardData,
-	}
-
-	writeCard(p.CardPath, &card)
+	writeCard( /*p.CardPath*/ "", &card)
 	return nil
 }

--- a/cmd/drone-acr/main.go
+++ b/cmd/drone-acr/main.go
@@ -7,9 +7,6 @@ import (
 	"strings"

 	"github.com/joho/godotenv"
-	"github.com/sirupsen/logrus"
-
-	docker "github.com/drone-plugins/drone-docker"
 )

 func main() {
@@ -43,12 +40,12 @@ func main() {
 	os.Setenv("DOCKER_PASSWORD", password)

 	// invoke the base docker plugin binary
-	cmd := exec.Command(docker.GetDroneDockerExecCmd())
+	cmd := exec.Command("drone-docker")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err := cmd.Run()
 	if err != nil {
-		logrus.Fatal(err)
+		os.Exit(1)
 	}
 }

--- a/cmd/drone-docker/main.go
+++ b/cmd/drone-docker/main.go
@@ -2,7 +2,6 @@ package main

 import (
 	"os"
-	"runtime"

 	"github.com/joho/godotenv"
 	"github.com/sirupsen/logrus"
@@ -249,11 +248,6 @@ func main() {
 			Usage:  "additional host:IP mapping",
 			EnvVar: "PLUGIN_ADD_HOST",
 		},
-		cli.StringFlag{
-			Name:   "drone-card-path",
-			Usage:  "card path location to write to",
-			EnvVar: "DRONE_CARD_PATH",
-		},
 	}

 	if err := app.Run(os.Args); err != nil {
@@ -272,28 +266,27 @@ func run(c *cli.Context) error {
 			Email:    c.String("docker.email"),
 			Config:   c.String("docker.config"),
 		},
-		CardPath: c.String("drone-card-path"),
 		Build: docker.Build{
-			Remote:      c.String("remote.url"),
-			Name:        c.String("commit.sha"),
-			Dockerfile:  c.String("dockerfile"),
-			Context:     c.String("context"),
-			Tags:        c.StringSlice("tags"),
-			Args:        c.StringSlice("args"),
-			ArgsEnv:     c.StringSlice("args-from-env"),
-			Target:      c.String("target"),
-			Squash:      c.Bool("squash"),
-			Pull:        c.BoolT("pull-image"),
-			CacheFrom:   c.StringSlice("cache-from"),
-			Compress:    c.Bool("compress"),
-			Repo:        c.String("repo"),
-			Labels:      c.StringSlice("custom-labels"),
-			LabelSchema: c.StringSlice("label-schema"),
-			AutoLabel:   c.BoolT("auto-label"),
-			Link:        c.String("link"),
-			NoCache:     c.Bool("no-cache"),
-			AddHost:     c.StringSlice("add-host"),
-			Quiet:       c.Bool("quiet"),
+			Remote:        c.String("remote.url"),
+			Name:          c.String("commit.sha"),
+			Dockerfile:    c.String("dockerfile"),
+			Context:       c.String("context"),
+			Tags:          c.StringSlice("tags"),
+			Args:          c.StringSlice("args"),
+			ArgsEnv:       c.StringSlice("args-from-env"),
+			Target:        c.String("target"),
+			Squash:        c.Bool("squash"),
+			Pull:          c.BoolT("pull-image"),
+			CacheFrom:     c.StringSlice("cache-from"),
+			Compress:      c.Bool("compress"),
+			Repo:          c.String("repo"),
+			Labels:        c.StringSlice("custom-labels"),
+			LabelSchema:   c.StringSlice("label-schema"),
+			AutoLabel:     c.BoolT("auto-label"),
+			Link:          c.String("link"),
+			NoCache:       c.Bool("no-cache"),
+			AddHost:       c.StringSlice("add-host"),
+			Quiet:         c.Bool("quiet"),
 		},
 		Daemon: docker.Daemon{
 			Registry:      c.String("docker.registry"),
@@ -334,11 +327,3 @@ func run(c *cli.Context) error {

 	return plugin.Exec()
 }
-
-func GetExecCmd() string {
-	if runtime.GOOS == "windows" {
-		return "C:/bin/drone-docker.exe"
-	}
-
-	return "drone-docker"
-}
--- a/cmd/drone-ecr/main.go
+++ b/cmd/drone-ecr/main.go
@@ -11,15 +11,12 @@ import (
 	"strings"

 	"github.com/joho/godotenv"
-	"github.com/sirupsen/logrus"

 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ecr"
-
-	docker "github.com/drone-plugins/drone-docker"
 )

 const defaultRegion = "us-east-1"
@@ -113,11 +110,11 @@ func main() {
 	os.Setenv("DOCKER_PASSWORD", password)

 	// invoke the base docker plugin binary
-	cmd := exec.Command(docker.GetDroneDockerExecCmd())
+	cmd := exec.Command("drone-docker")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err = cmd.Run(); err != nil {
-		logrus.Fatal(err)
+		os.Exit(1)
 	}
 }

--- a/cmd/drone-gcr/main.go
+++ b/cmd/drone-gcr/main.go
@@ -8,9 +8,6 @@ import (
 	"strings"

 	"github.com/joho/godotenv"
-	"github.com/sirupsen/logrus"
-
-	docker "github.com/drone-plugins/drone-docker"
 )

 // gcr default username
@@ -57,12 +54,12 @@ func main() {
 	os.Setenv("DOCKER_PASSWORD", password)

 	// invoke the base docker plugin binary
-	cmd := exec.Command(docker.GetDroneDockerExecCmd())
+	cmd := exec.Command("drone-docker")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()
 	if err != nil {
-		logrus.Fatal(err)
+		os.Exit(1)
 	}
 }

--- a/docker.go
+++ b/docker.go
@@ -6,7 +6,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"time"
 )
@@ -64,34 +63,11 @@ type (

 	// Plugin defines the Docker plugin parameters.
 	Plugin struct {
-		Login    Login  // Docker login configuration
-		Build    Build  // Docker build configuration
-		Daemon   Daemon // Docker daemon configuration
-		Dryrun   bool   // Docker push is skipped
-		Cleanup  bool   // Docker purge is enabled
-		CardPath string // Card path to write file to
-	}
-
-	Inspect []struct {
-		ID            string        `json:"Id"`
-		RepoTags      []string      `json:"RepoTags"`
-		RepoDigests   []interface{} `json:"RepoDigests"`
-		Parent        string        `json:"Parent"`
-		Comment       string        `json:"Comment"`
-		Created       time.Time     `json:"Created"`
-		Container     string        `json:"Container"`
-		DockerVersion string        `json:"DockerVersion"`
-		Author        string        `json:"Author"`
-		Architecture  string        `json:"Architecture"`
-		Os            string        `json:"Os"`
-		Size          int           `json:"Size"`
-		VirtualSize   int           `json:"VirtualSize"`
-		Metadata      struct {
-			LastTagTime time.Time `json:"LastTagTime"`
-		} `json:"Metadata"`
-		SizeString        string
-		VirtualSizeString string
-		Time              string
+		Login   Login  // Docker login configuration
+		Build   Build  // Docker build configuration
+		Daemon  Daemon // Docker daemon configuration
+		Dryrun  bool   // Docker push is skipped
+		Cleanup bool   // Docker purge is enabled
 	}
 )

@@ -455,11 +431,3 @@ func commandRmi(tag string) *exec.Cmd {
 func trace(cmd *exec.Cmd) {
 	fmt.Fprintf(os.Stdout, "+ %s\n", strings.Join(cmd.Args, " "))
 }
-
-func GetDroneDockerExecCmd() string {
-	if runtime.GOOS == "windows" {
-		return "C:/bin/drone-docker.exe"
-	}
-
-	return "drone-docker"
-}
--- a/docs/card.json
+++ b/docs/card.json
@@ -1,118 +0,0 @@
-{
-  "type": "AdaptiveCard",
-  "body": [
-    {
-      "type": "ColumnSet",
-      "columns": [
-        {
-          "type": "Column",
-          "items": [
-            {
-              "type": "Image",
-              "url": "https://d36jcksde1wxzq.cloudfront.net/be7833db9bddb4494d2a7c3dd659199a.png",
-              "size": "Medium"
-            }
-          ],
-          "width": "auto"
-        },
-        {
-          "type": "Column",
-          "items": [
-            {
-              "type": "TextBlock",
-              "text": "${RepoTags[0]}",
-              "size": "Medium"
-            },
-            {
-              "type": "TextBlock",
-              "text": "DIGEST: ${RepoDigests[0]}",
-              "wrap": true,
-              "size": "Small",
-              "weight": "Lighter",
-              "isSubtle": true,
-              "spacing": "Small"
-            },
-            {
-              "type": "ColumnSet",
-              "columns": [
-                {
-                  "type": "Column",
-                  "items": [
-                    {
-                      "type": "TextBlock",
-                      "weight": "Lighter",
-                      "text": "OS/ARCH",
-                      "wrap": true,
-                      "size": "Small",
-                      "isSubtle": true,
-                      "spacing": "Medium"
-                    },
-                    {
-                      "type": "TextBlock",
-                      "text": "${OS}/${Architecture}",
-                      "wrap": true,
-                      "size": "Small",
-                      "spacing": "Small"
-                    }
-                  ],
-                  "separator": true,
-                  "width": "auto"
-                },
-                {
-                  "type": "Column",
-                  "items": [
-                    {
-                      "type": "TextBlock",
-                      "weight": "Lighter",
-                      "text": "SIZE",
-                      "wrap": true,
-                      "size": "Small",
-                      "isSubtle": true
-                    },
-                    {
-                      "type": "TextBlock",
-                      "spacing": "Small",
-                      "text": "${SizeString}",
-                      "wrap": true,
-                      "size": "Small"
-                    }
-                  ],
-                  "width": "auto",
-                  "separator": true,
-                  "spacing": "Medium"
-                },
-                {
-                  "type": "Column",
-                  "items": [
-                    {
-                      "type": "TextBlock",
-                      "weight": "Lighter",
-                      "text": "LAST PUSHED",
-                      "wrap": true,
-                      "size": "Small",
-                      "isSubtle": true
-                    },
-                    {
-                      "type": "TextBlock",
-                      "spacing": "Small",
-                      "text": "{{DATE(${Time})}} - {{TIME(${Time})}}",
-                      "wrap": true,
-                      "size": "Small"
-                    }
-                  ],
-                  "width": "auto",
-                  "separator": true,
-                  "spacing": "Medium"
-                }
-              ],
-              "style": "default"
-            }
-          ],
-          "width": "stretch"
-        }
-      ]
-    }
-  ],
-  "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
-  "version": "1.0"
-}
--- a/docs/index.json
+++ b/docs/index.json
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,6 @@ module github.com/drone-plugins/drone-docker
 require (
 	github.com/aws/aws-sdk-go v1.26.7
 	github.com/coreos/go-semver v0.3.0
-	github.com/drone/drone-go v1.7.1
-	github.com/inhies/go-bytesize v0.0.0-20210819104631-275770b98743
 	github.com/joho/godotenv v1.3.0
 	github.com/sirupsen/logrus v1.3.0
 	github.com/urfave/cli v1.22.2
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,3 @@
-github.com/99designs/httpsignatures-go v0.0.0-20170731043157-88528bf4ca7e/go.mod h1:Xa6lInWHNQnuWoF0YPSsx+INFA9qk7/7pTjwb3PInkY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/aws/aws-sdk-go v1.26.7 h1:ObjEnmzvSdYy8KVd3me7v/UMyCn81inLy2SyoIPoBkg=
 github.com/aws/aws-sdk-go v1.26.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
@@ -8,12 +7,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSY
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/drone/drone-go v1.7.1 h1:ZX+3Rs8YHUSUQ5mkuMLmm1zr1ttiiE2YGNxF3AnyDKw=
-github.com/drone/drone-go v1.7.1/go.mod h1:fxCf9jAnXDZV1yDr0ckTuWd1intvcQwfJmTRpTZ1mXg=
-github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/inhies/go-bytesize v0.0.0-20210819104631-275770b98743 h1:X3Xxno5Ji8idrNiUoFc7QyXpqhSYlDRYQmc7mlpMBzU=
-github.com/inhies/go-bytesize v0.0.0-20210819104631-275770b98743/go.mod h1:KrtyD5PFj++GKkFS/7/RRrfnRhAMGQwy75GLCHWrCNs=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
--- a/scripts/windows/latest.ps1
+++ b/scripts/windows/latest.ps1
@@ -20,7 +20,7 @@ echo $env:VERSION
 echo $env:REGISTRY

 # build the binary
-Write-Host "+ go build -o release/windows/amd64/drone-${env:REGISTRY}.exe ./cmd/drone-${env:REGISTRY}";
+Write-Host "+ go build -o release/windows/amd64/drone-${env:REGISTRY}.exe";
 go build -o release/windows/amd64/drone-${env:REGISTRY}.exe ./cmd/drone-${env:REGISTRY}

 # build and publish the docker image
--- a/scripts/windows/tag.ps1
+++ b/scripts/windows/tag.ps1
@@ -30,7 +30,7 @@ echo $env:GOARCH
 echo $env:VERSION

 # build the binary
-Write-Host "+ go build -o release/windows/amd64/drone-${env:REGISTRY}.exe ./cmd/drone-${env:REGISTRY}"
+Write-Host "+ go build -o release/windows/amd64/drone-${env:REGISTRY}.exe"
 go build -o release/windows/amd64/drone-${env:REGISTRY}.exe ./cmd/drone-${env:REGISTRY}

 # authenticate with the docker registry