Merge branch 'master' into better-errors

.github/workflows/release.yml

@@ -0,0 +1,32 @@
+on:
+  push:
+    tags:
+      - "v*"
+name: Release
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+      - name: Unshallow
+        run: git fetch --prune --unshallow
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.14
+      - name: Docker Login
+        if: success() && startsWith(github.ref, 'refs/tags/v')
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+        run: |
+          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+      - name: Run GoReleaser
+        if: success() && startsWith(github.ref, 'refs/tags/v')
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}

.gitignore

@@ -23,6 +23,7 @@ dist/
 # generated docs
 out
 docstrings/gen.go
+/.idea/*
 /.idea/.gitignore
 /.idea/dictionaries/dj.xml
 /.idea/flyctl.iml

.goreleaser.yml

@@ -3,51 +3,64 @@ before:
     - go mod download
     - go generate ./...
 builds:
-- env:
-  - CGO_ENABLED=0
-  goos:
-  - windows
-  - darwin
-  - linux
-  ignore:
-  - goos: darwin
-    goarch: 386
-  ldflags:
-    - -X github.com/superfly/flyctl/flyctl.BuildDate={{.Date}} 
-    - -X github.com/superfly/flyctl/flyctl.Version={{ .Version }}
-    - -X github.com/superfly/flyctl/flyctl.Commit={{ .ShortCommit }}
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - windows
+      - darwin
+      - linux
+    ignore:
+      - goos: darwin
+        goarch: 386
+    ldflags:
+      - -X github.com/superfly/flyctl/flyctl.BuildDate={{.Date}}
+      - -X github.com/superfly/flyctl/flyctl.Version={{ .Version }}
+      - -X github.com/superfly/flyctl/flyctl.Commit={{ .ShortCommit }}
+      - -X github.com/superfly/flyctl/flyctl.Environment=production
 archives:
-- replacements:
-    darwin: macOS
-    linux: Linux
-    windows: Windows
-    386: i386
-    amd64: x86_64
-  files: [only-the-binary*]
-  wrap_in_directory: false
-  format: tar.gz
-- id: binary
-  format: binary
-  files: [only-the-binary*]
+  - replacements:
+      darwin: macOS
+      linux: Linux
+      windows: Windows
+      386: i386
+      amd64: x86_64
+    files: [only-the-binary*]
+    wrap_in_directory: false
+    format: tar.gz
+  - id: binary
+    format: binary
+    files: [only-the-binary*]
+    replacements:
+      darwin: macOS
+      linux: Linux
+      windows: Windows
+      386: i386
+      amd64: x86_64
+dockers:
+  - goos: linux
+    goarch: amd64
+    image_templates:
+      - "flyio/flyctl:latest"
+      - "flyio/flyctl:v{{ .Version }}"
 checksum:
-  name_template: 'checksums.txt'
+  name_template: "checksums.txt"
 snapshot:
   name_template: "{{ .Tag }}-next"
 changelog:
   sort: asc
   filters:
     exclude:
-    - '^docs:'
-    - '^test:'
+      - "^docs:"
+      - "^test:"
 brews:
-  -
-    github:
+  - github:
       owner: superfly
       name: homebrew-tap
     folder: Formula
     homepage: https://fly.io
     test: |
       system "#{bin}/flyctl version"
+
 # snapcrafts:
 #   -
 #     id: flyctl
@@ -65,4 +78,4 @@ brews:
 #       fly-config:
 #         interface: personal-files
 #         write:
-#         - $HOME/.fly
+#         - $HOME/.fly

Dockerfile

@@ -0,0 +1,7 @@
+FROM golang:alpine as build
+RUN apk --no-cache add ca-certificates
+
+FROM scratch
+COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY flyctl /
+ENTRYPOINT ["/flyctl"]

Makefile

@@ -1,8 +1,13 @@
+all: build cmddocs
+
 generate:
+	@echo Running Generate for Help
 	go generate ./...
 
 build: generate
+	@echo Running Build
 	go build -o bin/flyctl . 
 
 cmddocs: generate
-	sh scripts/generate_docs.sh
+	@echo Running Docs Generation
+	sh scripts/generate_docs.sh

README.md

@@ -11,6 +11,11 @@ flyctl is a command line interface for fly.io
 ```bash
 brew install superfly/tap/flyctl
 ```
+To upgrade to the latest version:
+
+```bash
+brew upgrade flyctl
+```
 
 ## Install Script
 
@@ -19,19 +24,15 @@ Download `flyctl` and install into
 Installing the latest version:
 
 ```bash
-curl https://get.fly.io/flyctl.sh | sh
+curl -L https://fly.io/install.sh | sh
 ```
 
 Installing a specific version:
 
 ```bash
-curl https://get.fly.io/flyctl.sh | sh -s v0.0.1
+curl -L https://fly.io/install.sh | sh -s v0.0.1
 ```
 
-Install into a bin directory other than `/usr/local/bin`:
-```bash
-BIN_DIR=~/.bin curl https://get.fly.io/flyctl.sh | sh
-```
 ## Downloading from GitHub
 
 Download the appropriate version from the [Releases](https://github.com/superfly/flyctl/releases) page of the `flyctl` GitHub repository.

api/api.go

@@ -2,5 +2,8 @@ package api
 
 import "errors"
 
+// ErrNotFound - Error to return when something is not found
 var ErrNotFound = errors.New("Not Found")
+
+// ErrUnknown - Error to return when an unknown server error occurs
 var ErrUnknown = errors.New("An unknown server error occured, please try again")

api/casting.go

@@ -0,0 +1,16 @@
+package api
+
+// IntPointer - Returns a pointer to an int
+func IntPointer(val int) *int {
+	return &val
+}
+
+// BoolPointer - Returns a pointer to a bool
+func BoolPointer(val bool) *bool {
+	return &val
+}
+
+// StringPointer - Returns a pointer to a string
+func StringPointer(val string) *string {
+	return &val
+}

api/client.go

@@ -7,37 +7,43 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"os"
 	"regexp"
 	"strings"
 
 	"github.com/machinebox/graphql"
 )
 
 var baseURL string
+var errorLog bool
 
 func SetBaseURL(url string) {
 	baseURL = url
 }
 
+func SetErrorLog(log bool) {
+	errorLog = log
+}
+
 type Client struct {
 	httpClient  *http.Client
 	client      *graphql.Client
 	accessToken string
 	userAgent   string
 }
 
-func NewClient(accessToken string, version string) (*Client, error) {
+func NewClient(accessToken string, version string) *Client {
 	if accessToken == "" {
 		return nil, errors.New("No api access token available. Please login with 'flyctl auth signup' or 'flyctl auth login'")
 	}
 
 	httpClient, _ := newHTTPClient()
 
-	url := fmt.Sprintf("%s/api/v2/graphql", baseURL)
+	url := fmt.Sprintf("%s/graphql", baseURL)
 
 	client := graphql.NewClient(url, graphql.WithHTTPClient(httpClient))
 	userAgent := fmt.Sprintf("flyctl/%s", version)
-	return &Client{httpClient, client, accessToken, userAgent}, nil
+	return &Client{httpClient, client, accessToken, userAgent}
 }
 
 func (c *Client) NewRequest(q string) *graphql.Request {
@@ -58,6 +64,11 @@ func (c *Client) RunWithContext(ctx context.Context, req *graphql.Request) (Quer
 	if err != nil && strings.HasPrefix(err.Error(), "graphql: ") {
 		return resp, errors.New(strings.TrimPrefix(err.Error(), "graphql: "))
 	}
+
+	if resp.Errors != nil && errorLog {
+		fmt.Fprintf(os.Stderr, "Error: %+v\n", resp.Errors)
+	}
+
 	return resp, err
 }