Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into vrp
Browse files Browse the repository at this point in the history
  • Loading branch information
kalpanakanagasabai committed Dec 6, 2023
2 parents 04e4fad + 4a2908f commit ecce210
Show file tree
Hide file tree
Showing 94 changed files with 1,139 additions and 440 deletions.
39 changes: 0 additions & 39 deletions .github/workflows/check-label.yml

This file was deleted.

38 changes: 30 additions & 8 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,20 @@ on:
# Triggers the workflow on push or pull request events but only for the master branch
pull_request:
branches:
- 'master'
types:
- labeled

- 'main'

jobs:

Build-repo-check:

if: ${{ contains(github.event.pull_request.labels.*.name, 'Ready-to-Build') }}
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 8
- uses: actions/checkout@v3
- name: Set up Node 16
uses: actions/setup-node@v3
Expand All @@ -50,8 +46,34 @@ jobs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Setup Maven settings.xml
uses: whelk-io/maven-settings-xml-action@v11
with:
mirrors: >
[
{
"id": "wso2-nexus",
"mirrorOf": "wso2-nexus",
"url": "http://maven.wso2.org/nexus/content/groups/wso2-public/"
},
{
"id": "wso2.releases",
"mirrorOf": "wso2.releases",
"url": "http://maven.wso2.org/nexus/content/repositories/releases/"
},
{
"id": "wso2.snapshots",
"mirrorOf": "wso2.snapshots",
"url": "http://maven.wso2.org/nexus/content/repositories/snapshots/"
},
{
"id": "knopflerfish",
"mirrorOf": "knopflerfish",
"url": "http://resources.knopflerfish.org/repo/maven2/release"
}
]
- name: Build with Maven
run: |
export MAVEN_OPTS="-Xmx4g -XX:MaxPermSize=512m"
mvn -B install --file pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,25 @@
{% else %}
<RequestJWTValidation>true</RequestJWTValidation>
{% endif %}
<RegistrationRequestParams>
<SoftwareEnvironmentIdentification>
{% if open_banking.dcr.registration.software_environment_identification.ssa_property_name is defined %}
<PropertyName>{{open_banking.dcr.registration.software_environment_identification.ssa_property_name}}</PropertyName>
{% else %}
<PropertyName>software_environment</PropertyName>
{% endif %}
{% if open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_sandbox is defined %}
<PropertyValueForSandbox>{{open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_sandbox}}</PropertyValueForSandbox>
{% else %}
<PropertyValueForSandbox>sandbox</PropertyValueForSandbox>
{% endif %}
{% if open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_production is defined %}
<PropertyValueForProduction>{{open_banking.dcr.registration.software_environment_identification.ssa_property_value_for_production}}</PropertyValueForProduction>
{% else %}
<PropertyValueForProduction>production</PropertyValueForProduction>
{% endif %}
</SoftwareEnvironmentIdentification>
</RegistrationRequestParams>
</DCR>
<KeyManagerName>{{open_banking.keyManager.name}}</KeyManagerName>
{% if open_banking.publisher.hostname is defined %}
Expand All @@ -315,6 +334,13 @@
<Enabled>false</Enabled>
{% endif %}
</APIMAnalytics>
<ELKAnalytics>
{% if open_banking.analytics.elk is defined %}
<Enabled>{{open_banking.analytics.elk.enabled}}</Enabled>
{% else %}
<Enabled>false</Enabled>
{% endif %}
</ELKAnalytics>
<DataPublishing>
{% if open_banking.data_publishing.enable is defined %}
<Enabled>{{open_banking.data_publishing.enable}}</Enabled>
Expand Down
4 changes: 2 additions & 2 deletions open-banking-accelerator/accelerators/ob-apim/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.wso2</groupId>
<groupId>com.wso2.openbanking.accelerator</groupId>
<artifactId>open-banking</artifactId>
<version>3.0.0</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,12 @@ roles = "AISP,PISP"
api_name = "AccountandTransactionAPI"
roles = "AISP"

