Merge branch 'main' into pytest-runner

Author: cguldner

.github/workflows/pypiupload.yaml

@@ -6,16 +6,33 @@ name: Publish to PyPi
 on:
   release:
     types: [created]
+  workflow_dispatch:  # Allow manual trigger for testing
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    permissions:  # required for OIDC authentication
+      id-token: write
+      contents: read
     strategy:
       matrix:
         python-version: [3.x]
 
     steps:
     - uses: actions/checkout@v2
+
+    - name: Configure AWS credentials (OIDC)
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        role-to-assume: arn:aws:iam::082972943155:role/oidc-github-dropbox-stone-branch-main
+        aws-region: us-west-2
+    - name: Get PyPI token from AWS Secrets Manager
+      id: get-secret
+      uses: aws-actions/aws-secretsmanager-get-secrets@v2
+      with:
+        secret-ids: |
+          PYPI_SECRET,arn:aws:secretsmanager:us-west-2:082972943155:secret:pypi-api-token-vbs5JD
+        parse-json-secrets: false
     - name: Publish to PyPi
       uses: actions/setup-python@v2.1.4
       with:
@@ -34,7 +51,7 @@ jobs:
     - name: Publish
       env:
         TWINE_USERNAME: __token__
-        TWINE_PASSWORD: ${{ secrets.pypi_secret }}
+        TWINE_PASSWORD: ${{ env.PYPI_SECRET }}
       run: |
         twine check dist/*
         twine upload dist/*

stone/backends/obj_c_types.py

@@ -83,7 +83,7 @@ class ObjCTypesBackend(ObjCBaseBackend):
 
     cmdline_parser = _cmdline_parser
     obj_name_to_namespace = {}  # type: typing.Dict[str, str]
-    namespace_to_has_route_auth_list = {}  # type: typing.Dict[typing.Any, typing.Set]
+    namespace_to_has_route_auth_list = {}  # type: typing.Dict[typing.Any, typing.List]
 
     def generate(self, api):
         """
@@ -134,18 +134,25 @@ def generate(self, api):
                 ns_dict = {"name": ns_name, "children": [], }
                 jazzy_cfg['custom_categories'].insert(idx, ns_dict)
 
+        namespace_to_has_route_auth_list = {}
+
         for namespace in api.namespaces.values():
-            self.namespace_to_has_route_auth_list[namespace] = set()
+            namespace_to_has_route_auth_list[namespace] = set()
             if namespace.routes:
                 for route in namespace.routes:
                     auth_types = set(map(lambda x: x.strip(), route.attrs.get('auth').split(',')))
                     if 'noauth' not in auth_types:
-                        self.namespace_to_has_route_auth_list[namespace].add(
+                        namespace_to_has_route_auth_list.setdefault(namespace, set()).add(
                             route.attrs.get('auth'))
                     else:
-                        self.namespace_to_has_route_auth_list[namespace].add(
+                        namespace_to_has_route_auth_list.setdefault(namespace, set()).add(
                             'user')
 
+        self.namespace_to_has_route_auth_list = {
+            k: sorted(v)
+            for k, v in namespace_to_has_route_auth_list.items()
+        }
+
         with self.output_to_relative_path('DBSDKImportsGenerated.h'):
             self._generate_all_imports(api)