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

Subtree hscim #1152

Merged
merged 50 commits into from
Jul 2, 2020
Merged

Subtree hscim #1152

merged 50 commits into from
Jul 2, 2020

Conversation

arianvp
Copy link
Contributor

@arianvp arianvp commented Jul 1, 2020

No description provided.

Jon Elverkilde and others added 30 commits April 26, 2018 11:11
* Remove redundant cabal file from version control.

* Set stack resolver to match https://github.com/wireapp/wire-server/.

* Eliminate servant dependency exception.

(this will be helpful if we link this against the same executable
as saml2-web-sso and don't want to run two servants at the same time.)

* Cleanup

* Enable travis ci.

* Add missing test cases to Spec.hs.

* Use hspec-discover
* Use UUIDs

* Add a comment

* Add missing fields to 'ListResponse'

* Serve a single user

* Give the user an email

* Resource types

* Address comments
* A module for filtering users

* Integrate filtering into the mock implementation

* Don't allow users with duplicate usernames

* Overhaul error handling; fix comments
)

* Implement basic auth in a simpler way (without contexts etc)

* Throw errors via ExceptT

* Cleanup CCP switch for servant compatibility. (#13)

* Throw authorization errors as 'SCIMError's

* Move language extensions to package.yaml

* Export siteServer

* Add 'serverError'

* Make 'decodeAuth' more informative

* Remove TestStorage duplication

* Add all the necessary instances for FromJSON StoredUser
* Add 'renderFilter'

* Add a roundtrip test
Needed for LTS-12 (servant-generic is deprecated).
* Clarify 'version'

* Don't merge fields in PUT /Users

* Fix a warning

* Redo User serialization

* More tests for new User serialization
* Support extra fields in 'User'

* Comments
* More comments; don't send the lowercase version to FromJSON extra

* Clarify
* Add 'forbidden' error helper
* Customizable ID types + no extra logic

* Fix the Id type (it must behave like a string)

* Don't test how we handle duplicate usernames

* Migrate groups

* Inline mock server methods
* ListResponse is 1-indexed, not 0-indexed

* implement patch in terms of get and put

* Implements patch _only_ for userName, displayName, externalId

* Add Azure acceptance test

Co-authored-by: fisx <mf@zerobuzz.net>
* Make hscim compile with LTS 14.12

We need this to bump wire-server

* Add version bounds

This makes it possible to also build this with Cabal and get a similar
build plan :)

* Don't ignore cabal file

I think we even need it if we need to upload this to Hackage?

Sure hpack is cute, but for applications... Also I'm not sure
if I buy the yaml all the things trend

* Update gitignore

* Don't hardcode LTS version in CI? what's the point of that :)
Co-Authored-By: fisx <mf@zerobuzz.net>
fisx and others added 15 commits January 28, 2020 12:37
(the test suite is exposed by the library for the library user, so it
needs ot be a bit more flexible.)
Support acceptance tests on scim apis with prefix.
* Allow to configure displayName generators in acceptance tests.

This required to give up on the idea of isolating individual test
cases in individual `it`s, which was illegal to begin with: test cases
are morally collected in a set by a writer, and are only executed in
order by coincidence, and only if nobody adds `parallel` anywhere in
the test tree.

* Make auth token configurable as well.

* Introduce doctest.

* More verbose shouldRespondWith function.

* Better error messages in tests.

* Make missing metadata location field at least parseable.

* Add missing tests as pending; add TODOs.

* Make test wait for deletion to happen asynchronously.
Was merged into network-uri in 2.6.2

This allows us to move to a newer version of LTS 14
* Add test

* Make 'active' field patchable

* Make tests marginally more generic.

Co-authored-by: Matthias Fischmann <mf@zerobuzz.net>
git-subtree-dir: libs/hscim
git-subtree-mainline: 8710776
git-subtree-split: f5f7489
@CLAassistant
Copy link

CLAassistant commented Jul 1, 2020

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
6 out of 7 committers have signed the CLA.

✅ fisx
✅ jschaul
✅ arianvp
✅ ChrisPenner
✅ akshaymankar
✅ flokli
❌ Jon Elverkilde


Jon Elverkilde seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@fisx
Copy link
Contributor

fisx commented Jul 1, 2020

Jon used to work here, and I'm pretty sure he has signed away his IPR. Hi @elverkilde o/ :)!

We can either change the author on the resp. commits to Jon Elverkilde <jon.elverkilde@pusher.com> and ask him to sign off on it again, redundantly, or just ignore the false warning, merge it as is, and keep the hscim repo around as evidence.

@akshaymankar
Copy link
Member

akshaymankar commented Jul 2, 2020

Please archive the hscim repository before (or just after) this gets merged with a note about where to find the latest hscim.

@fisx
Copy link
Contributor

fisx commented Jul 2, 2020

can't make a lot of sense out of this, so let's try one more time:

bash: docker: command not found
stack clean
<<<<<<<<<<<<<<<<<<
You are currently using Stack version 2.1.3, but version 2.3.1 is available
You can try to upgrade by running 'stack upgrade'
Tired of seeing this? Add 'recommend-stack-upgrade: false' to /root/.stack/config.yaml
>>>>>>>>>>>>>>>>>>

Aeson exception:
Error in $.packages[1].completed: failed to parse field 'packages': failed to parse field 'completed': Could not parse a UnresolvedPackageLocationImmutable from: Object (fromList [("subdir",String "wai-middleware-prometheus"),("name",String "wai-middleware-prometheus"),("version",String "1.0.0"),("git",String "https://github.com/fimad/prometheus-haskell"),("pantry-tree",Object (fromList [("size",Number 359.0),("sha256",String "72560f0d8c7f57db769e77d491e8b10255938631847981de52e94781b905a27a")])),("commit",String "2e3282e5fb27ba8d989c271a0a989823fad7ec43")])
make: *** [Makefile:64: clean] Error 1
The command '/bin/sh -c make clean install' returned a non-zero code: 2

or perhaps there is something about git-subtree that we need to sort out on ci?

@fisx
Copy link
Contributor

fisx commented Jul 2, 2020

same error. I've removed libs/hscim from stack.yaml, let's see if that changes anything. but there is no mention of docker in libs/hscim, so this looks to me like some unrelated concourse issue.

@arianvp
Copy link
Contributor Author

arianvp commented Jul 2, 2020

You somehow commited a corrupted lockfile (Removed all kinds of cabal hashes) which seems very off. Please make sure that you're running the same version of stack and hpack as CI. Stack is not stable across versions and will break (without major version bumps) in inexplicable ways in my experience

Our CI is using 2.1.3 whilst you generated the lockfile with 2.3.1

A sane project wouldn't break because of this; but it seems that Stack does =)

This is because Stack dropped hpack translations in 2.3.1 and hence doesn't store the hashes of cabal files anymore; but 2.1.3 will crash without them

@arianvp
Copy link
Contributor Author

arianvp commented Jul 2, 2020

hscim unit test build seems to fail; but the logs stack outputs are all over the place and hard to read so I cant figure out what is failing

@arianvp
Copy link
Contributor Author

arianvp commented Jul 2, 2020

@fisx it seems the hscim doctests are failing. I have no experience with doctests. It might be that they were broken all along because I never ran them. There don't seem to be logs what failed in the doctests. Can we get rid of them? they seem akward.

- global stack.yaml, stack.yaml.lock.
- remove stack noise from package.
- remove stack*, .travis.yml, ormolu.sh from package.
- Remove doctests.
@fisx fisx merged commit c3fcda3 into develop Jul 2, 2020
@fisx fisx deleted the subtree-hscim branch July 2, 2020 19:00
@fisx fisx mentioned this pull request Jul 13, 2020
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.

None yet

7 participants