feat(go): Update to Go 1.18 & remove Kaniko Dependencies (#20)

* update to Go 1.18 * update to Go 1.18 * remove kaniko deps and use Go 1.18 build info * remove kaniko deps and use Go 1.18 build info * chore(dep): bump golang.org/x/sys * ci: add golang 1.18 as base for step * ci: move uses golang to single step * ci: fix gha use/run mismatch Co-authored-by: GregoryDosh <GregoryDosh@users.noreply.github.com>
go-vela · Apr 11, 2022 · 44c7553 · 44c7553
1 parent 58b7331
commit 44c7553
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 91 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: golang:1.17
+      image: golang:1.18
     steps:
     - name: clone
       uses: actions/checkout@v3

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -12,7 +12,7 @@ jobs:
   prerelease:
     runs-on: ubuntu-latest
     container:
-      image: golang:1.17
+      image: golang:1.18
     steps:
     - name: clone
       uses: actions/checkout@v3

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,7 +11,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     container:
-      image: golang:1.17
+      image: golang:1.18
     steps:
     - name: clone
       uses: actions/checkout@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     container:
-      image: golang:1.17
+      image: golang:1.18
     steps:
       - name: clone
         uses: actions/checkout@v3

diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml
@@ -10,7 +10,7 @@ jobs:
   diff-review:
     runs-on: ubuntu-latest
     container:
-      image: golang:1.17
+      image: golang:1.18
     steps:
     - name: clone
       uses: actions/checkout@v3
@@ -27,7 +27,7 @@ jobs:
   full-review:
     runs-on: ubuntu-latest
     container:
-      image: golang:1.17
+      image: golang:1.18
     steps:
     - name: clone
       uses: actions/checkout@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
   unit-test:
     runs-on: ubuntu-latest
     container:
-      image: golang:1.17
+      image: golang:1.18
     steps:
     - name: clone
       uses: actions/checkout@v3
@@ -36,15 +36,21 @@ jobs:
       uses: actions/checkout@v3
 
     - name: build for integration test
-      run: make build
+      uses: docker://golang:1.18
+      with:
+        entrypoint: make
+        args: build-static-ci
+      env:
+        GOOS: linux
+        CGO_ENABLED: '0'
 
     - name: integration test with fake server
       run: make docker-build && make docker-test
 
   gha-publish-test:
     runs-on: ubuntu-latest
     container:
-      image: golang:1.17
+      image: golang:1.18
     steps:
     - name: clone
       uses: actions/checkout@v3

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -11,7 +11,7 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     container:
-      image: golang:1.17
+      image: golang:1.18
     steps:
     - name: clone
       uses: actions/checkout@v3

diff --git a/Makefile b/Makefile
@@ -2,9 +2,6 @@
 #
 # Use of this source code is governed by the LICENSE file in this repository.
 
-# capture the current date we build the application from
-BUILD_DATE = $(shell date +%Y-%m-%dT%H:%M:%SZ)
-
 # Versions installed for OpenSSH and SSHPass binaries.
 # This is the ONLY place these hardcoded versions are set.
 # They're used in the Dockerfile the GitHub Actions workflow,
@@ -15,29 +12,17 @@ OPENSSH_VERSION=8.8_p1-r1
 # renovate: datasource=repology depName=alpine_3_15/sshpass versioning=loose
 SSHPASS_VERSION=1.09-r0
 
-# check if a git commit sha is already set
-ifndef GITHUB_SHA
-	# capture the current git commit sha we build the application from
-	GITHUB_SHA = $(shell git rev-parse HEAD)
-endif
-
 # check if a git tag is already set
 ifndef GITHUB_TAG
 	# capture the current git tag we build the application from
 	GITHUB_TAG = $(shell git describe --tag --abbrev=0)
 endif
 
-# check if a go version is already set
-ifndef GOLANG_VERSION
-	# capture the current go version we build the application from
-	GOLANG_VERSION = $(shell go version | awk '{ print $$3 }')
-endif
-
 # create a list of linker flags for building the golang application
-# The reference here to Kaniko is so that this repo doesn't need to duplicate
-# the version.go file across multiple plugin repositories. Ideally that file would
-# migrate into its own repository at some point so that it can be widely used.
-LD_FLAGS = -X github.com/go-vela/vela-openssh/internal/openssh.OpenSSHVersion=${OPENSSH_VERSION} -X github.com/go-vela/vela-openssh/internal/openssh.SSHPassVersion=${SSHPASS_VERSION} -X github.com/go-vela/vela-kaniko/version.Commit=${GITHUB_SHA} -X github.com/go-vela/vela-kaniko/version.Date=${BUILD_DATE} -X github.com/go-vela/vela-kaniko/version.Go=${GOLANG_VERSION} -X github.com/go-vela/vela-kaniko/version.Tag=${GITHUB_TAG}
+LD_FLAGS = \
+	-X github.com/go-vela/vela-openssh/internal/openssh.OpenSSHVersion=${OPENSSH_VERSION} \
+	-X github.com/go-vela/vela-openssh/internal/openssh.SSHPassVersion=${SSHPASS_VERSION} \
+	-X github.com/go-vela/vela-openssh/internal/openssh.PluginVersion=${GITHUB_TAG}
 
 # The `clean` target is intended to clean the workspace
 # and prepare the local changes for submission.

diff --git a/cmd/vela-scp/main.go b/cmd/vela-scp/main.go
@@ -31,7 +31,7 @@ func main() {
 		// The version field looks gross but in practice is really only seen and used in integration tests
 		// or when a plugin is misconfigured. We should log the version information of dependent binaries
 		// to assist with debugging why a plugin might be failing to operate in a way users expect.
-		Version: fmt.Sprintf("Plugin: %s - OpenSSH: %s - SSHPass: %s", openssh.PluginVersion.Semantic(), openssh.OpenSSHVersion, openssh.SSHPassVersion),
+		Version: fmt.Sprintf("Plugin: %s - OpenSSH: %s - SSHPass: %s", openssh.PluginVersion, openssh.OpenSSHVersion, openssh.SSHPassVersion),
 		Flags: []cli.Flag{
 			&cli.StringSliceFlag{
 				Name:     "source",
@@ -110,12 +110,16 @@ func run(c *cli.Context) error {
 		})
 	}
 
+	if openssh.DirtyBuild {
+		logrus.Warnf("binary built from modified commit %s", openssh.GitCommit)
+	}
+
 	logrus.WithFields(logrus.Fields{
 		"code":            "https://github.com/go-vela/vela-openssh",
 		"docs":            "https://go-vela.github.io/docs/plugins/registry/scp",
 		"registry":        "https://hub.docker.com/r/target/vela-scp",
-		"commit":          openssh.PluginVersion.Metadata.GitCommit,
-		"version-plugin":  openssh.PluginVersion.Semantic(),
+		"commit":          openssh.GitCommit,
+		"version-plugin":  openssh.PluginVersion,
 		"version-openssh": openssh.OpenSSHVersion,
 		"version-sshpass": openssh.SSHPassVersion,
 	}).Info("Vela SCP Plugin")

diff --git a/cmd/vela-ssh/main.go b/cmd/vela-ssh/main.go
@@ -31,7 +31,7 @@ func main() {
 		// The version field looks gross but in practice is really only seen and used in integration tests
 		// or when a plugin is misconfigured. We should log the version information of dependent binaries
 		// to assist with debugging why a plugin might be failing to operate in a way users expect.
-		Version: fmt.Sprintf("Plugin: %s - OpenSSH: %s - SSHPass: %s", openssh.PluginVersion.Semantic(), openssh.OpenSSHVersion, openssh.SSHPassVersion),
+		Version: fmt.Sprintf("Plugin: %s - OpenSSH: %s - SSHPass: %s", openssh.PluginVersion, openssh.OpenSSHVersion, openssh.SSHPassVersion),
 		Flags: []cli.Flag{
 			&cli.StringFlag{
 				Name:     "destination",
@@ -110,12 +110,16 @@ func run(c *cli.Context) error {
 		})
 	}
 
+	if openssh.DirtyBuild {
+		logrus.Warnf("binary built from modified commit %s", openssh.GitCommit)
+	}
+
 	logrus.WithFields(logrus.Fields{
 		"code":            "https://github.com/go-vela/vela-openssh",
 		"docs":            "https://go-vela.github.io/docs/plugins/registry/ssh",
 		"registry":        "https://hub.docker.com/r/target/vela-ssh",
-		"commit":          openssh.PluginVersion.Metadata.GitCommit,
-		"version-plugin":  openssh.PluginVersion.Semantic(),
+		"commit":          openssh.GitCommit,
+		"version-plugin":  openssh.PluginVersion,
 		"version-openssh": openssh.OpenSSHVersion,
 		"version-sshpass": openssh.SSHPassVersion,
 	}).Info("Vela SSH Plugin")

diff --git a/go.mod b/go.mod
@@ -1,19 +1,16 @@
 module github.com/go-vela/vela-openssh
 
-go 1.17
+go 1.18
 
 require (
-	github.com/go-vela/vela-kaniko v0.8.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/afero v1.8.2
 	github.com/urfave/cli/v2 v2.4.0
 )
 
 require (
-	github.com/Masterminds/semver/v3 v3.1.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
-	github.com/go-vela/types v0.11.1-0.20211209165039-76b75a4cd961 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	golang.org/x/sys v0.0.0-20220111092808-5a964db01320 // indirect
+	golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
 	golang.org/x/text v0.3.7 // indirect
 )