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.

Sign up for GitHub

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

Jump to bottom

feat: sync with the main branch + CredentialDefinition adoption for MT. Signed-off-by: Yurii Shynbuiev [email protected] #695

Merged
merged 24 commits into from
Sep 7, 2023
Merged

feat: sync with the main branch + CredentialDefinition adoption for MT. Signed-off-by: Yurii Shynbuiev [email protected] #695

merged 24 commits into from
Sep 7, 2023

Conversation

yshyn-iohk
Copy link
Member

Overview

merge the main into the mt branch
adopt Credential Defition to MT

Checklist

My PR contains...

  • No code changes (changes to documentation, CI, metadata, etc.)
  • Bug fixes (non-breaking change which fixes an issue)
  • Improvements (misc. changes to existing features)
  • Features (non-breaking change which adds functionality)

My changes...

  • are breaking changes
  • are not breaking changes
  • If yes to above: I have updated the documentation accordingly

Documentation

  • My changes do not require a change to the project documentation
  • My changes require a change to the project documentation
  • If yes to above: I have updated the documentation accordingly

Tests

  • My changes can not or do not need to be tested
  • My changes can and should be tested by unit and/or integration tests
  • If yes to above: I have added tests to cover my changes
  • If yes to above: I have taken care to cover edge cases in my tests

mineme0110 and others added 22 commits August 28, 2023 15:26
@mineme0110
fix(prism-agent): invitation expiry configuration and new state (#655)
c61999d 
Signed-off-by: Shailesh Patil <[email protected]>
@CryptoKnightIOG
feat: add anoncreds credential definition rest api (#624)
99e338a 
Signed-off-by: Bassam Riman <[email protected]>
Signed-off-by: Anton Baliasnikov <[email protected]>
Co-authored-by: Anton Baliasnikov <[email protected]>
docs: update readme, dco, contribution guidelines [skip ci] (#654)
b3c0bae 
Signed-off-by: Anton Baliasnikov <[email protected]>
ci: add test container image and automation (#664)
24284f8 
Signed-off-by: Anton Baliasnikov <[email protected]>
ci: fix tags in push test ci image [skip ci] (#665)
4497dc1 
Signed-off-by: Anton Baliasnikov <[email protected]>
docs: fix links in readme for dco and contributing [skip ci] (#666)
7947bad 
Signed-off-by: Anton Baliasnikov <[email protected]>
docs: fix links in contribution guide [skip ci] (#668)
a10e7a4 
Signed-off-by: Anton Baliasnikov <[email protected]>
ci: remove disabled unused workflows [skip ci] (#675)
b6a1929 
Signed-off-by: Anton Baliasnikov <[email protected]>
@atala-dev
chore(release): cut atala prism 1.12.0 release
7df61c4 
# [1.12.0](prism-agent-v1.11.0...prism-agent-v1.12.0) (2023-08-31)

### Bug Fixes

* **prism-agent:** invitation expiry configuration and new state ([#655](#655)) ([c61999d](c61999d))

### Features

* add anoncreds credential definition rest api ([#624](#624)) ([99e338a](99e338a))
* allow external API keys to be defined for an agent ([#643](#643)) ([756dea7](756dea7))
* ATL-5571 Generalized Vault to Store Json ([#650](#650)) ([ebf0328](ebf0328))
* ATL-5574 Prime Anoncred Lib ([#652](#652)) ([70b2f16](70b2f16))
* ATL-5575 Generalize and Streamline Json Schema SerDes logic ([#653](#653)) ([eb4f8f4](eb4f8f4))

Signed-off-by: Anton Baliasnikov <[email protected]>
docs: add adr placeholders [skip ci] (#508)
95c6185 
Signed-off-by: Anton Baliasnikov <[email protected]>
@bvoiturier
chore(prism-agent): use the agent endpoint declarations in Tapir2Stat…
f1cb5d8 
…icOAS (#676)

Signed-off-by: Benjamin Voiturier <[email protected]>
@CryptoKnightIOG
fix: correct vault path (#678)
9426e7f 
Signed-off-by: Bassam Riman <[email protected]>
@FabioPinheiro
fix: CredentialOffer not following spec (#569)
3d479b9 
Signed-off-by: FabioPinheiro <[email protected]>
fix(prism-agent): make resolve did representation content type work (#…
fd417d9 
…679)

Signed-off-by: Pat Losoponkul <[email protected]>
@FabioPinheiro
build: remove mediator from this repository (#680)
a4b8f31 
Signed-off-by: FabioPinheiro <[email protected]>
chore: fix security vulnerabilities in workflows and npm (#677)
fad9b80 
Signed-off-by: Anton Baliasnikov <[email protected]>
docs: remove internal handbook link from readme [skip ci] (#681)
c73b736 
Signed-off-by: Anton Baliasnikov <[email protected]>
@milosbackonja
fix: indentation in apisixroute (#682)
6eec8ba 
Signed-off-by: Milos Backonja <[email protected]>
@milosbackonja
fix: another indentation in apisixroute (#683)
d7c5e52 
Signed-off-by: Milos Backonja <[email protected]>
@yshyn-iohk
Merge remote-tracking branch 'origin/main' into feat/merge-main-2-mt-…
523fc6e 
…walletapi-isolation

# Conflicts:
#	build.sbt
#	connect/lib/core/src/main/scala/io/iohk/atala/connect/core/service/ConnectionService.scala
#	connect/lib/core/src/main/scala/io/iohk/atala/connect/core/service/ConnectionServiceNotifier.scala
#	infrastructure/shared/apisix/conf/apisix.yaml
#	pollux/lib/sql-doobie/src/test/scala/io/iohk/atala/pollux/sql/VerifiableCredentialSchemaSqlIntegrationSpec.scala
#	prism-agent/service/server/src/main/scala/io/iohk/atala/agent/server/Main.scala
#	prism-agent/service/server/src/main/scala/io/iohk/atala/agent/server/PrismAgentApp.scala
#	prism-agent/service/server/src/main/scala/io/iohk/atala/agent/server/jobs/ConnectBackgroundJobs.scala
#	prism-agent/service/server/src/test/scala/io/iohk/atala/api/util/Tapir2StaticOAS.scala
#	prism-agent/service/server/src/test/scala/io/iohk/atala/pollux/schema/CredentialSchemaBasicSpec.scala
#	prism-agent/service/server/src/test/scala/io/iohk/atala/pollux/schema/CredentialSchemaLookupAndPaginationSpec.scala
#	prism-agent/service/server/src/test/scala/io/iohk/atala/pollux/schema/CredentialSchemaTestTools.scala
@yshyn-iohk
Merge remote-tracking branch 'origin/feat/mt-walletapi-isolation' int…
018fd11 
…o feat/merge-main-2-mt-walletapi-isolation

# Conflicts:
#	prism-agent/service/server/src/main/scala/io/iohk/atala/agent/server/PrismAgentApp.scala
@yshyn-iohk
feat: adopt CredentialDefinition to MT (merge the main into mt branch)
ad4463e
@yshyn-iohk yshyn-iohk requested a review from a user September 7, 2023 09:19
@yshyn-iohk yshyn-iohk changed the title Merge main 2mt walletapi isolation feat: sync with the main branch + CredentialDefinition adoption for MT Sep 7, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2023 •
edited
Loading

Atala PRISM Test Results

  76 files    76 suites   13m 32s ⏱️
644 tests 633 ✔️ 11 💤 0 ❌
650 runs  639 ✔️ 11 💤 0 ❌

Results for commit 34a5680.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2023 •
edited
Loading

E2E Test Results

10 files  10 suites   1m 28s ⏱️
21 tests   1 ✔️ 0 💤 18 ❌ 2 🔥
32 runs    1 ✔️ 0 💤 29 ❌ 2 🔥

For more details on these failures and errors, see this check.

Results for commit 34a5680.

♻️ This comment has been updated with latest results.

patlo-iog
patlo-iog approved these changes Sep 7, 2023
View reviewed changes
Copy link
Contributor

@patlo-iog patlo-iog left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for paying the price of long-lived branch 😃 . Small comment, but generally LGTM 👍 .

...main/scala/io/iohk/atala/pollux/core/repository/CredentialDefinitionRepositoryInMemory.scala Outdated Show resolved Hide resolved
@sonarcloud
Copy link

sonarcloud bot commented Sep 7, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

No Coverage information No Coverage information
1.4% 1.4% Duplication

@yshyn-iohk yshyn-iohk changed the title feat: sync with the main branch + CredentialDefinition adoption for MT feat: sync with the main branch + CredentialDefinition adoption for MT. Signed-off-by: Yurii Shynbuiev [email protected] Sep 7, 2023
@yshyn-iohk yshyn-iohk merged commit bc0c11a into feat/mt-walletapi-isolation Sep 7, 2023
10 of 13 checks passed
@yshyn-iohk yshyn-iohk deleted the merge-main-2mt-walletapi-isolation branch September 7, 2023 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@patlo-iog patlo-iog patlo-iog approved these changes

@antonbaliasnikov antonbaliasnikov Awaiting requested review from antonbaliasnikov

@BS-IO BS-IO Awaiting requested review from BS-IO

@bvoiturier bvoiturier Awaiting requested review from bvoiturier bvoiturier is a code owner

@CryptoKnightIOG CryptoKnightIOG Awaiting requested review from CryptoKnightIOG CryptoKnightIOG is a code owner

@mineme0110 mineme0110 Awaiting requested review from mineme0110 mineme0110 is a code owner

@FabioPinheiro FabioPinheiro Awaiting requested review from FabioPinheiro FabioPinheiro is a code owner

Assignees
No one assigned
Labels
Component: Cloud Agent Component: Infrastructure Type: Documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@yshyn-iohk @patlo-iog @atala-dev @mineme0110 @CryptoKnightIOG @bvoiturier @FabioPinheiro @milosbackonja