.dockerignore

@@ -0,0 +1,2 @@
+*
+!dist/

.drone.jsonnet

@@ -0,0 +1,351 @@
+local PipelineTest = {
+  kind: 'pipeline',
+  name: 'test',
+  platform: {
+    os: 'linux',
+    arch: 'amd64',
+  },
+  steps: [
+    {
+      name: 'deps',
+      image: 'golang:1.18',
+      commands: [
+        'make deps',
+      ],
+      volumes: [
+        {
+          name: 'godeps',
+          path: '/go',
+        },
+      ],
+    },
+    {
+      name: 'lint',
+      image: 'golang:1.18',
+      commands: [
+        'make lint',
+      ],
+      volumes: [
+        {
+          name: 'godeps',
+          path: '/go',
+        },
+      ],
+    },
+    {
+      name: 'test',
+      image: 'golang:1.18',
+      commands: [
+        'make test',
+      ],
+      volumes: [
+        {
+          name: 'godeps',
+          path: '/go',
+        },
+      ],
+    },
+  ],
+  volumes: [
+    {
+      name: 'godeps',
+      temp: {},
+    },
+  ],
+  trigger: {
+    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
+  },
+};
+
+
+local PipelineBuildBinaries = {
+  kind: 'pipeline',
+  name: 'build-binaries',
+  platform: {
+    os: 'linux',
+    arch: 'amd64',
+  },
+  steps: [
+    {
+      name: 'build',
+      image: 'techknowlogick/xgo:go-1.18.x',
+      commands: [
+        'make release',
+      ],
+    },
+    {
+      name: 'executable',
+      image: 'alpine',
+      commands: [
+        '$(find dist/ -executable -type f -iname ${DRONE_REPO_NAME}-linux-amd64) --help',
+      ],
+    },
+    {
+      name: 'changelog-generate',
+      image: 'thegeeklab/git-chglog',
+      commands: [
+        'git fetch -tq',
+        'git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}',
+      ],
+    },
+    {
+      name: 'changelog-format',
+      image: 'thegeeklab/alpine-tools',
+      commands: [
+        'prettier CHANGELOG.md',
+        'prettier -w CHANGELOG.md',
+      ],
+    },
+    {
+      name: 'publish',
+      image: 'plugins/github-release',
+      settings: {
+        overwrite: true,
+        api_key: {
+          from_secret: 'github_token',
+        },
+        files: ['dist/*'],
+        title: '${DRONE_TAG}',
+        note: 'CHANGELOG.md',
+      },
+      when: {
+        ref: [
+          'refs/tags/**',
+        ],
+      },
+    },
+  ],
+  depends_on: [
+    'test',
+  ],
+  trigger: {
+    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
+  },
+};
+
+local PipelineBuildContainer(arch='amd64') = {
+  kind: 'pipeline',
+  name: 'build-container-' + arch,
+  platform: {
+    os: 'linux',
+    arch: arch,
+  },
+  steps: [
+    {
+      name: 'build',
+      image: 'golang:1.18',
+      commands: [
+        'make build',
+      ],
+    },
+    {
+      name: 'dryrun',
+      image: 'thegeeklab/drone-docker:19',
+      settings: {
+        dry_run: true,
+        dockerfile: 'docker/Dockerfile.' + arch,
+        repo: 'thegeeklab/${DRONE_REPO_NAME}',
+      },
+      depends_on: ['build'],
+      when: {
+        ref: ['refs/pull/**'],
+      },
+    },
+    {
+      name: 'publish-dockerhub',
+      image: 'thegeeklab/drone-docker:19',
+      settings: {
+        auto_tag: true,
+        auto_tag_suffix: arch,
+        dockerfile: 'docker/Dockerfile.' + arch,
+        repo: 'thegeeklab/${DRONE_REPO_NAME}',
+        username: { from_secret: 'docker_username' },
+        password: { from_secret: 'docker_password' },
+      },
+      when: {
+        ref: ['refs/heads/main', 'refs/tags/**'],
+      },
+      depends_on: ['dryrun'],
+    },
+    {
+      name: 'publish-quay',
+      image: 'thegeeklab/drone-docker:19',
+      settings: {
+        auto_tag: true,
+        auto_tag_suffix: arch,
+        dockerfile: 'docker/Dockerfile.' + arch,
+        registry: 'quay.io',
+        repo: 'quay.io/thegeeklab/${DRONE_REPO_NAME}',
+        username: { from_secret: 'quay_username' },
+        password: { from_secret: 'quay_password' },
+      },
+      when: {
+        ref: ['refs/heads/main', 'refs/tags/**'],
+      },
+      depends_on: ['dryrun'],
+    },
+  ],
+  depends_on: [
+    'test',
+  ],
+  trigger: {
+    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
+  },
+};
+
+local PipelineDocs = {
+  kind: 'pipeline',
+  name: 'docs',
+  platform: {
+    os: 'linux',
+    arch: 'amd64',
+  },
+  concurrency: {
+    limit: 1,
+  },
+  steps: [
+    {
+      name: 'markdownlint',
+      image: 'thegeeklab/markdownlint-cli',
+      commands: [
+        "markdownlint 'docs/content/**/*.md' 'README.md' 'CONTRIBUTING.md'",
+      ],
+    },
+    {
+      name: 'spellcheck',
+      image: 'node:lts-alpine',
+      commands: [
+        'npm install -g spellchecker-cli',
+        "spellchecker --files '_docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls --no-suggestions",
+      ],
+      environment: {
+        FORCE_COLOR: true,
+        NPM_CONFIG_LOGLEVEL: 'error',
+      },
+    },
+    {
+      name: 'publish',
+      image: 'plugins/gh-pages',
+      settings: {
+        username: { from_secret: 'github_username' },
+        password: { from_secret: 'github_token' },
+        pages_directory: '_docs/',
+        target_branch: 'docs',
+      },
+      when: {
+        ref: ['refs/heads/main'],
+      },
+    },
+  ],
+  depends_on: [
+    'build-binaries',
+    'build-container-amd64',
+    'build-container-arm64',
+    'build-container-arm',
+  ],
+  trigger: {
+    ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
+  },
+};
+
+local PipelineNotifications = {
+  kind: 'pipeline',
+  name: 'notifications',
+  platform: {
+    os: 'linux',
+    arch: 'amd64',
+  },
+  steps: [
+    {
+      image: 'plugins/manifest',
+      name: 'manifest-dockerhub',
+      settings: {
+        ignore_missing: true,
+        auto_tag: true,
+        username: { from_secret: 'docker_username' },
+        password: { from_secret: 'docker_password' },
+        spec: 'docker/manifest.tmpl',
+      },
+      when: {
+        status: ['success'],
+      },
+    },
+    {
+      image: 'plugins/manifest',
+      name: 'manifest-quay',
+      settings: {
+        ignore_missing: true,
+        auto_tag: true,
+        username: { from_secret: 'quay_username' },
+        password: { from_secret: 'quay_password' },
+        spec: 'docker/manifest-quay.tmpl',
+      },
+      when: {
+        status: ['success'],
+      },
+    },
+    {
+      name: 'pushrm-dockerhub',
+      image: 'chko/docker-pushrm:1',
+      environment: {
+        DOCKER_PASS: {
+          from_secret: 'docker_password',
+        },
+        DOCKER_USER: {
+          from_secret: 'docker_username',
+        },
+        PUSHRM_FILE: 'README.md',
+        PUSHRM_SHORT: 'Custom Drone YAML formatter',
+        PUSHRM_TARGET: 'thegeeklab/${DRONE_REPO_NAME}',
+      },
+      when: {
+        status: ['success'],
+      },
+    },
+    {
+      name: 'pushrm-quay',
+      image: 'chko/docker-pushrm:1',
+      environment: {
+        APIKEY__QUAY_IO: {
+          from_secret: 'quay_token',
+        },
+        PUSHRM_FILE: 'README.md',
+        PUSHRM_TARGET: 'quay.io/thegeeklab/${DRONE_REPO_NAME}',
+      },
+      when: {
+        status: ['success'],
+      },
+    },
+    {
+      name: 'matrix',
+      image: 'thegeeklab/drone-matrix',
+      settings: {
+        homeserver: { from_secret: 'matrix_homeserver' },
+        roomid: { from_secret: 'matrix_roomid' },
+        template: 'Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}',
+        username: { from_secret: 'matrix_username' },
+        password: { from_secret: 'matrix_password' },
+      },
+      when: {
+        status: ['success', 'failure'],
+      },
+    },
+  ],
+  depends_on: [
+    'docs',
+  ],
+  trigger: {
+    ref: ['refs/heads/main', 'refs/tags/**'],
+    status: ['success', 'failure'],
+  },
+};
+
+[
+  PipelineTest,
+  PipelineBuildBinaries,
+  PipelineBuildContainer(arch='amd64'),
+  PipelineBuildContainer(arch='arm64'),
+  PipelineBuildContainer(arch='arm'),
+  PipelineDocs,
+  PipelineNotifications,
+]

.drone.yml

