Skip to content

Remove secrets usage #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2025
Merged

Remove secrets usage #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions adafruit_funhouse/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,12 @@ def __init__(

def init_io_mqtt(self) -> IO_MQTT:
"""Initialize MQTT for Adafruit IO"""
try:
aio_username = self._get_setting("AIO_USERNAME")
aio_key = self._get_setting("AIO_KEY")
except KeyError:
raise KeyError(
"Adafruit IO secrets are kept in settings.toml, please add them there!\n\n"
) from KeyError
aio_username = self._get_setting["ADAFRUIT_AIO_USERNAME"]
aio_key = self._get_setting["ADAFRUIT_AIO_KEY"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will the addition of the ADAFRUIT_ prefix to these keys require changing learn guide code or pages? Is that already coordinated if so?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So PortalBase will look for either, and I'm working with Tyeth on the learn guides

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/adafruit/Adafruit_CircuitPython_PortalBase/blob/53c1666ee15d1d811226a1fee79e4fd890936f42/adafruit_portalbase/network.py#L70 and https://github.com/adafruit/Adafruit_CircuitPython_PortalBase/blob/53c1666ee15d1d811226a1fee79e4fd890936f42/adafruit_portalbase/network.py#L137

if None in [aio_username, aio_key]:
raise AttributeError(
"Adafruit IO keys are kept in settings.toml, please add them there."
)

return self.init_mqtt(IO_MQTT_BROKER, 8883, aio_username, aio_key, True)

Expand Down
1 change: 0 additions & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"ssl",
"wifi",
"socketpool",
"secrets",
"analogio",
"touchio",
"bitmaptools",
Expand Down