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

chore: merge main to next #5871

Merged
merged 37 commits into from
May 15, 2023
Merged

chore: merge main to next #5871

merged 37 commits into from
May 15, 2023

Conversation

livio-a
Copy link
Member

@livio-a livio-a commented May 15, 2023

Definition of Ready

  • I am happy with the code
  • Short description of the feature/issue is added in the pr description
  • PR is linked to the corresponding user story
  • Acceptance criteria are met
  • All open todos and follow ups are defined in a new ticket and justified
  • Deviations from the acceptance criteria and design are agreed with the PO and documented.
  • No debug or dead code
  • Critical parts are tested automatically
  • Where possible E2E tests are implemented
  • Documentation/examples are up-to-date
  • All non-functional requirements are met
  • Functionality of the acceptance criteria is checked manually on the dev system.

muhlemmer and others added 30 commits April 24, 2023 20:40
* instances

* delete rate limits

* service users

* serviceusers

* serviceusers
* docs: technical advisory

* Update docs/sidebars.js

Co-authored-by: mffap <mpa@zitadel.com>

* Update docs/docs/support/advisory/a10000.md

Co-authored-by: mffap <mpa@zitadel.com>

* Update docs/docs/support/advisory/a10000.md

Co-authored-by: mffap <mpa@zitadel.com>

* Update docs/docs/support/advisory/a10000.md

Co-authored-by: mffap <mpa@zitadel.com>

---------

Co-authored-by: mffap <mpa@zitadel.com>
Add integrations tests for the gRPC API, primarily targeted at `v2` but
can also be used for legacy. Provides a crude framework that runs a
server, prepares a client and exposes the underlying resources such as
`command` and `query` handlers to the tester. The code in
`internal/integration` is written just as a proof of concept and
probably needs to be split up in more reusable chunks when we need more
functionality, like multiple users, organisations, instances etc.

Integrations tests for `user/v2alpha` are also included.

See the added documentation for more details.

Related to #5598
* refactor: use new protoc plugin for api v2

* simplify code
* docs(sh-manage): add logging to production setup

* Update docs/docs/self-hosting/manage/production.md

Co-authored-by: Florian Forster <florian@zitadel.com>

* add suggestion from review

---------

Co-authored-by: Florian Forster <florian@zitadel.com>
* docs(concepts): Audit Trail

* event viewer

* event api

* future plans

* fix broken links

* external system

* link to logs (dependency)

* correct link

* Apply suggestions from code review

Co-authored-by: Florian Forster <florian@zitadel.com>

* service user link

* replace image

---------

Co-authored-by: Florian Forster <florian@zitadel.com>
#5728)

* fix: 404 for robots.txt and meta robots tags

* fix: add unit tests for robots txt and tag

* fix: add meta tag robots none for login pages

* fix: weird format issue in header.go

* fix: add x-robots-tag=none to grpcwebserver

* fix linting

---------

Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: Livio Spring <livio.a@gmail.com>
livio-a and others added 6 commits May 5, 2023 15:34
* backup new protoc plugin

* backup

* session

* backup

* initial implementation

* change to specific events

* implement tests

* cleanup

* refactor: use new protoc plugin for api v2

* change package

* simplify code

* cleanup

* cleanup

* fix merge

* start queries

* fix tests

* improve returned values

* add token to projection

* tests

* test db map

* update query

* permission checks

* fix tests and linting

* rework token creation

* i18n

* refactor token check and fix tests

* session to PB test

* request to query tests

* cleanup proto

* test user check

* add comment

* simplify database map type

* Update docs/docs/guides/integrate/access-zitadel-system-api.md

Co-authored-by: Tim Möhlmann <tim+github@zitadel.com>

* fix test

* cleanup

* docs

---------

Co-authored-by: Tim Möhlmann <tim+github@zitadel.com>
* fix: remove access interceptor for console

* feat: template quota cookie value

* fix: send exhausted cookie from grpc-gateway

