From 066762073c9e3754d141a674271a166ce6ae9f3b Mon Sep 17 00:00:00 2001 From: dsk-minchulahn Date: Mon, 22 May 2023 08:56:57 +0000 Subject: [PATCH 1/8] Update sample-app desired version --- rc-version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc-version.json b/rc-version.json index ce98dce..f1b35fb 100644 --- a/rc-version.json +++ b/rc-version.json @@ -163,4 +163,4 @@ "desired_version": "rc0.0.0" } ] -} +} \ No newline at end of file From 760cb9cf3c0fa48cdcc8055649c5781bbb968486 Mon Sep 17 00:00:00 2001 From: minchulahn Date: Tue, 23 May 2023 11:36:41 +0900 Subject: [PATCH 2/8] =?UTF-8?q?desired=20version=20=EC=9D=B4=EB=A6=84=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 6 +++--- rc-version.json | 54 ++++++++++++++++++++++++------------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/main.py b/main.py index 2f56271..8ee2356 100644 --- a/main.py +++ b/main.py @@ -6,9 +6,9 @@ def get_service_index(): return index exit(traceback.print_exc()) -def set_desired_version(): +def set_latest_version(): service_index = get_service_index() - json_data["service"][service_index]["desired_version"] = tagName + json_data["service"][service_index]["set_latest_version"] = tagName if __name__ == '__main__': @@ -22,7 +22,7 @@ if __name__ == '__main__': with open(file_path, 'r') as json_file: json_data = json.load(json_file) - set_desired_version() + set_latest_version() with open(file_path, 'w') as file: json.dump(json_data, file, indent=4) diff --git a/rc-version.json b/rc-version.json index e21653e..8f140f6 100644 --- a/rc-version.json +++ b/rc-version.json @@ -4,163 +4,163 @@ "type": "front", "name": "dsk-ui", "version": "rc0.0.0", - "desired_version": "rc0.0.0" + "latest_version": "rc0.0.0" }, { "type": "api", "name": "sample-app", "version": "rc0.1.0", - "desired_version": "rc0.1.0" + "latest_version": "rc0.1.0" }, { "type": "api", "name": "dsk-agent-api", "version": "rc0.0.2", - "desired_version": "rc0.0.2" + "latest_version": "rc0.0.2" }, { "type": "api", "name": "dsk-agentmanager-api", "version": "rc0.0.2", - "desired_version": "rc0.0.2" + "latest_version": "rc0.0.2" }, { "type": "api", "name": "dsk-alert-api", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "api", "name": "dsk-apm-api", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "api", "name": "dsk-chart-api", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "api", "name": "dsk-dashboard-api", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "api", "name": "dsk-database-api", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "api", "name": "dsk-infrastructure-api", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "api", "name": "dsk-log-api", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "api", "name": "dsk-notification-api", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "api", "name": "dsk-usergate-api", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "api", "name": "dsk-app-sender", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "api", "name": "dsk-backoffice", "version": "", - "desired_version": "" + "latest_version": "" }, { "type": "api", "name": "dsk-metering-batch", "version": "", - "desired_version": "" + "latest_version": "" }, { "type": "api", "name": "dsk-live-api", "version": "", - "desired_version": "" + "latest_version": "" }, { "type": "stream", "name": "dsk-database-plan-stream", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "stream", "name": "dsk-metric-base-agg-stream", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "stream", "name": "dsk-metric-base-flat-stream", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "stream", "name": "dsk-metric-jaeger-flat-stream", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "stream", "name": "dsk-trace-stream", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "stream", "name": "dsk-metric-custom-flat-stream", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "stream", "name": "dsk-tagging-connector", "version": "rc0.0.1", - "desired_version": "rc0.0.1" + "latest_version": "rc0.0.1" }, { "type": "stream", "name": "dsk-kafka2storage", "version": "rc0.0.0", - "desired_version": "rc0.0.0" + "latest_version": "rc0.0.0" }, { "type": "datagate", "name": "dsk-datagate", "version": "rc0.0.0", - "desired_version": "rc0.0.0" + "latest_version": "rc0.0.0" }, { "type": "datagate", "name": "dsk-loggate", "version": "rc0.0.0", - "desired_version": "rc0.0.0" + "latest_version": "rc0.0.0" } ] } From 61b20e60082921c737442e9e957d87df83ba7af2 Mon Sep 17 00:00:00 2001 From: minchulahn Date: Tue, 23 May 2023 11:37:39 +0900 Subject: [PATCH 3/8] Update rc-version.json --- rc-version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc-version.json b/rc-version.json index 5a8356e..c3ed3bd 100644 --- a/rc-version.json +++ b/rc-version.json @@ -10,7 +10,7 @@ "type": "api", "name": "sample-app", "version": "rc0.1.1", - "desired_version": "rc0.1.1" + "latest_version": "rc0.1.1" }, { "type": "api", From 3f89406ee1b4195f7d9b7ed562d71b4b06a86781 Mon Sep 17 00:00:00 2001 From: minchulahn Date: Thu, 25 May 2023 17:34:34 +0900 Subject: [PATCH 4/8] =?UTF-8?q?candidate=20json=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-version.json => candidate-version.json | 1 + main.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) rename rc-version.json => candidate-version.json (99%) diff --git a/rc-version.json b/candidate-version.json similarity index 99% rename from rc-version.json rename to candidate-version.json index c3ed3bd..1dbfda7 100644 --- a/rc-version.json +++ b/candidate-version.json @@ -1,4 +1,5 @@ { + "datasaker": "dsk-YY.quarter.increase", "service": [ { "type": "front", diff --git a/main.py b/main.py index 8ee2356..fea2cf8 100644 --- a/main.py +++ b/main.py @@ -8,16 +8,16 @@ def get_service_index(): def set_latest_version(): service_index = get_service_index() - json_data["service"][service_index]["set_latest_version"] = tagName + json_data["service"][service_index]["latest_version"] = tagName if __name__ == '__main__': - if len(sys.argv) != 3 or 'rc' not in sys.argv[1]: + if len(sys.argv) != 3: exit(traceback.print_exc()) tagName = sys.argv[1] service_name = sys.argv[2] - file_path = "./rc-version.json" + file_path = "./candidate-version.json" with open(file_path, 'r') as json_file: json_data = json.load(json_file) From 6210f45d0e43b74f376f3b01e0d8540c21abed36 Mon Sep 17 00:00:00 2001 From: minchulahn Date: Thu, 25 May 2023 17:36:20 +0900 Subject: [PATCH 5/8] Clean Code --- main.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index fea2cf8..e1950bd 100644 --- a/main.py +++ b/main.py @@ -2,21 +2,19 @@ import json, sys, traceback def get_service_index(): for index, value in enumerate(json_data['service']): - if(value['name'] == service_name): + if(value['name'] == sys.argv[2]): return index exit(traceback.print_exc()) def set_latest_version(): service_index = get_service_index() - json_data["service"][service_index]["latest_version"] = tagName + json_data["service"][service_index]["latest_version"] = sys.argv[1] if __name__ == '__main__': if len(sys.argv) != 3: exit(traceback.print_exc()) - tagName = sys.argv[1] - service_name = sys.argv[2] file_path = "./candidate-version.json" with open(file_path, 'r') as json_file: From 53e0670a4ad558cdc132eb257010bd8e4493511e Mon Sep 17 00:00:00 2001 From: dsk-minchulahn Date: Thu, 25 May 2023 09:36:25 +0000 Subject: [PATCH 6/8] Update sample-app latest version --- candidate-version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/candidate-version.json b/candidate-version.json index 1dbfda7..cf7aa7c 100644 --- a/candidate-version.json +++ b/candidate-version.json @@ -11,7 +11,7 @@ "type": "api", "name": "sample-app", "version": "rc0.1.1", - "latest_version": "rc0.1.1" + "latest_version": "null" }, { "type": "api", From 192251afcf3a49d079183218047c196b39d88054 Mon Sep 17 00:00:00 2001 From: dsk-minchulahn Date: Thu, 25 May 2023 09:42:49 +0000 Subject: [PATCH 7/8] Update sample-app latest version --- candidate-version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/candidate-version.json b/candidate-version.json index cf7aa7c..d2f33f4 100644 --- a/candidate-version.json +++ b/candidate-version.json @@ -11,7 +11,7 @@ "type": "api", "name": "sample-app", "version": "rc0.1.1", - "latest_version": "null" + "latest_version": "release-0.2.0" }, { "type": "api", From f35a138887260d05d6fadaaf71a76a931d3d3771 Mon Sep 17 00:00:00 2001 From: minchulahn Date: Thu, 25 May 2023 17:54:19 +0900 Subject: [PATCH 8/8] Update candidate version --- candidate-version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/candidate-version.json b/candidate-version.json index d2f33f4..de41edd 100644 --- a/candidate-version.json +++ b/candidate-version.json @@ -10,7 +10,7 @@ { "type": "api", "name": "sample-app", - "version": "rc0.1.1", + "version": "release-0.2.0", "latest_version": "release-0.2.0" }, {