[open_banking.dcr.registration.software_environment_identification]
ssa_property_name = "software_environment"
# If both below values doesnt match, Then software_environment is default to production.
ssa_property_value_for_sandbox = "sandbox"
ssa_property_value_for_production = "production"

#============executors=========================
[[open_banking.gateway.openbanking_gateway_executors.type]]
name = "Default"
Expand Down Expand Up @@ -471,6 +477,9 @@ priority = 1000
[open_banking.apim.analytics]
enable=false

[open_banking.analytics.elk]
enabled = false

[open_banking.data_publishing]
enable = false
username="$ref{super_admin.username}@carbon.super"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,12 @@ roles = "AISP,PISP"
api_name = "AccountandTransactionAPI"
roles = "AISP"

[open_banking.dcr.registration.software_environment_identification]
ssa_property_name = "software_environment"
# If both below values doesnt match, Then software_environment is default to production.
ssa_property_value_for_sandbox = "sandbox"
ssa_property_value_for_production = "production"

#============executors=========================
[[open_banking.gateway.openbanking_gateway_executors.type]]
name = "Default"
Expand Down Expand Up @@ -471,6 +477,9 @@ priority = 1000
[open_banking.apim.analytics]
enable=false

[open_banking.analytics.elk]
enabled = false

[open_banking.data_publishing]
enable = false
username="$ref{super_admin.username}@carbon.super"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,12 @@ roles = "AISP,PISP"
api_name = "AccountandTransactionAPI"
roles = "AISP"

[open_banking.dcr.registration.software_environment_identification]
ssa_property_name = "software_environment"
# If both below values doesnt match, Then software_environment is default to production.
ssa_property_value_for_sandbox = "sandbox"
ssa_property_value_for_production = "production"

#============executors=========================
[[open_banking.gateway.openbanking_gateway_executors.type]]
name = "Default"
Expand Down Expand Up @@ -475,6 +481,9 @@ priority = 1000
[open_banking.apim.analytics]
enable=false

[open_banking.analytics.elk]
enabled = false

[open_banking.data_publishing]
enable = false
username="$ref{super_admin.username}@carbon.super"
Expand Down
4 changes: 2 additions & 2 deletions open-banking-accelerator/accelerators/ob-bi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.wso2</groupId>
<groupId>com.wso2.openbanking.accelerator</groupId>
<artifactId>open-banking</artifactId>
<version>3.0.0</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

-- All the data related to time are stored in unix time stamp and therefore, the data types for the time related data
-- are represented in BIGINT.
-- Since the database systems does not support adding default unix time to the database columns, the default data
-- storing is handled within the database querieS.

CREATE TABLE OB_NOTIFICATION (
NOTIFICATION_ID varchar(36) NOT NULL,
CLIENT_ID varchar(255) NOT NULL,
RESOURCE_ID varchar(255) NOT NULL,
STATUS varchar(10) NOT NULL,
UPDATED_TIMESTAMP DATETIME2(0) DEFAULT GETDATE(),
PRIMARY KEY (NOTIFICATION_ID)
);

CREATE TABLE OB_NOTIFICATION_EVENT (
EVENT_ID int NOT NULL IDENTITY,
NOTIFICATION_ID varchar(36) NOT NULL,
EVENT_TYPE varchar(200) NOT NULL,
EVENT_INFO varchar(1000) NOT NULL,
PRIMARY KEY (EVENT_ID),
CONSTRAINT FK_NotificationEvent FOREIGN KEY (NOTIFICATION_ID) REFERENCES OB_NOTIFICATION(NOTIFICATION_ID)
);

CREATE TABLE OB_NOTIFICATION_ERROR (
NOTIFICATION_ID varchar(36) NOT NULL,
ERROR_CODE varchar(255) NOT NULL,
DESCRIPTION varchar(255) NOT NULL,
PRIMARY KEY (NOTIFICATION_ID),
CONSTRAINT FK_NotificationError FOREIGN KEY (NOTIFICATION_ID) REFERENCES OB_NOTIFICATION(NOTIFICATION_ID)
);

