Merge branch 'master' into doco-tweaks

.circleci/config.yml

@@ -1,14 +1,13 @@
 version: 2.1
 
 orbs:
-  codecov: codecov/[email protected]
   shellcheck: circleci/[email protected]
   windows: circleci/[email protected]
 
 executors:
   go:
     docker:
-      - image: circleci/golang:1.17
+      - image: cimg/go:1.18
     environment:
       CGO_ENABLED: 0
   mac:
@@ -23,11 +22,10 @@ commands:
   force-http-1:
     steps:
       - run:
-          # Uploading to codecov has been failing due to HTTP 2.0 issues.
           # https://app.circleci.com/jobs/github/CircleCI-Public/circleci-cli/6480
           #     curl: (92) HTTP/2 stream 0 was not closed cleanly: PROTOCOL_ERROR (err 1)
           # The issue seems to be on the server-side, so force HTTP 1.1
-          name: "cURL: Force HTTP 1.1"
+          name: 'cURL: Force HTTP 1.1'
           command: echo '--http1.1' >> ~/.curlrc
   build-docker-image:
     steps:
@@ -51,7 +49,7 @@ commands:
       - persist_to_workspace:
           root: .
           paths:
-            - "dist"
+            - 'dist'
       - store_artifacts:
           path: ./dist
           destination: dist
@@ -62,7 +60,7 @@ commands:
         default: https://github.com/goreleaser/goreleaser/releases/download/v0.127.0/goreleaser_amd64.deb
     steps:
       - restore_cache:
-          keys: [v4-goreleaser-]
+          keys: [v5-goreleaser-]
       - run:
           name: Install GoReleaser
           command: |
@@ -72,7 +70,7 @@ commands:
   gomod:
     steps:
       - restore_cache:
-          keys: ["v2-gomod-{{ arch }}-"]
+          keys: ['v3-gomod-{{ arch }}-']
       - run:
           name: Download go module dependencies
           command: go mod download
@@ -104,8 +102,9 @@ jobs:
     steps:
       - checkout
       - run: |
-          brew install [email protected]
-          echo 'export PATH="/usr/local/opt/[email protected]/bin:$PATH"' >> ~/.bash_profile
+          brew update
+          brew install [email protected]
+          echo 'export PATH="/usr/local/opt/[email protected]/bin:$PATH"' >> ~/.bash_profile
       - gomod
       - run: make test
   build:
@@ -117,7 +116,7 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - "build"
+            - 'build'
   cucumber:
     docker:
       - image: cimg/ruby:2.7
@@ -126,7 +125,7 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: "Install CLI tool from workspace"
+          name: 'Install CLI tool from workspace'
           command: sudo cp ~/project/build/linux/amd64/circleci /usr/local/bin/
       - run:
           command: bundle install
@@ -154,14 +153,16 @@ jobs:
       - store_artifacts:
           path: ./coverage.txt
           destination: coverage.txt
-      - codecov/upload:
-          file: coverage.txt
 
   docs:
     executor: go
     steps:
       - checkout
-      - run: sudo apt-get install pandoc
+      - run:
+          name: Install pandoc
+          command: |
+            sudo apt-get update
+            sudo apt-get install pandoc
       - gomod
       - run: go run main.go usage
       - store_artifacts:
@@ -171,12 +172,12 @@ jobs:
       - run: ./.circleci/deploy-gh-pages.sh
 
   lint:
-    executor: go
+    docker:
+      - image: golangci/golangci-lint:v1.46-alpine
+    resource_class: large
     steps:
       - checkout
-      - run: make install-lint
-      - run: make build
-      - run: make lint
+      - run: golangci-lint run
 
   deploy-test:
     executor: go

.github/CODEOWNERS

@@ -1,2 +1,6 @@
-* @CircleCI-Public/EcoSystem
-*orb*.go @CircleCI-Public/CPEng @CircleCI-Public/EcoSystem
+* @CircleCI-Public/Extensibility
+*orb*.go @CircleCI-Public/CPEng @CircleCI-Public/Extensibility
+
+/api/runner @CircleCI-Public/runner
+/cmd/runner @CircleCI-Public/runner
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,5 @@
 # Checklist
