-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #82 from catenax-ng/release1.5.1
feat: Update DT asset creation
- Loading branch information
Showing
12 changed files
with
103 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
src/main/resources/edc-request-template/asset-request-filter.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
{ | ||
"@context": { | ||
"edc": "https://w3id.org/edc/v0.0.1/ns/" | ||
}, | ||
"@type": "QuerySpec", | ||
"offset": 0, | ||
"limit": 10, | ||
"sortOrder": "DESC", | ||
"sortField": "id", | ||
"filterExpression": [ | ||
{ | ||
"edc:operandLeft": "https://w3id.org/edc/v0.0.1/ns/type", | ||
"edc:operator": "=", | ||
"edc:operandRight": "data.core.digitalTwinRegistry" | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,39 @@ | ||
{ | ||
"@context": {}, | ||
"asset": { | ||
"@type": "Asset", | ||
"@id": "%s", | ||
"properties": { | ||
"id": "%s", | ||
"type": "data.core.digitalTwinRegistry", | ||
"name": "Digital Twin Registry Endpoint of provider %s", | ||
"contenttype": "application/json", | ||
"policy-id": "use-eu", | ||
"publisher": "%s" | ||
} | ||
}, | ||
"dataAddress": { | ||
"type": "HttpData", | ||
"baseUrl": "%s" | ||
} | ||
"@context": { | ||
"edc": "https://w3id.org/edc/v0.0.1/ns/", | ||
"oauth2": "https://datatracker.ietf.org/doc/html/rfc6749", | ||
"dcat": "https://www.w3.org/ns/dcat/", | ||
"rdfs": "http://www.w3.org/2000/01/rdf-schema#", | ||
"aas": "https://admin-shell.io/aas/API/3/0/", | ||
"aas-registry": "aas:AssetAdministrationShellRegistryServiceSpecification/", | ||
"aas-discovery": "aas:DiscoveryServiceSpecification/" | ||
}, | ||
"@type": "edc:AssetEntryDto", | ||
"edc:asset": { | ||
"@type": "Asset", | ||
"@id": "${assetId}", | ||
"edc:properties": { | ||
"edc:description": "Digital twin registry information", | ||
"edc:id": "${assetId}", | ||
"edc:name": "Digital twin registry information", | ||
"edc:contenttype": "application/json", | ||
"edc:version": "1.0.0", | ||
"edc:publisher": "${tenantId}:${controlPlaneEndpoint}", | ||
"edc:type": "data.core.digitalTwinRegistry", | ||
"edc:modified": "${createdDate}", | ||
"edc:creationDate": "${updateDate}" | ||
} | ||
}, | ||
"edc:dataAddress": { | ||
"edc:type": "HttpData", | ||
"edc:baseUrl": "${dtregistryUrl}", | ||
"oauth2:tokenUrl": "${idpIssuerUri}", | ||
"oauth2:clientId": "${keycloakAuthenticationClientId}", | ||
"oauth2:clientSecretKey": "client-secret", | ||
"edc:proxyMethod": "true", | ||
"edc:proxyBody": "true", | ||
"edc:proxyPath": "true", | ||
"edc:proxyQueryParams": "true", | ||
"edc:contentType": "application/json" | ||
} | ||
} |
8 changes: 4 additions & 4 deletions
8
src/main/resources/edc-request-template/contract-defination.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
{ | ||
"@context": {}, | ||
"@id": "%s", | ||
"@id": "${contractPolicyId}", | ||
"@type": "ContractDefinition", | ||
"accessPolicyId": "%s", | ||
"contractPolicyId": "%s", | ||
"accessPolicyId": "${policyId}", | ||
"contractPolicyId": "${policyId}", | ||
"assetsSelector": { | ||
"@type": "CriterionDto", | ||
"operandLeft": "https://w3id.org/edc/v0.0.1/ns/id", | ||
"operator": "=", | ||
"operandRight": "%s" | ||
"operandRight": "${assetId}" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters