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

Fix for TRG checks of QG 24.05 #184

Merged
merged 6 commits into from
May 15, 2024
Merged
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
22 changes: 19 additions & 3 deletions .tractusx
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
###############################################################
# Copyright (c) 2022,2024 BMW Group AG
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://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.
#
# SPDX-License-Identifier: Apache-2.0
###############################################################

product: "Country Risk"
leadingRepository: "https://github.com/eclipse-tractusx/vas-country-risk"
repositories:
- name: "vas-country-risk"
usage: "frontend code for the country risk application"
url: "https://github.com/eclipse-tractusx/vas-country-risk"
- name: "vas-country-risk-backend"
usage: "backend code for the country risk application"
url: "https://github.com/eclipse-tractusx/vas-country-risk-backend"
395 changes: 395 additions & 0 deletions LICENSES/CC-BY-4.0.txt

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ SPDX-License-Identifier: Apache-2.0
The project maintains the following source code repositories:

* https://github.com/eclipse-tractusx/vas-country-risk
* https://github.com/eclipse-tractusx/vas-country-risk-backend


## Third-party Content
Expand Down
6 changes: 3 additions & 3 deletions backend/DOCKER_NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Eclipse Tractus-X product(s) installed within the image:

**VAS Country Risk Backend**

- GitHub: https://github.com/eclipse-tractusx/vas-country-risk-backend
- GitHub: https://github.com/eclipse-tractusx/vas-country-risk
- Project home: https://projects.eclipse.org/projects/automotive.tractusx
- Dockerfile: https://github.com/eclipse-tractusx/vas-country-risk-backend/blob/main/Dockerfile
- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/vas-country-risk-backend/blob/main/LICENSE)
- Dockerfile: https://github.com/eclipse-tractusx/vas-country-risk/blob/main/backend/Dockerfile
- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/vas-country-risk/blob/main/LICENSE)

**Used base image**

Expand Down
7 changes: 0 additions & 7 deletions backend/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ Table of content:
This project in mainly used as a microservice for the Value Added Service Frontend project. It feeds information from
an database and also from other CatenaX microservices

## Running environments

| Environment | Link |
|-------------|---------------------------------------------------------|
| Dev | https://vas-country-risk-backend.dev.demo.catena-x.net/ |
| Int | https://vas-country-risk-backend.int.demo.catena-x.net/ |

## Getting started

### Prerequisites
Expand Down
8 changes: 1 addition & 7 deletions backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@ Source:
* [temurin-build](https://github.com/adoptium/temurin-build)
* [temurin docker repo info](https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin)

## Running environments

| Environment | Link |
|-------------|---------------------------------------------------------|
| Dev | https://vas-country-risk-backend.dev.demo.catena-x.net/ |
| Int | https://vas-country-risk-backend.int.demo.catena-x.net/ |

## Helm chart

Expand Down Expand Up @@ -77,7 +71,7 @@ The project is mainly configured to use Postgres as a Database. For this, you ne
directory and run the following command `docker compose up`. This will mount the database using the docker compose file
in the project. The connection configurations for this database are in the application-local.yml.

See [Installation guide](https://github.com/eclipse-tractusx/vas-country-risk-backend/blob/main/backend/INSTALL.md)
See [Installation guide](https://github.com/eclipse-tractusx/vas-country-risk/blob/main/backend/INSTALL.md)

## Project Structure

Expand Down
4 changes: 2 additions & 2 deletions charts/country-risk/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
apiVersion: v2
name: country-risk
type: application
version: 4.0.0
version: 4.0.1
appVersion: "2.0.0-alpha"
description: A Helm chart for deploying the Country Risk service
home: https://github.com/eclipse-tractusx/vas-country-risk-frontend
Expand All @@ -29,7 +29,7 @@ sources:
- https://github.com/eclipse-tractusx/vas-country-risk-backend
dependencies:
- name: postgresql
version: 11.*.*
version: 12.x.x
repository: https://charts.bitnami.com/bitnami
alias: postgres
condition: postgres.enabled
Expand Down
4 changes: 2 additions & 2 deletions charts/country-risk/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ countryRiskFrontend:
registry: "tractusx"
# -- Name of the docker image
name: "vas-country-risk"
pullPolicy: Always
pullPolicy: IfNotPresent
# -- Overrides the image tag whose default is the chart appVersion.
tag: ""

Expand Down Expand Up @@ -169,7 +169,7 @@ countryRiskBackend:
registry: "tractusx"
# -- Name of the docker image
name: "vas-country-risk-backend"
pullPolicy: Always
pullPolicy: IfNotPresent
# -- Overrides the image tag whose default is the chart appVersion.
tag: ""

Expand Down
101 changes: 0 additions & 101 deletions charts/helper/backend/_helpers.tpl

This file was deleted.

100 changes: 0 additions & 100 deletions charts/helper/frontend/_helpers.tpl

This file was deleted.

2 changes: 1 addition & 1 deletion docs/Arc42-Documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ classDiagram
# Interfaces

Please Check Swagger Documentation
https://vas-country-risk-backend.dev.demo.catena-x.net/swagger-ui/index.html#/
https://${hostname}:${port}/swagger-ui/index.html#/


### Endpoint explanation:
Expand Down
4 changes: 1 addition & 3 deletions frontend/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

This project is a Frontend web application for the value added services project written in React.JS

* INT: https://country-risk-dashboard.int.demo.catena-x.net/
* DEV: https://country-risk-dashboard.dev.demo.catena-x.net/
* Components: https://portal.dev.demo.catena-x.net/_storybook/
* Components: https://eclipse-tractusx.github.io/portal-shared-components

# Getting Started and How to run locally

Expand Down
9 changes: 4 additions & 5 deletions frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@ For more information and documentation, please refer to [documentation](https://

For topics and information discussion, please refer to [Eclipse Country Risk Room](https://chat.eclipse.org/#/room/#tools.tractusx-country-risk:matrix.eclipse.org)

## Demo environments
## Components

There are two demo environments provided by Catena-X:
This URL is used to reuse components already developed by the Portal team.

* [portal-shared-components](https://github.com/eclipse-tractusx/portal-shared-components): https://eclipse-tractusx.github.io/portal-shared-components

* INT: https://country-risk-dashboard.int.demo.catena-x.net/
* DEV: https://country-risk-dashboard.dev.demo.catena-x.net/
* Components: https://portal.dev.demo.catena-x.net/_storybook/
# Getting Started and How to run locally

You can follow our installation guides to install and run our application:
Expand Down
Loading