More cleanup

Author: DomAyre

src/confcom/azext_confcom/custom.py

@@ -3,13 +3,10 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-import json
 import os
 import sys
-import tempfile
 from typing import BinaryIO, Optional
 
-from azext_confcom import config
 from azext_confcom import oras_proxy, os_util, security_policy
 from azext_confcom._validators import resolve_stdio
 from azext_confcom.config import (
@@ -20,15 +17,13 @@
 from azext_confcom.fragment_util import get_all_fragment_contents
 from azext_confcom.init_checks import run_initial_docker_checks
 from azext_confcom.kata_proxy import KataPolicyGenProxy
-from azext_confcom.security_policy import AciPolicy, OutputType, policy_deserialize
-from azext_confcom.lib.policy import Container
-from azext_confcom.lib.serialization import policy_serialize, policy_deserialize
+from azext_confcom.security_policy import AciPolicy, OutputType
 from azext_confcom.command.radius_policy_insert import radius_policy_insert as _radius_policy_insert
+from azext_confcom.command.containers_from_radius import containers_from_radius as _containers_from_radius
 from azext_confcom.template_util import (
     get_image_name, inject_policy_into_template, inject_policy_into_yaml,
     pretty_print_func, print_existing_policy_from_arm_template,
     print_existing_policy_from_yaml, print_func, str_to_sha256)
-from azext_confcom.command.containers_from_radius import containers_from_radius as _containers_from_radius
 from knack.log import get_logger
 from pkg_resources import parse_version
 
@@ -367,12 +362,6 @@ def acifragmentgen_confcom(
         feed = get_image_name(image_target)
 
     fragment_text = policy.generate_fragment(namespace, svn, output_type, omit_id=omit_id)
-    with tempfile.NamedTemporaryFile(mode="w+", delete=True) as temp_policy_file:
-        temp_policy_file.write(fragment_text)
-        temp_policy_file.flush()
-        policy_obj = policy_deserialize(temp_policy_file.name)
-        policy_obj.containers.extend(Container(**json.loads(c)) for c in container_definitions)
-        fragment_text = policy_serialize(policy_obj)
 
     if output_type != security_policy.OutputType.DEFAULT and not no_print:
         print(fragment_text)

src/confcom/azext_confcom/security_policy.py

@@ -6,7 +6,6 @@
 import copy
 from dataclasses import asdict
 import json
-import tempfile
 import warnings
 from enum import Enum, auto
 from typing import Any, Dict, List, Optional, Tuple, Union
@@ -15,7 +14,6 @@
 from azext_confcom import config, os_util
 from azext_confcom.lib.policy import Container
 from azext_confcom.container import ContainerImage, UserContainerImage
-from azext_confcom.lib.policy import Container
 from azext_confcom.errors import eprint
 from azext_confcom.fragment_util import sanitize_fragment_fields
 from azext_confcom.oras_proxy import create_list_of_standalone_imports
@@ -44,7 +42,6 @@
                                          process_mounts,
                                          process_mounts_from_config,
                                          readable_diff)
-from azext_confcom.lib.serialization import policy_serialize, policy_deserialize
 from knack.log import get_logger
 from tqdm import tqdm