Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jhandguy committed Sep 12, 2023
1 parent 1eefbce commit 5c2a3e5
Show file tree
Hide file tree
Showing 33 changed files with 997 additions and 1,006 deletions.
19 changes: 7 additions & 12 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- cli
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Run golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.52
version: v1.54
working-directory: ${{ matrix.binary }}
skip-pkg-cache: true

Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
rollouts-enabled: true
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -127,21 +127,19 @@ jobs:
feature: mysql
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Homebrew
uses: Homebrew/actions/setup-homebrew@master

- name: Setup Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
profile: minimal
toolchain: stable
components: rustfmt, clippy
target: x86_64-unknown-linux-musl
override: true

- name: Install dependencies
run: |
Expand Down Expand Up @@ -191,21 +189,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Homebrew
uses: Homebrew/actions/setup-homebrew@master

- name: Setup Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
profile: minimal
toolchain: stable
components: rustfmt, clippy
target: x86_64-unknown-linux-musl
override: true

- name: Install dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ lint_helm_%:
go_lint: lint_s3 lint_dynamo lint_gateway lint_cli

rust_lint:
lint_sql FEATURE=postgres
lint_sql FEATURE=mysql
make lint_sql FEATURE=postgres
make lint_sql FEATURE=mysql

lint_%:
make -C $* lint
Expand Down
33 changes: 18 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,27 @@ brew install protobuf protoc-gen-go protoc-gen-go-grpc kind terraform k6

## Run Tests

| Environment | Command |
|-------------|--------------------------------------|
| Consul | `make go_test ENVIRONMENT=consul` |
| Nginx | `make go_test ENVIRONMENT=nginx` |
| HAProxy | `make rust_test ENVIRONMENT=haproxy` |
| Environment | Command |
|----------------------|-------------------------------------------------------------------|
| Consul | `make go_test ENVIRONMENT=consul` |
| Nginx | `make go_test ENVIRONMENT=nginx` |
| Nginx (ArgoRollouts) | `make go_test ENVIRONMENT=nginx TF_VAR_argorollouts_enabled=true` |
| HAProxy | `make rust_test ENVIRONMENT=haproxy` |

## Run Load Tests

| Environment | Command |
|-------------|--------------------------------------|
| Consul | `make go_load ENVIRONMENT=consul` |
| Nginx | `make go_load ENVIRONMENT=nginx` |
| HAProxy | `make rust_load ENVIRONMENT=haproxy` |
| Environment | Command |
|----------------------|-------------------------------------------------------------------|
| Consul | `make go_load ENVIRONMENT=consul` |
| Nginx | `make go_load ENVIRONMENT=nginx` |
| Nginx (ArgoRollouts) | `make go_load ENVIRONMENT=nginx TF_VAR_argorollouts_enabled=true` |
| HAProxy | `make rust_load ENVIRONMENT=haproxy` |

## Destroy Infrastructure

| Environment | Command |
|-------------|-------------------------------------|
| Consul | `make teardown ENVIRONMENT=consul` |
| Nginx | `make teardown ENVIRONMENT=nginx` |
| HAProxy | `make teardown ENVIRONMENT=haproxy` |
| Environment | Command |
|----------------------|--------------------------------------------------------------------|
| Consul | `make teardown ENVIRONMENT=consul` |
| Nginx | `make teardown ENVIRONMENT=nginx` |
| Nginx (ArgoRollouts) | `make teardown ENVIRONMENT=nginx TF_VAR_argorollouts_enabled=true` |
| HAProxy | `make teardown ENVIRONMENT=haproxy` |
35 changes: 17 additions & 18 deletions cli/go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
module github.com/jhandguy/cloud-playground/cli

go 1.20
go 1.21

require (
github.com/go-resty/resty/v2 v2.7.0
github.com/google/uuid v1.3.0
github.com/prometheus/client_golang v1.15.0
github.com/google/uuid v1.3.1
github.com/prometheus/client_golang v1.16.0
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.15.0
github.com/stretchr/testify v1.8.2
go.uber.org/zap v1.24.0
github.com/spf13/viper v1.16.0
github.com/stretchr/testify v1.8.4
go.uber.org/zap v1.25.0
)

require (
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand All @@ -24,22 +24,21 @@ require (
github.com/magiconair/properties v1.8.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
go.uber.org/atomic v1.10.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/text v0.9.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 5c2a3e5

Please sign in to comment.