Skip to content

Commit

Permalink
ci: setup for zanzibar branch (#276)
Browse files Browse the repository at this point in the history
  • Loading branch information
zepatrik committed Oct 23, 2020
1 parent f2ddb9d commit 1e7afa8
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 41 deletions.
24 changes: 12 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ jobs:
-
image: circleci/golang:1.14
environment:
- TEST_DATABASE_POSTGRESQL=postgres://test:test@localhost:5432/keto?sslmode=disable
- TEST_DATABASE_MYSQL=root:test@(localhost:3306)/mysql?parseTime=true
TEST_DATABASE_POSTGRESQL: postgres://test:test@localhost:5432/keto?sslmode=disable
TEST_DATABASE_MYSQL: root:test@(localhost:3306)/mysql?parseTime=true
-
image: postgres:9.5
environment:
- POSTGRES_USER=test
- POSTGRES_PASSWORD=test
- POSTGRES_DB=keto
POSTGRES_USER: test
POSTGRES_PASSWORD: test
POSTGRES_DB: keto
-
image: mysql:8.0
environment:
- MYSQL_ROOT_PASSWORD=test
MYSQL_ROOT_PASSWORD: test
working_directory: /go/src/github.com/ory/keto
steps:
- checkout
Expand Down Expand Up @@ -98,12 +98,12 @@ workflows:
only: /.*/
branches:
only: master
-
sdk/generate:
appname: Ory_Keto
requires:
- test
- validate
# -
# sdk/generate:
# appname: Ory_Keto
# requires:
# - test
# - validate
-
sdk/release:
requires:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ endif

.PHONY: format
format:
goimports -w -local github.com/ory $$(listx .)
goimports -w -local github.com/ory/keto $$(listx .)

.PHONY: install-stable
install-stable: deps
Expand Down
3 changes: 2 additions & 1 deletion cmd/relation/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import (

"github.com/spf13/cobra"

"github.com/ory/x/cmdx"

"github.com/ory/keto/cmd/client"
"github.com/ory/keto/models"
"github.com/ory/x/cmdx"
)

func newCreateCmd() *cobra.Command {
Expand Down
48 changes: 27 additions & 21 deletions docs/docs/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ Please follow these guidelines when formatting source code:
Please provide documentation when changing, removing, or adding features.
Documentation resides in the project's `docs` folder.

In cases where a project does not have a `docs` folder check the README for instructions.
In cases where a project does not have a `docs` folder check the README for
instructions.

The commands listed below work exclusively for projects with a `docs` folder

Expand All @@ -108,8 +109,8 @@ To start a local development server with hot reloading, run:
$ npm start
```

This command opens up a browser window. Please note that changes to the sidebar are not hot-reloaded
and require a restart of the command.
This command opens up a browser window. Please note that changes to the sidebar
are not hot-reloaded and require a restart of the command.

#### Build

Expand Down Expand Up @@ -146,27 +147,32 @@ please include a note in your commit message explaining why.

## How We Organize Our Work

All repositories in the [ORY organization](https://github.com/ory) have their issues and pull requests
monitored in the [ORY Monitoring Board](https://github.com/orgs/ory/projects/9). This allows
for a transparent backlog of unanswered issues and pull requests across the ecosystem from those
who are allowed to merge pull requests to the main branch.
All repositories in the [ORY organization](https://github.com/ory) have their
issues and pull requests monitored in the
[ORY Monitoring Board](https://github.com/orgs/ory/projects/9). This allows for
a transparent backlog of unanswered issues and pull requests across the
ecosystem from those who are allowed to merge pull requests to the main branch.

The process is as follows:

1. _Cards_ represent open issues and pull requests and are automatically assigned to the **Triage** column if
the author is not one of the maintainers and no maintainer has answered yet.
2. A maintainer assigns the issue or pull request to someone or adds the label _help wanted_
which moves the card to **Requires Action**.
3. If a maintainer leaves a comment or review, the card moves to **Pending Reply**, implying that
the original author needs to do something (e.g. implement a change, explain something in more detail, ...).
4. If a non-maintainer pushes changes to the pull request or leaves a comment, the card moves
back to **Requires Action**.
5. If a card stays inactive for 60 days or more days, we assume that public interest in the issue
or change has waned, **archiving** the card.
6. If the issue is closed or the pull request merged or closed, the card is **archived** as well.

We try our best to answer all issues and review all pull requests and hope that this transparent way
of keeping a backlog helps you better understand how heavy the workload is.
1. _Cards_ represent open issues and pull requests and are automatically
assigned to the **Triage** column if the author is not one of the maintainers
and no maintainer has answered yet.
2. A maintainer assigns the issue or pull request to someone or adds the label
_help wanted_ which moves the card to **Requires Action**.
3. If a maintainer leaves a comment or review, the card moves to **Pending
Reply**, implying that the original author needs to do something (e.g.
implement a change, explain something in more detail, ...).
4. If a non-maintainer pushes changes to the pull request or leaves a comment,
the card moves back to **Requires Action**.
5. If a card stays inactive for 60 days or more days, we assume that public
interest in the issue or change has waned, **archiving** the card.
6. If the issue is closed or the pull request merged or closed, the card is
**archived** as well.

We try our best to answer all issues and review all pull requests and hope that
this transparent way of keeping a backlog helps you better understand how heavy
the workload is.

## Communication

Expand Down
19 changes: 13 additions & 6 deletions docs/docs/milestones.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,30 @@ Something is not working.

#### Issues

- [ ] Slash (/) in role or policy id causes 404 error for GET and DELETE ([keto#140](https://github.com/ory/keto/issues/140))
- [ ] Keto is posting plain text passwords when there is an issue with DSN ([keto#237](https://github.com/ory/keto/issues/237))
- [ ] Slash (/) in role or policy id causes 404 error for GET and DELETE
([keto#140](https://github.com/ory/keto/issues/140))
- [ ] Keto is posting plain text passwords when there is an issue with DSN
([keto#237](https://github.com/ory/keto/issues/237))

### [Feat](https://github.com/ory/keto/labels/feat)

New feature or request.

#### Issues

- [ ] Evaluate queries needs to get the entire database in cache to works ([keto#187](https://github.com/ory/keto/issues/187))
- [ ] Roles and Policies Filter by using flavor strategy ([keto#186](https://github.com/ory/keto/issues/186))
- [x] Add a description attribute to access control policy role ([keto#213](https://github.com/ory/keto/issues/213))
- [ ] Evaluate queries needs to get the entire database in cache to works
([keto#187](https://github.com/ory/keto/issues/187))
- [ ] Roles and Policies Filter by using flavor strategy
([keto#186](https://github.com/ory/keto/issues/186))
- [x] Add a description attribute to access control policy role
([keto#213](https://github.com/ory/keto/issues/213))

### [Rfc](https://github.com/ory/keto/labels/rfc)

A request for comments to discuss and share ideas.

#### Issues

- [ ] IDs being limited to varchar(64) reduces the usefulness of URNs when you are using them globally ([keto#197](https://github.com/ory/keto/issues/197))
- [ ] IDs being limited to varchar(64) reduces the usefulness of URNs when you
are using them globally
([keto#197](https://github.com/ory/keto/issues/197))

0 comments on commit 1e7afa8

Please sign in to comment.