Merge pull request #224 from gene1wood/release_1.2.2

Release 1.2.2
mozilla-iam · Jul 14, 2020 · da613b5 · da613b5
2 parents be04887 + 1a36331
commit da613b5
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.2] - 2020-07-14
+
+### Fixed
+* Bug when an AWS Account has no alias. Previously, if a user used 
+  mozilla-aws-cli with an AWS account that had no account alias defined, 
+  it would respond with errors described in #220. Now it gracefully handles AWS
+  accounts without aliases. This fixes the bug in mozilla-aws-cli and changes
+  the ID Token for Roles API to prevent the bug in deployed versions of
+  mozilla-aws-cli prior to v1.2.2 [#221](https://github.com/mozilla-iam/mozilla-aws-cli/issues/221)
+
+### Added
+* A check to the Group Role Map Builder that the federated principal in an 
+  IAM policy has the same AWS account ID as the account containing the policy.
+  This will prevent malformed IAM Role policies from being included in the group
+  role map. [#218](https://github.com/mozilla-iam/mozilla-aws-cli/issues/218)
+* Support for sending informational messages from the backend to the frontend.
+  Previously only error messages could be passed. [#219](https://github.com/mozilla-iam/mozilla-aws-cli/issues/219)
+
 ## [1.2.1] - 2020-05-20
 
 ### Fixed
@@ -121,7 +139,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 * Initial release of the mozilla-aws-cli tool
 
-[Unreleased]: https://github.com/mozilla-iam/mozilla-aws-cli/compare/v1.2.1...HEAD
+[Unreleased]: https://github.com/mozilla-iam/mozilla-aws-cli/compare/v1.2.2...HEAD
+[1.2.2]: https://github.com/mozilla-iam/mozilla-aws-cli/compare/v1.2.1...v1.2.2
 [1.2.1]: https://github.com/mozilla-iam/mozilla-aws-cli/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/mozilla-iam/mozilla-aws-cli/compare/v1.1.1...v1.2.0
 [1.1.1]: https://github.com/mozilla-iam/mozilla-aws-cli/compare/v1.1.0...v1.1.1

diff --git a/cloudformation/idtoken_for_roles/functions/idtoken_for_roles.py b/cloudformation/idtoken_for_roles/functions/idtoken_for_roles.py
@@ -136,13 +136,14 @@ def get_roles_and_aliases(token, key, cache):
                         and len(account_alias_map[aws_account_id]) > 0):
                     if aws_account_id not in aliases:
                         logger.debug(
-                            'Group {} found in AMR {} adding AWS Account alias {} '
-                            'for account {}'.format(
+                            'Group {} found in AMR {} adding AWS Account '
+                            'alias {} for account {}'.format(
                                 group,
                                 id_token['amr'],
                                 account_alias_map[aws_account_id],
                                 aws_account_id))
-                        aliases[aws_account_id] = account_alias_map[aws_account_id]
+                        aliases[aws_account_id] = (
+                            account_alias_map[aws_account_id])
                 else:
                     aliases[aws_account_id] = [aws_account_id]
             roles.update(mapped_roles)

diff --git a/setup.py b/setup.py
@@ -57,6 +57,6 @@
     tests_require=test_requirements,
     extras_require=extras,
     url="https://github.com/mozilla-iam/mozilla-aws-cli",
-    version="1.2.1",
+    version="1.2.2",
     zip_safe=False,
 )