@@ -0,0 +1,459 @@
+---
+kind: pipeline
+name: test
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: deps
+    image: golang:1.18
+    commands:
+      - make deps
+    volumes:
+      - name: godeps
+        path: /go
+
+  - name: lint
+    image: golang:1.18
+    commands:
+      - make lint
+    volumes:
+      - name: godeps
+        path: /go
+
+  - name: test
+    image: golang:1.18
+    commands:
+      - make test
+    volumes:
+      - name: godeps
+        path: /go
+
+volumes:
+  - name: godeps
+    temp: {}
+
+trigger:
+  ref:
+    - refs/heads/main
+    - refs/tags/**
+    - refs/pull/**
+
+---
+kind: pipeline
+name: build-binaries
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: build
+    image: techknowlogick/xgo:go-1.18.x
+    commands:
+      - make release
+
+  - name: executable
+    image: alpine
+    commands:
+      - $(find dist/ -executable -type f -iname ${DRONE_REPO_NAME}-linux-amd64) --help
+
+  - name: changelog-generate
+    image: thegeeklab/git-chglog
+    commands:
+      - git fetch -tq
+      - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
+
+  - name: changelog-format
+    image: thegeeklab/alpine-tools
+    commands:
+      - prettier CHANGELOG.md
+      - prettier -w CHANGELOG.md
+
+  - name: publish
+    image: plugins/github-release
+    settings:
+      api_key:
+        from_secret: github_token
+      files:
+        - dist/*
+      note: CHANGELOG.md
+      overwrite: true
+      title: ${DRONE_TAG}
+    when:
+      ref:
+        - refs/tags/**
+
+trigger:
+  ref:
+    - refs/heads/main
+    - refs/tags/**
+    - refs/pull/**
+
+depends_on:
+  - test
+
+---
+kind: pipeline
+name: build-container-amd64
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: build
+    image: golang:1.18
+    commands:
+      - make build
+
+  - name: dryrun
+    image: thegeeklab/drone-docker:19
+    settings:
+      dockerfile: docker/Dockerfile.amd64
+      dry_run: true
+      repo: thegeeklab/${DRONE_REPO_NAME}
+    when:
+      ref:
+        - refs/pull/**
+    depends_on:
+      - build
+
+  - name: publish-dockerhub
+    image: thegeeklab/drone-docker:19
+    settings:
+      auto_tag: true
+      auto_tag_suffix: amd64
+      dockerfile: docker/Dockerfile.amd64
+      password:
+        from_secret: docker_password
+      repo: thegeeklab/${DRONE_REPO_NAME}
+      username:
+        from_secret: docker_username
+    when:
+      ref:
+        - refs/heads/main
+        - refs/tags/**
+    depends_on:
+      - dryrun
+
+  - name: publish-quay
+    image: thegeeklab/drone-docker:19
+    settings:
+      auto_tag: true
+      auto_tag_suffix: amd64
+      dockerfile: docker/Dockerfile.amd64
+      password:
+        from_secret: quay_password
+      registry: quay.io
+      repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
+      username:
+        from_secret: quay_username
+    when:
+      ref:
+        - refs/heads/main
+        - refs/tags/**
+    depends_on:
+      - dryrun
+
+trigger:
+  ref:
+    - refs/heads/main
+    - refs/tags/**
+    - refs/pull/**
+
+depends_on:
+  - test
+
+---
+kind: pipeline
+name: build-container-arm64
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+  - name: build
+    image: golang:1.18
+    commands:
+      - make build
+
+  - name: dryrun
+    image: thegeeklab/drone-docker:19
+    settings:
+      dockerfile: docker/Dockerfile.arm64
+      dry_run: true
+      repo: thegeeklab/${DRONE_REPO_NAME}
+    when:
+      ref:
+        - refs/pull/**
+    depends_on:
+      - build
+
+  - name: publish-dockerhub
+    image: thegeeklab/drone-docker:19
+    settings:
+      auto_tag: true
+      auto_tag_suffix: arm64
+      dockerfile: docker/Dockerfile.arm64
+      password:
+        from_secret: docker_password
+      repo: thegeeklab/${DRONE_REPO_NAME}
+      username:
+        from_secret: docker_username
+    when:
+      ref:
+        - refs/heads/main
+        - refs/tags/**
+    depends_on:
+      - dryrun
+
+  - name: publish-quay
+    image: thegeeklab/drone-docker:19
+    settings:
+      auto_tag: true
+      auto_tag_suffix: arm64
+      dockerfile: docker/Dockerfile.arm64
+      password:
+        from_secret: quay_password
+      registry: quay.io
+      repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
+      username:
+        from_secret: quay_username
+    when:
+      ref:
+        - refs/heads/main
+        - refs/tags/**
+    depends_on:
+      - dryrun
+
+trigger:
+  ref:
+    - refs/heads/main
+    - refs/tags/**
+    - refs/pull/**
+
+depends_on:
+  - test
+
+---
+kind: pipeline
+name: build-container-arm
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+  - name: build
+    image: golang:1.18
+    commands:
+      - make build
+
+  - name: dryrun
+    image: thegeeklab/drone-docker:19
+    settings:
+      dockerfile: docker/Dockerfile.arm
+      dry_run: true
+      repo: thegeeklab/${DRONE_REPO_NAME}
+    when:
+      ref:
+        - refs/pull/**
+    depends_on:
+      - build
+
+  - name: publish-dockerhub
+    image: thegeeklab/drone-docker:19
+    settings:
+      auto_tag: true
+      auto_tag_suffix: arm
+      dockerfile: docker/Dockerfile.arm
+      password:
+        from_secret: docker_password
+      repo: thegeeklab/${DRONE_REPO_NAME}
+      username:
+        from_secret: docker_username
+    when:
+      ref:
+        - refs/heads/main
+        - refs/tags/**
+    depends_on:
+      - dryrun
+
+  - name: publish-quay
+    image: thegeeklab/drone-docker:19
+    settings:
+      auto_tag: true
+      auto_tag_suffix: arm
+      dockerfile: docker/Dockerfile.arm
+      password:
+        from_secret: quay_password
+      registry: quay.io
+      repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
+      username:
+        from_secret: quay_username
+    when:
+      ref:
+        - refs/heads/main
+        - refs/tags/**
+    depends_on:
+      - dryrun
+
+trigger:
+  ref:
+    - refs/heads/main
+    - refs/tags/**
+    - refs/pull/**
+
+depends_on:
+  - test
+
+---
+kind: pipeline
+name: docs
+
+platform:
+  os: linux
+  arch: amd64
+
+concurrency:
+  limit: 1
+
+steps:
+  - name: markdownlint
+    image: thegeeklab/markdownlint-cli
+    commands:
+      - markdownlint 'docs/content/**/*.md' 'README.md' 'CONTRIBUTING.md'
+
+  - name: spellcheck
+    image: node:lts-alpine
+    commands:
+      - npm install -g spellchecker-cli
+      - spellchecker --files '_docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls --no-suggestions
+    environment:
+      FORCE_COLOR: true
+      NPM_CONFIG_LOGLEVEL: error
+
+  - name: publish
+    image: plugins/gh-pages
+    settings:
+      pages_directory: _docs/
+      password:
+        from_secret: github_token
+      target_branch: docs
+      username:
+        from_secret: github_username
+    when:
+      ref:
+        - refs/heads/main
+
+trigger:
+  ref:
+    - refs/heads/main
+    - refs/tags/**
+    - refs/pull/**
+
+depends_on:
+  - build-binaries
+  - build-container-amd64
+  - build-container-arm64
+  - build-container-arm
+
+---
+kind: pipeline
+name: notifications
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: manifest-dockerhub
+    image: plugins/manifest
+    settings:
+      auto_tag: true
+      ignore_missing: true
+      password:
+        from_secret: docker_password
+      spec: docker/manifest.tmpl
+      username:
+        from_secret: docker_username
+    when:
+      status:
+        - success
+
+  - name: manifest-quay
+    image: plugins/manifest
+    settings:
+      auto_tag: true
+      ignore_missing: true
+      password:
+        from_secret: quay_password
+      spec: docker/manifest-quay.tmpl
+      username:
+        from_secret: quay_username
+    when:
+      status:
+        - success
+
+  - name: pushrm-dockerhub
+    image: chko/docker-pushrm:1
+    environment:
+      DOCKER_PASS:
+        from_secret: docker_password
+      DOCKER_USER:
+        from_secret: docker_username
+      PUSHRM_FILE: README.md
+      PUSHRM_SHORT: Custom Drone YAML formatter
+      PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
+    when:
+      status:
+        - success
+
+  - name: pushrm-quay
+    image: chko/docker-pushrm:1
+    environment:
+      APIKEY__QUAY_IO:
+        from_secret: quay_token
+      PUSHRM_FILE: README.md
+      PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME}
+    when:
+      status:
+        - success
+
+  - name: matrix
+    image: thegeeklab/drone-matrix
+    settings:
+      homeserver:
+        from_secret: matrix_homeserver
+      password:
+        from_secret: matrix_password
+      roomid:
+        from_secret: matrix_roomid
+      template: "Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}"
+      username:
+        from_secret: matrix_username
+    when:
+      status:
+        - success
+        - failure
+
+trigger:
+  ref:
+    - refs/heads/main
+    - refs/tags/**
+  status:
+    - success
+    - failure
+
+depends_on:
+  - docs
+
+---
+kind: signature
+hmac: 314420aab55fd338afc0a5edf1255fe25d017742c3ee5dd1a47833f64c408f00
+
+...

.golangci.yml

@@ -1,91 +1,25 @@
 linters:
+  enable:
+    - gosimple
+    - deadcode
+    - typecheck
+    - govet
+    - errcheck
+    - staticcheck
+    - unused
+    - structcheck
+    - varcheck
+    - dupl
+    - gofmt
+    - misspell
+    - gocritic
+    - bidichk
+    - ineffassign
+    - revive
+    - gofumpt
+    - depguard
   enable-all: false
   disable-all: true
-  enable:
-    - errcheck
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-    - typecheck
-    - unused
-    - asasalint
-    - asciicheck
-    - bidichk
-    - bodyclose
-    - containedctx
-    - contextcheck
-    - decorder
-    - dogsled
-    - dupl
-    - dupword
-    - durationcheck
-    - errchkjson
-    - errname
-    - errorlint
-    - execinquery
-    - exhaustive
-    - exportloopref
-    - forcetypeassert
-    - ginkgolinter
-    - gocheckcompilerdirectives
-    - gochecknoglobals
-    - gochecknoinits
-    - gocognit
-    - goconst
-    - gocritic
-    - gocyclo
-    - godot
-    - godox
-    - goerr113
-    - gofmt
-    - gofumpt
-    - goheader
-    - goimports
-    - gomnd
-    - gomoddirectives
-    - gomodguard
-    - goprintffuncname
-    - gosec
-    - grouper
-    - importas
-    - interfacebloat
-    - ireturn
-    - lll
-    - loggercheck
-    - maintidx
-    - makezero
-    - misspell
-    - musttag
-    - nakedret
-    - nestif
-    - nilerr
-    - nilnil
-    - nlreturn
-    - noctx
-    - nolintlint
-    - nonamedreturns
-    - nosprintfhostport
-    - prealloc
-    - predeclared
-    - promlinter
-    - reassign
-    - revive
-    # - rowserrcheck
-    # - sqlclosecheck
-    # - structcheck
-    - stylecheck
-    - tagliatelle
-    - tenv
-    - testableexamples
-    - thelper
-    - tparallel
-    - unconvert
-    - unparam
-    - usestdlibvars
-    # - wastedassign
-    - whitespace
-    - wsl
   fast: false
 
 run:
@@ -94,10 +28,4 @@ run:
 linters-settings:
   gofumpt:
     extra-rules: true
-    lang-version: "1.20"
-  tagliatelle:
-    case:
-      use-field-name: true
-      rules:
-        json: snake
-        yaml: snake
+    lang-version: "1.18"

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 ## Security
 
 If you think you have found a **security issue**, please do not mention it in this repository.
-Instead, send an email to `security@thegeeklab.de` with as many details as possible so it can be handled confidential.
+Instead, send an email to security@thegeeklab.de with as many details as possible so it can be handled confidential.
 
 ## Bug Reports and Feature Requests
 

Makefile

@@ -1,7 +1,7 @@
 # renovate: datasource=github-releases depName=mvdan/gofumpt
-GOFUMPT_PACKAGE_VERSION := v0.5.0
+GOFUMPT_PACKAGE_VERSION := v0.3.1
 # renovate: datasource=github-releases depName=golangci/golangci-lint
-GOLANGCI_LINT_PACKAGE_VERSION := v1.54.2
+GOLANGCI_LINT_PACKAGE_VERSION := v1.46.2
 
 EXECUTABLE := drone-yaml
 
@@ -19,14 +19,9 @@ GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@$(G
 XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
 
 GENERATE ?=
-XGO_VERSION := go-1.20.x
+XGO_VERSION := go-1.18.x
 XGO_TARGETS ?= linux/amd64,linux/arm-6,linux/arm-7,linux/arm64
 
-TARGETOS ?= linux
-TARGETARCH ?= amd64
-ifneq ("$(TARGETVARIANT)","")
-GOARM ?= $(subst v,,$(TARGETVARIANT))
-endif
 TAGS ?= netgo
 
 ifndef VERSION
@@ -74,7 +69,7 @@ test:
 build: $(DIST)/$(EXECUTABLE)
 
 $(DIST)/$(EXECUTABLE): $(SOURCES)
-	GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) GOARM=$(GOARM) $(GO) build -v -tags '$(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -o $@ ./cmd/$(EXECUTABLE)
+	$(GO) build -v -tags '$(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -o $@ ./cmd/$(EXECUTABLE)
 
 $(DIST_DIRS):
 	mkdir -p $(DIST_DIRS)

README.md

@@ -1,6 +1,6 @@
 # drone-yaml
 
-DISCONTINUED: Custom Drone YAML formatter
+Custom Drone YAML formatter
 
 [![Build Status](https://img.shields.io/drone/build/thegeeklab/drone-yaml?logo=drone&server=https%3A%2F%2Fdrone.thegeeklab.de)](https://drone.thegeeklab.de/thegeeklab/drone-yaml)
 [![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/drone-yaml)
@@ -10,13 +10,11 @@ DISCONTINUED: Custom Drone YAML formatter
 [![Source: GitHub](https://img.shields.io/badge/source-github-blue.svg?logo=github&logoColor=white)](https://github.com/thegeeklab/drone-yaml)
 [![License: Apache-2.0](https://img.shields.io/github/license/thegeeklab/drone-yaml)](https://github.com/thegeeklab/drone-yaml/blob/main/LICENSE)
 
-> **DISCONTINUED:** As I don't use Drone CI anymore, this project is unmaintained. If you are interested in a free and open source CI system check out [Woodpecker CI](https://woodpecker-ci.org/).
-
-Custom linter and formatter for the [Drone](https://github.com/drone/drone) YAML configuration file format. You can find the full documentation at [https://drone-plugin-index.geekdocs.de](https://drone-plugin-index.geekdocs.de/tools/drone-yaml).
+Custom linter and formatter for the [Drone](https://github.com/drone/drone) YAML configuration file format. You can find the full documentation at You can find the full documentation at [https://drone-plugin-index.geekdocs.de](https://drone-plugin-index.geekdocs.de/tools/drone-yaml).
 
 ## Contributors
 
-Special thanks to all [contributors](https://github.com/thegeeklab/drone-yaml/graphs/contributors). If you would like to contribute, please see the [instructions](https://github.com/thegeeklab/drone-yaml/blob/main/CONTRIBUTING.md).
+Special thanks goes to all [contributors](https://github.com/thegeeklab/drone-yaml/graphs/contributors). If you would like to contribute, please see the [instructions](https://github.com/thegeeklab/drone-yaml/blob/main/CONTRIBUTING.md).
 
 ## License
 

cmd/drone-yaml/main.go

@@ -6,15 +6,16 @@ package main
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
 	"os"
 
-	"github.com/alecthomas/kingpin/v2"
 	"github.com/drone/drone-yaml/yaml"
 	"github.com/drone/drone-yaml/yaml/linter"
 	"github.com/drone/drone-yaml/yaml/pretty"
+
+	"gopkg.in/alecthomas/kingpin.v2"
 )
 
-//nolint:gochecknoglobals
 var (
 	format     = kingpin.Command("fmt", "format the yaml file")
 	formatSave = format.Flag("save", "save result to source").Short('s').Bool()
@@ -25,8 +26,6 @@ var (
 	lintFile = lint.Arg("source", "source file location").Default(".drone.yml").File()
 )
 
-const DefaultFilePerm = 0o640
-
 func main() {
 	switch kingpin.Parse() {
 	case format.FullCommand():
@@ -38,7 +37,6 @@ func main() {
 
 func runFormat() error {
 	f := *formatFile
-
 	m, err := yaml.Parse(f)
 	if err != nil {
 		return err
@@ -48,28 +46,23 @@ func runFormat() error {
 	pretty.Print(b, m)
 
 	if *formatSave {
-		return os.WriteFile(f.Name(), b.Bytes(), DefaultFilePerm)
+		return ioutil.WriteFile(f.Name(), b.Bytes(), 0o644)
 	}
-
 	_, err = io.Copy(os.Stderr, b)
-
 	return err
 }
 
 func runLint() error {
 	f := *lintFile
-
 	m, err := yaml.Parse(f)
 	if err != nil {
 		return err
 	}
-
 	for _, r := range m.Resources {
 		err := linter.Lint(r, *lintPriv)
 		if err != nil {
 			return err
 		}
 	}
-
 	return nil
 }

docker/Dockerfile.amd64

@@ -1,14 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.20@sha256:741d6f9bcab778441efe05c8e4369d4f8ff56c9a635a97d77f55d8b0ec62f907 as build
-
-ARG TARGETOS
-ARG TARGETARCH
-
-ADD . /src
-WORKDIR /src
-
-RUN make build
-
-FROM alpine:3.18@sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a
+FROM alpine:3.16@sha256:686d8c9dfa6f3ccfc8230bc3178d23f84eeaf7e457f36f271ab1acc53015037c
 
 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@@ -17,5 +7,5 @@ LABEL org.opencontainers.image.url="https://github.com/thegeeklab/drone-yaml"
 LABEL org.opencontainers.image.source="https://github.com/thegeeklab/drone-yaml"
 LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/drone-yaml"
 
-COPY --from=build /src/dist/drone-yaml /bin/drone-yaml
+ADD dist/drone-yaml /bin/
 ENTRYPOINT [ "/bin/drone-yaml" ]

docker/Dockerfile.arm

@@ -0,0 +1,11 @@
+FROM arm32v7/alpine:3.16@sha256:0615cdd745d0b78e7e6ac3a7b1f02e4daefa664eae0324120955f4e4c91bea3f
+
+LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
+LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
+LABEL org.opencontainers.image.title="drone-yaml"
+LABEL org.opencontainers.image.url="https://github.com/thegeeklab/drone-yaml"
+LABEL org.opencontainers.image.source="https://github.com/thegeeklab/drone-yaml"
+LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/drone-yaml"
+
+ADD dist/drone-yaml /bin/
+ENTRYPOINT [ "/bin/drone-yaml" ]

docker/Dockerfile.arm64

@@ -0,0 +1,11 @@
+FROM arm64v8/alpine:3.16@sha256:c3c58223e2af75154c4a7852d6924b4cc51a00c821553bbd9b3319481131b2e0
+
+LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
+LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
+LABEL org.opencontainers.image.title="drone-yaml"
+LABEL org.opencontainers.image.url="https://github.com/thegeeklab/drone-yaml"
+LABEL org.opencontainers.image.source="https://github.com/thegeeklab/drone-yaml"
+LABEL org.opencontainers.image.documentation="https://github.com/thegeeklab/drone-yaml"
+
+ADD dist/drone-yaml /bin/
+ENTRYPOINT [ "/bin/drone-yaml" ]

docker/manifest-quay.tmpl

@@ -0,0 +1,24 @@
+image: quay.io/thegeeklab/drone-yaml:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  - image: quay.io/thegeeklab/drone-yaml:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64
+    platform:
+      architecture: amd64
+      os: linux
+
+  - image: quay.io/thegeeklab/drone-yaml:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64
+    platform:
+      architecture: arm64
+      os: linux
+      variant: v8
+
+  - image: quay.io/thegeeklab/drone-yaml:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
+    platform:
+      architecture: arm
+      os: linux
+      variant: v7

docker/manifest.tmpl

@@ -0,0 +1,24 @@
+image: thegeeklab/drone-yaml:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  - image: thegeeklab/drone-yaml:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64
+    platform:
+      architecture: amd64
+      os: linux
+
+  - image: thegeeklab/drone-yaml:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64
+    platform:
+      architecture: arm64
+      os: linux
+      variant: v8
+
+  - image: thegeeklab/drone-yaml:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
+    platform:
+      architecture: arm
+      os: linux
+      variant: v7

go.mod

@@ -1,18 +1,19 @@
 module github.com/drone/drone-yaml
 
-go 1.20
+go 1.18
 
 require (
-	github.com/alecthomas/kingpin/v2 v2.3.2
-	github.com/bmatcuk/doublestar/v4 v4.6.0
-	github.com/docker/go-units v0.5.0
-	github.com/google/go-cmp v0.5.9
+	github.com/bmatcuk/doublestar/v4 v4.0.2
+	github.com/docker/go-units v0.4.0
+	github.com/google/go-cmp v0.5.8
+	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
+	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
-	github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )

go.sum

@@ -1,15 +1,16 @@
-github.com/alecthomas/kingpin/v2 v2.3.2 h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWrKI6ocU=
-github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
-github.com/bmatcuk/doublestar/v4 v4.6.0 h1:HTuxyug8GyFbRkrffIpzNCSK4luc0TY3wzXvzIZhEXc=
-github.com/bmatcuk/doublestar/v4 v4.6.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bmatcuk/doublestar/v4 v4.0.2 h1:X0krlUVAVmtr2cRoTqR8aDMrDqnB36ht8wpWTiQ3jsA=
+github.com/bmatcuk/doublestar/v4 v4.0.2/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
-github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
+github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -18,14 +19,13 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
-github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

renovate.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["github>thegeeklab/renovate-presets:golang"]
+}

yaml/build.go

@@ -29,18 +29,15 @@ type (
 // UnmarshalYAML implements yaml unmarshalling.
 func (b *Build) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	d := new(build)
-
 	err := unmarshal(&d.Image)
 	if err != nil {
 		err = unmarshal(d)
 	}
-
 	b.Args = d.Args
 	b.CacheFrom = d.CacheFrom
 	b.Context = d.Context
 	b.Dockerfile = d.Dockerfile
 	b.Labels = d.Labels
 	b.Image = d.Image
-
 	return err
 }

yaml/cond.go

@@ -32,15 +32,12 @@ func (c *Condition) Match(v string) bool {
 	if c.Excludes(v) {
 		return false
 	}
-
 	if c.Includes(v) {
 		return true
 	}
-
 	if len(c.Include) == 0 {
 		return true
 	}
-
 	return false
 }
 
@@ -52,7 +49,6 @@ func (c *Condition) Includes(v string) bool {
 			return true
 		}
 	}
-
 	return false
 }
 
@@ -64,17 +60,13 @@ func (c *Condition) Excludes(v string) bool {
 			return true
 		}
 	}
-
 	return false
 }
 
 // UnmarshalYAML implements yml unmarshalling.
 func (c *Condition) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var (
-		out1 string
-		out2 []string
-	)
-
+	var out1 string
+	var out2 []string
 	out3 := struct {
 		Include []string
 		Exclude []string
@@ -83,7 +75,6 @@ func (c *Condition) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	err := unmarshal(&out1)
 	if err == nil {
 		c.Include = []string{out1}
-
 		return nil
 	}
 

yaml/cron.go

@@ -5,8 +5,6 @@ package yaml
 
 import "errors"
 
-var ErrInvlaidCronBranch = errors.New("yaml: invalid cron branch")
-
 type (
 	// Cron is a resource that defines a cron job, used
 	// to execute pipelines at scheduled intervals.
@@ -21,9 +19,9 @@ type (
 
 	// CronSpec defines the cron job.
 	CronSpec struct {
-		Schedule   string         `json:"schedule,omitempty"`
-		Branch     string         `json:"branch,omitempty"`
-		Deployment CronDeployment `json:"deployment,omitempty" yaml:"deployment"`
+		Schedule string         `json:"schedule,omitempty"`
+		Branch   string         `json:"branch,omitempty"`
+		Deploy   CronDeployment `json:"deployment,omitempty" yaml:"deployment"`
 	}
 
 	// CronDeployment defines a cron job deployment.
@@ -42,7 +40,7 @@ func (c *Cron) GetKind() string { return c.Kind }
 func (c Cron) Validate() error {
 	switch {
 	case c.Spec.Branch == "":
-		return ErrInvlaidCronBranch
+		return errors.New("yaml: invalid cron branch")
 	default:
 		return nil
 	}

yaml/env.go

@@ -8,46 +8,39 @@ type (
 	// can be defined as a string literal or as a reference
 	// to a secret.
 	Variable struct {
-		Value      string `json:"value,omitempty"`
-		FromSecret string `json:"from_secret,omitempty" yaml:"from_secret"`
+		Value  string `json:"value,omitempty"`
+		Secret string `json:"from_secret,omitempty" yaml:"from_secret"`
 	}
 
 	// variable is a tempoary type used to unmarshal
 	// variables with references to secrets.
 	variable struct {
-		Value      string
-		FromSecret string `yaml:"from_secret"`
+		Value  string
+		Secret string `yaml:"from_secret"`
 	}
 )
 
 // UnmarshalYAML implements yaml unmarshalling.
 func (v *Variable) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	d := new(variable)
-
 	err := unmarshal(&d.Value)
 	if err != nil {
 		err = unmarshal(d)
 	}
-
 	v.Value = d.Value
-	v.FromSecret = d.FromSecret
-
+	v.Secret = d.Secret
 	return err
 }
 
 // MarshalYAML implements yaml marshalling.
 func (v *Variable) MarshalYAML() (interface{}, error) {
-	if v.FromSecret != "" {
+	if v.Secret != "" {
 		m := map[string]interface{}{}
-		m["from_secret"] = v.FromSecret
-
+		m["from_secret"] = v.Secret
 		return m, nil
 	}
-
 	if v.Value != "" {
 		return v.Value, nil
 	}
-
-	//nolint:nilnil
 	return nil, nil
 }

yaml/linter/config.go

@@ -27,13 +27,12 @@ var ErrCyclicalPipelineDependency = errors.New("linter: cyclical pipeline depend
 var ErrPipelineSelfDependency = errors.New("linter: pipeline cannot have a dependency on itself")
 
 // Manifest performs lint operations for a manifest.
-func Manifest(manifest *yaml.Manifest) error {
-	return checkPipelines(manifest)
+func Manifest(manifest *yaml.Manifest, trusted bool) error {
+	return checkPipelines(manifest, trusted)
 }
 
-func checkPipelines(manifest *yaml.Manifest) error {
+func checkPipelines(manifest *yaml.Manifest, trusted bool) error {
 	names := map[string]struct{}{}
-
 	for _, resource := range manifest.Resources {
 		switch v := resource.(type) {
 		case *yaml.Pipeline:
@@ -41,14 +40,11 @@ func checkPipelines(manifest *yaml.Manifest) error {
 			if ok {
 				return ErrDuplicatePipelineName
 			}
-
 			names[v.Name] = struct{}{}
-
 			err := checkPipelineDeps(v, names)
 			if err != nil {
 				return err
 			}
-
 			if (v.Kind == "pipeline" || v.Kind == "") && (v.Type == "" || v.Type == "docker") {
 				err = checkPlatform(v.Platform)
 				if err != nil {
@@ -59,7 +55,6 @@ func checkPipelines(manifest *yaml.Manifest) error {
 			continue
 		}
 	}
-
 	return nil
 }
 
@@ -69,11 +64,9 @@ func checkPipelineDeps(pipeline *yaml.Pipeline, deps map[string]struct{}) error
 		if !ok {
 			return ErrMissingPipelineDependency
 		}
-
 		if pipeline.Name == dep {
 			return ErrPipelineSelfDependency
 		}
 	}
-
 	return nil
 }

yaml/linter/linter.go

@@ -10,49 +10,29 @@ import (
 	"github.com/drone/drone-yaml/yaml"
 )
 
-//nolint:gochecknoglobals
-var (
-	os = map[string]struct{}{
-		"linux":   {},
-		"windows": {},
-	}
-	arch = map[string]struct{}{
-		"arm":   {},
-		"arm64": {},
-		"amd64": {},
-	}
-)
+var os = map[string]struct{}{
+	"linux":   {},
+	"windows": {},
+}
 
-var (
-	// ErrDuplicateStepName is returned when two Pipeline steps
-	// have the same name.
-	ErrDuplicateStepName = errors.New("linter: duplicate step names")
+var arch = map[string]struct{}{
+	"arm":   {},
+	"arm64": {},
+	"amd64": {},
+}
 
-	// ErrMissingDependency is returned when a Pipeline step
-	// defines dependencies that are invalid or unknown.
-	ErrMissingDependency = errors.New("linter: invalid or unknown step dependency")
+// ErrDuplicateStepName is returned when two Pipeline steps
+// have the same name.
+var ErrDuplicateStepName = errors.New("linter: duplicate step names")
 
-	// ErrCyclicalDependency is returned when a Pipeline step
-	// defines a cyclical dependency, which would result in an
-	// infinite execution loop.
-	ErrCyclicalDependency = errors.New("linter: cyclical step dependency detected")
+// ErrMissingDependency is returned when a Pipeline step
+// defines dependencies that are invalid or unknown.
+var ErrMissingDependency = errors.New("linter: invalid or unknown step dependency")
 
-	ErrUnsupportedOS         = errors.New("linter: unsupported os")
-	ErrUnsupportedArch       = errors.New("linter: unsupported architecture")
-	ErrInvalidImage          = errors.New("linter: invalid or missing image")
-	ErrInvalidBuildImage     = errors.New("linter: invalid or missing build image")
-	ErrInvalidName           = errors.New("linter: invalid or missing name")
-	ErrPrivilegedNotAllowed  = errors.New("linter: untrusted repositories cannot enable privileged mode")
-	ErrMountNotAllowed       = errors.New("linter: untrusted repositories cannot mount devices")
-	ErrDNSNotAllowed         = errors.New("linter: untrusted repositories cannot configure dns")
-	ErrDNSSearchNotAllowed   = errors.New("linter: untrusted repositories cannot configure dns_search")
-	ErrExtraHostsNotAllowed  = errors.New("linter: untrusted repositories cannot configure extra_hosts")
-	ErrNetworkModeNotAllowed = errors.New("linter: untrusted repositories cannot configure network_mode")
-	ErrInvalidVolumeName     = errors.New("linter: invalid volume name")
-	ErrHostPortNotAllowed    = errors.New("linter: untrusted repositories cannot map to a host port")
-	ErrHostVolumeNotAllowed  = errors.New("linter: untrusted repositories cannot mount host volumes")
-	ErrTempVolumeNotAllowed  = errors.New("linter: untrusted repositories cannot mount in-memory volumes")
-)
+// ErrCyclicalDependency is returned when a Pipeline step
+// defines a cyclical dependency, which would result in an
+// infinite execution loop.
+var ErrCyclicalDependency = errors.New("linter: cyclical step dependency detected")
 
 // Lint performs lint operations for a resource.
 func Lint(resource yaml.Resource, trusted bool) error {
@@ -77,23 +57,19 @@ func checkPipeline(pipeline *yaml.Pipeline, trusted bool) error {
 	if err != nil {
 		return err
 	}
-
 	err = checkPlatform(pipeline.Platform)
 	if err != nil {
 		return err
 	}
-
 	names := map[string]struct{}{}
 	if !pipeline.Clone.Disable {
 		names["clone"] = struct{}{}
 	}
-
 	for _, container := range pipeline.Steps {
 		_, ok := names[container.Name]
 		if ok {
 			return ErrDuplicateStepName
 		}
-
 		names[container.Name] = struct{}{}
 
 		err := checkContainer(container, trusted)
@@ -106,13 +82,11 @@ func checkPipeline(pipeline *yaml.Pipeline, trusted bool) error {
 			return err
 		}
 	}
-
 	for _, container := range pipeline.Services {
 		_, ok := names[container.Name]
 		if ok {
 			return ErrDuplicateStepName
 		}
-
 		names[container.Name] = struct{}{}
 
 		err := checkContainer(container, trusted)
@@ -120,7 +94,6 @@ func checkPipeline(pipeline *yaml.Pipeline, trusted bool) error {
 			return err
 		}
 	}
-
 	return nil
 }
 
@@ -128,17 +101,15 @@ func checkPlatform(platform yaml.Platform) error {
 	if v := platform.OS; v != "" {
 		_, ok := os[v]
 		if !ok {
-			return fmt.Errorf("%w: %s", ErrUnsupportedOS, v)
+			return fmt.Errorf("linter: unsupported os: %s", v)
 		}
 	}
-
 	if v := platform.Arch; v != "" {
 		_, ok := arch[v]
 		if !ok {
-			return fmt.Errorf("%w: %s", ErrUnsupportedArch, v)
+			return fmt.Errorf("linter: unsupported architecture: %s", v)
 		}
 	}
-
 	return nil
 }
 
@@ -147,50 +118,39 @@ func checkContainer(container *yaml.Container, trusted bool) error {
 	if err != nil {
 		return err
 	}
-
 	if container.Build == nil && container.Image == "" {
-		return ErrInvalidImage
+		return errors.New("linter: invalid or missing image")
 	}
-
 	if container.Build != nil && container.Build.Image == "" {
-		return ErrInvalidBuildImage
+		return errors.New("linter: invalid or missing build image")
 	}
-
 	if container.Name == "" {
-		return ErrInvalidName
+		return errors.New("linter: invalid or missing name")
 	}
-
 	if trusted && container.Privileged {
-		return ErrPrivilegedNotAllowed
+		return errors.New("linter: untrusted repositories cannot enable privileged mode")
 	}
-
 	if trusted && len(container.Devices) > 0 {
-		return ErrMountNotAllowed
+		return errors.New("linter: untrusted repositories cannot mount devices")
 	}
-
 	if trusted && len(container.DNS) > 0 {
-		return ErrDNSNotAllowed
+		return errors.New("linter: untrusted repositories cannot configure dns")
 	}
-
 	if trusted && len(container.DNSSearch) > 0 {
-		return ErrDNSSearchNotAllowed
+		return errors.New("linter: untrusted repositories cannot configure dns_search")
 	}
-
 	if trusted && len(container.ExtraHosts) > 0 {
-		return ErrExtraHostsNotAllowed
+		return errors.New("linter: untrusted repositories cannot configure extra_hosts")
 	}
-
-	if trusted && len(container.NetworkMode) > 0 {
-		return ErrNetworkModeNotAllowed
+	if trusted && len(container.Network) > 0 {
+		return errors.New("linter: untrusted repositories cannot configure network_mode")
 	}
-
 	for _, mount := range container.Volumes {
 		switch mount.Name {
 		case "workspace", "_workspace", "_docker_socket":
-			return fmt.Errorf("%w: %s", ErrInvalidVolumeName, mount.Name)
+			return fmt.Errorf("linter: invalid volume name: %s", mount.Name)
 		}
 	}
-
 	return nil
 }
 
@@ -201,56 +161,49 @@ func checkPorts(ports []*yaml.Port, trusted bool) error {
 			return err
 		}
 	}
-
 	return nil
 }
 
 func checkPort(port *yaml.Port, trusted bool) error {
 	if trusted && port.Host != 0 {
-		return ErrHostPortNotAllowed
+		return errors.New("linter: untrusted repositories cannot map to a host port")
 	}
-
 	return nil
 }
 
 func checkVolumes(pipeline *yaml.Pipeline, trusted bool) error {
 	for _, volume := range pipeline.Volumes {
-		if volume.Temp != nil {
-			err := checkEmptyDirVolume(volume.Temp, trusted)
+		if volume.EmptyDir != nil {
+			err := checkEmptyDirVolume(volume.EmptyDir, trusted)
 			if err != nil {
 				return err
 			}
 		}
-
-		if volume.Host != nil {
-			err := checkHostPathVolume(trusted)
+		if volume.HostPath != nil {
+			err := checkHostPathVolume(volume.HostPath, trusted)
 			if err != nil {
 				return err
 			}
 		}
-
 		switch volume.Name {
 		case "workspace", "_workspace", "_docker_socket":
-			return fmt.Errorf("%w: %s", ErrInvalidVolumeName, volume.Name)
+			return fmt.Errorf("linter: invalid volume name: %s", volume.Name)
 		}
 	}
-
 	return nil
 }
 
-func checkHostPathVolume(trusted bool) error {
+func checkHostPathVolume(volume *yaml.VolumeHostPath, trusted bool) error {
 	if trusted {
-		return ErrHostVolumeNotAllowed
+		return errors.New("linter: untrusted repositories cannot mount host volumes")
 	}
-
 	return nil
 }
 
 func checkEmptyDirVolume(volume *yaml.VolumeEmptyDir, trusted bool) error {
 	if trusted && volume.Medium == "memory" {
-		return ErrTempVolumeNotAllowed
+		return errors.New("linter: untrusted repositories cannot mount in-memory volumes")
 	}
-
 	return nil
 }
 
@@ -260,11 +213,9 @@ func checkDeps(container *yaml.Container, deps map[string]struct{}) error {
 		if !ok {
 			return ErrMissingDependency
 		}
-
 		if container.Name == dep {
 			return ErrCyclicalDependency
 		}
 	}
-
 	return nil
 }

yaml/manifest.go

@@ -20,8 +20,6 @@ const (
 	KindSignature = "signature"
 )
 
-var ErrMarshalNotImplemented = errors.New("yaml: marshal not implemented")
-
 type (
 	// Manifest is a collection of Drone resources.
 	Manifest struct {
@@ -46,7 +44,6 @@ type (
 		Data    []byte `yaml:"-"`
 	}
 
-	//nolint:musttag
 	resource struct {
 		Version string
 		Kind    string `json:"kind"`
@@ -57,22 +54,17 @@ type (
 // UnmarshalJSON implement the json.Unmarshaler.
 func (m *Manifest) UnmarshalJSON(b []byte) error {
 	messages := []json.RawMessage{}
-
 	err := json.Unmarshal(b, &messages)
 	if err != nil {
 		return err
 	}
-
 	for _, message := range messages {
 		res := new(resource)
-
 		err := json.Unmarshal(message, res)
 		if err != nil {
 			return err
 		}
-
 		var obj Resource
-
 		switch res.Kind {
 		case "cron":
 			obj = new(Cron)
@@ -85,15 +77,12 @@ func (m *Manifest) UnmarshalJSON(b []byte) error {
 		default:
 			obj = new(Pipeline)
 		}
-
 		err = json.Unmarshal(message, obj)
 		if err != nil {
 			return err
 		}
-
 		m.Resources = append(m.Resources, obj)
 	}
-
 	return nil
 }
 
@@ -107,19 +96,17 @@ func (m *Manifest) MarshalJSON() ([]byte, error) {
 // documents, and MarshalYAML would otherwise attempt to marshal
 // as a single Yaml document. Use the Encode method instead.
 func (m *Manifest) MarshalYAML() (interface{}, error) {
-	return nil, ErrMarshalNotImplemented
+	return nil, errors.New("yaml: marshal not implemented")
 }
 
 // Encode encodes the manifest in Yaml format.
 func (m *Manifest) Encode() ([]byte, error) {
 	buf := new(bytes.Buffer)
 	enc := yaml.NewEncoder(buf)
-
 	for _, res := range m.Resources {
 		if err := enc.Encode(res); err != nil {
 			return nil, err
 		}
 	}
-
 	return buf.Bytes(), nil
 }

yaml/param.go

@@ -8,14 +8,14 @@ type (
 	// can be defined as a literal or as a reference
 	// to a secret.
 	Parameter struct {
-		Value      interface{} `json:"value,omitempty"`
-		FromSecret string      `json:"from_secret,omitempty" yaml:"from_secret"`
+		Value  interface{} `json:"value,omitempty"`
+		Secret string      `json:"from_secret,omitempty" yaml:"from_secret"`
 	}
 
 	// parameter is a tempoary type used to unmarshal
 	// parameters with references to secrets.
 	parameter struct {
-		FromSecret string `yaml:"from_secret"`
+		Secret string `yaml:"from_secret"`
 	}
 )
 
@@ -23,33 +23,25 @@ type (
 func (p *Parameter) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	d := new(parameter)
 	err := unmarshal(d)
-
-	if err == nil && d.FromSecret != "" {
-		p.FromSecret = d.FromSecret
-
+	if err == nil && d.Secret != "" {
+		p.Secret = d.Secret
 		return nil
 	}
-
 	var i interface{}
 	err = unmarshal(&i)
 	p.Value = i
-
 	return err
 }
 
 // MarshalYAML implements yaml marshalling.
 func (p *Parameter) MarshalYAML() (interface{}, error) {
-	if p.FromSecret != "" {
+	if p.Secret != "" {
 		m := map[string]interface{}{}
-		m["from_secret"] = p.FromSecret
-
+		m["from_secret"] = p.Secret
 		return m, nil
 	}
-
 	if p.Value != "" {
 		return p.Value, nil
 	}
-
-	//nolint:nilnil
 	return nil, nil
 }

yaml/parse.go

@@ -14,7 +14,7 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-var ErrMissingKind = errors.New("yaml: missing kind attribute")
+var errorMissingKind = errors.New("yaml: missing kind attribute")
 
 // Parse parses the configuration from io.Reader r.
 func Parse(r io.Reader) (*Manifest, error) {
@@ -22,29 +22,23 @@ func Parse(r io.Reader) (*Manifest, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	manifest := new(Manifest)
-
 	for _, raw := range resources {
 		if raw == nil {
 			continue
 		}
-
 		resource, err := parseRaw(raw)
 		if err != nil {
 			return nil, err
 		}
-
 		if resource.GetKind() == "" {
-			return nil, ErrMissingKind
+			return nil, errorMissingKind
 		}
-
 		manifest.Resources = append(
 			manifest.Resources,
 			resource,
 		)
 	}
-
 	return manifest, nil
 }
 
@@ -69,13 +63,11 @@ func ParseFile(p string) (*Manifest, error) {
 		return nil, err
 	}
 	defer f.Close()
-
 	return Parse(f)
 }
 
-func parseRaw(r *RawResource) (Resource, error) { //nolint:ireturn
+func parseRaw(r *RawResource) (Resource, error) {
 	var obj Resource
-
 	switch r.Kind {
 	case "cron":
 		obj = new(Cron)
@@ -88,9 +80,7 @@ func parseRaw(r *RawResource) (Resource, error) { //nolint:ireturn
 	default:
 		obj = new(Pipeline)
 	}
-
 	err := yaml.Unmarshal(r.Data, obj)
-
 	return obj, err
 }
 
@@ -98,11 +88,8 @@ func parseRaw(r *RawResource) (Resource, error) { //nolint:ireturn
 // io.Reader and returns a slice of raw resources.
 func ParseRaw(r io.Reader) ([]*RawResource, error) {
 	const newline = '\n'
-
-	var (
-		resources []*RawResource
-		resource  *RawResource
-	)
+	var resources []*RawResource
+	var resource *RawResource
 
 	scanner := bufio.NewScanner(r)
 	for scanner.Scan() {
@@ -110,42 +97,34 @@ func ParseRaw(r io.Reader) ([]*RawResource, error) {
 		if isSeparator(line) {
 			resource = nil
 		}
-
 		if resource == nil {
 			resource = &RawResource{}
 			resources = append(resources, resource)
 		}
-
 		if isSeparator(line) {
 			continue
 		}
-
 		if isTerminator(line) {
 			break
 		}
-
-		if errors.Is(scanner.Err(), io.EOF) {
+		if scanner.Err() == io.EOF {
 			break
 		}
-
 		resource.Data = append(
 			resource.Data,
 			line...,
 		)
-
 		resource.Data = append(
 			resource.Data,
 			newline,
 		)
 	}
-
 	for _, resource := range resources {
 		err := yaml.Unmarshal(resource.Data, resource)
 		if err != nil {
 			return nil, err
 		}
 	}
-
 	return resources, nil
 }
 
@@ -173,7 +152,6 @@ func ParseRawFile(p string) ([]*RawResource, error) {
 		return nil, err
 	}
 	defer f.Close()
-
 	return ParseRaw(f)
 }
 

yaml/pipeline.go

@@ -11,17 +11,17 @@ type Pipeline struct {
 	Type    string `json:"type,omitempty"`
 	Name    string `json:"name,omitempty"`
 
-	Clone            Clone             `json:"clone,omitempty"`
-	Concurrency      Concurrency       `json:"concurrency,omitempty"`
-	DependsOn        []string          `json:"depends_on,omitempty" yaml:"depends_on" `
-	Node             map[string]string `json:"node,omitempty" yaml:"node"`
-	Platform         Platform          `json:"platform,omitempty"`
-	ImagePullSecrets []string          `json:"image_pull_secrets,omitempty" yaml:"image_pull_secrets"`
-	Services         []*Container      `json:"services,omitempty"`
-	Steps            []*Container      `json:"steps,omitempty"`
-	Trigger          Conditions        `json:"trigger,omitempty"`
-	Volumes          []*Volume         `json:"volumes,omitempty"`
-	Workspace        Workspace         `json:"workspace,omitempty"`
+	Clone       Clone             `json:"clone,omitempty"`
+	Concurrency Concurrency       `json:"concurrency,omitempty"`
+	DependsOn   []string          `json:"depends_on,omitempty" yaml:"depends_on" `
+	Node        map[string]string `json:"node,omitempty" yaml:"node"`
+	Platform    Platform          `json:"platform,omitempty"`
+	PullSecrets []string          `json:"image_pull_secrets,omitempty" yaml:"image_pull_secrets"`
+	Services    []*Container      `json:"services,omitempty"`
+	Steps       []*Container      `json:"steps,omitempty"`
+	Trigger     Conditions        `json:"trigger,omitempty"`
+	Volumes     []*Volume         `json:"volumes,omitempty"`
+	Workspace   Workspace         `json:"workspace,omitempty"`
 }
 
 // GetVersion returns the resource version.
@@ -58,7 +58,7 @@ type (
 		ExtraHosts  []string              `json:"extra_hosts,omitempty" yaml:"extra_hosts"`
 		Failure     string                `json:"failure,omitempty"`
 		Image       string                `json:"image,omitempty"`
-		NetworkMode string                `json:"network_mode,omitempty" yaml:"network_mode"`
+		Network     string                `json:"network_mode,omitempty" yaml:"network_mode"`
 		Name        string                `json:"name,omitempty"`
 		Ports       []*Port               `json:"ports,omitempty"`
 		Privileged  bool                  `json:"privileged,omitempty"`
@@ -102,23 +102,23 @@ type (
 
 	// Volume that can be mounted by containers.
 	Volume struct {
-		Name string          `json:"name,omitempty"`
-		Temp *VolumeEmptyDir `json:"temp,omitempty" yaml:"temp"`
-		Host *VolumeHostPath `json:"host,omitempty" yaml:"host"`
+		Name     string          `json:"name,omitempty"`
+		EmptyDir *VolumeEmptyDir `json:"temp,omitempty" yaml:"temp"`
+		HostPath *VolumeHostPath `json:"host,omitempty" yaml:"host"`
 	}
 
 	// VolumeDevice describes a mapping of a raw block
 	// device within a container.
 	VolumeDevice struct {
-		Name string `json:"name,omitempty"`
-		Path string `json:"path,omitempty" yaml:"path"`
+		Name       string `json:"name,omitempty"`
+		DevicePath string `json:"path,omitempty" yaml:"path"`
 	}
 
 	// VolumeMount describes a mounting of a Volume
 	// within a container.
 	VolumeMount struct {
-		Name string `json:"name,omitempty"`
-		Path string `json:"path,omitempty" yaml:"path"`
+		Name      string `json:"name,omitempty"`
+		MountPath string `json:"path,omitempty" yaml:"path"`
 	}
 
 	// VolumeEmptyDir mounts a temporary directory from the

yaml/port.go

@@ -22,15 +22,12 @@ type (
 // UnmarshalYAML implements yaml unmarshalling.
 func (p *Port) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	out := new(port)
-
 	err := unmarshal(&out.Port)
 	if err != nil {
 		err = unmarshal(&out)
 	}
-
 	p.Port = out.Port
 	p.Host = out.Host
 	p.Protocol = out.Protocol
-
 	return err
 }

yaml/pretty/container.go

@@ -19,7 +19,6 @@ func printContainer(w writer, v *yaml.Container) {
 	if v.Build != nil {
 		printBuild(w, v.Build)
 	}
-
 	if v.Push != nil {
 		w.WriteTagValue("push", v.Push.Image)
 	}
@@ -33,7 +32,7 @@ func printContainer(w writer, v *yaml.Container) {
 	w.WriteTagValue("dns", v.DNS)
 	w.WriteTagValue("dns_search", v.DNSSearch)
 	w.WriteTagValue("extra_hosts", v.ExtraHosts)
-	w.WriteTagValue("network_mode", v.NetworkMode)
+	w.WriteTagValue("network_mode", v.Network)
 
 	if len(v.Settings) > 0 {
 		printSettings(w, v.Settings)
@@ -50,27 +49,21 @@ func printContainer(w writer, v *yaml.Container) {
 	if len(v.Devices) > 0 {
 		printDeviceMounts(w, v.Devices)
 	}
-
 	if len(v.Ports) > 0 {
 		printPorts(w, v.Ports)
 	}
-
 	if v.Resources != nil {
 		printResources(w, v.Resources)
 	}
-
 	if len(v.Volumes) > 0 {
 		printVolumeMounts(w, v.Volumes)
 	}
-
 	if !isConditionsEmpty(v.When) {
 		printConditions(w, "when", v.When)
 	}
-
 	if len(v.DependsOn) > 0 {
 		printDependsOn(w, v.DependsOn)
 	}
-
 	_ = w.WriteByte('\n')
 	w.IndentDecrease()
 }
@@ -100,49 +93,43 @@ func printDependsOn(w writer, v []string) {
 // helper function pretty prints the device sequence.
 func printDeviceMounts(w writer, v []*yaml.VolumeDevice) {
 	w.WriteTag("devices")
-
 	for _, v := range v {
 		s := new(indexWriter)
 		s.writer = w
 		s.IndentIncrease()
 		s.WriteTagValue("name", v.Name)
-		s.WriteTagValue("path", v.Path)
+		s.WriteTagValue("path", v.DevicePath)
 		s.IndentDecrease()
 	}
 }
 
 // helper function pretty prints the environment mapping.
 func printEnviron(w writer, v map[string]*yaml.Variable) {
-	keys := make([]string, 0)
-
+	var keys []string
 	for k := range v {
 		keys = append(keys, k)
 	}
-
 	sort.Strings(keys)
 
 	w.WriteTag("environment")
 	w.IndentIncrease()
-
 	for _, k := range keys {
 		v := v[k]
-		if v.FromSecret == "" {
+		if v.Secret == "" {
 			w.WriteTagValue(k, v.Value)
 		} else {
 			w.WriteTag(k)
 			w.IndentIncrease()
-			w.WriteTagValue("from_secret", v.FromSecret)
+			w.WriteTagValue("from_secret", v.Secret)
 			w.IndentDecrease()
 		}
 	}
-
 	w.IndentDecrease()
 }
 
 // helper function pretty prints the port sequence.
 func printPorts(w writer, v []*yaml.Port) {
 	w.WriteTag("ports")
-
 	for _, v := range v {
 		if shortPort(v) {
 			_ = w.WriteByte('\n')
@@ -150,7 +137,6 @@ func printPorts(w writer, v []*yaml.Port) {
 			_ = w.WriteByte('-')
 			_ = w.WriteByte(' ')
 			writeInt(w, v.Port)
-
 			continue
 		}
 
@@ -176,7 +162,6 @@ func printResources(w writer, v *yaml.Resources) {
 		w.WriteTagValue("memory", v.Limits.Memory)
 		w.IndentDecrease()
 	}
-
 	if v.Requests != nil {
 		w.WriteTag("requests")
 		w.IndentIncrease()
@@ -184,44 +169,38 @@ func printResources(w writer, v *yaml.Resources) {
 		w.WriteTagValue("memory", v.Requests.Memory)
 		w.IndentDecrease()
 	}
-
 	w.IndentDecrease()
 }
 
 // helper function pretty prints the resoure mapping.
 func printSettings(w writer, v map[string]*yaml.Parameter) {
-	keys := make([]string, 0)
-
+	var keys []string
 	for k := range v {
 		keys = append(keys, k)
 	}
-
 	sort.Strings(keys)
 
 	w.WriteTag("settings")
 	w.IndentIncrease()
-
 	for _, k := range keys {
 		v := v[k]
-		if v.FromSecret == "" {
+		if v.Secret == "" {
 			w.IncludeZero()
 			w.WriteTagValue(k, v.Value)
 			w.ExcludeZero()
 		} else {
 			w.WriteTag(k)
 			w.IndentIncrease()
-			w.WriteTagValue("from_secret", v.FromSecret)
+			w.WriteTagValue("from_secret", v.Secret)
 			w.IndentDecrease()
 		}
 	}
-
 	w.IndentDecrease()
 }
 
 // helper function pretty prints the volume sequence.
 func printVolumeMounts(w writer, v []*yaml.VolumeMount) {
 	w.WriteTag("volumes")
-
 	for _, v := range v {
 		s := new(indexWriter)
 		s.writer = w
@@ -229,7 +208,7 @@ func printVolumeMounts(w writer, v []*yaml.VolumeMount) {
 		s.IndentIncrease()
 
 		s.WriteTagValue("name", v.Name)
-		s.WriteTagValue("path", v.Path)
+		s.WriteTagValue("path", v.MountPath)
 
 		s.IndentDecrease()
 		w.IndentDecrease()

yaml/pretty/cron.go

@@ -23,11 +23,9 @@ func printSpec(w writer, v *yaml.Cron) {
 	w.IndentIncrease()
 	w.WriteTagValue("schedule", v.Spec.Schedule)
 	w.WriteTagValue("branch", v.Spec.Branch)
-
 	if hasDeployment(v) {
 		printDeploy(w, v)
 	}
-
 	w.IndentDecrease()
 }
 
@@ -35,12 +33,12 @@ func printSpec(w writer, v *yaml.Cron) {
 func printDeploy(w writer, v *yaml.Cron) {
 	w.WriteTag("deployment")
 	w.IndentIncrease()
-	w.WriteTagValue("target", v.Spec.Deployment.Target)
+	w.WriteTagValue("target", v.Spec.Deploy.Target)
 	w.IndentDecrease()
 }
 
 // helper function returns true if the deployment
 // object is empty.
 func hasDeployment(v *yaml.Cron) bool {
-	return v.Spec.Deployment.Target != ""
+	return v.Spec.Deploy.Target != ""
 }

yaml/pretty/pipeline.go

@@ -21,27 +21,22 @@ func printPipeline(w writer, v *yaml.Pipeline) {
 	} else {
 		printPlatformDefault(w)
 	}
-
 	if !isCloneEmpty(v.Clone) {
 		printClone(w, v.Clone)
 	}
-
 	if !isConcurrencyEmpty(v.Concurrency) {
 		printConcurrency(w, v.Concurrency)
 	}
-
 	if !isWorkspaceEmpty(v.Workspace) {
 		printWorkspace(w, v.Workspace)
 	}
 
 	if len(v.Steps) > 0 {
 		w.WriteTag("steps")
-
 		for _, step := range v.Steps {
 			if step == nil {
 				continue
 			}
-
 			seq := new(indexWriter)
 			seq.writer = w
 			seq.IndentIncrease()
@@ -52,12 +47,10 @@ func printPipeline(w writer, v *yaml.Pipeline) {
 
 	if len(v.Services) > 0 {
 		w.WriteTag("services")
-
 		for _, step := range v.Services {
 			if step == nil {
 				continue
 			}
-
 			seq := new(indexWriter)
 			seq.writer = w
 			seq.IndentIncrease()
@@ -71,8 +64,8 @@ func printPipeline(w writer, v *yaml.Pipeline) {
 		_ = w.WriteByte('\n')
 	}
 
-	if len(v.ImagePullSecrets) > 0 {
-		w.WriteTagValue("image_pull_secrets", v.ImagePullSecrets)
+	if len(v.PullSecrets) > 0 {
+		w.WriteTagValue("image_pull_secrets", v.PullSecrets)
 		_ = w.WriteByte('\n')
 	}
 
@@ -118,54 +111,42 @@ func printConcurrency(w writer, v yaml.Concurrency) {
 func printConditions(w writer, name string, v yaml.Conditions) {
 	w.WriteTag(name)
 	w.IndentIncrease()
-
 	if !isConditionEmpty(v.Action) {
 		printCondition(w, "action", v.Action)
 	}
-
 	if !isConditionEmpty(v.Branch) {
 		printCondition(w, "branch", v.Branch)
 	}
-
 	if !isConditionEmpty(v.Cron) {
 		printCondition(w, "cron", v.Cron)
 	}
-
 	if !isConditionEmpty(v.Event) {
 		printCondition(w, "event", v.Event)
 	}
-
 	if !isConditionEmpty(v.Instance) {
 		printCondition(w, "instance", v.Instance)
 	}
-
 	if !isConditionEmpty(v.Paths) {
 		printCondition(w, "paths", v.Paths)
 	}
-
 	if !isConditionEmpty(v.Ref) {
 		printCondition(w, "ref", v.Ref)
 	}
-
 	if !isConditionEmpty(v.Repo) {
 		printCondition(w, "repo", v.Repo)
 	}
-
 	if !isConditionEmpty(v.Status) {
 		printCondition(w, "status", v.Status)
 	}
-
 	if !isConditionEmpty(v.Target) {
 		printCondition(w, "target", v.Target)
 	}
-
 	w.IndentDecrease()
 }
 
 // helper function pretty prints a condition mapping.
 func printCondition(w writer, k string, v yaml.Condition) {
 	w.WriteTag(k)
-
 	if len(v.Include) != 0 && len(v.Exclude) == 0 {
 		_ = w.WriteByte('\n')
 		w.IndentIncrease()
@@ -173,13 +154,11 @@ func printCondition(w writer, k string, v yaml.Condition) {
 		writeValue(w, v.Include)
 		w.IndentDecrease()
 	}
-
 	if len(v.Include) != 0 && len(v.Exclude) != 0 {
 		w.IndentIncrease()
 		w.WriteTagValue("include", v.Include)
 		w.IndentDecrease()
 	}
-
 	if len(v.Exclude) != 0 {
 		w.IndentIncrease()
 		w.WriteTagValue("exclude", v.Exclude)
@@ -218,7 +197,6 @@ func printPlatformDefault(w writer) {
 // helper function pretty prints the volume sequence.
 func printVolumes(w writer, v []*yaml.Volume) {
 	w.WriteTag("volumes")
-
 	for _, v := range v {
 		s := new(indexWriter)
 		s.writer = w
@@ -226,10 +204,8 @@ func printVolumes(w writer, v []*yaml.Volume) {
 		s.IndentIncrease()
 
 		s.WriteTagValue("name", v.Name)
-
-		if v := v.Temp; v != nil {
+		if v := v.EmptyDir; v != nil {
 			s.WriteTag("temp")
-
 			if isEmptyDirEmpty(v) {
 				_ = w.WriteByte(' ')
 				_ = w.WriteByte('{')
@@ -242,7 +218,7 @@ func printVolumes(w writer, v []*yaml.Volume) {
 			}
 		}
 
-		if v := v.Host; v != nil {
+		if v := v.HostPath; v != nil {
 			s.WriteTag("host")
 			s.IndentIncrease()
 			s.WriteTagValue("path", v.Path)

yaml/pretty/pretty.go

@@ -12,7 +12,6 @@ import (
 // Print pretty prints the manifest.
 func Print(w io.Writer, v *yaml.Manifest) {
 	state := new(baseWriter)
-
 	for _, r := range v.Resources {
 		switch t := r.(type) {
 		case *yaml.Cron:
@@ -25,7 +24,6 @@ func Print(w io.Writer, v *yaml.Manifest) {
 			printPipeline(state, t)
 		}
 	}
-
 	state.WriteString("...")
 	state.WriteByte('\n')
 	_, _ = w.Write(state.Bytes())

yaml/pretty/secret.go

@@ -9,6 +9,8 @@ import (
 	"github.com/drone/drone-yaml/yaml"
 )
 
+// TODO consider "!!binary |" for secret value
+
 // helper function to pretty prints the signature resource.
 func printSecret(w writer, v *yaml.Secret) {
 	_, _ = w.WriteString("---")
@@ -20,13 +22,11 @@ func printSecret(w writer, v *yaml.Secret) {
 		w.WriteTagValue("name", v.Name)
 		printData(w, v.Data)
 	}
-
 	if !isSecretGetEmpty(v.Get) {
 		w.WriteTagValue("name", v.Name)
 		_ = w.WriteByte('\n')
 		printGet(w, v.Get)
 	}
-
 	_ = w.WriteByte('\n')
 	_ = w.WriteByte('\n')
 }
@@ -42,24 +42,22 @@ func printGet(w writer, v yaml.SecretGet) {
 }
 
 func printData(w writer, d string) {
-	spaceReplacer := strings.NewReplacer(" ", "", "\n", "")
-
 	w.WriteTag("data")
 	_ = w.WriteByte(' ')
 	_ = w.WriteByte('>')
 	w.IndentIncrease()
-
 	d = spaceReplacer.Replace(d)
-	//nolint:gomnd
 	for _, s := range chunk(d, 60) {
 		_ = w.WriteByte('\n')
 		w.Indent()
 		_, _ = w.WriteString(s)
 	}
-
 	w.IndentDecrease()
 }
 
+// replace spaces and newlines.
+var spaceReplacer = strings.NewReplacer(" ", "", "\n", "")
+
 // helper function returns true if the secret get
 // object is empty.
 func isSecretGetEmpty(v yaml.SecretGet) bool {

yaml/pretty/util.go

@@ -72,7 +72,6 @@ func isQuoted(s string) bool {
 	}
 
 	var r0, r1 byte
-
 	t := strings.TrimSpace(s)
 
 	// if the trimmed string does not match the string, it
@@ -85,7 +84,6 @@ func isQuoted(s string) bool {
 	if len(t) > 0 {
 		r0 = t[0]
 	}
-
 	if len(t) > 1 {
 		r1 = t[1]
 	}
@@ -105,7 +103,6 @@ func isQuoted(s string) bool {
 	}
 
 	var prev rune
-
 	for _, b := range s {
 		switch {
 		case isEscapeCode(b):
@@ -115,7 +112,6 @@ func isQuoted(s string) bool {
 		case b == '#' && prev == ' ':
 			return true
 		}
-
 		prev = b
 	}
 
@@ -128,17 +124,13 @@ func chunk(s string, chunkSize int) []string {
 	if len(s) == 0 {
 		return []string{s}
 	}
-
 	var chunks []string
-
 	for i := 0; i < len(s); i += chunkSize {
 		nn := i + chunkSize
 		if nn > len(s) {
 			nn = len(s)
 		}
-
 		chunks = append(chunks, s[i:nn])
 	}
-
 	return chunks
 }

yaml/pretty/util_test.go

@@ -71,7 +71,6 @@ func TestQuoted(t *testing.T) {
 		writeEncode(buf, test.before)
 		a := test.after
 		b := buf.String()
-
 		if b != a {
 			t.Errorf("Want %q, got %q", a, b)
 		}
@@ -79,17 +78,16 @@ func TestQuoted(t *testing.T) {
 }
 
 func TestChunk(t *testing.T) {
-	testChunk := []string{
-		"ZDllMjFjZDg3Zjk0ZWFjZDRhMjdhMTA1ZDQ1OTVkYTA1ODBjMTk0ZWVlZjQyNmU4",
-		"N2RiNTIwZjg0NWQwYjcyYjE3MmFmZDIyYzg3NTQ1N2YyYzgxODhjYjJmNDhhOTFj",
-		"ZjdhMzA0YjEzYWFlMmYxMTIwMmEyM2Q1YjQ5Yjg2ZmMK",
-	}
-
 	s := strings.Join(testChunk, "")
 	got, want := chunk(s, 64), testChunk
-
 	if diff := cmp.Diff(got, want); diff != "" {
 		t.Errorf("Unexpected chunk value")
 		t.Log(diff)
 	}
 }
+
+var testChunk = []string{
+	"ZDllMjFjZDg3Zjk0ZWFjZDRhMjdhMTA1ZDQ1OTVkYTA1ODBjMTk0ZWVlZjQyNmU4",
+	"N2RiNTIwZjg0NWQwYjcyYjE3MmFmZDIyYzg3NTQ1N2YyYzgxODhjYjJmNDhhOTFj",
+	"ZjdhMzA0YjEzYWFlMmYxMTIwMmEyM2Q1YjQ5Yjg2ZmMK",
+}

yaml/pretty/writer.go

@@ -12,6 +12,9 @@ import (
 	"github.com/drone/drone-yaml/yaml"
 )
 
+// TODO rename WriteTag to WriteKey
+// TODO rename WriteTagValue to WriteKeyValue
+
 // ESCAPING:
 //
 //   The string starts with a special character:
@@ -99,9 +102,7 @@ func (w *baseWriter) WriteTagValue(k, v interface{}) {
 	if isZero(v) && !w.zero {
 		return
 	}
-
 	w.WriteTag(k)
-
 	switch {
 	case isPrimative(v):
 		_ = w.WriteByte(' ')
@@ -141,7 +142,6 @@ func (w *indexWriter) ExcludeZero() {
 
 func (w *indexWriter) WriteTag(v interface{}) {
 	_ = w.WriteByte('\n')
-
 	if w.index == 0 {
 		w.IndentDecrease()
 		w.Indent()
@@ -151,7 +151,6 @@ func (w *indexWriter) WriteTag(v interface{}) {
 	} else {
 		w.Indent()
 	}
-
 	writeValue(w, v)
 	_ = w.WriteByte(':')
 	w.index++
@@ -161,9 +160,7 @@ func (w *indexWriter) WriteTagValue(k, v interface{}) {
 	if isZero(v) && !w.zero {
 		return
 	}
-
 	w.WriteTag(k)
-
 	switch {
 	case isPrimative(v):
 		_ = w.WriteByte(' ')
@@ -215,10 +212,8 @@ func writeEncode(w writer, v string) {
 	if len(v) == 0 {
 		_ = w.WriteByte('"')
 		_ = w.WriteByte('"')
-
 		return
 	}
-
 	if isQuoted(v) {
 		fmt.Fprintf(w, "%q", v)
 	} else {
@@ -229,10 +224,8 @@ func writeEncode(w writer, v string) {
 func writeValue(w writer, v interface{}) {
 	if v == nil {
 		_ = w.WriteByte('~')
-
 		return
 	}
-
 	switch v := v.(type) {
 	case bool, int, int64, float64, string:
 		writeScalar(w, v)
@@ -268,16 +261,13 @@ func writeSequence(w writer, v []interface{}) {
 	if len(v) == 0 {
 		_ = w.WriteByte('[')
 		_ = w.WriteByte(']')
-
 		return
 	}
-
 	for i, v := range v {
 		if i != 0 {
 			_ = w.WriteByte('\n')
 			w.Indent()
 		}
-
 		_ = w.WriteByte('-')
 		_ = w.WriteByte(' ')
 		w.IndentIncrease()
@@ -290,16 +280,13 @@ func writeSequenceStr(w writer, v []string) {
 	if len(v) == 0 {
 		_ = w.WriteByte('[')
 		_ = w.WriteByte(']')
-
 		return
 	}
-
 	for i, v := range v {
 		if i != 0 {
 			_ = w.WriteByte('\n')
 			w.Indent()
 		}
-
 		_ = w.WriteByte('-')
 		_ = w.WriteByte(' ')
 		writeEncode(w, v)
@@ -310,30 +297,22 @@ func writeMapping(w writer, v map[interface{}]interface{}) {
 	if len(v) == 0 {
 		_ = w.WriteByte('{')
 		_ = w.WriteByte('}')
-
 		return
 	}
-
-	keys := make([]string, 0)
-
+	var keys []string
 	for k := range v {
 		s := fmt.Sprint(k)
 		keys = append(keys, s)
 	}
-
 	sort.Strings(keys)
-
 	for i, k := range keys {
 		v := v[k]
-
 		if i != 0 {
 			_ = w.WriteByte('\n')
 			w.Indent()
 		}
-
 		writeEncode(w, k)
 		_ = w.WriteByte(':')
-
 		if v == nil || isPrimative(v) || isZero(v) {
 			_ = w.WriteByte(' ')
 			writeValue(w, v)
@@ -356,26 +335,19 @@ func writeMappingStr(w writer, v map[string]string) {
 	if len(v) == 0 {
 		_ = w.WriteByte('{')
 		_ = w.WriteByte('}')
-
 		return
 	}
-
-	keys := make([]string, 0)
-
+	var keys []string
 	for k := range v {
 		keys = append(keys, k)
 	}
-
 	sort.Strings(keys)
-
 	for i, k := range keys {
 		v := v[k]
-
 		if i != 0 {
 			_ = w.WriteByte('\n')
 			w.Indent()
 		}
-
 		writeEncode(w, k)
 		_ = w.WriteByte(':')
 		_ = w.WriteByte(' ')

yaml/pretty/writer_test.go

@@ -13,7 +13,25 @@ import (
 // this unit tests pretty prints a complex yaml structure
 // to ensure we have common use cases covered.
 func TestWriteComplexValue(t *testing.T) {
-	testComplexValue := `
+	block := map[interface{}]interface{}{}
+	err := yaml.Unmarshal([]byte(testComplexValue), &block)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	b := new(baseWriter)
+	writeValue(b, block)
+	got, want := b.String(), strings.TrimSpace(testComplexValue)
+	if got != want {
+		t.Errorf("Unexpected block format")
+		println(got)
+		println("---")
+		println(want)
+	}
+}
+
+var testComplexValue = `
 a: b
 c:
 - d
@@ -39,24 +57,3 @@ x: ~
 z: "#y"
 zz: "\nz\n"
 "{z}": z`
-
-	block := map[interface{}]interface{}{}
-
-	err := yaml.Unmarshal([]byte(testComplexValue), &block)
-	if err != nil {
-		t.Error(err)
-
-		return
-	}
-
-	b := new(baseWriter)
-	writeValue(b, block)
-
-	got, want := b.String(), strings.TrimSpace(testComplexValue)
-	if got != want {
-		t.Errorf("Unexpected block format")
-		println(got)
-		println("---")
-		println(want)
-	}
-}

yaml/push.go

@@ -19,13 +19,10 @@ type (
 // UnmarshalYAML implements yaml unmarshalling.
 func (p *Push) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	d := new(push)
-
 	err := unmarshal(&d.Image)
 	if err != nil {
 		err = unmarshal(d)
 	}
-
 	p.Image = d.Image
-
 	return err
 }

yaml/registry.go

@@ -18,8 +18,6 @@ type (
 	}
 )
 
-var ErrInvalidRegistry = errors.New("yaml: invalid registry resource")
-
 // GetVersion returns the resource version.
 func (r *Registry) GetVersion() string { return r.Version }
 
@@ -29,8 +27,7 @@ func (r *Registry) GetKind() string { return r.Kind }
 // Validate returns an error if the registry is invalid.
 func (r *Registry) Validate() error {
 	if len(r.Data) == 0 {
-		return ErrInvalidRegistry
+		return errors.New("yaml: invalid registry resource")
 	}
-
 	return nil
 }

yaml/secret.go

@@ -5,6 +5,9 @@ package yaml
 
 import "errors"
 
+// TODO(bradrydzewski) deprecate Secret
+// TODO(bradrydzewski) deprecate ExternalData
+
 type (
 	// Secret is a resource that provides encrypted data
 	// and pointers to external data (i.e. from vault).
@@ -35,8 +38,6 @@ type (
 	}
 )
 
-var ErrInvalidSecret = errors.New("yaml: invalid secret resource")
-
 // GetVersion returns the resource version.
 func (s *Secret) GetVersion() string { return s.Version }
 
@@ -46,8 +47,7 @@ func (s *Secret) GetKind() string { return s.Kind }
 // Validate returns an error if the secret is invalid.
 func (s *Secret) Validate() error {
 	if len(s.Data) == 0 && len(s.Get.Path) == 0 && len(s.Get.Name) == 0 {
-		return ErrInvalidSecret
+		return errors.New("yaml: invalid secret resource")
 	}
-
 	return nil
 }

yaml/signature.go

@@ -17,8 +17,6 @@ type (
 	}
 )
 
-var ErrInvalidSignature = errors.New("yaml: invalid signature due to missing hash")
-
 // GetVersion returns the resource version.
 func (s *Signature) GetVersion() string { return s.Version }
 
@@ -28,8 +26,7 @@ func (s *Signature) GetKind() string { return s.Kind }
 // Validate returns an error if the signature is invalid.
 func (s Signature) Validate() error {
 	if s.Hmac == "" {
-		return ErrInvalidSignature
+		return errors.New("yaml: invalid signature. missing hash")
 	}
-
 	return nil
 }

yaml/unit.go

@@ -17,7 +17,6 @@ func (b *BytesSize) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	var intType int64
 	if err := unmarshal(&intType); err == nil {
 		*b = BytesSize(intType)
-
 		return nil
 	}
 
@@ -30,7 +29,6 @@ func (b *BytesSize) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	if err == nil {
 		*b = BytesSize(intType)
 	}
-
 	return err
 }
 

yaml/unit_test.go

@@ -21,7 +21,7 @@ func TestBytesSize(t *testing.T) {
 			text: "1KiB",
 		},
 		{
-			yaml: "100MiB",
+			yaml: "100Mi",
 			size: 104857600,
 			text: "100MiB",
 		},
@@ -34,18 +34,14 @@ func TestBytesSize(t *testing.T) {
 	for _, test := range tests {
 		in := []byte(test.yaml)
 		out := BytesSize(0)
-
 		err := yaml.Unmarshal(in, &out)
 		if err != nil {
 			t.Error(err)
-
 			return
 		}
-
 		if got, want := int64(out), test.size; got != want {
 			t.Errorf("Want byte size %d, got %d", want, got)
 		}
-
 		if got, want := out.String(), test.text; got != want {
 			t.Errorf("Want byte text %s, got %s", want, got)
 		}