Skip to content

chore: remove go workspace, handle them personal to each developer #1357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StarpTech merged 6 commits into from
Nov 11, 2024
Merged

chore: remove go workspace, handle them personal to each developer #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0e4bf0
chore: remove go workspace
StarpTech Nov 9, 2024
1a79d2d
chore: ignore workspace files
StarpTech Nov 9, 2024
300e7e5
chore: tidy module
StarpTech Nov 9, 2024
ff4bd34
chore: lock router for lambda
StarpTech Nov 9, 2024
1724108
chore: tidy module
StarpTech Nov 9, 2024
2fed496
chore: improve onboarding
StarpTech Nov 11, 2024
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
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@ lerna-debug.log
/demo/cmd/subscriptiontest/subscriptiontest
.github/scripts/keycloak-22.0.4/**
.github/scripts/keycloak-22.0.4.zip
/router-tests/cmd/config-validator/router-configs/**
/router-tests/cmd/config-validator/router-configs/**

# Go workspace files
go.work
go.work.sum
20 changes: 20 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,26 @@ make

Ready! You can now start contributing to the WunderGraph Cosmo repository. Feel free to open an issue or pull request to add a new feature or fix a bug.

## Go workspace

According to best practices, we don't commit the `go.work` or `go.sum` files. Those files are personal to each developer. As a result, we use the `go.mod` file to manage the dependencies and overwrites. You can still create `go.work` file in the root of the repository if you are feeling more comfortable with it or to improve tooling support.

### Example

```
go 1.21.5

toolchain go1.22.0

use (
./demo
./router
./router-tests
)

// Here you can add custom replacements
```

## Conventional Commit Standard

We use [conventionalcommits](https://www.conventionalcommits.org/en/v1.0.0-beta.2/#why-use-conventional-commits) for changelog generation and more structured commit messages.
Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ sync-go-workspace:
cd composition-go && go mod tidy
cd graphqlmetrics && go mod tidy
cd router-tests && make bump-deps
go work sync

# Validates if any breaking changes has been introduced.
# Compares the head of the branch with your local changes
Expand Down
2 changes: 0 additions & 2 deletions aws-lambda-router/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
bump-router:
go get github.com/wundergraph/cosmo/router@upgrade
go mod tidy
cd .. && go work sync

VERSION?=dev
# RFC3339 format
Expand Down Expand Up @@ -40,4 +39,3 @@ create-lambda-zip: build fetch-router-config
bump-deps:
go get github.com/wundergraph/cosmo/router@upgrade
go mod tidy
cd .. && go work sync
10 changes: 6 additions & 4 deletions aws-lambda-router/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
module github.com/wundergraph/cosmo/aws-lambda-router

go 1.21.5

toolchain go1.22.0

require (
github.com/akrylysov/algnhsa v1.1.0
github.com/aws/aws-lambda-go v1.43.0
github.com/stretchr/testify v1.9.0
github.com/wundergraph/cosmo/router v0.0.0-20241108151630-db3184e032a7
github.com/wundergraph/cosmo/router v0.0.0-20241107203432-34a709900e23
go.uber.org/zap v1.27.0
)

Expand Down Expand Up @@ -124,6 +128,4 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

go 1.21.5

toolchain go1.22.0
// replace github.com/wundergraph/cosmo/router => ../router
4 changes: 2 additions & 2 deletions aws-lambda-router/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ github.com/vektah/gqlparser/v2 v2.5.16 h1:1gcmLTvs3JLKXckwCwlUagVn/IlV2bwqle0vJ0
github.com/vektah/gqlparser/v2 v2.5.16/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww=
github.com/wundergraph/astjson v0.0.0-20241108124845-44485579ffa5 h1:rc+IQxG3rrAXEjBywirkzhKkyCKvXLGQXABVD8GiUtU=
github.com/wundergraph/astjson v0.0.0-20241108124845-44485579ffa5/go.mod h1:eOTL6acwctsN4F3b7YE+eE2t8zcJ/doLm9sZzsxxxrE=
github.com/wundergraph/cosmo/router v0.0.0-20241108151630-db3184e032a7 h1:UcdtoevbUSn79W0g/XarFn7E65owhzT7IWKA58iPnbk=
github.com/wundergraph/cosmo/router v0.0.0-20241108151630-db3184e032a7/go.mod h1:xSraMjn2YsV+yGHKmzBu7g5Z1UV96OFAhCm+9S7T1iA=
github.com/wundergraph/cosmo/router v0.0.0-20241107203432-34a709900e23 h1:0CHBPKdqj0tKyNwAc7KC/q3nxRCzsankxolNtAQlC+k=
github.com/wundergraph/cosmo/router v0.0.0-20241107203432-34a709900e23/go.mod h1:xSraMjn2YsV+yGHKmzBu7g5Z1UV96OFAhCm+9S7T1iA=
github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.121 h1:VsrSvBsOcQNiTwESJg55tecBzHfZPUdII/zDstHyBuc=
github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.121/go.mod h1:s4r/lhVEU5s0c6tCgpR0hK6FHEmX0cbrKcMU1pMc/ZI=
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
Expand Down
1 change: 0 additions & 1 deletion demo/bump-deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ echo "Updating dependencies to $GIT_REV"

go get "github.com/wundergraph/cosmo/router@${GIT_REV}"
go mod tidy
cd .. && go work sync
2 changes: 2 additions & 0 deletions demo/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,13 +296,15 @@ github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y4
github.com/vektah/gqlparser/v2 v2.5.16 h1:1gcmLTvs3JLKXckwCwlUagVn/IlV2bwqle0vJ0vy5p8=
github.com/vektah/gqlparser/v2 v2.5.16/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww=
github.com/wundergraph/astjson v0.0.0-20241108124845-44485579ffa5 h1:rc+IQxG3rrAXEjBywirkzhKkyCKvXLGQXABVD8GiUtU=
github.com/wundergraph/astjson v0.0.0-20241108124845-44485579ffa5/go.mod h1:eOTL6acwctsN4F3b7YE+eE2t8zcJ/doLm9sZzsxxxrE=
github.com/wundergraph/cosmo/composition-go v0.0.0-20240124120900-5effe48a4a1d h1:NEUrhuqOaTO1dpW8pz2tu6dKbQAqFvgiF/m4NXdzZm0=
github.com/wundergraph/cosmo/composition-go v0.0.0-20240124120900-5effe48a4a1d/go.mod h1:9I3gPMAlAY+m1/cFL20iN7XHTyuZd3VT5ijccdU/FsI=
github.com/wundergraph/cosmo/router v0.0.0-20241108155000-9f371059ec96 h1:F1n+3lSwxX5kkT9GLoZ1HWpr65oFdZrM0k3h9NI3z/Q=
github.com/wundergraph/cosmo/router v0.0.0-20241108155000-9f371059ec96/go.mod h1:xSraMjn2YsV+yGHKmzBu7g5Z1UV96OFAhCm+9S7T1iA=
github.com/wundergraph/cosmo/router-tests v0.0.0-20241024215101-0c757faf23de h1:kEiNUGYSxHaT1I5GKre0GqHFCHVabpC/N33Chfue/rs=
github.com/wundergraph/cosmo/router-tests v0.0.0-20241024215101-0c757faf23de/go.mod h1:7WvZF+cOkfV4GaXka1qZfCqf/9GmOcksbPoMmJXtja4=
github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.121 h1:VsrSvBsOcQNiTwESJg55tecBzHfZPUdII/zDstHyBuc=
github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.121/go.mod h1:s4r/lhVEU5s0c6tCgpR0hK6FHEmX0cbrKcMU1pMc/ZI=
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw=
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
Expand Down
20 changes: 0 additions & 20 deletions go.work
View file
Open in desktop

This file was deleted.

Loading