Skip to content
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
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-java-api/discussions/
url: https://github.com/guacsec/trustify-da-java-client/discussions/
about: You can also use Discussions for questions and ideas.
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ jobs:
echo "python-bin-location=$(echo $pythonLocation)/bin" >> $GITHUB_OUTPUT
- name: Verify the project and create coverage report
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"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
mvn verify -Pits,cov -B -ff
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: Deploy release
environment: staging
# only trigger the workflow on the base repository and if the merged branch name starts with release.
if: (github.repository_owner == 'trustification' && github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') ) || (github.repository_owner == 'trustification' && github.ref_name == 'main' && contains(github.event.commits[0].message, 'release/directly'))
if: (github.repository_owner == 'guacsec' && github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') ) || (github.repository_owner == 'guacsec' && github.ref_name == 'main' && contains(github.event.commits[0].message, 'release/directly'))
outputs:
project_version: ${{ steps.project.outputs.version }}
last_release_tag: ${{ steps.last-release.outputs.tag-name }}
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
release:
runs-on: ubuntu-latest
name: Release
if: (github.repository_owner == 'trustification' && startsWith(github.head_ref, 'release/')) || (github.repository_owner == 'trustification' && github.ref_name == 'main' && contains(github.event.commits[0].message, 'release/directly'))
if: (github.repository_owner == 'guacsec' && startsWith(github.head_ref, 'release/')) || (github.repository_owner == 'guacsec' && github.ref_name == 'main' && contains(github.event.commits[0].message, 'release/directly'))
environment: staging
needs: deploy
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Deploy snapshot
env:
RUN_PYTHON_BIN: ${{ vars.RUN_PYTHON_BIN }}
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/')
outputs:
project_version: ${{ steps.project.outputs.version }}
steps:
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Deploy snapshot to GitHub
if: |
contains(steps.project.outputs.version, 'SNAPSHOT') &&
github.repository == 'trustification/exhort-java-api'
github.repository == 'guacsec/trustify-da-java-client'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: mvn deploy -Pprepare-deployment,deploy-github -B -ff -DskipTests=true -Dskip.junit_platform=true
Expand All @@ -52,7 +52,7 @@ jobs:
needs: deploy
if: |
contains(needs.deploy.outputs.project_version, 'SNAPSHOT') &&
github.repository_owner == 'trustification' && github.event.pull_request.merged == true && !startsWith(github.head_ref, 'release/')
github.repository_owner == 'guacsec' && github.event.pull_request.merged == true && !startsWith(github.head_ref, 'release/')
steps:
- name: Check for existing ${{ needs.deploy.outputs.project_version }} release
id: existing_release
Expand Down
24 changes: 12 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to *exhort-java-api*<br/>![java-version][10]
# Contributing to *trustify-da-java-client*<br/>![java-version][10]

* Fork the repository
* Create a new branch
Expand Down Expand Up @@ -37,17 +37,17 @@

### Good to know

* You can override the default backend url by setting the `EXHORT_DEV_MODE` environment variable/system property to true:
* In case environment variable/System Property `EXHORT_DEV_MODE=true` - You can Override the default exhort backend by setting
`DEV_EXHORT_BACKEND_URL` env variable/system property to the desired exhort backend instance address ( useful for tests).
* In case `DEV_EXHORT_BACKEND_URL` is not set via environment variable/system property, then the default DEV exhort backend is picked.
* In case `EXHORT_DEV_MODE=false` or not set at all levels, then default backend url ( exhort prod) is picked, regardless of the value of `DEV_EXHORT_BACKEND_URL`.
* Environment variables takes precedence over System properties - for example, if System property `EXHORT_DEV_MODE=true`
but environment variable `EXHORT_DEV_MODE=false` , then default exhort prod will be used anyway.
* You can override the default backend url by setting the `TRUSTIFY_DA_DEV_MODE` environment variable/system property to true:
* In case environment variable/System Property `TRUSTIFY_DA_DEV_MODE=true` - You can Override the default trustify-dependency-analytics backend by setting
`DEV_TRUSTIFY_DA_BACKEND_URL` env variable/system property to the desired trustify-dependency-analytics backend instance address ( useful for tests).
* In case `DEV_TRUSTIFY_DA_BACKEND_URL` is not set via environment variable/system property, then the default DEV trustify-dependency-analytics backend is picked.
* In case `TRUSTIFY_DA_DEV_MODE=false` or not set at all levels, then default backend url ( trustify-dependency-analytics prod) is picked, regardless of the value of `DEV_TRUSTIFY_DA_BACKEND_URL`.
* Environment variables takes precedence over System properties - for example, if System property `TRUSTIFY_DA_DEV_MODE=true`
but environment variable `TRUSTIFY_DA_DEV_MODE=false` , then default trustify-dependency-analytics prod will be used anyway.

### OpenAPI Specifications

We use the Java generated library for the [Exhort OpenAPI spec][1] for deserialization of the Backend's
We use the Java generated library for the [Trustify Dependency Analytics API Specification][1] for deserialization of the Backend's
API responses.<br/>

When the [Backend's spec file][1] is modified, a new
Expand Down Expand Up @@ -97,10 +97,10 @@ $ mvn clean verify -Pits,dev
```

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
EXHORT_ITS_USE_REAL_API=true mvn clean verify -Pits
TRUSTIFY_DA_ITS_USE_REAL_API=true mvn clean verify -Pits
```

> TIP: When working on a new integration test project, it's helpful opening the IDE directly in the test project folder.
Expand All @@ -114,7 +114,7 @@ contribution. See the [DCO](DCO) file for details.

<!-- Real links -->
[0]: https://www.conventionalcommits.org/en/v1.0.0/
[1]: https://github.com/guacsec/trustify-da-api-spec/blob/main/api/v4/openapi.yaml
[1]: https://github.com/guacsec/trustify-da-api-spec/blob/main/api/v5/openapi.yaml

<!-- Badge links -->
[10]: https://badgen.net/badge/Java%20Version/11/5382a1
Loading
Loading