Merge remote-tracking branch 'upstream/main'

org/branchprotection.yml

@@ -195,3 +195,21 @@ branch-protection:
           protect: false
         buildpacks-envs:
           protect: false
+
+        cnbapplifecycle:
+          allow_deletions: false
+          allow_disabled_policies: true
+          allow_force_pushes: false
+          enforce_admins: true
+          include: ["^main$"]
+          protect: true
+          required_status_checks:
+            contexts:
+              - "Go / unit (pull_request)"
+              - "EasyCLA"
+          required_pull_request_reviews:
+            bypass_pull_request_allowances:
+              teams: ["wg-app-runtime-platform-bots"]
+            dismiss_stale_reviews: true
+            require_code_owner_reviews: true
+            required_approving_review_count: 1

org/cloudfoundry.yml

@@ -2483,7 +2483,6 @@ orgs:
         description: "Temporary team for managing Buildpacks secrets until we have a permanent plan."
         maintainers:
         - arjun024
-        - brayanhenao
         - sophiewigmore
         members: []
         privacy: closed
@@ -2600,3 +2599,12 @@ orgs:
           cf_exporter: admin
           firehose_exporter: admin
           bosh_exporter: admin
+      temp-ari-capi-admins:
+        description: "Temporary admin team for CAPI"
+        maintainers:
+          - philippthun
+          - johha
+        members: []
+        privacy: closed
+        repos:
+          cloud_controller_ng: admin

org/contributors.yml

@@ -15,7 +15,6 @@ contributors:
 - anoopjb
 - anshrupani
 - anthonydahanne
-- antonina-kyoseva
 - app-autoscaler-ci-bot
 - aqstack
 - aramprice
@@ -136,7 +135,6 @@ contributors:
 - MerricdeLauney
 - metric-store-ci
 - mingxiao
-- MirahImage
 - mkocher
 - modulo11
 - moggibear
@@ -152,6 +150,7 @@ contributors:
 - nouseforaname
 - nvvalchev
 - ohkyle
+- oliver-heinrich
 - oppegard
 - pabloarodas
 - paketo-bot
@@ -167,7 +166,6 @@ contributors:
 - pivotal-marcela-campo
 - pivotalgeorge
 - plowin
-- Pooja-08
 - radhavmwtnz
 - radito3
 - radoslav-tomov
@@ -222,7 +220,6 @@ contributors:
 - torsten-sap
 - totherme
 - vinaybheri
-- visargsoneji
 - vkalapov
 - VRBogdanov
 - WeiQuan0605

org/org_management.py

@@ -88,10 +88,10 @@ def load_from_project(self):
     def get_contributors(self) -> Set[str]:
         return set(self.contributors)
 
-    def get_community_members_with_role(self) -> Set[str]:
-        result = set(self.toc)
+    def get_community_members_with_role_by_wg(self) -> Dict[str, Set[str]]:
+        result = {"toc": set(self.toc)}
         for wg in self.working_groups:
-            result |= OrgGenerator._wg_github_users(wg)
+            result[wg["name"]] = OrgGenerator._wg_github_users(wg)
         return result
 
     def generate_org_members(self):

org/org_user_management.py

@@ -90,14 +90,21 @@ def _write_yaml_file(self, path, data):
         with open(path, "w") as f:
             yaml.dump(data, f)
 
+    def _get_inactive_users_msg_for_wgs(self, inactive_users_by_wg, user_tagging_prefix):
+        result = "\n\nWarning:\n" if inactive_users_by_wg else ""
+        for wg, users in inactive_users_by_wg.items():
+            wg_users_as_list = "\n".join(str(user_tagging_prefix + s) for s in users)
+            result += f'Inactive users of Working Group "{wg}" are: \n{wg_users_as_list}\n'
+        return result
+
     def delete_inactive_contributors(self, users_to_delete):
         path = f"{_SCRIPT_PATH}/contributors.yml"
         contributors_yaml = self._load_yaml_file(path)
         users_to_delete_lower = [user.lower() for user in users_to_delete]
         contributors_yaml["contributors"] = [c for c in contributors_yaml["contributors"] if c.lower() not in users_to_delete_lower]
         self._write_yaml_file(path, contributors_yaml)
 
-    def get_inactive_users_msg(self, users_to_delete, tagusers):
+    def get_inactive_users_msg(self, users_to_delete, inactive_users_by_wg, tagusers):
         rfc = (
             "https://github.com/cloudfoundry/community/blob/main/toc/rfc/"
             "rfc-0025-define-criteria-and-removal-process-for-inactive-members.md"
@@ -107,21 +114,28 @@ def get_inactive_users_msg(self, users_to_delete, tagusers):
             "criteria-and-removal-process-for-inactive-members.md#remove-the-membership-to-the-cloud-foundry-github-organization"
         )
 
