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: migrate master branch to main branch #167

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: 2.1
# Orbs used in this pipeline
##
orbs:
slack: circleci/[email protected] # Ref: https://github.com/mojaloop/ci-config/tree/master/slack-templates
slack: circleci/[email protected] # Ref: https://github.com/mojaloop/ci-config/tree/main/slack-templates
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
slack: circleci/[email protected] # Ref: https://github.com/mojaloop/ci-config/tree/main/slack-templates
slack: circleci/[email protected] # Ref: https://github.com/mojaloop/ci-config/tree/master/slack-templates

Reverting because this is external, and we cant manage that.

pr-tools: mojaloop/[email protected] # Ref: https://github.com/mojaloop/ci-config/
gh: circleci/[email protected]

Expand Down Expand Up @@ -48,7 +48,7 @@ defaults_npm_publish_release: &defaults_npm_publish_release
defaults_export_version_from_package: &defaults_export_version_from_package
name: Format the changelog into the github release body and get release tag
command: |
git diff --no-indent-heuristic master~1 HEAD CHANGELOG.md | sed -n '/^+[^+]/ s/^+//p' > /tmp/changes
git diff --no-indent-heuristic main~1 HEAD CHANGELOG.md | sed -n '/^+[^+]/ s/^+//p' > /tmp/changes
echo 'export RELEASE_CHANGES=`cat /tmp/changes`' >> $BASH_ENV
echo 'export RELEASE_TAG=`cat package-lock.json | jq -r .version`' >> $BASH_ENV

Expand Down Expand Up @@ -442,7 +442,6 @@ workflows:
ignore: /.*/
branches:
ignore:
- master
- main
- test-lint:
context: org-global
Expand Down Expand Up @@ -488,7 +487,7 @@ workflows:
ignore:
- /feature*/
- /bugfix*/
# New commits to master release automatically
# New commits to main release automatically
- release:
context: org-global
requires:
Expand All @@ -500,7 +499,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /release\/v.*/
- github-release:
context: org-global
Expand All @@ -509,7 +508,7 @@ workflows:
filters:
branches:
only:
- master
- main
- /release\/v.*/
- publish:
context: org-global
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Validate the result file.
## Swagger-UI

The snippets specification is previewable using swagger-ui. Swagger-UI files
are found in `docs/dist/`. Github pages uses the master branch `docs/` folder
are found in `docs/dist/`. Github pages uses the `main` branch `docs/` folder
to build the page found at https://docs.mojaloop.io/api-snippets/
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
to build the page found at https://docs.mojaloop.io/api-snippets/
to build the page found at https://mojaloop.github.io/api-snippets

Copy link
Member

Choose a reason for hiding this comment

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

Every other change "URL" below this comment should be reverted from to master


