90 fix rabbitmq username and password in clowder related containers (#91

) * pass in the correct environment variable * add changelog * add changelog entry * add changelog entry * typo
ncsa · Nov 27, 2023 · fae9d52 · fae9d52
1 parent 10087b5
commit fae9d52
Show file tree

Hide file tree

Showing 17 changed files with 118 additions and 17 deletions.
diff --git 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

diff --git a/containerized_analytics/clowder/clowder_create_collection/CHANGELOG.md 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_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/CHANGELOG.md 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_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/CHANGELOG.md 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_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):
@@ -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()

diff --git a/containerized_analytics/clowder/clowder_list/CHANGELOG.md 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_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/CHANGELOG.md 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
+
diff --git 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/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_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/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_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/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)
diff --git 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):