qontract-reconcile 0.10.2.dev163__py3-none-any.whl → 0.10.2.dev165__py3-none-any.whl

{qontract_reconcile-0.10.2.dev163.dist-info → qontract_reconcile-0.10.2.dev165.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev163
+Version: 0.10.2.dev165
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev163.dist-info → qontract_reconcile-0.10.2.dev165.dist-info}/RECORD

@@ -664,7 +664,7 @@ reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,1637
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=IDlrNvGEc2i6ElZIL_fzaJEad1nRC3DkP9_VXhJXmU0,37329
-reconcile/utils/terrascript_aws_client.py,sha256=-knIxxuez_gmaI4OvkMq3YeYdZgzkDIVVorFdS_nw4E,289989
+reconcile/utils/terrascript_aws_client.py,sha256=OJm42zVrc0GjVRFHb7SD5ZwHcWI1vAnNRYqeivzeknk,291509
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=aSA8l9cJlPUHpChFGl27nSY-Mpq9FMjBo7Dcgb1BVfM,15036
@@ -804,7 +804,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev163.dist-info/METADATA,sha256=5N8yyOG8iyt-2Yd_11j59PrrMza06xwFPNvd7qIjYrk,24627
-qontract_reconcile-0.10.2.dev163.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev163.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev163.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev165.dist-info/METADATA,sha256=plKaiYqaDTQq1ATPumJJ3ElVf4s2-ws0i5NaoBo5Kag,24627
+qontract_reconcile-0.10.2.dev165.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev165.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev165.dist-info/RECORD,,

reconcile/utils/terrascript_aws_client.py

@@ -6138,6 +6138,11 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             callback_urls=[f"{bucket_url}/token.html"],
             depends_on=["aws_cognito_resource_server.userpool_gateway_resource_server"],
             **pool_client_args,
+            token_validity_units={
+                "access_token": "minutes",
+                "id_token": "minutes",
+                "refresh_token": "days",
+            },
         )
         tf_resources.append(cognito_user_pool_client)
 
@@ -6149,9 +6154,15 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                 user_pool_id=f"${{{cognito_user_pool_resource.id}}}",
                 callback_urls=insights_callback_urls,
                 **pool_client_args,
+                token_validity_units={
+                    "access_token": "minutes",
+                    "id_token": "minutes",
+                    "refresh_token": "days",
+                },
             )
             tf_resources.append(insights_cognito_user_pool_client)
 
+        # todo: these scopes should be defined in an external resource file
         # POOL RESOURCE SERVER
         cognito_resource_server_resource = aws_cognito_resource_server(
             "userpool_service_resource_server",
@@ -6215,6 +6226,11 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             allowed_oauth_scopes=["ocm/AccountManagement"],
             depends_on=["aws_cognito_resource_server.userpool_service_resource_server"],
             **pool_client_service_account_common_args,
+            token_validity_units={
+                "access_token": "minutes",
+                "id_token": "minutes",
+                "refresh_token": "days",
+            },
         )
         tf_resources.append(ams_service_account_pool_client_resource)
 
@@ -6226,6 +6242,11 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             allowed_oauth_scopes=["ocm/ClusterService"],
             depends_on=["aws_cognito_resource_server.userpool_service_resource_server"],
             **pool_client_service_account_common_args,
+            token_validity_units={
+                "access_token": "minutes",
+                "id_token": "minutes",
+                "refresh_token": "days",
+            },
         )
         tf_resources.append(cs_service_account_pool_client_resource)
 
@@ -6237,6 +6258,11 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             allowed_oauth_scopes=["ocm/ServiceLogService"],
             depends_on=["aws_cognito_resource_server.userpool_service_resource_server"],
             **pool_client_service_account_common_args,
+            token_validity_units={
+                "access_token": "minutes",
+                "id_token": "minutes",
+                "refresh_token": "days",
+            },
         )
         tf_resources.append(osl_service_account_pool_client_resource)
 
@@ -6251,6 +6277,11 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                     "aws_cognito_resource_server.userpool_service_resource_server"
                 ],
                 **pool_client_service_account_common_args,
+                token_validity_units={
+                    "access_token": "minutes",
+                    "id_token": "minutes",
+                    "refresh_token": "days",
+                },
             )
         )
         tf_resources.append(backplane_cli_service_account_pool_client_resource)
@@ -6266,6 +6297,11 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                     "aws_cognito_resource_server.userpool_service_resource_server"
                 ],
                 **pool_client_service_account_common_args,
+                token_validity_units={
+                    "access_token": "minutes",
+                    "id_token": "minutes",
+                    "refresh_token": "days",
+                },
             )
         )
         tf_resources.append(backplane_api_service_account_pool_client_resource)
@@ -6278,6 +6314,11 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             allowed_oauth_scopes=["ocm/InsightsServiceAccount"],
             depends_on=["aws_cognito_resource_server.userpool_service_resource_server"],
             **pool_client_service_account_common_args,
+            token_validity_units={
+                "access_token": "minutes",
+                "id_token": "minutes",
+                "refresh_token": "days",
+            },
         )
         tf_resources.append(insights_service_account_pool_client_resource)