Skip to content

Commit

Permalink
fix merge of upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
@wiomoc
wiomoc committed Aug 1, 2023
1 parent 8453884 commit 5c7f84d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 243 deletions.
3 changes: 3 additions & 0 deletions components/bpmn-q/modeler-component/extensions/opentosca/deployment/OpenTOSCAUtils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ export async function createServiceInstance(csar, camundaEngineEndpoint) {

let state = 'CREATING';
console.log('Polling for finished service instance at URL: %s', pollingUrl);
let properties = '';
while (!(state === 'CREATED' || state === 'FAILED')) {

// wait 5 seconds for next poll
Expand All @@ -215,11 +216,13 @@ export async function createServiceInstance(csar, camundaEngineEndpoint) {
let pollingResponse = await fetch(pollingUrl);
let pollingResponseJson = await pollingResponse.json();
console.log('Polling response: ', pollingResponseJson);
properties = pollingResponseJson._links.properties.href;

state = pollingResponseJson.state;
}

result.success = true;
result.properties = properties;
return result;
}

Expand Down
30 changes: 2 additions & 28 deletions .../bpmn-q/modeler-component/extensions/opentosca/modeling/properties-provider/YamlUpload.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { useService } from 'bpmn-js-properties-panel';
import React from 'react';
import YamlModal from './YamlModal';
import { createRoot } from 'react-dom/client';
import { useState } from 'react';
import './yaml-modal.css';

/**
Expand All @@ -15,16 +14,8 @@ export function YamlUpload(props) {
const commandStack = useService('commandStack');

const onClick = () => {
const yamlUploadDiv = document.querySelector("#yamlUploadDiv");

if (yamlUploadDiv) {
yamlUploadDiv.remove();
}
const div = document.createElement("div");
div.id = "yamlUploadDiv";
document.getElementById('main-div').appendChild(div);
const root = createRoot(document.getElementById("yamlUploadDiv"));
root.render(<YAMLModal element={element} commandStack={commandStack}/>);
const root = createRoot(document.getElementById("modal-container"));
root.render(<YamlModal onClose={() => root.unmount()} element={element} commandStack={commandStack}/>);
};

return HeaderButton({
Expand All @@ -37,20 +28,3 @@ export function YamlUpload(props) {
onClick,
});
}

function YAMLModal(props) {
const [showModal, setShowModal] = useState(true);
const {element, commandStack} = props;

function handleModalClosed() {
setShowModal(false);
}

return (
<div>
{showModal && (
<YamlModal onClose={handleModalClosed} element={element} commandStack={commandStack}/>
)}
</div>
);
}
215 changes: 0 additions & 215 deletions components/bpmn-q/modeler-component/extensions/quantme/deployment/OpenTOSCAUtils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,221 +12,6 @@
import {fetch} from 'whatwg-fetch';
import {performAjax} from '../utilities/Utilities';

/**
* Upload the CSAR located at the given URL to the connected OpenTOSCA Container and return the corresponding URL and required input parameters
*
* @param opentoscaEndpoint the endpoint of the OpenTOSCA Container
* @param csarName the name of the CSAR to upload
* @param url the URL pointing to the CSAR
* @param wineryEndpoint the endpoint of the Winery containing the CSAR to upload
*/
export async function uploadCSARToContainer(opentoscaEndpoint, csarName, url, wineryEndpoint) {

if (opentoscaEndpoint === undefined) {
console.error('OpenTOSCA endpoint is undefined. Unable to upload CSARs...');
return {success: false};
}

try {
if (url.startsWith('{{ wineryEndpoint }}')) {
url = url.replace('{{ wineryEndpoint }}', wineryEndpoint);
}
console.log('Checking if CSAR at following URL is already uploaded to the OpenTOSCA Container: ', url);

// check if CSAR is already uploaded
let getCSARResult = await getBuildPlanForCSAR(opentoscaEndpoint, csarName);

if (!getCSARResult.success) {
console.log('CSAR is not yet uploaded. Uploading...');

let body = {
enrich: 'false',
name: csarName,
url: url
};

// upload the CSAR
await fetch(opentoscaEndpoint, {
method: 'POST',
body: JSON.stringify(body),
headers: {'Content-Type': 'application/json'}
});

// check successful upload and retrieve corresponding url
getCSARResult = await getBuildPlanForCSAR(opentoscaEndpoint, csarName);
}

if (!getCSARResult.success) {
console.error('Uploading CSAR failed!');
return {success: false};
}

// retrieve input parameters for the build plan
let buildPlanResult = await fetch(getCSARResult.url);
let buildPlanResultJson = await buildPlanResult.json();

return {success: true, url: getCSARResult.url, inputParameters: buildPlanResultJson.input_parameters};
} catch (e) {
console.error('Error while uploading CSAR: ' + e);
return {success: false};
}
}

/**
* Get the link to the build plan of the CSAR with the given name if it is uploaded to the OpenTOSCA Container
*
* @param opentoscaEndpoint the endpoint of the OpenTOSCA Container
* @param csarName the name of the csar
* @return the status whether the given CSAR is uploaded and the corresponding build plan link if available
*/
async function getBuildPlanForCSAR(opentoscaEndpoint, csarName) {

// get all currently deployed CSARs
let response = await fetch(opentoscaEndpoint);
let responseJson = await response.json();

let deployedCSARs = responseJson.csars;
if (deployedCSARs === undefined) {

// no CSARs available
return {success: false};
}

for (let i = 0; i < deployedCSARs.length; i++) {
let deployedCSAR = deployedCSARs[i];
if (deployedCSAR.id === csarName) {
console.log('Found uploaded CSAR with id: %s', csarName);
let url = deployedCSAR._links.self.href;

// retrieve the URl to the build plan required to get the input parameters and to instantiate the CSAR
return getBuildPlanUrl(url);
}
}

// unable to find CSAR
return {success: false};
}

/**
* Get the URL to the build plan of the given CSAR
*
* @param csarUrl the URL to a CSAR
* @return the URL to the build plan for the given CSAR
*/
async function getBuildPlanUrl(csarUrl) {

let response = await fetch(csarUrl + '/servicetemplates');
let responseJson = await response.json();

if (!responseJson.service_templates || responseJson.service_templates.length !== 1) {
console.error('Unable to find service template in CSAR at URL: %s', csarUrl);
return {success: false};
}

let buildPlansUrl = responseJson.service_templates[0]._links.self.href + '/buildplans';
response = await fetch(buildPlansUrl);
responseJson = await response.json();

if (!responseJson.plans || responseJson.plans.length !== 1) {
console.error('Unable to find build plan at URL: %s', buildPlansUrl);
return {success: false};
}

return {success: true, url: responseJson.plans[0]._links.self.href};
}

/**
* Create an instance of the ServiceTemplate contained in the given CSAR
*
* @param csar the details about the CSAR to create an instance from the contained ServiceTemplate
* @param camundaEngineEndpoint the endpoint of the Camunda engine to bind services using the pulling pattern
* @return the result of the instance creation (success, endpoint, topic on which the service listens, ...)
*/
export async function createServiceInstance(csar, camundaEngineEndpoint) {

let result = {success: false};

let inputParameters = csar.inputParameters;
if (csar.type === 'pull') {

// get special parameters that are required to bind services using external tasks / the pulling pattern
let camundaTopicParam = inputParameters.find((param) => param.name === 'camundaTopic');
let camundaEndpointParam = inputParameters.find((param) => param.name === 'camundaEndpoint');

// abort if parameters are not available
if (camundaTopicParam === undefined || camundaEndpointParam === undefined) {
console.error('Unable to pass topic to poll to service instance creation. Service binding will fail!');
return result;
}

// generate topic for the binding
let topicName = makeId(12);

camundaTopicParam.value = topicName;
camundaEndpointParam.value = camundaEngineEndpoint;
result.topicName = topicName;
}

// trigger instance creation
let instanceCreationResponse = await fetch(csar.buildPlanUrl + '/instances', {
method: 'POST',
body: JSON.stringify(inputParameters),
headers: {'Content-Type': 'application/json'}
});
let instanceCreationResponseJson = await instanceCreationResponse.json();

// wait for the service instance to be created
await new Promise(r => setTimeout(r, 5000));

// get service template instance to poll for completness
let buildPlanResponse = await fetch(csar.buildPlanUrl + '/instances/' + instanceCreationResponseJson);
let buildPlanResponseJson = await buildPlanResponse.json();

// retry polling 10 times, creation of the build time takes some time
for (let retry = 0; retry < 10; retry++) {

// stop retries in case of correct response
if (buildPlanResponseJson._links) {
break;
}

await new Promise(r => setTimeout(r, 5000));

console.log('Retry fetching build plan');

buildPlanResponse = await fetch(csar.buildPlanUrl + '/instances/' + instanceCreationResponseJson);
buildPlanResponseJson = await buildPlanResponse.json();
}

if (!buildPlanResponseJson._links) {
console.log('Unable to fetch build plans for ' + csar.buildPlanUrl + '/instances/' + instanceCreationResponseJson);
result.success = false;
return result;
}

let pollingUrl = buildPlanResponseJson._links.service_template_instance.href;

let state = 'CREATING';
console.log('Polling for finished service instance at URL: %s', pollingUrl);
let properties = '';
while (!(state === 'CREATED' || state === 'FAILED')) {

// wait 5 seconds for next poll
await new Promise(r => setTimeout(r, 5000));
// poll for current state
let pollingResponse = await fetch(pollingUrl);
let pollingResponseJson = await pollingResponse.json();
console.log('Polling response: ', pollingResponseJson);
properties = pollingResponseJson._links.properties.href;

state = pollingResponseJson.state;
}

result.success = true;
result.properties = properties;
return result;
}

/**
* Create a new ArtifactTemplate of the given type and add the given blob as file
*
Expand Down

0 comments on commit 5c7f84d

Please sign in to comment.