From 2da739b009343631473c43a7a5f46315bf2974c1 Mon Sep 17 00:00:00 2001 From: "M. Rehan" Date: Wed, 25 May 2022 17:30:03 +0500 Subject: [PATCH] Use stdin for retrieving image tags provided by catalog update --- charts/chia/upgrade_strategy | 8 +++--- charts/emby/upgrade_info.json | 1 + charts/emby/upgrade_strategy | 26 +++++++++++++++++++ charts/home-assistant/upgrade_strategy | 8 +++--- charts/ipfs/upgrade_info.json | 2 +- charts/ipfs/upgrade_strategy | 8 +++--- ...ade_strategy_disabled => upgrade_strategy} | 8 +++--- charts/minio/upgrade_info.json | 2 +- charts/minio/upgrade_strategy | 8 +++--- charts/netdata/upgrade_strategy | 8 +++--- charts/nextcloud/upgrade_info.json | 2 +- charts/nextcloud/upgrade_strategy | 8 +++--- charts/photoprism/upgrade_strategy | 8 +++--- charts/pihole/upgrade_strategy | 8 +++--- charts/plex/upgrade_info.json | 2 +- charts/plex/upgrade_strategy | 8 +++--- charts/qbittorent/upgrade_strategy | 8 +++--- charts/syncthing/upgrade_strategy | 8 +++--- test/chia/upgrade_strategy | 8 +++--- test/collabora/upgrade_strategy_disabled | 8 +++--- test/emby/upgrade_strategy | 8 +++--- test/home-assistant/upgrade_strategy | 8 +++--- test/ipfs/upgrade_strategy | 8 +++--- test/machinaris/upgrade_strategy | 8 +++--- test/minio/upgrade_strategy | 8 +++--- test/netdata/upgrade_strategy | 8 +++--- test/nextcloud/upgrade_strategy | 8 +++--- test/photoprism/upgrade_strategy | 8 +++--- test/pihole/upgrade_strategy | 8 +++--- test/plex/upgrade_strategy | 8 +++--- ...rade_strategy_disable => upgrade_strategy} | 8 +++--- test/syncthing/upgrade_strategy | 8 +++--- 32 files changed, 161 insertions(+), 82 deletions(-) create mode 100644 charts/emby/upgrade_info.json create mode 100755 charts/emby/upgrade_strategy rename charts/machinaris/{upgrade_strategy_disabled => upgrade_strategy} (71%) rename test/qbittorent/{upgrade_strategy_disable => upgrade_strategy} (69%) diff --git a/charts/chia/upgrade_strategy b/charts/chia/upgrade_strategy index d7f07a0d07..fee6131e03 100755 --- a/charts/chia/upgrade_strategy +++ b/charts/chia/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/charts/emby/upgrade_info.json b/charts/emby/upgrade_info.json new file mode 100644 index 0000000000..f22ddd1aee --- /dev/null +++ b/charts/emby/upgrade_info.json @@ -0,0 +1 @@ +{"filename": "ix_values.yaml", "keys": ["image"], "test_filename": "test_values.yaml"} diff --git a/charts/emby/upgrade_strategy b/charts/emby/upgrade_strategy new file mode 100755 index 0000000000..26b1870b43 --- /dev/null +++ b/charts/emby/upgrade_strategy @@ -0,0 +1,26 @@ +#!/usr/bin/python3 +import json +import sys + +from catalog_update.upgrade_strategy import semantic_versioning + + +def newer_mapping(image_tags): + key = list(image_tags.keys())[0] + version = semantic_versioning(sorted(image_tags[key], reverse=True)) + if not version: + return {} + + return { + 'tags': {key: version}, + 'app_version': version, + } + + +if __name__ == '__main__': + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') + + print(json.dumps(newer_mapping(versions_json))) diff --git a/charts/home-assistant/upgrade_strategy b/charts/home-assistant/upgrade_strategy index 7b17b7c084..39bb56546a 100755 --- a/charts/home-assistant/upgrade_strategy +++ b/charts/home-assistant/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/charts/ipfs/upgrade_info.json b/charts/ipfs/upgrade_info.json index 5bf84fb901..f22ddd1aee 100644 --- a/charts/ipfs/upgrade_info.json +++ b/charts/ipfs/upgrade_info.json @@ -1 +1 @@ -{"filename": "ix_values.yaml", "keys": ["image"]} +{"filename": "ix_values.yaml", "keys": ["image"], "test_filename": "test_values.yaml"} diff --git a/charts/ipfs/upgrade_strategy b/charts/ipfs/upgrade_strategy index 3682360b3d..13d38b0f3c 100755 --- a/charts/ipfs/upgrade_strategy +++ b/charts/ipfs/upgrade_strategy @@ -18,7 +18,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/charts/machinaris/upgrade_strategy_disabled b/charts/machinaris/upgrade_strategy similarity index 71% rename from charts/machinaris/upgrade_strategy_disabled rename to charts/machinaris/upgrade_strategy index 6b95867d8d..81ad1edb3b 100755 --- a/charts/machinaris/upgrade_strategy_disabled +++ b/charts/machinaris/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/charts/minio/upgrade_info.json b/charts/minio/upgrade_info.json index 5bf84fb901..f22ddd1aee 100644 --- a/charts/minio/upgrade_info.json +++ b/charts/minio/upgrade_info.json @@ -1 +1 @@ -{"filename": "ix_values.yaml", "keys": ["image"]} +{"filename": "ix_values.yaml", "keys": ["image"], "test_filename": "test_values.yaml"} diff --git a/charts/minio/upgrade_strategy b/charts/minio/upgrade_strategy index f8293e4f9f..1d3be0fbdf 100755 --- a/charts/minio/upgrade_strategy +++ b/charts/minio/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/charts/netdata/upgrade_strategy b/charts/netdata/upgrade_strategy index d7f07a0d07..fee6131e03 100755 --- a/charts/netdata/upgrade_strategy +++ b/charts/netdata/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/charts/nextcloud/upgrade_info.json b/charts/nextcloud/upgrade_info.json index 5bf84fb901..f22ddd1aee 100644 --- a/charts/nextcloud/upgrade_info.json +++ b/charts/nextcloud/upgrade_info.json @@ -1 +1 @@ -{"filename": "ix_values.yaml", "keys": ["image"]} +{"filename": "ix_values.yaml", "keys": ["image"], "test_filename": "test_values.yaml"} diff --git a/charts/nextcloud/upgrade_strategy b/charts/nextcloud/upgrade_strategy index d98b6bcd7a..02fe284868 100755 --- a/charts/nextcloud/upgrade_strategy +++ b/charts/nextcloud/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/charts/photoprism/upgrade_strategy b/charts/photoprism/upgrade_strategy index 7b17b7c084..39bb56546a 100755 --- a/charts/photoprism/upgrade_strategy +++ b/charts/photoprism/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/charts/pihole/upgrade_strategy b/charts/pihole/upgrade_strategy index 7b17b7c084..39bb56546a 100755 --- a/charts/pihole/upgrade_strategy +++ b/charts/pihole/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/charts/plex/upgrade_info.json b/charts/plex/upgrade_info.json index 5bf84fb901..f22ddd1aee 100644 --- a/charts/plex/upgrade_info.json +++ b/charts/plex/upgrade_info.json @@ -1 +1 @@ -{"filename": "ix_values.yaml", "keys": ["image"]} +{"filename": "ix_values.yaml", "keys": ["image"], "test_filename": "test_values.yaml"} diff --git a/charts/plex/upgrade_strategy b/charts/plex/upgrade_strategy index a8940ad684..10b871eede 100755 --- a/charts/plex/upgrade_strategy +++ b/charts/plex/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/charts/qbittorent/upgrade_strategy b/charts/qbittorent/upgrade_strategy index 7b17b7c084..39bb56546a 100755 --- a/charts/qbittorent/upgrade_strategy +++ b/charts/qbittorent/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/charts/syncthing/upgrade_strategy b/charts/syncthing/upgrade_strategy index 7b17b7c084..39bb56546a 100755 --- a/charts/syncthing/upgrade_strategy +++ b/charts/syncthing/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/chia/upgrade_strategy b/test/chia/upgrade_strategy index d7f07a0d07..fee6131e03 100755 --- a/test/chia/upgrade_strategy +++ b/test/chia/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/collabora/upgrade_strategy_disabled b/test/collabora/upgrade_strategy_disabled index ef93561d04..26b1870b43 100755 --- a/test/collabora/upgrade_strategy_disabled +++ b/test/collabora/upgrade_strategy_disabled @@ -18,7 +18,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/emby/upgrade_strategy b/test/emby/upgrade_strategy index ef93561d04..26b1870b43 100755 --- a/test/emby/upgrade_strategy +++ b/test/emby/upgrade_strategy @@ -18,7 +18,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/home-assistant/upgrade_strategy b/test/home-assistant/upgrade_strategy index 7b17b7c084..39bb56546a 100755 --- a/test/home-assistant/upgrade_strategy +++ b/test/home-assistant/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/ipfs/upgrade_strategy b/test/ipfs/upgrade_strategy index 3682360b3d..13d38b0f3c 100755 --- a/test/ipfs/upgrade_strategy +++ b/test/ipfs/upgrade_strategy @@ -18,7 +18,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/machinaris/upgrade_strategy b/test/machinaris/upgrade_strategy index 6b95867d8d..81ad1edb3b 100755 --- a/test/machinaris/upgrade_strategy +++ b/test/machinaris/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/minio/upgrade_strategy b/test/minio/upgrade_strategy index f8293e4f9f..1d3be0fbdf 100755 --- a/test/minio/upgrade_strategy +++ b/test/minio/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/netdata/upgrade_strategy b/test/netdata/upgrade_strategy index d7f07a0d07..fee6131e03 100755 --- a/test/netdata/upgrade_strategy +++ b/test/netdata/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/nextcloud/upgrade_strategy b/test/nextcloud/upgrade_strategy index d98b6bcd7a..02fe284868 100755 --- a/test/nextcloud/upgrade_strategy +++ b/test/nextcloud/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/photoprism/upgrade_strategy b/test/photoprism/upgrade_strategy index 7b17b7c084..39bb56546a 100755 --- a/test/photoprism/upgrade_strategy +++ b/test/photoprism/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/pihole/upgrade_strategy b/test/pihole/upgrade_strategy index 7b17b7c084..39bb56546a 100755 --- a/test/pihole/upgrade_strategy +++ b/test/pihole/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/plex/upgrade_strategy b/test/plex/upgrade_strategy index a8940ad684..10b871eede 100755 --- a/test/plex/upgrade_strategy +++ b/test/plex/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/qbittorent/upgrade_strategy_disable b/test/qbittorent/upgrade_strategy similarity index 69% rename from test/qbittorent/upgrade_strategy_disable rename to test/qbittorent/upgrade_strategy index 7b17b7c084..39bb56546a 100755 --- a/test/qbittorent/upgrade_strategy_disable +++ b/test/qbittorent/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json))) diff --git a/test/syncthing/upgrade_strategy b/test/syncthing/upgrade_strategy index 7b17b7c084..39bb56546a 100755 --- a/test/syncthing/upgrade_strategy +++ b/test/syncthing/upgrade_strategy @@ -19,7 +19,9 @@ def newer_mapping(image_tags): if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') - print(json.dumps(newer_mapping(json.loads(sys.argv[1])))) + print(json.dumps(newer_mapping(versions_json)))