From 127d952635251eddafdcd16d6fcbea85fbde8389 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Mon, 27 Nov 2023 12:10:21 -0600 Subject: [PATCH 1/5] pass in the correct environment variable --- .../clowder/clowder_create_collection/rabbitmq_handler.py | 4 ++-- .../clowder/clowder_create_dataset/rabbitmq_handler.py | 4 ++-- .../clowder/clowder_create_space/rabbitmq_handler.py | 4 ++-- .../clowder/clowder_list/rabbitmq_handler.py | 4 ++-- .../clowder/clowder_upload_file/rabbitmq_handler.py | 4 ++-- .../smile/classification_predict/rabbitmq_handler.py | 4 ++-- .../smile/classification_split/rabbitmq_handler.py | 4 ++-- .../smile/classification_train/rabbitmq_handler.py | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/containerized_analytics/clowder/clowder_create_collection/rabbitmq_handler.py b/containerized_analytics/clowder/clowder_create_collection/rabbitmq_handler.py index 66aa49f0..ba57b23d 100644 --- a/containerized_analytics/clowder/clowder_create_collection/rabbitmq_handler.py +++ b/containerized_analytics/clowder/clowder_create_collection/rabbitmq_handler.py @@ -6,8 +6,8 @@ import requests RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'rabbitmq') -RABBITMQ_USER = os.getenv('RABBITMQ_HOST', 'guest') -RABBITMQ_PASSWORD = os.getenv('RABBITMQ_HOST', 'guest') +RABBITMQ_USER = os.getenv('RABBITMQ_USER', 'guest') +RABBITMQ_PASSWORD = os.getenv('RABBITMQ_PASSWORD', 'guest') def rabbitmq_handler(ch, method, properties, body): diff --git a/containerized_analytics/clowder/clowder_create_dataset/rabbitmq_handler.py b/containerized_analytics/clowder/clowder_create_dataset/rabbitmq_handler.py index aa27982b..5de4d2ee 100644 --- a/containerized_analytics/clowder/clowder_create_dataset/rabbitmq_handler.py +++ b/containerized_analytics/clowder/clowder_create_dataset/rabbitmq_handler.py @@ -6,8 +6,8 @@ import requests RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'rabbitmq') -RABBITMQ_USER = os.getenv('RABBITMQ_HOST', 'guest') -RABBITMQ_PASSWORD = os.getenv('RABBITMQ_HOST', 'guest') +RABBITMQ_USER = os.getenv('RABBITMQ_USER', 'guest') +RABBITMQ_PASSWORD = os.getenv('RABBITMQ_PASSWORD', 'guest') def rabbitmq_handler(ch, method, properties, body): diff --git a/containerized_analytics/clowder/clowder_create_space/rabbitmq_handler.py b/containerized_analytics/clowder/clowder_create_space/rabbitmq_handler.py index ba3db0d3..de02fc6a 100644 --- a/containerized_analytics/clowder/clowder_create_space/rabbitmq_handler.py +++ b/containerized_analytics/clowder/clowder_create_space/rabbitmq_handler.py @@ -6,8 +6,8 @@ import requests RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'rabbitmq') -RABBITMQ_USER = os.getenv('RABBITMQ_HOST', 'guest') -RABBITMQ_PASSWORD = os.getenv('RABBITMQ_HOST', 'guest') +RABBITMQ_USER = os.getenv('RABBITMQ_USER', 'guest') +RABBITMQ_PASSWORD = os.getenv('RABBITMQ_PASSWORD', 'guest') def rabbitmq_handler(ch, method, properties, body): diff --git a/containerized_analytics/clowder/clowder_list/rabbitmq_handler.py b/containerized_analytics/clowder/clowder_list/rabbitmq_handler.py index 969f4ee5..0f55188e 100644 --- a/containerized_analytics/clowder/clowder_list/rabbitmq_handler.py +++ b/containerized_analytics/clowder/clowder_list/rabbitmq_handler.py @@ -6,8 +6,8 @@ import requests RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'rabbitmq') -RABBITMQ_USER = os.getenv('RABBITMQ_HOST', 'guest') -RABBITMQ_PASSWORD = os.getenv('RABBITMQ_HOST', 'guest') +RABBITMQ_USER = os.getenv('RABBITMQ_USER', 'guest') +RABBITMQ_PASSWORD = os.getenv('RABBITMQ_PASSWORD', 'guest') def rabbitmq_handler(ch, method, properties, body): diff --git a/containerized_analytics/clowder/clowder_upload_file/rabbitmq_handler.py b/containerized_analytics/clowder/clowder_upload_file/rabbitmq_handler.py index 11579cc1..13aaf3f2 100644 --- a/containerized_analytics/clowder/clowder_upload_file/rabbitmq_handler.py +++ b/containerized_analytics/clowder/clowder_upload_file/rabbitmq_handler.py @@ -7,8 +7,8 @@ import writeToS3 as s3 RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'rabbitmq') -RABBITMQ_USER = os.getenv('RABBITMQ_HOST', 'guest') -RABBITMQ_PASSWORD = os.getenv('RABBITMQ_HOST', 'guest') +RABBITMQ_USER = os.getenv('RABBITMQ_USER', 'guest') +RABBITMQ_PASSWORD = os.getenv('RABBITMQ_PASSWORD', 'guest') def get_config_json(config_url): diff --git a/containerized_analytics/smile/classification_predict/rabbitmq_handler.py b/containerized_analytics/smile/classification_predict/rabbitmq_handler.py index 666b3f9d..17e4a861 100644 --- a/containerized_analytics/smile/classification_predict/rabbitmq_handler.py +++ b/containerized_analytics/smile/classification_predict/rabbitmq_handler.py @@ -8,8 +8,8 @@ import postToAWSLambda RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'rabbitmq') -RABBITMQ_USER = os.getenv('RABBITMQ_HOST', 'guest') -RABBITMQ_PASSWORD = os.getenv('RABBITMQ_HOST', 'guest') +RABBITMQ_USER = os.getenv('RABBITMQ_USER', 'guest') +RABBITMQ_PASSWORD = os.getenv('RABBITMQ_PASSWORD', 'guest') def rabbitmq_handler(ch, method, properties, body): diff --git a/containerized_analytics/smile/classification_split/rabbitmq_handler.py b/containerized_analytics/smile/classification_split/rabbitmq_handler.py index b8a3dc89..2181e618 100644 --- a/containerized_analytics/smile/classification_split/rabbitmq_handler.py +++ b/containerized_analytics/smile/classification_split/rabbitmq_handler.py @@ -9,8 +9,8 @@ import postToAWSLambda RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'rabbitmq') -RABBITMQ_USER = os.getenv('RABBITMQ_HOST', 'guest') -RABBITMQ_PASSWORD = os.getenv('RABBITMQ_HOST', 'guest') +RABBITMQ_USER = os.getenv('RABBITMQ_USER', 'guest') +RABBITMQ_PASSWORD = os.getenv('RABBITMQ_PASSWORD', 'guest') def rabbitmq_handler(ch, method, properties, body): diff --git a/containerized_analytics/smile/classification_train/rabbitmq_handler.py b/containerized_analytics/smile/classification_train/rabbitmq_handler.py index 6aecb730..139c57b7 100644 --- a/containerized_analytics/smile/classification_train/rabbitmq_handler.py +++ b/containerized_analytics/smile/classification_train/rabbitmq_handler.py @@ -9,8 +9,8 @@ import postToAWSLambda RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'rabbitmq') -RABBITMQ_USER = os.getenv('RABBITMQ_HOST', 'guest') -RABBITMQ_PASSWORD = os.getenv('RABBITMQ_HOST', 'guest') +RABBITMQ_USER = os.getenv('RABBITMQ_USER', 'guest') +RABBITMQ_PASSWORD = os.getenv('RABBITMQ_PASSWORD', 'guest') def rabbitmq_handler(ch, method, properties, body): From b95a92abe344b152faade75a48512b210e943a62 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Mon, 27 Nov 2023 12:13:00 -0600 Subject: [PATCH 2/5] add changelog --- .../clowder_create_collection/CHANGELOG.md | 16 ++++++++++++++++ .../clowder/clowder_create_dataset/CHANGELOG.md | 16 ++++++++++++++++ .../clowder/clowder_create_space/CHANGELOG.md | 16 ++++++++++++++++ .../clowder/clowder_list/CHANGELOG.md | 16 ++++++++++++++++ .../clowder/clowder_upload_file/CHANGELOG.md | 16 ++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 containerized_analytics/clowder/clowder_create_collection/CHANGELOG.md create mode 100644 containerized_analytics/clowder/clowder_create_dataset/CHANGELOG.md create mode 100644 containerized_analytics/clowder/clowder_create_space/CHANGELOG.md create mode 100644 containerized_analytics/clowder/clowder_list/CHANGELOG.md create mode 100644 containerized_analytics/clowder/clowder_upload_file/CHANGELOG.md diff --git a/containerized_analytics/clowder/clowder_create_collection/CHANGELOG.md b/containerized_analytics/clowder/clowder_create_collection/CHANGELOG.md new file mode 100644 index 00000000..cb8bc652 --- /dev/null +++ b/containerized_analytics/clowder/clowder_create_collection/CHANGELOG.md @@ -0,0 +1,16 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Fixed +- Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90) + +## [0.1.0] - 09-21-2023 + +### Added +- Initial release + diff --git a/containerized_analytics/clowder/clowder_create_dataset/CHANGELOG.md b/containerized_analytics/clowder/clowder_create_dataset/CHANGELOG.md new file mode 100644 index 00000000..cb8bc652 --- /dev/null +++ b/containerized_analytics/clowder/clowder_create_dataset/CHANGELOG.md @@ -0,0 +1,16 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Fixed +- Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90) + +## [0.1.0] - 09-21-2023 + +### Added +- Initial release + diff --git a/containerized_analytics/clowder/clowder_create_space/CHANGELOG.md b/containerized_analytics/clowder/clowder_create_space/CHANGELOG.md new file mode 100644 index 00000000..cb8bc652 --- /dev/null +++ b/containerized_analytics/clowder/clowder_create_space/CHANGELOG.md @@ -0,0 +1,16 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Fixed +- Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90) + +## [0.1.0] - 09-21-2023 + +### Added +- Initial release + diff --git a/containerized_analytics/clowder/clowder_list/CHANGELOG.md b/containerized_analytics/clowder/clowder_list/CHANGELOG.md new file mode 100644 index 00000000..cb8bc652 --- /dev/null +++ b/containerized_analytics/clowder/clowder_list/CHANGELOG.md @@ -0,0 +1,16 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Fixed +- Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90) + +## [0.1.0] - 09-21-2023 + +### Added +- Initial release + diff --git a/containerized_analytics/clowder/clowder_upload_file/CHANGELOG.md b/containerized_analytics/clowder/clowder_upload_file/CHANGELOG.md new file mode 100644 index 00000000..cb8bc652 --- /dev/null +++ b/containerized_analytics/clowder/clowder_upload_file/CHANGELOG.md @@ -0,0 +1,16 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Fixed +- Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90) + +## [0.1.0] - 09-21-2023 + +### Added +- Initial release + From 38ecfbf43b2f964a8efcac6e8cc1c209a27f0d64 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Mon, 27 Nov 2023 12:15:57 -0600 Subject: [PATCH 3/5] add changelog entry --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 595e1ab8..f309edda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Reorganized repository structure [#10](https://github.com/ncsa/standalone-smm-analytics/issues/10) +### Fixed +- Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90) + ## [Beta] - 10-26-2023 ### Added From f6cdc65a3067b0647aab54fd435d23669b9e8957 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Mon, 27 Nov 2023 12:18:20 -0600 Subject: [PATCH 4/5] add changelog entry --- .../smile/classification_predict/CHANGELOG.md | 6 ++++++ .../smile/classification_split/CHANGELOG.md | 6 ++++++ .../smile/classification_train/CHANGELOG.md | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/containerized_analytics/smile/classification_predict/CHANGELOG.md b/containerized_analytics/smile/classification_predict/CHANGELOG.md index d6637e04..0a02eeff 100644 --- a/containerized_analytics/smile/classification_predict/CHANGELOG.md +++ b/containerized_analytics/smile/classification_predict/CHANGELOG.md @@ -3,3 +3,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + + +## [Unreleased] + +### Fixed +- Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90) diff --git a/containerized_analytics/smile/classification_split/CHANGELOG.md b/containerized_analytics/smile/classification_split/CHANGELOG.md index d6637e04..0a02eeff 100644 --- a/containerized_analytics/smile/classification_split/CHANGELOG.md +++ b/containerized_analytics/smile/classification_split/CHANGELOG.md @@ -3,3 +3,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + + +## [Unreleased] + +### Fixed +- Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90) diff --git a/containerized_analytics/smile/classification_train/CHANGELOG.md b/containerized_analytics/smile/classification_train/CHANGELOG.md index d6637e04..0a02eeff 100644 --- a/containerized_analytics/smile/classification_train/CHANGELOG.md +++ b/containerized_analytics/smile/classification_train/CHANGELOG.md @@ -3,3 +3,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + + +## [Unreleased] + +### Fixed +- Rabbitmq username and password [#61](https://github.com/ncsa/standalone-smm-analytics/issues/90) From 9e99b752d801225bd6fa1433aedbb8d982abb667 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Mon, 27 Nov 2023 12:47:25 -0600 Subject: [PATCH 5/5] typo --- .../clowder/clowder_create_space/rabbitmq_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containerized_analytics/clowder/clowder_create_space/rabbitmq_handler.py b/containerized_analytics/clowder/clowder_create_space/rabbitmq_handler.py index de02fc6a..76a91824 100644 --- a/containerized_analytics/clowder/clowder_create_space/rabbitmq_handler.py +++ b/containerized_analytics/clowder/clowder_create_space/rabbitmq_handler.py @@ -100,7 +100,7 @@ def _findMyself(username): if __name__ == '__main__': - ccredentials = pika.PlainCredentials(RABBITMQ_USER, RABBITMQ_PASSWORD) + credentials = pika.PlainCredentials(RABBITMQ_USER, RABBITMQ_PASSWORD) parameters = pika.ConnectionParameters(RABBITMQ_HOST, 5672, '/', credentials) connection = pika.BlockingConnection(parameters) channel = connection.channel()