qontract-reconcile 0.10.1rc983__py3-none-any.whl → 0.10.1rc985__py3-none-any.whl

{qontract_reconcile-0.10.1rc983.dist-info → qontract_reconcile-0.10.1rc985.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc983
+Version: 0.10.1rc985
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc983.dist-info → qontract_reconcile-0.10.1rc985.dist-info}/RECORD

@@ -665,7 +665,7 @@ reconcile/utils/gitlab_api.py,sha256=WfhLhOp3-cOwgptiCNPhWja74Lo41ZIlJ6HFSWaIDRw
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=NqxosFCInLy_dF_fcXnRYcZgsThedSyv_I3U8k2SLMg,14161
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
-reconcile/utils/helm.py,sha256=u8BzdAhuYGYO5zN8lA14N2nV0STCCZR3sHq1UpekXxE,3854
+reconcile/utils/helm.py,sha256=hdNOVz1FkEZU3Iv46_aaulnh-c40_De1ou40pMSmBiw,3777
 reconcile/utils/helpers.py,sha256=k9svgFFZG7H5FvHYY0g5jJyvgvh2UDZxf0Ib221teag,1179
 reconcile/utils/imap_client.py,sha256=h8YDiCSCvroErhpH_-KGYI7Y2WU2Q2oSpuxDFbOkSbY,1989
 reconcile/utils/instrumented_wrappers.py,sha256=eVwMoa6FCrYxLv3RML3WpZF9qKVfCTjMxphgVXG03OM,1073
@@ -710,7 +710,7 @@ reconcile/utils/state.py,sha256=a_EO5u7__Pqd0_E3MqzUttJ-0xRtuxcNx5oQi5WIahI,1639
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=tCDVrfmFCB6lGfGhJt13VRkHxGy7Psw88KIze0r-JLo,31787
-reconcile/utils/terrascript_aws_client.py,sha256=6eKwBkyesrARf5j1cAaVV9aCECkPDWTxGX1bIZNofbg,277032
+reconcile/utils/terrascript_aws_client.py,sha256=vVUpJZRInTHRZOWr3XFxEon5Q7CIaNt3jhT5eM39UQ8,278023
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=9GSNHku8tw5KM2LKpZ1myWYDLtLGUJgpSnD0DxbzeO0,14956
@@ -851,8 +851,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc983.dist-info/METADATA,sha256=bPJ_umvkKlHPv1vWkMcu9rFpAZCkz4jZlcsufQ6TM90,2262
-qontract_reconcile-0.10.1rc983.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc983.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc983.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc983.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc985.dist-info/METADATA,sha256=6LHjMZZMBaGEpwXw6RRgJTCc4uog6hygujeZ8nFtqV0,2262
+qontract_reconcile-0.10.1rc985.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc985.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc985.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc985.dist-info/RECORD,,

reconcile/utils/helm.py

@@ -35,9 +35,7 @@ def do_template(
             tempfile.NamedTemporaryFile(
                 mode="w+", encoding="locale"
             ) as repository_config_file,
-            tempfile.NamedTemporaryFile(
-                mode="w+", encoding="locale"
-            ) as repository_cache_file,
+            tempfile.TemporaryDirectory() as repository_cache_dir,
         ):
             with open(
                 os.path.join(path, "Chart.yaml"), encoding="locale"
@@ -55,7 +53,7 @@ def do_template(
                                 "--repository-config",
                                 repository_config_file.name,
                                 "--repository-cache",
-                                repository_cache_file.name,
+                                repository_cache_dir,
                             ]
                             run(cmd, capture_output=False, check=True)
                     cmd = [
@@ -66,7 +64,7 @@ def do_template(
                         "--repository-config",
                         repository_config_file.name,
                         "--repository-cache",
-                        repository_cache_file.name,
+                        repository_cache_dir,
                     ]
                     run(cmd, capture_output=False, check=True)
             with tempfile.NamedTemporaryFile(
@@ -85,7 +83,7 @@ def do_template(
                     "--repository-config",
                     repository_config_file.name,
                     "--repository-cache",
-                    repository_cache_file.name,
+                    repository_cache_dir,
                 ]
                 result = run(cmd, capture_output=True, check=True)
     except CalledProcessError as e:

reconcile/utils/terrascript_aws_client.py

@@ -1196,16 +1196,16 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                     self.add_resource(infra_account_name, tf_resource)
 
     def populate_vpc_requests(
-        self, vpc_requests: Iterable[VPCRequest], aws_provider_version: str
+        self, vpc_requests: Iterable[VPCRequest], vpc_module_version: str
     ) -> None:
         for request in vpc_requests:
             # skiping deleted requests
             if request.delete:
                 continue
             # The default values here come from infra repo's module configuration
-            values = {
+            vpc_module_values = {
                 "source": "terraform-aws-modules/vpc/aws",
-                "version": aws_provider_version,
+                "version": vpc_module_version,
                 "name": request.identifier,
                 "cidr": request.cidr_block.network_address,
                 "private_subnet_tags": {"kubernetes.io/role/internal-elb": "1"},
@@ -1218,29 +1218,52 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             }
 
             if request.subnets and request.subnets.public:
-                values["public_subnets"] = request.subnets.public
+                vpc_module_values["public_subnets"] = request.subnets.public
             if request.subnets and request.subnets.private:
-                values["private_subnets"] = request.subnets.private
+                vpc_module_values["private_subnets"] = request.subnets.private
             if request.subnets and request.subnets.availability_zones:
-                values["azs"] = request.subnets.availability_zones
+                vpc_module_values["azs"] = request.subnets.availability_zones
 
             # We only want to enable nat_gateway if we have public and private subnets
             if request.subnets and request.subnets.public and request.subnets.private:
-                values["enable_nat_gateway"] = True
+                vpc_module_values["enable_nat_gateway"] = True
 
             aws_account = request.account.name
-            module = Module(request.identifier, **values)
-            self.add_resource(aws_account, module)
+            vpc_module = Module(request.identifier, **vpc_module_values)
+            self.add_resource(aws_account, vpc_module)
+
+            # vpc_endpoint
+            vpc_endpoint_values = {
+                "source": "terraform-aws-modules/vpc/aws//modules/vpc-endpoints",
+                "version": vpc_module_version,
+                "vpc_id": vpc_module.vpc_id,
+                "endpoints": {
+                    "s3": {
+                        "service": "s3",
+                        "serivce_type": "Gateway",
+                        "tags": {
+                            "managed_by_integration": self.integration,
+                            "Name": f"{request.identifier}--vpce-s3",
+                            "route_table_ids": vpc_module.vpc.private_route_table_ids,
+                        },
+                    }
+                },
+            }
+
+            vpc_endpoint = Module(
+                f"{request.identifier}-endpoint", **vpc_endpoint_values
+            )
+            self.add_resource(aws_account, vpc_endpoint)
 
             # The outputs for module are only working with this sintaxe
             vpc_id_output = Output(
-                f"{request.identifier}-vpc_id", value=f"${{{module.vpc_id}}}"
+                f"{request.identifier}-vpc_id", value=f"${{{vpc_module.vpc_id}}}"
             )
             self.add_resource(aws_account, vpc_id_output)
 
             vpc_cidr_block_output = Output(
                 f"{request.identifier}-vpc_cidr_block",
-                value=f"${{{module.vpc_cidr_block}}}",
+                value=f"${{{vpc_module.vpc_cidr_block}}}",
             )
             self.add_resource(aws_account, vpc_cidr_block_output)