From dd53e4db9d93982019e1fa66ff6f7c280854cf81 Mon Sep 17 00:00:00 2001 From: Gianluca Piccolo Date: Wed, 7 Oct 2020 15:55:10 +0200 Subject: [PATCH] Fix params names --- application/controllers/ConfigController.php | 12 ++++++------ doc/70-REST-API.md | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php index a9de1b39..f0b1b3e7 100644 --- a/application/controllers/ConfigController.php +++ b/application/controllers/ConfigController.php @@ -151,23 +151,23 @@ class ConfigController extends ActionController $configChecksum = $status->getConfigChecksumForStageName($stageName); $activeConfiguration = [ 'stage_name' => $stageName, - 'config_checksum' => ($configChecksum) ? : null, - 'activity_log_checksum' => $lastActivityLogChecksum + 'config' => ($configChecksum) ? : null, + 'activity' => $lastActivityLogChecksum ]; } $result = [ 'active_configuration' => (object) $activeConfiguration, ]; - if ($configChecksumsListToVerify = $this->params->get('config_checksums')) { - $result['configuration'] = $status->getDeploymentStatusForConfigChecksums( + if ($configChecksumsListToVerify = $this->params->get('configs')) { + $result['configs'] = $status->getDeploymentStatusForConfigChecksums( explode(',', $configChecksumsListToVerify), $configChecksum ); } - if ($activityLogChecksumsListToVerify = $this->params->get('activity_log_checksums')) { - $result['activity'] = $status->getDeploymentStatusForActivityLogChecksums( + if ($activityLogChecksumsListToVerify = $this->params->get('activities')) { + $result['activities'] = $status->getDeploymentStatusForActivityLogChecksums( explode(',', $activityLogChecksumsListToVerify), $lastActivityLogChecksum ); diff --git a/doc/70-REST-API.md b/doc/70-REST-API.md index 5507b97f..eacd24b9 100644 --- a/doc/70-REST-API.md +++ b/doc/70-REST-API.md @@ -512,9 +512,9 @@ Content-Type: application/json ```json { "active_configuration": { - "stage_name": "...", - "config_checksum": "...", - "activity_log_checksum": "..." + "stage_name": "b191211d-05cb-4679-842b-c45170b96421", + "config": "617b9cbad9e141cfc3f4cb636ec684bd60073be1", + "activity": "028b3a19ca7457f5fc9dbb5e4ea527eaf61616a2" } } ``` @@ -534,14 +534,14 @@ Following an example of how to do it: { "active_configuration": { "stage_name": "b191211d-05cb-4679-842b-c45170b96421", - "config_checksum": "617b9cbad9e141cfc3f4cb636ec684bd60073be1", - "activity_log_checksum": "028b3a19ca7457f5fc9dbb5e4ea527eaf61616a2" + "config": "617b9cbad9e141cfc3f4cb636ec684bd60073be1", + "activity": "028b3a19ca7457f5fc9dbb5e4ea527eaf61616a2" }, - "configuration": { + "configs": { "617b9cbad9e141cfc3f4cb636ec684bd60073be2": "deployed", "617b9cbad9e141cfc3f4cb636ec684bd60073be1": "active" }, - "activity": { + "activities": { "617b9cbad9e141cfc3f4cb636ec684bd60073be1": "undeployed", "028b3a19ca7457f5fc9dbb5e4ea527eaf61616a2": "active" }