Skip to content
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.

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

Update release branch v0.6 #810

Merged
merged 7 commits into from
Jun 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
run: go mod download && go mod verify

- name: Build app to make sure there are zero issues
run: go build -o hookcamp ./cmd
run: go build -o convoy ./cmd

- name: Go vet
run: go vet ./...
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

# Dependency directories (remove the comment below to include it)
# vendor/
hookstack
.idea

/server/ui/build/*
Expand Down
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
## v0.6.0-rc.1

- [Change] Introduce organisations to partition different sets of projects.
- [Change] Deprecate file authentication and authorisation. You no longer specify authentication credentials from convoy.json. User and permission details are now persisted to the DB and use jwt for authentication.
- [Change] All users are now super users in the OSS core.
- [Change] Sentry error tracking has been deprecated. Only New relic is supported for error tracking.
- [Change] Revamped UI. The former convoy dashboard was revamped to enable more management of several vital resources - users, projects, applications, endpoints, sources, and subscriptions.
- [Change] require_auth has been deprecated. All endpoints will now require authentication.
- [Feature] Add Github Custom source #792 #791
- [Enhancement] Change base_url config variable to host #754
- [Enhancement] Set default event types when filter config is nil #783
- [Enhancement] Switched background job system to asynq. #711
- [Enhancement] Add toggle subscription status endpoint #784
- [Enhancement] Autogenerated webhook secrets use alphanumeric secrets #751
- [Enhancement] Use asynq for the scheduler. #745
- [Bugfix] Prevent an organisation owner from being deactivated #781
- [Bugfix] Fix events ingestion to create event flow #744
- [Bugfix] Fixed a race condition that could occur when making an application endpoint #790
- [Bugfix] Fixed app portal link. #790
- [Bugfix] Use correct arguments for API key verifier #779
- [Bugfix] Fixed switching between organisations #775
- [Bugfix] Return proper error from SendNotification #764
- [Bugfix] Fixed filters in events and event deliveries #718
- [Bugfix] Fixed loaders in projects page #724

## v0.6.0-rc

- [Enhancement] Optimize group statistics query #677
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ mockgen:

setup: init-hooks

ui_install:
ui_install:
cd web/ui/dashboard && \
npm install && \
npm ci && \
npm run build

integration_tests:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ $ docker run \
-p 5005:5005 \
--name convoy-server \
-v `pwd`/convoy.json:/convoy.json \
packages.getconvoy.io/frain-dev/convoy:v0.4.9
docker.cloudsmith.io/convoy/convoy/frain-dev/convoy:v0.6.0-rc.1
```

You can view a sample configuration here - [convoy.json](https://github.com/frain-dev/convoy/blob/main/convoy.json.example).
Expand Down
19 changes: 12 additions & 7 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Releases
This page describes the release process for hookcamp.

This page describes the release process for convoy.

## How to cut an Individual release

These instruction is currently only valid for this repo.

### Branch management and versioning strategy

We use [Semantic Versioning](https://semver.org/).

We maintain a separate branch for each minor release, named `release-<major>.<minor>`, e.g. `release-1.1`, `release-2.0`.
Expand All @@ -18,6 +21,7 @@ If a bug fix got accidentally merged into main after non-bug-fix changes in main
Maintaining the release branches for older minor releases happens on a best effort basis.

### 0. Updating dependencies

A few days before a major or minor release, consider updating the dependencies.

Then create a pull request against the main branch.
Expand All @@ -32,9 +36,11 @@ case, you have to create an issue or pull request in the GitHub project for
later follow-up.

#### Updating Go dependencies

TBD.

#### Updating React dependencies

TBD.

### 1. Prepare your release
Expand All @@ -51,10 +57,10 @@ For release candidates still update `CHANGELOG.md`, but when you cut the final r

Entries in the `CHANGELOG.md` are meant to be in this order:

* `[CHANGE]`
* `[FEATURE]`
* `[ENHANCEMENT]`
* `[BUGFIX]`
- `[CHANGE]`
- `[FEATURE]`
- `[ENHANCEMENT]`
- `[BUGFIX]`

### 2. Draft the new release

Expand All @@ -75,9 +81,8 @@ Optionally, you can use this handy `.gitconfig` alias.

Then release with `git tag-release`.

Once a tag is created, the release process through Github actions will take care of the rest.
Once a tag is created, the release process through Github actions will take care of the rest.

TODO: A missing step here which should be later automated. A release needs to be created before the assets can be uploaded to match the tag. :)

Finally, wait for the build step for the tag to finish. The point here is to wait for tarballs to be uploaded to the Github release and the container images to be pushed to the Docker Hub and Quay.io. Once that has happened, click _Publish release_, which will make the release publicly visible and create a GitHub notification.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.6.0-rc
v0.6.0-rc.1
4 changes: 2 additions & 2 deletions datastore/badger/subscription.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ func (*subscriptionRepo) UpdateSubscriptionStatus(context.Context, string, strin
return nil
}

func (*subscriptionRepo) FindSubscriptionBySourceIDs(context.Context, string, string) ([]datastore.Subscription, error) {
func (*subscriptionRepo) FindSubscriptionsBySourceIDs(context.Context, string, string) ([]datastore.Subscription, error) {
return nil, nil
}

func (*subscriptionRepo) FindSubscriptionByEventType(context.Context, string, string, datastore.EventType) ([]datastore.Subscription, error) {
func (*subscriptionRepo) FindSubscriptionsByEventType(context.Context, string, string, datastore.EventType) ([]datastore.Subscription, error) {
return nil, nil
}

Expand Down