* refactor: remove ineffectual err assignments

* Update internal/api/grpc/server/gateway.go

Co-authored-by: Livio Spring <livio.a@gmail.com>

* use dynamic host header to find instance

* add instance mgmt url to environment.json

* support hosts with default ports

* fix linting

* docs: update lb example

* print access logs to stdout

* fix grpc gateway exhausted cookies

* cleanup

---------

Co-authored-by: Livio Spring <livio.a@gmail.com>
* feat: device code

* device code, create stepper

* rm logs

* app setup with device code

* remove redirects if grant type is device code only

* add device code app e2e

---------

Co-authored-by: Fabi <fabienne.gerschwiler@gmail.com>
Co-authored-by: Elio Bischof <elio@zitadel.com>
* fix: only reuse port for integration tests

* exclude default listenConfig from integration build
* feat: add v2alpha policies service

* feat: add v2alpha policies service

* fix: rename of attributes and messages in v2alpha api

* fix: rename of attributes and messages in v2alpha api

* fix: linter corrections

* fix: review corrections

* fix: review corrections

* fix: review corrections

* fix: review corrections

* fix grpc

* refactor: rename to settings and more

* Apply suggestions from code review

Co-authored-by: Fabi <fabienne.gerschwiler@gmail.com>

* add service to docs and rename legal settings

* unit tests for converters

* go mod tidy

* ensure idp name and return list details

* fix: use correct resource owner for active idps

* change query to join

---------

Co-authored-by: Livio Spring <livio.a@gmail.com>
Co-authored-by: Fabi <fabienne.gerschwiler@gmail.com>
Co-authored-by: Tim Möhlmann <tim+github@zitadel.com>
@vercel
Copy link

vercel bot commented May 15, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
docs ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 15, 2023 2:30pm

@livio-a livio-a changed the title 2 27 to next chore: merge main to next May 15, 2023
@livio-a livio-a marked this pull request as ready for review May 15, 2023 14:25
@livio-a livio-a enabled auto-merge May 15, 2023 14:25
@livio-a livio-a requested a review from adlerhurst May 15, 2023 14:29
@codecov
Copy link

codecov bot commented May 15, 2023

Codecov Report

Merging #5871 (4b2a95b) into next (32d33d3) will decrease coverage by 3.65%.
The diff coverage is 64.38%.

@@            Coverage Diff             @@
##             next    #5871      +/-   ##
==========================================
- Coverage   48.29%   44.65%   -3.65%     
==========================================
  Files         716     1185     +469     
  Lines       73402   104490   +31088     
==========================================
+ Hits        35452    46661   +11209     
- Misses      36278    55655   +19377     
- Partials     1672     2174     +502     
Impacted Files Coverage Δ
cmd/setup/03.go 0.00% <0.00%> (ø)
cmd/setup/config_change.go 0.00% <0.00%> (ø)
internal/api/grpc/settings/v2/settings.go 0.00% <0.00%> (ø)
internal/api/http/header.go 12.00% <ø> (ø)
internal/api/http/middleware/auth_interceptor.go 12.19% <0.00%> (+12.19%) ⬆️
internal/api/ui/console/console.go 24.74% <0.00%> (ø)
internal/domain/permission.go 0.00% <ø> (ø)
internal/domain/policy_login.go 60.00% <0.00%> (+22.50%) ⬆️
internal/integration/usertype_string.go 0.00% <0.00%> (ø)
internal/repository/session/aggregate.go 0.00% <0.00%> (ø)
... and 39 more

... and 609 files with indirect coverage changes

auto-merge was automatically disabled May 15, 2023 14:51

Merge commits are not allowed on this repository

@livio-a livio-a merged commit 4982af8 into next May 15, 2023
@livio-a livio-a deleted the 2-27-to-next branch May 15, 2023 14:51
@github-actions
Copy link

🎉 This PR is included in version 2.24.0-ignore-me2.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants