Skip to content

Commit

Permalink
chore(shared): move api folder into runnable and reset build settings…
Browse files Browse the repository at this point in the history
… for dockerRepository and version.sbt (#152)

* chore(shared): move API folder for mercury and prism-agent into service / runnable folder

* build(mercury): revert dockerRepository change back to ghcr.io and reset version to next snapshot version 0.3.0-SNAPSHOT

* chore(mercury): updated README to be clear why API folder moved
  • Loading branch information
davidpoltorak-io authored Nov 23, 2022
1 parent 14906a6 commit dc641b1
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 10 deletions.
7 changes: 2 additions & 5 deletions mercury/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

We are following the directory structure defined in [RFC 0013 - Service-Oriented BB API Dependency Management](https://input-output.atlassian.net/wiki/spaces/ATB/pages/3534848001/RFC+0013+-+Service-Oriented+BB+API+Dependency+Management).

**Folders:**

- `api`:
Contains the API's for the Mercury Building Block.
> Note: The API folder has been moved into the `mercury-mediator` folder which does not conform with the published RFC - however - this change is required to ensure the CI process detects commits related to API changes and publishes the runnable image containing the API spec.
**Warning:** this folder is a dependicy of `prism-mediator`/`build.sbt`'s `apiBaseDirectory` property.
**Folders:**

- `mercury-library`:
Is our project implementation of the DID Comm and DID Comm protocols.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ info:

servers:
- url: "https://k8s-dev.atalaprism.io/mediator/"
- url: "http://localhost/mediator/"

tags:
- name: Mailbox Mediator
Expand Down
4 changes: 2 additions & 2 deletions mercury/mercury-mediator/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ inThisBuild(
// Custom keys
val apiBaseDirectory =
settingKey[File]("The base directory for Castor API specifications")
ThisBuild / apiBaseDirectory := baseDirectory.value / ".." / "api"
ThisBuild / apiBaseDirectory := baseDirectory.value / "api"
ThisBuild / resolvers += Resolver.githubPackages("input-output-hk", "atala-prism-building-blocks")

lazy val V = new {
Expand Down Expand Up @@ -88,7 +88,7 @@ lazy val mediator = project
githubTokenSource := TokenSource.Environment("ATALA_GITHUB_TOKEN"),
// ### Build Docker Image ###
Docker / maintainer := "[email protected]",
Docker / dockerRepository := Some("atala-prism.io"),
Docker / dockerRepository := Some("ghcr.io"),
Docker / dockerUsername := Some("input-output-hk"),
Docker / githubOwner := "atala-prism-building-blocks",
Docker / dockerUpdateLatest := true,
Expand Down
2 changes: 1 addition & 1 deletion mercury/mercury-mediator/version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ThisBuild / version := "0.1.0"
ThisBuild / version := "0.3.0-SNAPSHOT"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ openapi: 3.0.1
info:
title: PrismAgent OpenAPI specification
description: OpenAPI specification for Decentralized Identifiers (DID) Operations
version: 1.0.0
version: 0.1.0
contact:
name: Core DID
email: [email protected]
servers:
- url: "https://k8s-dev.atalaprism.io/prism-agent/"
- url: "http://localhost/prism-agent"

components:
securitySchemes:
Expand Down
2 changes: 1 addition & 1 deletion prism-agent/service/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ inThisBuild(
Seq(
organization := "io.iohk.atala",
scalaVersion := "3.2.0",
apiBaseDirectory := baseDirectory.value / "../api",
apiBaseDirectory := baseDirectory.value / "api",
fork := true,
run / connectInput := true,
versionScheme := Some("semver-spec"),
Expand Down

0 comments on commit dc641b1

Please sign in to comment.