CREATE TABLE OB_NOTIFICATION_SUBSCRIPTION (
SUBSCRIPTION_ID varchar(36) NOT NULL,
CLIENT_ID varchar(255) NOT NULL,
REQUEST JSON NOT NULL,
CALLBACK_URL varchar(255),
TIMESTAMP BIGINT NOT NULL,
SPEC_VERSION varchar(255),
STATUS varchar(255) NOT NULL,
PRIMARY KEY (SUBSCRIPTION_ID)
);

CREATE TABLE OB_NOTIFICATION_SUBSCRIBED_EVENTS (
SUBSCRIPTION_ID varchar(36) NOT NULL,
EVENT_TYPE varchar(255) NOT NULL,
PRIMARY KEY (SUBSCRIPTION_ID, EVENT_TYPE),
CONSTRAINT FK_NotificationSubEvents FOREIGN KEY (SUBSCRIPTION_ID) REFERENCES OB_NOTIFICATION_SUBSCRIPTION(SUBSCRIPTION_ID)
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

-- All the data related to time are stored in unix time stamp and therefore, the data types for the time related data
-- are represented in BIGINT.
-- Since the database systems does not support adding default unix time to the database columns, the default data
-- storing is handled within the database querieS.

-- For event notifications feature run the following queries against the openbank_openbankingdb--

CREATE TABLE IF NOT EXISTS OB_NOTIFICATION (
NOTIFICATION_ID varchar(36) NOT NULL,
CLIENT_ID varchar(255) NOT NULL,
RESOURCE_ID varchar(255) NOT NULL,
STATUS varchar(10) NOT NULL,
UPDATED_TIMESTAMP TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (NOTIFICATION_ID)
)
ENGINE=InnoDB;

CREATE TABLE IF NOT EXISTS OB_NOTIFICATION_EVENT (
EVENT_ID int(11) NOT NULL AUTO_INCREMENT,
NOTIFICATION_ID varchar(36) NOT NULL,
EVENT_TYPE varchar(200) NOT NULL,
EVENT_INFO varchar(1000) NOT NULL,
PRIMARY KEY (EVENT_ID),
CONSTRAINT FK_NotificationEvent FOREIGN KEY (NOTIFICATION_ID) REFERENCES OB_NOTIFICATION(NOTIFICATION_ID)
)
ENGINE=InnoDB;

CREATE TABLE IF NOT EXISTS OB_NOTIFICATION_ERROR (
NOTIFICATION_ID varchar(36) NOT NULL,
ERROR_CODE varchar(255) NOT NULL,
DESCRIPTION varchar(255) NOT NULL,
PRIMARY KEY (NOTIFICATION_ID),
CONSTRAINT FK_NotificationError FOREIGN KEY (NOTIFICATION_ID) REFERENCES OB_NOTIFICATION(NOTIFICATION_ID)
)
ENGINE=InnoDB;

CREATE TABLE IF NOT EXISTS OB_NOTIFICATION_SUBSCRIPTION (
SUBSCRIPTION_ID varchar(36) NOT NULL,
CLIENT_ID varchar(255) NOT NULL,
REQUEST JSON NOT NULL,
CALLBACK_URL varchar(255),
TIMESTAMP BIGINT NOT NULL,
SPEC_VERSION varchar(255),
STATUS varchar(255) NOT NULL,
PRIMARY KEY (SUBSCRIPTION_ID)
)
ENGINE=InnoDB;

CREATE TABLE IF NOT EXISTS OB_NOTIFICATION_SUBSCRIBED_EVENTS (
SUBSCRIPTION_ID varchar(36) NOT NULL,
EVENT_TYPE varchar(255) NOT NULL,
PRIMARY KEY (SUBSCRIPTION_ID, EVENT_TYPE),
CONSTRAINT FK_NotificationSubEvents FOREIGN KEY (SUBSCRIPTION_ID) REFERENCES OB_NOTIFICATION_SUBSCRIPTION(SUBSCRIPTION_ID)
)
ENGINE=InnoDB;
Loading

0 comments on commit ecce210

Please sign in to comment.