qontract-reconcile 0.10.1rc536__py3-none-any.whl → 0.10.1rc538__py3-none-any.whl

reconcile/utils/terraform_client.py

@@ -90,7 +90,7 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
         self.thread_pool_size = thread_pool_size
         self._aws_api = aws_api
         self._log_lock = Lock()
-        self.should_apply = False
+        self.apply_count = 0
 
         self.specs: list[TerraformSpec] = []
         self.init_specs()
@@ -111,6 +111,12 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
             for account, output in self.outputs.items()
         }
 
+    def increment_apply_count(self):
+        self.apply_count += 1
+
+    def should_apply(self) -> bool:
+        return self.apply_count > 0
+
     def get_new_users(self):
         new_users = []
         self.init_outputs()  # get updated output
@@ -282,7 +288,7 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
             after = output_change.get("after")
             if before != after:
                 logging.info(["update", name, "output", output_name])
-                self.should_apply = True
+                self.increment_apply_count()
 
         # A way to detect deleted outputs is by comparing
         # the prior state with the output changes.
@@ -295,7 +301,7 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
         deleted_outputs = [po for po in prior_outputs if po not in output_changes]
         for output_name in deleted_outputs:
             logging.info(["delete", name, "output", output_name])
-            self.should_apply = True
+            self.increment_apply_count()
 
         resource_changes = output.get("resource_changes")
         if resource_changes is None:
@@ -339,7 +345,7 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
                         resource_name,
                         self._resource_diff_changed_fields(action, resource_change),
                     ])
-                    self.should_apply = True
+                    self.increment_apply_count()
                 if action == "create":
                     if resource_type == "aws_iam_user_login_profile":
                         created_users.append(AccountUser(name, resource_name))

reconcile/utils/terrascript_aws_client.py

@@ -3890,22 +3890,30 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             if os.path.isfile(print_to_file):
                 os.remove(print_to_file)
 
-        for name, ts in self.tss.items():
+        for name, ts in self.terraform_configurations().items():
             if print_to_file:
                 with open(print_to_file, "a", encoding="locale") as f:
                     f.write(f"##### {name} #####\n")
-                    f.write(str(ts))
+                    f.write(ts)
                     f.write("\n")
             if existing_dirs is None:
                 wd = tempfile.mkdtemp(prefix=TMP_DIR_PREFIX)
             else:
                 wd = working_dirs[name]
             with open(wd + "/config.tf.json", "w", encoding="locale") as f:
-                f.write(str(ts))
+                f.write(ts)
             working_dirs[name] = wd
 
         return working_dirs
 
+    def terraform_configurations(self) -> dict[str, str]:
+        """
+        Return the Terraform configurations (in JSON format) for each AWS account.
+
+        :return: key is AWS account name and value is terraform configuration
+        """
+        return {name: str(ts) for name, ts in self.tss.items()}
+
     def init_values(self, spec: ExternalResourceSpec, init_tags: bool = True) -> dict:
         """
         Initialize the values of the terraform resource and merge the defaults and

tools/qontract_cli.py

@@ -2446,8 +2446,8 @@ def early_exit_cache(ctx):
 )
 @click.option(
     "-c",
-    "--cache-desired-state",
-    help="Cache desired state. It should be a JSON string.",
+    "--cache-source",
+    help="Cache source. It should be a JSON string.",
     required=True,
 )
 @click.pass_context
@@ -2456,14 +2456,14 @@ def early_exit_cache_head(
     integration,
     integration_version,
     dry_run,
-    cache_desired_state,
+    cache_source,
 ):
     with EarlyExitCache.build() as cache:
         cache_key = CacheKey(
             integration=integration,
             integration_version=integration_version,
             dry_run=dry_run,
-            cache_desired_state=json.loads(cache_desired_state),
+            cache_source=json.loads(cache_source),
         )
         status = cache.head(cache_key)
         print(status)
@@ -2489,8 +2489,8 @@ def early_exit_cache_head(
 )
 @click.option(
     "-c",
-    "--cache-desired-state",
-    help="Cache desired state. It should be a JSON string.",
+    "--cache-source",
+    help="Cache source. It should be a JSON string.",
     required=True,
 )
 @click.pass_context
@@ -2499,14 +2499,14 @@ def early_exit_cache_get(
     integration,
     integration_version,
     dry_run,
-    cache_desired_state,
+    cache_source,
 ):
     with EarlyExitCache.build() as cache:
         cache_key = CacheKey(
             integration=integration,
             integration_version=integration_version,
             dry_run=dry_run,
-            cache_desired_state=json.loads(cache_desired_state),
+            cache_source=json.loads(cache_source),
         )
         value = cache.get(cache_key)
         print(value)
@@ -2532,14 +2532,14 @@ def early_exit_cache_get(
 )
 @click.option(
     "-c",
-    "--cache-desired-state",
-    help="Cache desired state. It should be a JSON string.",
+    "--cache-source",
+    help="Cache source. It should be a JSON string.",
     required=True,
 )
 @click.option(
-    "-d",
-    "--desired-state",
-    help="Desired state. It should be a JSON string.",
+    "-p",
+    "--payload",
+    help="Payload in Cache value. It should be a JSON string.",
     required=True,
 )
 @click.option(
@@ -2568,8 +2568,8 @@ def early_exit_cache_set(
     integration,
     integration_version,
     dry_run,
-    cache_desired_state,
-    desired_state,
+    cache_source,
+    payload,
     log_output,
     applied_count,
     ttl,
@@ -2579,10 +2579,10 @@ def early_exit_cache_set(
             integration=integration,
             integration_version=integration_version,
             dry_run=dry_run,
-            cache_desired_state=json.loads(cache_desired_state),
+            cache_source=json.loads(cache_source),
         )
         cache_value = CacheValue(
-            desired_state=json.loads(desired_state),
+            payload=json.loads(payload),
             log_output=log_output,
             applied_count=applied_count,
         )

tools/test/test_qontract_cli.py

@@ -84,7 +84,7 @@ def test_early_exit_cache_set(env_vars, mock_queries, mock_early_exit_cache):
 
     result = runner.invoke(
         qontract_cli.early_exit_cache,
-        "set -i a -v b --no-dry-run -c {} -d {} -l log -t 30",
+        "set -i a -v b --no-dry-run -c {} -p {} -l log -t 30",
     )
     assert result.exit_code == 0
     mock_early_exit_cache.build.return_value.__enter__.return_value.set.assert_called()