Skip to content

Commit

Permalink
Beanstalk Bugfix (#127)
Browse files Browse the repository at this point in the history
* pass region, parse API correctly

* add changelog entries

* take Kent's suggestion

Co-authored-by: Kent M Pitman <netsettler@users.noreply.github.com>

* use region constant

Co-authored-by: Kent M Pitman <netsettler@users.noreply.github.com>
  • Loading branch information
willronchetti and netsettler authored Jan 6, 2021
1 parent 2f79b77 commit 62a06df
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ dcicutils
Change Log
----------

1.8.4
=====

**PR 127: Beanstalk Bugfix**

* Parses Beanstalk API correctly and passes region.

1.8.3
=====

**No PR: Just fixes to GA PyPi deploy**


1.8.2
=====

Expand Down
6 changes: 4 additions & 2 deletions dcicutils/beanstalk_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,9 +393,11 @@ def _get_beanstalk_configuration_settings(env):
}
"""
try:
client = boto3.client('elasticbeanstalk')
client = boto3.client('elasticbeanstalk', region_name=REGION)
config = client.describe_configuration_settings(ApplicationName='4dn-web', EnvironmentName=env)
options = config['ConfigurationSettings']['OptionSettings'] # guaranteed to be present
# These are guaranteed to be present
[settings] = config['ConfigurationSettings']
options = settings['OptionSettings']
return options
except ClientError:
logger.error('Error encountered attempting to get environment settings for %s' % env)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "dcicutils"
version = "1.8.3"
version = "1.8.4"
description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
license = "MIT"
Expand Down

0 comments on commit 62a06df

Please sign in to comment.