From 46069ba924e0fb3c12f1f772a3959234639e659d Mon Sep 17 00:00:00 2001 From: Scott Yeager Date: Wed, 12 Mar 2025 17:08:00 -0700 Subject: [PATCH] Restore old json encoders --- lib/threefold/grid3/models/deployment.v | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/threefold/grid3/models/deployment.v b/lib/threefold/grid3/models/deployment.v index b82062cc..a3fcaec2 100644 --- a/lib/threefold/grid3/models/deployment.v +++ b/lib/threefold/grid3/models/deployment.v @@ -129,20 +129,20 @@ pub fn (mut d Deployment) add_signature(twin u32, signature string) { signature_type: 'sr25519' } } -pub fn (d Deployment) json_encode() string { - return json.encode(d) -} - -// pub fn (mut d Deployment) json_encode() string { -// mut encoded_workloads := []string{} -// for mut w in d.workloads { -// encoded_workloads << w.json_encode() -// } - -// workloads := '[${encoded_workloads.join(',')}]' -// return '{"version":${d.version},"twin_id":${d.twin_id},"contract_id":${d.contract_id},"expiration":${d.expiration},"metadata":"${d.metadata}","description":"${d.description}","workloads":${workloads},"signature_requirement":${json.encode(d.signature_requirement)}}' +// pub fn (d Deployment) json_encode() string { +// return json.encode(d) // } +pub fn (mut d Deployment) json_encode() string { + mut encoded_workloads := []string{} + for mut w in d.workloads { + encoded_workloads << w.json_encode() + } + + workloads := '[${encoded_workloads.join(',')}]' + return '{"version":${d.version},"twin_id":${d.twin_id},"contract_id":${d.contract_id},"expiration":${d.expiration},"metadata":"${d.metadata}","description":"${d.description}","workloads":${workloads},"signature_requirement":${json.encode(d.signature_requirement)}}' +} + pub fn (dl Deployment) count_public_ips() u8 { mut count := u8(0) for wl in dl.workloads { @@ -173,14 +173,14 @@ pub: project_name string @[json: 'projectName'] } -// pub fn (data DeploymentData) json_encode() string { -// return "{\\\"type\\\":\\\"${data.type_}\\\",\\\"name\\\":\\\"${data.name}\\\",\\\"projectName\\\":\\\"${data.project_name}\\\"}" -// } - -pub fn (d DeploymentData) json_encode() string { - return json.encode(d) +pub fn (data DeploymentData) json_encode() string { + return "{\\\"type\\\":\\\"${data.type_}\\\",\\\"name\\\":\\\"${data.name}\\\",\\\"projectName\\\":\\\"${data.project_name}\\\"}" } +// pub fn (d DeploymentData) json_encode() string { +// return json.encode(d) +// } + pub fn (mut dl Deployment) add_metadata(type_ string, project_name string) { mut data := DeploymentData{ type_: type_