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

Merge v3 feature rebac admin #1339

Merged

Conversation

kian99
Copy link
Contributor

@kian99 kian99 commented Sep 2, 2024

Description

Merge the latest changes from the v3 branch in the feature-rebac-admin branch.

pkulik0 and others added 30 commits August 2, 2024 17:59
…ical#1309)

* add go cache to v3 branch to make it available to child branch

* add new line

* fix pr comments
* fix go build and enable go cache action on v3 and feature branches
* Initial pr for golint

* more linting fixes

* lint fixes for tests, gocognit and gocritic

* goheader, gci and imprtas linters

* jujuparams lint

* missing uuids

* All linting issues solved

* fix errs import

* test fixes

---------

Co-authored-by: Ales Stimec <[email protected]>
* Refactors add-cloud-to-controller
* Refactors add-cloud-to-controller

The function was confusing and now attempts to be readable by function names.

* update

* refactors add controller

* pr comments

* pr comment

* attempt to fix tests

* fix custom tls hostname error

* Reset refactor

* wip

* fix custom tls

* wip

* wip

* wip

* prevent refactor of tests

* remove extra get

* revert access control test and update godoc

* update comment

* add controller transactor

* Update for ales' comments

Co-authored-by: Ales Stimec <[email protected]>

---------

Co-authored-by: Ales Stimec <[email protected]>
* add a login service to the jimm layer

* fix test due to changed error message

* add tests and move UserLogin method

The GetUser and UpdateUserLastLogin have been unexported in favour of UserLogin.
The tests in admin_test.go use a mock authenticator but primarily verify that the new methods in jimm/admin.go perform the expected validation and have the baseline desired behaviour.

* remove redundant mock function

* fix test timeout

* add comment about service account IDs

* fix test and reduce duplication

- fixed a test I broke with the recent change.
- reduced the cognitive complexity of `handleAdminFacade` by reducing code duplication.

* update godoc for LoginWithSessionCookie
* ignore tests gocognit

* ignore watchController

* ineff
* break watcher logic away

At the end of ImportModel we perform a retrieval of deltas. Having this in it's own composed function reduces the cognitive complexity.

* add dial model

* update godoc

* move to jimm

* rename
* golangci-lint

* test linter with err

* will this work?

* perhaps it is working?

* try a 5 min timeout with verbose...

* 10m no critic

* try a bump

* wip

* reference field directly?

* tmate

* bump jimm?

* approle

* .

* int overflows.

* rename

* extra newline

* add linting to make

* make target
* Add composite action for starting a JIMM environment

- Use the composite action as part of a basic integration test

* Run integration test on PR

- Adding a trigger to run the new integration test on PRs to verify it works.

* fix naming

* allow action to start dev env

* rewording

* remove need for env file

* add default string

* use extends in compose

- Use `extends` to shift common config to a separate file
If the user does not specify which cloud to add the model to and only
one cloud is known to JIMM, we will select that cloud and continue instead
of returning an error.
…add-model

Allow adding a model with implicit cloud.
* remove need for approle.json

* remove references to vault env and approle files

* remove sql init volume

* Add new lines
* simplify Docker compose and OpenFGA setup

* entrypoint tweaks
* create model manager interface

* add godocs
* eliminate the need for TLS certs in tests

* remove InsecureSkipVerify config
* avoid duplicate everyone checks

* make method not exported
kian99 and others added 5 commits August 30, 2024 10:44
* return cloud-credentials with empty attribute

* set empty map if attributes not found

* change application logic to not return error on empty attributes

* add app layer test

* return empty map rather than nil

* fix test
* improve readme and supporting docs

* PR tweaks

* Add a line explaining building/publishing section

* put jimm history in a separate doc

* add project links
* tweak how tags are resolved

- allow resolving tags without hitting the db if a UUID is specified

* simplify matcher and tests

* fix tests

- Additionally cleaned up duplicated logic in ToJAASTag()

* improve error message
@kian99 kian99 requested a review from a team as a code owner September 2, 2024 14:56
@kian99 kian99 force-pushed the merge-v3-feature-rebac-admin branch from 2e60e73 to f26f3a5 Compare September 2, 2024 15:28
@kian99 kian99 merged commit 8766152 into canonical:feature-rebac-admin Sep 3, 2024
4 checks passed
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.

5 participants