Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

fix: Support unquoted int exit code #374

Closed
wants to merge 13 commits into from
Closed

fix: Support unquoted int exit code #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
32133b7
fix: Support unquoted int exit code
adamnovak Mar 15, 2022
9d88ab1
Manually bump tools version
adamnovak Mar 16, 2022
4ce7729
Remove unused bytes import
adamnovak Mar 16, 2022
0d35ee2
Add new checksums
adamnovak Mar 18, 2022
09adab4
Bring build system into WES client package
adamnovak Mar 18, 2022
3d4e3c1
Add unit tests and supporting modules
adamnovak Mar 18, 2022
acf3445
Attach to main Makefile and pass test
adamnovak Mar 18, 2022
652d29b
Add init step
adamnovak Mar 18, 2022
e2062ab
Install formatter and apply formatting changes
adamnovak Mar 18, 2022
4cfa516
Match wes_api package versions to those allowed by cli package
adamnovak Mar 18, 2022
d4c80d5
Re-add missing =
adamnovak Mar 18, 2022
d082cfe
Authorize a bunch more checksums to appease CI
adamnovak Mar 18, 2022
a55f92f
Add hashes that are detected as format changes
adamnovak Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION := $(shell git describe --always --tags)
PACKAGES := $(shell ls -d ${PWD}/packages/*/ | grep -v -E "(vendor|api|engines)")
PACKAGES := $(shell ls -d ${PWD}/packages/*/ | grep -v -E "(vendor|engines)")

.PHONY: test build build-cli release release-cli release-cdk $(PACKAGES)

Expand Down
2 changes: 1 addition & 1 deletion packages/cli/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ require (
github.com/stretchr/testify v1.7.0
github.com/xeipuuv/gojsonschema v1.2.0
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f
golang.org/x/tools v0.1.9 // indirect
golang.org/x/tools v0.1.10 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)
Expand Down
6 changes: 6 additions & 0 deletions packages/cli/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
Expand Down Expand Up @@ -413,6 +414,8 @@ golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down Expand Up @@ -521,6 +524,7 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k=
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
Expand Down Expand Up @@ -601,6 +605,8 @@ golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8=
golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
21 changes: 21 additions & 0 deletions packages/wes_api/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
PACKAGES := client

.PHONY: format test build init $(PACKAGES)

all: format test build

format:
target=format $(MAKE) $(PACKAGES)

test:
target=test $(MAKE) $(PACKAGES)

build:
target=build $(MAKE) $(PACKAGES)

init:
target=init $(MAKE) $(PACKAGES)

$(PACKAGES):
(cd $@; $(MAKE) $(target))

30 changes: 30 additions & 0 deletions packages/wes_api/client/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
PACKAGES=.
GOBIN=${PWD}/bin/tools
COVERAGE=coverage.out

LINKER_FLAGS=

all: format test build

.PHONY: build compile-local format test run-unit-test tools init

build: compile-local

compile-local:
go build -ldflags "${LINKER_FLAGS}" .

format:
../../../scripts/fiximports.sh
${GOBIN}/goimports -w .

test: run-unit-test

run-unit-test:
go test -race -cover -count=1 -coverprofile ${COVERAGE} ${PACKAGES}

tools:
GOBIN=${GOBIN} go get golang.org/x/tools/cmd/goimports

init: tools
echo "No initialization needed"

1 change: 1 addition & 0 deletions packages/wes_api/client/api_workflow_execution_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
_neturl "net/url"
"os"
"strings"

"github.com/antihax/optional"
)

Expand Down
3 changes: 2 additions & 1 deletion packages/wes_api/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"encoding/xml"
"errors"
"fmt"
"github.com/aws/aws-sdk-go-v2/aws"
"io"
"io/ioutil"
"log"
Expand All @@ -32,6 +31,8 @@ import (
"strings"
"time"
"unicode/utf8"

"github.com/aws/aws-sdk-go-v2/aws"
"golang.org/x/oauth2"
)

Expand Down
4 changes: 2 additions & 2 deletions packages/wes_api/client/git_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ if [ "$git_host" = "" ]; then
fi

if [ "$git_user_id" = "" ]; then
git_user_id="GIT_USER_ID"
git_user_id="rsc"
echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
fi

if [ "$git_repo_id" = "" ]; then
git_repo_id="GIT_REPO_ID"
git_repo_id="wes_client"
echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
fi

Expand Down
6 changes: 4 additions & 2 deletions packages/wes_api/client/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
module github.com/GIT_USER_ID/GIT_REPO_ID
module github.com/rsc/wes_client

go 1.16

require (
github.com/antihax/optional v1.0.0
github.com/aws/aws-sdk-go-v2 v1.8.1
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
github.com/stretchr/testify v1.7.0
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
golang.org/x/tools v0.1.10 // indirect
)
Loading