-        rfc_promotion_rules = (
-            "https://github.com/cloudfoundry/community/blob/main/toc/rfc/rfc-0008-role-change-process.md#proposal"
-        )
+        rfc_promotion_rules = "https://github.com/cloudfoundry/community/blob/main/toc/rfc/rfc-0008-role-change-process.md#proposal"
 
         user_tagging_prefix = "@" if tagusers else ""
         users_as_list = "\n".join(str(user_tagging_prefix + s) for s in users_to_delete)
         return (
             f"According to the rules for inactivity defined in [RFC-0025]({rfc}) following users will be deleted:\n"
             f"{users_as_list}\nAccording to the [revocation policy in the RFC]({rfc_revocation_rules}), users have"
-            " two weeks to refute this revocation, if they wish by commenting on this pull-request\n"
+            " two weeks to refute this revocation, if they wish by commenting on this pull-request "
             "and open a new pull-request to be re-added as contributor after this one is merged.\n"
-            f"As alternative, if you are active in a working group please check the [promotion rules]({rfc_promotion_rules})\n"
+            f"As alternative, if you are active in a working group please check the [promotion rules]({rfc_promotion_rules}) "
             "and if you are eligible and wish apply for a role in that working group."
+            f"{self._get_inactive_users_msg_for_wgs(inactive_users_by_wg, user_tagging_prefix)}"
         )
 
+    def get_inactive_users_by_wg(self, inactive_users, community_members_with_role_by_wg):
+        result = dict()
+        for wg, members in community_members_with_role_by_wg.items():
+            wg_inactive_members = inactive_users.intersection(members)
+            if len(wg_inactive_members) != 0 and wg != "Admin":
+                result[wg] = wg_inactive_members
+        return result
+
     @staticmethod
     def _get_bool_env_var(env_var_name, default):
         return os.getenv(env_var_name, default).lower() == "true"
@@ -154,7 +168,10 @@ def _get_bool_env_var(env_var_name, default):
     print("Get information about community users")
     generator = OrgGenerator()
     generator.load_from_project()
-    community_members_with_role = generator.get_community_members_with_role()
+    community_members_with_role_by_wg = generator.get_community_members_with_role_by_wg()
+    community_members_with_role = set()
+    for members in community_members_with_role_by_wg.values():
+        community_members_with_role |= set(members)
 
     print("Analyzing Cloud Foundry org user activity.")
     userHandler = InactiveUserHandler(args.githuborg, args.githuborgid, args.sincedate, args.githubtoken)
@@ -163,16 +180,15 @@ def _get_bool_env_var(env_var_name, default):
     print(f"Inactive users length is {len(inactive_users)} and inactive users are {inactive_users}")
     users_to_delete = inactive_users - community_members_with_role
     tagusers = args.tagusers or InactiveUserHandler._get_bool_env_var("INACTIVE_USER_MANAGEMENT_TAG_USERS", "False")
-    inactive_users_msg = userHandler.get_inactive_users_msg(users_to_delete, tagusers)
+    inactive_users_by_wg = userHandler.get_inactive_users_by_wg(inactive_users, community_members_with_role_by_wg)
+    inactive_users_msg = userHandler.get_inactive_users_msg(users_to_delete, inactive_users_by_wg, tagusers)
     if args.dryrun or InactiveUserHandler._get_bool_env_var("INACTIVE_USER_MANAGEMENT_DRY_RUN", "False"):
         print(f"Dry-run mode.\nInactive_users_msg is: {inactive_users_msg}")
         print(f"Following users will be deleted: {inactive_users}")
+        print(f"Inactive users by wg are {inactive_users_by_wg}")
     elif users_to_delete:
         userHandler.delete_inactive_contributors(users_to_delete)
         with open(os.environ["GITHUB_OUTPUT"], "a") as env:
             separator = uuid.uuid1()
             step_output_name = "inactive_users_pr_description"
             print(f"{step_output_name}<<{separator}\n{inactive_users_msg}\n{separator}", file=env)
-
-    inactive_users_with_role = community_members_with_role.intersection(inactive_users)
-    print(f"Inactive users with role length is {len(inactive_users_with_role)} and users are {inactive_users_with_role}")

toc/rfc/rfc-0030-add-support-for-file-based-service-binding.md

@@ -33,7 +33,7 @@ The two approaches should be supported in parallel. Users should be able to sele
       * Less implementation effort for the Cloud Controller
    * Disadvantages:
       * Can’t make use of tools and libraries from the Cloud Native community because K8s specifies a different file structure and format for the service binding information
-2. Implement the K8s service binding specification. The environment variable `SERVICE_BINDING_ROOT` defines the location for the service bindings. There is a file per service binding. The name of the file and the format follow the [K8s specification](https://servicebinding.io/):
+2. Implement the K8s service binding specification. The environment variable `SERVICE_BINDING_ROOT` defines the location for the service bindings. The name of the file and the format follow the [K8s specification](https://servicebinding.io/):
    * Advantages:
       * CF community could re-use service binding libraries from the Cloud Native community
       * Moving application between CF or K8s deployments will be easier
@@ -64,7 +64,7 @@ action := &models.RunAction{
       Value: "ENVVALUE",
     },
   },
- Files: []*models.Files{
+ ServiceBindingFiles: []*models.Files{
     {
       Name: "/etc/cf-instance-binding",
       Value: "VALUE",