+
 =========
 
 - [ ] I have performed a self-review of my own code
@@ -8,30 +9,30 @@
 - [ ] I have read [Contribution Guidelines](https://github.com/CircleCI-Public/circleci-cli/blob/master/CONTRIBUTING.md).
 
 ## Changes
+
 =======
 
 - Put itemized changes here, preferably in imperative mood, i.e. "Add
   `functionA` to `fileB`"
 
 ## Rationale
+
 =========
 
 What was the overarching product goal of this PR as well as any pertinent
 history of changes
 
 ## Considerations
+
 ==============
 
 Why you made some of the technical decisions that you made, especially if the
 reasoning is not immediately obvious
 
-## Analytics Events Added
-======================
-
-- `event-name` 
-
 ## Screenshots
+
 ============
+
 <h4>Before</h4>
 Image or [gif](https://giphy.com/apps/giphycapture)
 

.gitignore

@@ -7,6 +7,8 @@ docs/
 out/
 vendor/
 .vscode
+.idea
+.DS_Store 
 
 # For supporting generated config of 2.1 syntax for local testing
 .circleci/processed.yml

.golangci.yml

@@ -0,0 +1,36 @@
+---
+service:
+  golangci-lint-version: 1.46.x
+
+linters:
+  enable:
+    - deadcode
+    - errcheck
+    - goconst
+    - gofmt
+    - goimports
+    # - gosec
+    - gosimple
+    - govet
+    - ineffassign
+    - megacheck
+    - misspell
+    - nakedret
+    # - revive
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unconvert
+    # - unparam
+    - unused
+    - varcheck
+    - vet
+    - vetshadow
+
+# Instead of disabling tests entirely, just ignore goconst, which is the only
+# one with issues there currently.
+issues:
+  exclude-rules:
+    - path: (.+)_test.go
+      linters:
+        - goconst

Dockerfile

@@ -1,4 +1,4 @@
-FROM circleci/golang:1.10.3
+FROM cimg/go:1.18.3
 
 ENV CIRCLECI_CLI_SKIP_UPDATE_CHECK true
 

HACKING.md

@@ -24,7 +24,7 @@ You should already have [installed Go](https://golang.org/doc/install).
 Clone the repo.
 
 ```
-$ git clone github.com/CircleCI-Public/circleci-cli
+$ git clone git@github.com:CircleCI-Public/circleci-cli.git
 $ cd circleci-cli
 ```
 

Makefile

@@ -26,16 +26,11 @@ cover:
 
 .PHONY: lint
 lint:
-	bash .circleci/lint.sh
+	golangci-lint run
 
 .PHONY: doc
 doc:
 	godoc -http=:6060
 
-.PHONY: install-lint
-install-lint:
-	bash .circleci/install-lint.sh
-
-
 .PHONY: always
 always:

README.md

@@ -10,7 +10,6 @@ This is CircleCI's command-line application.
 [![CircleCI](https://circleci.com/gh/CircleCI-Public/circleci-cli.svg?style=shield)](https://circleci.com/gh/CircleCI-Public/circleci-cli)
 [![GitHub release](https://img.shields.io/github/tag/CircleCI-Public/circleci-cli.svg?label=latest)](https://github.com/CircleCI-Public/circleci-cli/releases)
 [![GoDoc](https://img.shields.io/badge/godoc-reference-blue.svg)](https://godoc.org/github.com/CircleCI-Public/circleci-cli)
-[![Codecov](https://codecov.io/gh/CircleCI-Public/circleci-cli/branch/master/graph/badge.svg)](https://codecov.io/gh/CircleCI-Public/circleci-cli)
 [![License](https://img.shields.io/badge/license-MIT-red.svg)](./LICENSE)
 
 ## Getting Started