releng - increment versions and update dependencies (cloud-custodian#8738)

Author: kapilt

.git-blame-ignore-revs

@@ -0,0 +1,11 @@
+# .git-blame-ignore-revs
+# 
+# Configuration for github to ignore formatting commits for purposes of its blame view
+# https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
+#
+# For local configuration you can use `git blame --ignore-revs-file .git-blame-ignore-revs`
+# or `git config blame.ignoreRevsFile .git-blame-ignore-revs`
+
+ 
+# mailer format w/ black (#8636)
+0861541554b9afef3702ab2161fb3530e690513b 

c7n/credentials.py

@@ -26,15 +26,15 @@ def __init__(self, region, profile=None, assume_role=None, external_id=None):
         self.profile = profile
         self.assume_role = assume_role
         self.external_id = external_id
-        self.user_agent_name = "CloudCustodian"
         self.session_name = "CloudCustodian"
         if 'C7N_SESSION_SUFFIX' in os.environ:
             self.session_name = "%s@%s" % (
                 self.session_name, os.environ['C7N_SESSION_SUFFIX'])
         self._subscribers = []
+        self._policy_name = ""
 
     def _set_policy_name(self, name):
-        self.user_agent_name = ("CloudCustodian(%s)" % name).strip()
+        self._policy_name = name
 
     policy_name = property(None, _set_policy_name)
 
@@ -51,8 +51,10 @@ def __call__(self, assume=True, region=None):
         return self.update(session)
 
     def update(self, session):
-        session._session.user_agent_name = self.user_agent_name
+        session._session.user_agent_name = "c7n"
         session._session.user_agent_version = version
+        if self._policy_name:
+            session._session.user_agent_extra = f"c7n/policy#{self._policy_name}"
 
         for s in self._subscribers:
             s(session)

c7n/version.py

@@ -1,2 +1,2 @@
 # Generated via tools/dev/poetrypkg.py
-version = "0.9.28"
+version = "0.9.29"

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "c7n"
-version = "0.9.28"
+version = "0.9.29"
 description = "Cloud Custodian - Policy Rules Engine"
 authors = ["Cloud Custodian Project"]
 readme = "README.md"

pyproject.toml

@@ -18,7 +18,7 @@ def test_session_factory(self):
         factory = SessionFactory("us-east-1")
         session = factory()
         self.assertTrue(
-            session._session.user_agent().startswith("CloudCustodian/%s" % version)
+            session._session.user_agent().startswith("c7n/%s" % version)
         )
 
     def test_regional_sts(self):
@@ -65,11 +65,15 @@ def test_policy_name_user_agent(self):
         session.policy_name = "test-policy-name-ua"
         client = session().client('s3')
         self.assertTrue(
-            client._client_config.user_agent.startswith(
-                "CloudCustodian(test-policy-name-ua)/%s" % version
+            client.meta.config.user_agent.startswith(
+                f"c7n/{version}"
             )
         )
 
+        self.assertTrue(
+            " c7n/policy#test-policy-name-ua" in client.meta.config.user_agent
+        )
+
     def test_local_session_agent_update(self):
         factory = SessionFactory('us-east-1')
         factory.policy_name = "check-ebs"

tests/test_credentials.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "c7n_awscc"
-version = "0.1.13"
+version = "0.1.14"
 readme = "readme.md"
 homepage = "https://cloudcustodian.io"
 repository = "https://github.com/cloud-custodian/cloud-custodian"