## Dev Tools
Expand Down
4 changes: 2 additions & 2 deletions docs/dist/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,7 @@ components:
schema:
type: string
required: false
description: 'The `FSPIOP-HTTP-Method` header field is a non-HTTP standard field used by the API for signature verification, should contain the service HTTP method. Required if signature verification is used, for more information, see [the API Signature document](https://github.com/mojaloop/docs/tree/master/Specification%20Document%20Set).'
description: 'The `FSPIOP-HTTP-Method` header field is a non-HTTP standard field used by the API for signature verification, should contain the service HTTP method. Required if signature verification is used, for more information, see [the API Signature document](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set).'
FSPIOP-Signature:
name: FSPIOP-Signature
in: header
Expand All @@ -1377,7 +1377,7 @@ components:
schema:
type: string
required: false
description: 'The `FSPIOP-URI` header field is a non-HTTP standard field used by the API for signature verification, should contain the service URI. Required if signature verification is used, for more information, see [the API Signature document](https://github.com/mojaloop/docs/tree/master/Specification%20Document%20Set).'
description: 'The `FSPIOP-URI` header field is a non-HTTP standard field used by the API for signature verification, should contain the service URI. Required if signature verification is used, for more information, see [the API Signature document](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set).'
ID:
name: ID
in: path
Expand Down
4 changes: 2 additions & 2 deletions docs/fspiop-rest-v1.0-openapi3-snippets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4177,7 +4177,7 @@ components:
API for signature verification, should contain the service URI. Required
if signature verification is used, for more information, see [the API
Signature
document](https://github.com/mojaloop/docs/tree/master/Specification%20Document%20Set).
document](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set).
FSPIOP-HTTP-Method:
name: FSPIOP-HTTP-Method
in: header
Expand All @@ -4189,7 +4189,7 @@ components:
by the API for signature verification, should contain the service HTTP
method. Required if signature verification is used, for more
information, see [the API Signature
document](https://github.com/mojaloop/docs/tree/master/Specification%20Document%20Set).
document](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set).
Accept:
name: Accept
in: header
Expand Down
8 changes: 4 additions & 4 deletions docs/fspiop-rest-v1.1-openapi3-snippets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ info:
title: Open API for FSP Interoperability (FSPIOP)
description: >-
Based on [API Definition updated on 2020-05-19 Version
1.1](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set/API%20Definition_v1.1.pdf).
1.1](https://github.com/mojaloop/mojaloop-specification/blob/main/documents/v1.1-document-set/API%20Definition_v1.1.pdf).


**Note:** The API supports a maximum size of 65536 bytes (64 Kilobytes) in
the HTTP header.
license:
name: CC BY-ND 4.0
url: https://github.com/mojaloop/mojaloop-specification/blob/master/LICENSE.md
url: https://github.com/mojaloop/mojaloop-specification/blob/main/LICENSE.md
contact:
name: Sam Kummary
url: https://github.com/mojaloop/mojaloop-specification/issues
Expand Down Expand Up @@ -3730,7 +3730,7 @@ components:
API for signature verification, should contain the service URI. Required
if signature verification is used, for more information, see [the API
Signature
document](https://github.com/mojaloop/docs/tree/master/Specification%20Document%20Set).
document](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set).
FSPIOP-HTTP-Method:
name: FSPIOP-HTTP-Method
in: header
Expand All @@ -3742,7 +3742,7 @@ components:
by the API for signature verification, should contain the service HTTP
method. Required if signature verification is used, for more
information, see [the API Signature
document](https://github.com/mojaloop/docs/tree/master/Specification%20Document%20Set).
document](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set).
Accept:
name: Accept
in: header
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ info:
the term "FSP" is equal to the term "DFSP".
license:
name: Apache License Version 2.0, January 2004
url: https://github.com/mojaloop/documentation/blob/master/LICENSE.md
url: https://github.com/mojaloop/documentation/blob/main/LICENSE.md
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
url: https://github.com/mojaloop/documentation/blob/main/LICENSE.md
url: https://github.com/mojaloop/documentation/blob/master/LICENSE.md

version: 1.0.0
paths:
/:
Expand Down
38 changes: 19 additions & 19 deletions docs/thirdparty-openapi3-snippets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ info:
title: Thirdparty Snippets
description: |
Based on sequence diagrams
(https://github.com/mojaloop/pisp/tree/master/docs/out).
(https://github.com/mojaloop/pisp/tree/main/docs/out).
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
(https://github.com/mojaloop/pisp/tree/main/docs/out).
(https://github.com/mojaloop/pisp/tree/master/docs/out).

This is a work in progress.
license:
name: TBD
Expand Down Expand Up @@ -2619,7 +2619,7 @@ components:
which was originally used by the PISP to identify the transaction
request.

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31612-post-thirdpartyrequestsauthorizations
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31612-post-thirdpartyrequestsauthorizations
properties:
completedTimestamp:
$ref: '#/components/schemas/DateTime'
Expand Down Expand Up @@ -2710,7 +2710,7 @@ components:
features enabled. - PISP - Enum used to query for PISPs. - AUTH_SERVICE
- Participants which provide Authentication Services.

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#3229-servicetype
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#3229-servicetype
enum:
- THIRD_PARTY_DFSP
- PISP
Expand Down Expand Up @@ -3021,7 +3021,7 @@ components:
is at the discretion of the address space owner (the payer DFSP in this
case).

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#3212-accountaddress
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#3212-accountaddress
pattern: ^([0-9A-Za-z_~\-\.]+[0-9A-Za-z_~\-])$
minLength: 1
maxLength: 1023
Expand All @@ -3031,7 +3031,7 @@ components:
description: >-
Data model for the complex type Account.

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#3211-account
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#3211-account
properties:
accountNickname:
$ref: '#/components/schemas/Name'
Expand All @@ -3050,7 +3050,7 @@ components:
The AccountList data model is used to hold information about the
accounts that a party controls.

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#3213-accountlist
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#3213-accountlist
items:
$ref: '#/components/schemas/Account'
minItems: 1
Expand All @@ -3068,7 +3068,7 @@ components:
result of a request for accounts information. The identifier ID given in
the call are the values given in the original request.

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31121--put-accountsid
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31121--put-accountsid
properties:
accounts:
$ref: '#/components/schemas/AccountList'
Expand Down Expand Up @@ -3116,7 +3116,7 @@ components:
DFSP, an account on which access types can be requested or granted. It
also defines the access types which are requested or granted.

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#32121-scope
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#32121-scope
properties:
address:
$ref: '#/components/schemas/AccountAddress'
Expand Down Expand Up @@ -3163,7 +3163,7 @@ components:
Callback: PUT /consentRequests/{ID} Error callback: PUT
/consentRequests/{ID}/error Data model - see below url

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31212-post-consentrequests
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31212-post-consentrequests
properties:
consentRequestId:
$ref: '#/components/schemas/CorrelationId'
Expand Down Expand Up @@ -3299,7 +3299,7 @@ components:
PISP will receive a token which they can use to prove to the DFSP that
the user trusts this PISP.

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31222-patch-consentrequestsid
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31222-patch-consentrequestsid
properties:
authToken:
$ref: '#/components/schemas/BinaryString'
Expand All @@ -3319,7 +3319,7 @@ components:
"GENERIC" - The credential is based on a simple public key validation.
Its payload is a GenericCredential object.

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#3226-credentialtype
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#3226-credentialtype
CredentialStatusPending:
title: CredentialStatusPending
type: string
Expand Down Expand Up @@ -3685,7 +3685,7 @@ components:
Callback - PUT /services/{ServiceType} Error Callback - PUT
/services/{ServiceType}/error Data Model - Empty body

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31531-put-servicesservicetype
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31531-put-servicesservicetype
properties:
providers:
type: array
Expand Down Expand Up @@ -3714,7 +3714,7 @@ components:
PUT /thirdpartyRequests/transactions/{ID}/error Data Model - See link
below

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31712-post-thirdpartyrequeststransactions
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31712-post-thirdpartyrequeststransactions
properties:
transactionRequestId:
allOf:
Expand Down Expand Up @@ -3778,7 +3778,7 @@ components:
/thirdpartyRequests/transactions/{ID}), the DFSP will send this
callback.

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31721-put-thirdpartyrequeststransactionsid
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31721-put-thirdpartyrequeststransactionsid
properties:
transactionId:
$ref: '#/components/schemas/CorrelationId'
Expand All @@ -3804,7 +3804,7 @@ components:
PUT /thirdpartyRequests/authorizations/{ID}/error Data Model - See below
url

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31612-post-thirdpartyrequestsauthorizations
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31612-post-thirdpartyrequestsauthorizations
type: object
properties:
authorizationRequestId:
Expand Down Expand Up @@ -3914,7 +3914,7 @@ components:
For this API, we represent ArrayBuffers as base64 encoded utf-8 strings.


https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#32128-fidopublickeycredentialassertion
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#32128-fidopublickeycredentialassertion
properties:
id:
type: string
Expand Down Expand Up @@ -4125,7 +4125,7 @@ components:
request the check, or the {ID} that was used in the GET
/thirdpartyRequests/verifications/{ID}.

https://github.com/mojaloop/documentation/blob/master/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31821-put-thirdpartyrequestsverificationsid
https://github.com/mojaloop/documentation/blob/main/website/versioned_docs/v1.0.1/api/thirdparty/data-models.md#31821-put-thirdpartyrequestsverificationsid
properties:
authenticationResponse:
$ref: '#/components/schemas/AuthenticationResponse'
Expand Down Expand Up @@ -4229,7 +4229,7 @@ components:
API for signature verification, should contain the service URI. Required
if signature verification is used, for more information, see [the API
Signature
document](https://github.com/mojaloop/docs/tree/master/Specification%20Document%20Set).
document](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set).
FSPIOP-HTTP-Method:
name: FSPIOP-HTTP-Method
in: header
Expand All @@ -4241,7 +4241,7 @@ components:
by the API for signature verification, should contain the service HTTP
method. Required if signature verification is used, for more
information, see [the API Signature
document](https://github.com/mojaloop/docs/tree/master/Specification%20Document%20Set).
document](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set).
Accept:
name: Accept
in: header
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ description: >-
API for signature verification, should contain the service HTTP method.
Required if signature verification is used, for more information, see [the API
Signature
document](https://github.com/mojaloop/docs/tree/master/Specification%20Document%20Set).
document](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set).
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ description: >-
The `FSPIOP-URI` header field is a non-HTTP standard field used by the API for
signature verification, should contain the service URI. Required if signature
verification is used, for more information, see [the API Signature
document](https://github.com/mojaloop/docs/tree/master/Specification%20Document%20Set).
document](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set).
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ description: >-
API for signature verification, should contain the service HTTP method.
Required if signature verification is used, for more information, see [the API
Signature
document](https://github.com/mojaloop/docs/tree/master/Specification%20Document%20Set).
document](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set).
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ description: >-
The `FSPIOP-URI` header field is a non-HTTP standard field used by the API for
signature verification, should contain the service URI. Required if signature
verification is used, for more information, see [the API Signature
document](https://github.com/mojaloop/docs/tree/master/Specification%20Document%20Set).
document](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set).
4 changes: 2 additions & 2 deletions fspiop/v1_1/openapi3/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ info:
title: Open API for FSP Interoperability (FSPIOP)
description: >-
Based on [API Definition updated on 2020-05-19 Version
1.1](https://github.com/mojaloop/mojaloop-specification/blob/master/documents/v1.1-document-set/API%20Definition_v1.1.pdf).
1.1](https://github.com/mojaloop/mojaloop-specification/blob/main/documents/v1.1-document-set/API%20Definition_v1.1.pdf).


**Note:** The API supports a maximum size of 65536 bytes (64 Kilobytes) in
the HTTP header.
license:
name: CC BY-ND 4.0
url: 'https://github.com/mojaloop/mojaloop-specification/blob/master/LICENSE.md'
url: 'https://github.com/mojaloop/mojaloop-specification/blob/main/LICENSE.md'
contact:
name: Sam Kummary
url: 'https://github.com/mojaloop/mojaloop-specification/issues'
Expand Down
Loading