Skip to content
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
blank_issues_enabled: false
contact_links:
- name: GitHub Discussions
url: https://github.com/trustification/exhort-javascript-api/discussions/
url: https://github.com/guacsec/trustify-da-javascript-client/discussions/
about: You can also use Discussions for questions and ideas.
8 changes: 6 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ jobs:

- name: Run unit tests
env:
EXHORT_PYTHON3_PATH: "${{steps.python-location.outputs.python-bin-location}}/python3"
EXHORT_PIP3_PATH: "${{steps.python-location.outputs.python-bin-location}}/pip3"
TRUSTIFY_DA_PYTHON3_PATH: "${{steps.python-location.outputs.python-bin-location}}/python3"
TRUSTIFY_DA_PIP3_PATH: "${{steps.python-location.outputs.python-bin-location}}/pip3"
TRUSTIFY_DA_DEV_MODE: 'true'
DEV_TRUSTIFY_DA_BACKEND_URL: 'https://exhort.stage.devshift.net'
run: npm run test

- name: Compile project
Expand All @@ -104,6 +106,8 @@ jobs:
- name: Run integration tests cli
working-directory: integration
run: bash ./run_its.sh
env:
TRUSTIFY_DA_DEV_MODE: 'true'

- name: Upload coverage reports
if: ${{ matrix.node == env.MAIN_NODE_VER }}
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
---
name: Release

env:
# 🖊️ EDIT to change the image build settings.
IMAGE_NAME: exhort-javascript-api
IMAGE_REGISTRY: quay.io/ecosystem-appeng
DOCKERFILE_PATH: ./docker-image/Dockerfiles/Dockerfile.alpha

on:
workflow_dispatch:
inputs:
Expand Down
32 changes: 3 additions & 29 deletions .github/workflows/stage.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
---
name: Stage

env:
# 🖊️ EDIT to change the image build settings.
IMAGE_NAME: exhort-javascript-api
IMAGE_REGISTRY: quay.io/ecosystem-appeng
DOCKERFILE_PATH: ./docker-image/Dockerfiles/Dockerfile

on:
pull_request_target:
types:
Expand All @@ -29,7 +23,7 @@ jobs:
stage:
runs-on: ubuntu-latest
# Branches that starts with `release/` shouldn't trigger this workflow, as these are triggering the release workflow.
if: github.repository_owner == 'trustification' && github.event.pull_request.merged == true && !startsWith(github.head_ref, 'release/')
if: github.repository_owner == 'guacsec' && github.event.pull_request.merged == true && !startsWith(github.head_ref, 'release/')
environment: staging
name: Stage the project
steps:
Expand Down Expand Up @@ -126,6 +120,8 @@ jobs:
if: steps.test-check.outputs.retest-is-needed == 'true'
env:
TRIGGERING_FILE: ${{ steps.test-check.outputs.triggering-file}}
TRUSTIFY_DA_DEV_MODE: 'true'
DEV_TRUSTIFY_DA_BACKEND_URL: 'https://exhort.stage.devshift.net'
run: |
echo "Re-test was triggered!!, triggering changed file - $TRIGGERING_FILE"
echo "Running Again Unit-tests =>"
Expand Down Expand Up @@ -162,25 +158,3 @@ jobs:
prerelease: true,
generate_release_notes: true
})

- name: Build Image With buildah
id: build-image
uses: redhat-actions/buildah-build@v2
with:
image: ${{ env.IMAGE_NAME }}
tags: ${{ steps.bump.outputs.version }}
dockerfiles: |
${{ env.DOCKERFILE_PATH }}
build-args: |
PACKAGE_REGISTRY_ACCESS_TOKEN=${{ secrets.PACKAGE_REGISTRY_ACCESS_TOKEN }}
EXHORT_JAVASCRIPT_API_VERSION=${{ steps.bump.outputs.version }}
context: docker-image

- name: Push Image To Registry
uses: redhat-actions/push-to-registry@v2
with:
image: ${{ steps.build-image.outputs.image }}
tags: ${{ steps.build-image.outputs.tags }}
registry: ${{ env.IMAGE_REGISTRY }}
username: ${{ secrets.IMAGE_REGISTRY_USER }}
password: ${{ secrets.IMAGE_REGISTRY_PASSWORD }}
4 changes: 2 additions & 2 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to *exhort-javascript-api*<br/>![nodejs-version][10]
# Contributing to *trustify-da-javascript-client*<br/>![nodejs-version][10]

* Fork the repository
* Create a new branch
Expand All @@ -20,11 +20,11 @@

### Good to know

* You can override the default backend url by setting another one in the _EXHORT_URL_ environment variable.
* You can override the default backend url by setting another one in the _TRUSTIFY_DA_URL_ environment variable.

### OpenAPI Specifications

The OpenAPI specification is located in the [`exhort-api-spec`](https://github.com/trustification/exhort-api-spec) where the Java and Javascript libraries are generated.
The OpenAPI specification is located in the [`trustify-da-api-spec`](https://github.com/trustify-da/trustify-da-api-model) where the Java and Javascript libraries are generated.

### Code Walkthrough

Expand Down Expand Up @@ -86,7 +86,7 @@ scripts in [integration/testers](integration/testers).<br/>

We have 3 _testers_:
* [integration/testers/cli](integration/testers/cli) is a _package.json_ used for installing the _ESM module_.
Invoking the CLI Script is done against the _@trustification/exhort-javascript-api/dist/src/cli.js_ in the tester's
Invoking the CLI Script is done against the _@trustify-da/trustify-da-javascript-client/dist/src/cli.js_ in the tester's
_node_modules_.
* [integration/testers/javascript](integration/testers/javascript) is a _javascript_ script invoking the _ESM module_.
* [integration/testers/typescript](integration/testers/typescript) is a _typescript_ script invoking the _ESM module_.
Expand All @@ -100,10 +100,10 @@ Run integration tests from the project's root:
```

Integration tests are executed against a mocked _Backend_ server.<br/>
If you need to run against the actual _Backend_ server, use the _EXHORT_ITS_USE_REAL_API_ environment variable:
If you need to run against the actual _Backend_ server, use the _TRUSTIFY_DA_ITS_USE_REAL_API_ environment variable:

```shell
(cd integration/ && EXHORT_ITS_USE_REAL_API=true bash ./run_its.sh)
(cd integration/ && TRUSTIFY_DA_ITS_USE_REAL_API=true bash ./run_its.sh)
```

The mocked server implementation is [integration/server/mock_server.js](integration/server/mock_server.js). See the
Expand All @@ -119,7 +119,7 @@ contribution. See the [DCO](DCO) file for details.

<!-- Real links -->
[0]: https://www.conventionalcommits.org/en/v1.0.0/
[1]: https://github.com/trustification/exhort/blob/0.1.x/src/main/resources/META-INF/openapi.yaml
[1]: https://github.com/guacsec/exhort/blob/0.1.x/src/main/resources/META-INF/openapi.yaml

<!-- Badge links -->
[10]: https://badgen.net/badge/NodeJS%20Version/18/68a063
Loading
Loading