Skip to content

Implement service publish/update flow with conflict handling #21

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.

Sign up for GitHub

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

Merged
chiranSachintha merged 2 commits into from
Jan 5, 2026
Merged

Implement service publish/update flow with conflict handling #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eda64e
Implement service publish/update flow with conflict handling
chiranSachintha Jan 3, 2026
f757d37
Fix review suggestion
chiranSachintha Jan 5, 2026
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: 0 additions & 2 deletions ballerina/listener.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@ public class Listener {
}

public function gracefulStop() returns error? {
check removeExistingServices(apimClient);
}

public function immediateStop() returns error? {
check removeExistingServices(apimClient);
}

public function detach(service object {} s) returns error? {
Expand Down
81 changes: 37 additions & 44 deletions ballerina/service.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import ballerina/http;
import ballerina/jballerina.java;
import ballerina/oauth2;
import ballerina/log;

configurable string serviceUrl = "https://apis.wso2.com/api/service-catalog/v1";
configurable string username = "";
Expand All @@ -33,8 +32,6 @@ configurable string[] scopes = ["service_catalog:service_view", "apim:api_view",

listener Listener 'listener = new Listener(port);

final string[] publishedServiceIds = [];

Client apimClient = check new (serviceUrl = serviceUrl, config = {
auth: {
username,
Expand All @@ -49,37 +46,9 @@ Client apimClient = check new (serviceUrl = serviceUrl, config = {
});

function publishArtifacts(ServiceArtifact[] artifacts) returns error? {
error? e = ();
foreach ServiceArtifact artifact in artifacts {
Service|error res = apimClient->/services.post({
serviceMetadata: {
name: artifact.name,
description: artifact.description,
'version: artifact.version,
serviceKey: artifact.serviceKey,
serviceUrl: artifact.serviceUrl,
definitionType: artifact.definitionType,
securityType: artifact.securityType,
mutualSSLEnabled: artifact.mutualSSLEnabled,
definitionUrl: artifact.definitionUrl
},
inlineContent: artifact.definitionFileContent
});

// If there is an error, wait until other artifacts get published
if res is error {
e = res;
continue;
}

string? id = res?.id;
if id == () {
continue;
}

publishedServiceIds.push(id);
_ = check publishOrUpdateService(artifact);
}
return e;
}

isolated function getArtifacts() returns ServiceArtifact[] = @java:Method {
Expand All @@ -101,18 +70,42 @@ function getServerCert(string? serverCert) returns http:ClientSecureSocket? {
return {enable: false};
}

function removeExistingServices(Client apimClient) returns error? {
foreach string id in publishedServiceIds {
http:Response|error response = apimClient->/services/[id].delete();
if response is error {
log:printError("Error occurred while deleting the service: ", response, serviceId = id);
return response;
}
function getServiceIdByKey(string serviceKey) returns string|error|() {
ServiceList res = check apimClient->/services.get('key = serviceKey);
Service[] services = res.list ?: [];
return services.length() > 0 ? services[0].id : ();
}

if response.statusCode != 204 {
string responseMessage = (check response.getJsonPayload()).toJsonString();
log:printError("Failed to delete service: ", serviceId = id, message = responseMessage);
return error("Failed to delete the service with id: " + id, cause = responseMessage);
}
function publishOrUpdateService(ServiceArtifact artifact) returns Service|error {
string|() serviceId = check getServiceIdByKey(artifact.serviceKey);
if serviceId is () {
return apimClient->/services.post({
serviceMetadata: {
name: artifact.name,
description: artifact.description,
'version: artifact.version,
serviceKey: artifact.serviceKey,
serviceUrl: artifact.serviceUrl,
definitionType: artifact.definitionType,
securityType: artifact.securityType,
mutualSSLEnabled: artifact.mutualSSLEnabled,
definitionUrl: artifact.definitionUrl
},
inlineContent: artifact.definitionFileContent
});
}
return apimClient->/services/[serviceId].put({
serviceMetadata: {
name: artifact.name,
description: artifact.description,
'version: artifact.version,
serviceKey: artifact.serviceKey,
serviceUrl: artifact.serviceUrl,
definitionType: artifact.definitionType,
securityType: artifact.securityType,
mutualSSLEnabled: artifact.mutualSSLEnabled,
definitionUrl: artifact.definitionUrl
},
inlineContent: artifact.definitionFileContent
});
}
Loading