Skip to content

Commit

Permalink
chore: try debug ci
Browse files Browse the repository at this point in the history
  • Loading branch information
richardtreier committed Nov 30, 2023
1 parent fbb481f commit 65d735a
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 1,154 deletions.
54 changes: 53 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,59 @@ jobs:
- name: "Gradle: Build"
uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c
with:
arguments: :extensions:wrapper:wrapper:test --tests "de.sovity.edc.ext.wrapper.api.ui.pages.transferhistory.TransferProcessAssetApiServiceTest" --tests "de.sovity.edc.ext.wrapper.api.usecase.CreateOfferingTest"
arguments: build ${{ env.GRADLE_ARGS }}
- name: "Gradle: Publish (Main & Release Only)"
uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c
if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }}
with:
arguments: publish ${{ env.GRADLE_ARGS }}
env:
USERNAME: ${{ github.actor }}
TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "Docker Image: edc-dev"
uses: ./.github/actions/build-connector-image
with:
registry-url: ${{ env.REGISTRY_URL }}
registry-user: ${{ env.REGISTRY_USER }}
registry-password: ${{ secrets.GITHUB_TOKEN }}
image-base-name: ${{ env.IMAGE_BASE_NAME }}
image-name: "edc-dev"
connector-name: "sovity-dev"
title: "sovity Dev EDC Connector"
description: "Extended EDC Connector built by sovity. This dev version contains no dataspace auth and can be used to quickly start a locally running EDC + EDC UI."
- name: "Docker Image: edc-ce"
uses: ./.github/actions/build-connector-image
with:
registry-url: ${{ env.REGISTRY_URL }}
registry-user: ${{ env.REGISTRY_USER }}
registry-password: ${{ secrets.GITHUB_TOKEN }}
image-base-name: ${{ env.IMAGE_BASE_NAME }}
image-name: "edc-ce"
connector-name: "sovity-ce"
title: "sovity Community Edition EDC Connector"
description: "EDC Connector built by sovity. Contains sovity's Community Edition EDC extensions and requires dataspace credentials to join an existing dataspace."
- name: "Docker Image: edc-ce-mds"
uses: ./.github/actions/build-connector-image
with:
registry-url: ${{ env.REGISTRY_URL }}
registry-user: ${{ env.REGISTRY_USER }}
registry-password: ${{ secrets.GITHUB_TOKEN }}
image-base-name: ${{ env.IMAGE_BASE_NAME }}
image-name: "edc-ce-mds"
connector-name: "mds-ce"
title: "MDS Community Edition EDC Connector"
description: "EDC Connector built by sovity and configured for compatibility with the Mobility Data Space (MDS). This EDC requires dataspace credentials, and additional MDS Services such as a Clearing House."
- name: "Docker Image: test-backend"
uses: ./.github/actions/build-connector-image
with:
registry-url: ${{ env.REGISTRY_URL }}
registry-user: ${{ env.REGISTRY_USER }}
registry-password: ${{ secrets.GITHUB_TOKEN }}
image-base-name: ${{ env.IMAGE_BASE_NAME }}
image-name: "test-backend"
connector-name: "test-backend"
title: "Test Data Source / Data Sink"
description: "Provides a minimal data source / data sink for E2E tests."
ts-api-client-library:
name: TS API Client Library
runs-on: ubuntu-latest
Expand Down
161 changes: 0 additions & 161 deletions docs/sovity-edc-api-wrapper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -384,23 +384,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/IdResponseDto'
/wrapper/use-case-api/data-offer:
post:
tags:
- Use Case
description: "Creates a new data offer, consisting of an asset, a policy definition\
\ and a contract definition."
operationId: createOffer
requestBody:
content:
application/json:
schema:
$ref: '#/components/schemas/CreateOfferingDto'
responses:
default:
description: default response
content:
'*/*': {}
/wrapper/use-case-api/kpis:
get:
tags:
Expand Down Expand Up @@ -1332,150 +1315,6 @@ components:
description: Additional transfer process properties. These are not passed
to the consumer EDC
description: "For type PARAMS_ONLY: Required data for starting a Transfer Process"
AssetEntryDto:
required:
- assetRequestId
- dataAddressProperties
type: object
properties:
assetRequestId:
type: string
assetRequestProperties:
type: object
additionalProperties:
type: object
dataAddressProperties:
type: object
additionalProperties:
type: string
description: At least a property 'type' must be set
description: At least a property 'type' must be set
AtomicConstraintDto:
required:
- leftExpression
- operator
- rightExpression
type: object
properties:
leftExpression:
type: string
description: Left part of the constraint.
operator:
$ref: '#/components/schemas/OperatorDto'
rightExpression:
type: string
description: Right part of the constraint.
description: Type-Safe OpenAPI generator friendly Constraint DTO that supports
an opinionated subset of the original EDC Constraint Entity.
ContractDefinitionRequestDto:
required:
- accessPolicyId
- assetsSelector
- contractPolicyId
type: object
properties:
id:
type: string
accessPolicyId:
type: string
contractPolicyId:
type: string
assetsSelector:
type: array
items:
$ref: '#/components/schemas/CriterionDto'
CreateOfferingDto:
type: object
properties:
assetEntry:
$ref: '#/components/schemas/AssetEntryDto'
policyDefinitionRequest:
$ref: '#/components/schemas/PolicyDefinitionRequestDto'
contractDefinitionRequest:
$ref: '#/components/schemas/ContractDefinitionRequestDto'
description: Necessary data for creating an offer
CriterionDto:
required:
- operandLeft
- operator
type: object
properties:
operandLeft:
type: object
operator:
type: string
operandRight:
type: object
ExpressionDto:
type: object
properties:
type:
$ref: '#/components/schemas/ExpressionType'
atomicConstraint:
$ref: '#/components/schemas/AtomicConstraintDto'
and:
type: array
items:
$ref: '#/components/schemas/ExpressionDto'
or:
type: array
items:
$ref: '#/components/schemas/ExpressionDto'
xor:
type: array
items:
$ref: '#/components/schemas/ExpressionDto'
description: Possible constraints for the permission
ExpressionType:
type: string
description: |
Expression types:
* `EMPTY` - No constraints for the policy
* `ATOMIC_CONSTRAINT` - A single constraint for the policy
* `AND` - Several constraints, all of which must be respected
* `OR` - Several constraints, of which at least one must be respected
* `XOR` - Several constraints, of which exactly one must be respected
enum:
- EMPTY
- ATOMIC_CONSTRAINT
- AND
- OR
- XOR
PermissionDto:
required:
- constraints
type: object
properties:
constraints:
$ref: '#/components/schemas/ExpressionDto'
description: Permission for this policy
PolicyDefinitionRequestDto:
required:
- id
- policy
type: object
properties:
id:
type: string
description: ID chosen by the user
policy:
$ref: '#/components/schemas/PolicyDto'
description: Data for creating a policy definition request
PolicyDto:
required:
- legacyPolicy
- permission
type: object
properties:
legacyPolicy:
type: string
description: Legacy JSON as built by the Management API. Will be replaced
in the future by a type-safe variant without polymorphisms that can be
used for our generated clients.
permission:
$ref: '#/components/schemas/PermissionDto'
description: Type-Safe OpenAPI generator friendly Policy DTO that supports an
opinionated subset of the original EDC Policy Entity.
KpiResult:
required:
- assetsCount
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,10 @@

package de.sovity.edc.ext.wrapper.api.usecase;

import de.sovity.edc.ext.wrapper.api.usecase.model.CreateOfferingDto;
import de.sovity.edc.ext.wrapper.api.usecase.model.KpiResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
Expand All @@ -30,19 +27,10 @@

/**
* Provides the endpoints for use-case specific requests.
*
* @author Ronja Quensel ([email protected])
* @author Richard Treier
* @author Tim Dahlmanns
*/
@Path("wrapper/use-case-api")
@Tag(name = "Use Case", description = "Generic Use Case Application API Endpoints.")
public interface UseCaseResource {
@POST
@Path("data-offer")
@Consumes(MediaType.APPLICATION_JSON)
@Operation(description = "Creates a new data offer, consisting of an asset, a policy definition and a contract definition.")
void createOffer(CreateOfferingDto dto);

@GET
@Path("kpis")
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 65d735a

Please sign in to comment.