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

feat: More ux fixups #3081

Closed
wants to merge 1 commit into from
Closed
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: 10 additions & 1 deletion .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,22 @@ jobs:

- name: Build with Gradle
run: >
./gradlew clean build runStartUpCheck --info --scan -Partifactory_user=${{ secrets.ARTIFACTORY_USERNAME }} -Partifactory_password=${{ secrets.ARTIFACTORY_PASSWORD }}
./gradlew clean build --info --scan
- name: Run startup check
run: >
./gradlew runStartUpCheck --info --scan
- name: Store results
uses: actions/upload-artifact@v2
if: always()
with:
name: CITests-${{ env.JOB_ID }}
path: |
integration-tests/build/reports/**
gateway-service/build/reports/**
api-catalog-services/build/reports/**
caching-service/build/reports/**
cloud-gateway-service/build/reports/**
discovery-service/build/reports/**
metrics-service/build/reports/**

- uses: ./.github/actions/teardown
9 changes: 9 additions & 0 deletions .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,19 @@ jobs:
image: ghcr.io/balhar-jakub/discovery-service:${{ github.run_id }}-${{ github.run_number }}
volumes:
- /api-defs:/api-defs
discovery-service-2:
image: ghcr.io/balhar-jakub/discovery-service:${{ github.run_id }}-${{ github.run_number }}
volumes:
- /api-defs:/api-defs
env:
APIML_SERVICE_HOSTNAME: discovery-service-2
gateway-service:
image: ghcr.io/balhar-jakub/gateway-service:${{ github.run_id }}-${{ github.run_number }}
env:
APIML_SECURITY_AUTH_JWT_CUSTOMAUTHHEADER: customJwtHeader
APIML_SECURITY_AUTH_PASSTICKET_CUSTOMUSERHEADER: customUserHeader
APIML_SECURITY_AUTH_PASSTICKET_CUSTOMAUTHHEADER: customPassticketHeader
APIML_SERVICE_CENTRALREGISTRYURLS: https://discovery-service-2:10011/eureka
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.run_id }}-${{ github.run_number }}
metrics-service:
Expand Down Expand Up @@ -156,6 +163,8 @@ jobs:
APIML_SERVICE_FORWARDCLIENTCERTENABLED: true
discoverable-client:
image: ghcr.io/balhar-jakub/discoverable-client:${{ github.run_id }}-${{ github.run_number }}
mock-services:
image: ghcr.io/balhar-jakub/mock-services:${{ github.run_id }}-${{ github.run_number }}

steps:
- uses: actions/checkout@v3
Expand Down
1 change: 0 additions & 1 deletion .run/GatewayApplication.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
</param>
</additionalParameters>
<option name="ALTERNATIVE_JRE_PATH" value="1.8 (2)" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<module name="api-layer.gateway-service.main" />
<option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<option name="SPRING_BOOT_MAIN_CLASS" value="org.zowe.apiml.gateway.GatewayApplication" />
Expand Down
20 changes: 17 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ The following tools are required to build and develop the API Mediation Layer:
./gradlew build
```

2. Install `concurrently` globally:
2. Install the same version of the `concurrently` globally:

```sh
npm install -g concurrently
npm install -g concurrently@^6.0.0
```

3. Run all service on your local machine:
Expand All @@ -71,7 +71,21 @@ Alternatively, to use Docker to run the API ML, consult the [Docker README](dock

By default the API Mediation Layer for local development uses mock zOSMF as the authentication provider. For development purposes, log in using the default setting `USER` for the username, and `validPassword` as the password

The API Mediation Layer can also use dummy credentials for development purposes. For development purposes, log in using the default setting `user` for the username, and `user` as the password.
The API Mediation Layer can also use dummy credentials for development purposes. For development purposes, log in using the default setting `user` for the username, and `user` as the password.
<details>
<summary>Configure dummy credentials provider</summary>
### Configure `dummy` credentials provider

Modify [gateway-service.yml](/config/local/gateway-service.yml)
```yaml
apiml:
security:
auth:
#provider: zosmf
provider: dummy

```
</details>

For more information, see [API Mediation Layer Security](https://docs.zowe.org/stable/extend/extend-apiml/zowe-api-mediation-layer-security-overview).

Expand Down
4 changes: 4 additions & 0 deletions api-catalog-ui/frontend/config-overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ module.exports = {

config.module.rules = [
...config.module.rules,
{
test: /\.html$/i,
use: 'html-loader',
},
{
resolve: {
fallback: { querystring: require.resolve('querystring-es3') },
Expand Down
Loading