Issue #410: Remove support for daemon mode (#413)

Author: zivnevo

.github/workflows/test-push.yml

@@ -150,23 +150,3 @@ jobs:
       - run: |
           export PYTHONPATH=.
           python tests/run_all_tests.py --type=k8s_live_general
-  rest-api:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-      - uses: ./.github/actions/setup-nca-env
-      - run: |
-          python -m nca --daemon &
-          NCA_PID=$!
-          while true; do  # wait until REST server becomes responsive
-            curl_status=0
-            curl localhost:5000 || curl_status=$?
-            [ $curl_status -gt 0 ]  || break
-            sleep 1
-          done
-          curl -X POST -H Content-Type:application/json -d @tests/k8s_testcases/example_podlist/ns_list.json localhost:5000/namespace_list
-          curl -X POST -H Content-Type:application/json -d @tests/k8s_testcases/example_podlist/pods_list.json localhost:5000/pod_list
-          curl -X POST -H Content-Type:application/json -d @tests/k8s_testcases/example_policies/testcase1/testcase1-networkpolicy1.json localhost:5000/policy_sets
-          curl localhost:5000/policy_sets/set_0/findings -o testcase1_findings.json
-          diff testcase1_findings.json tests/rest_api/testcase1-findings.json
-          kill $NCA_PID

README.md

@@ -82,8 +82,6 @@ The arguments to `--resource_list` and to `--base_resource_list` should be one o
   A valid token to access a GHE repository
 - `--period <minutes>`\
   Run NCA with given arguments every specified number of minutes
-- `--daemon`\
-  Run NCA as a daemon. Send and receive data using a REST API.
 - `--output_format <format>`\
   Output format specification (txt/yaml/csv/md/dot).\
   *default:* txt\

nca/RESTServer.py

@@ -14,7 +14,6 @@
 from nca.NetworkConfig.NetworkConfigQueryRunner import NetworkConfigQueryRunner
 from nca.NetworkConfig.ResourcesHandler import ResourcesHandler
 from nca.SchemeRunner import SchemeRunner
-from nca.RESTServer import RestServer
 
 
 def _valid_path(path_location, allow_ghe=False, allowed_platforms=None):
@@ -275,7 +274,6 @@ def nca_main(argv=None):
                                      action='append',
                                      help='Network policies (policy name/file/dir/GHE url/cluster-type) '
                                           'specifying permitted connections')
-    manual_or_automatic.add_argument('--daemon', action='store_true', help='Run NCA as a daemon with REST API')
     parser.add_argument('--base_np_list', '-b', type=_network_policies_valid_path, action='append',
                         help='Filesystem or GHE location of base network policies '
                              'for equiv/interferes/forbids/permits/semantic_diff check (default: k8s cluster)')
@@ -324,9 +322,6 @@ def nca_main(argv=None):
     if args.ghe_token:
         os.environ['GHE_TOKEN'] = args.ghe_token
 
-    if args.daemon:
-        return RestServer(args.ns_list, args.pod_list, args.resource_list).run()
-
     try:
         if args.period <= 0:
             ret_val = run_args(args)

nca/nca_cli.py

@@ -1,5 +1,4 @@
 ghapi==1.0.3
 ruamel.yaml==0.17.21
-Flask==2.2.2
 PyYAML==6.0
 greenery==4.0.0

requirements.txt

@@ -20,7 +20,6 @@ packages = find:
 install_requires =
     ghapi==1.0.3
     ruamel.yaml==0.17.21
-    Flask==2.2.2
     PyYAML==6.0
     greenery==4.0.0