From f10b7a1ebe94accce191a5706d65b639f2788e4b Mon Sep 17 00:00:00 2001
From: abin <abinx.mathew@intel.com>
Date: Fri, 19 May 2023 18:57:47 +0530
Subject: [PATCH] fixup! Remove Gramine dependencies that are not needed at
 runtime

Signed-off-by: abin <abinx.mathew@intel.com>
---
 gsc.py                                    | 29 +++++++++++------------
 templates/Dockerfile.common.sign.template |  1 -
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/gsc.py b/gsc.py
index d465965c..601db2f8 100755
--- a/gsc.py
+++ b/gsc.py
@@ -21,6 +21,16 @@
 import tomli_w # pylint: disable=import-error
 import yaml    # pylint: disable=import-error
 
+def test_trueish(value):
+    value = value.casefold()
+    if not value or value in ('false', 'off', 'no'):
+        return False
+    if value in ('true', 'on', 'yes'):
+        return True
+    if value.isdigit():
+        return bool(int(value))
+    raise ValueError(f'Invalid value for trueish: {value!r}')
+
 def gsc_image_name(original_image_name):
     return f'gsc-{original_image_name}'
 
@@ -138,8 +148,7 @@ def extract_define_args(args):
             key, value = item.split('=', maxsplit=1)
             defineargs_dict[key] = value
         else:
-            #user specified --define with key and without value, exiting here.
-            print(f'Invalid value for argument `{item}`, Expected `--define {item}=True/False`')
+            print(f'Invalid value for argument `{item}`, expected `--define {item}=<value>`')
             sys.exit(1)
     return defineargs_dict
 
@@ -529,25 +538,15 @@ def gsc_info_image(args):
     help='Set image sign-time variables.')
 sub_sign.add_argument('--remove-gramine-deps', action='append_const', dest='define',
     const='remove_gramine_deps=true', help='Remove Gramine dependencies that are not needed'
-                                           'at runtime.')
+                                           ' at runtime.')
 sub_sign.add_argument('--no-remove-gramine-deps', action='append_const', dest='define',
-    const='remove_gramine_deps=false', help='Retain Gramine dependencies that are not needed' 
-                                            'at runtime.')
+    const='remove_gramine_deps=false', help='Retain Gramine dependencies that are not needed'
+                                            ' at runtime.')
 sub_info = subcommands.add_parser('info-image', help='Retrieve information about a graminized '
                                   'Docker image')
 sub_info.set_defaults(command=gsc_info_image)
 sub_info.add_argument('image', help='Name of the graminized Docker image.')
 
-def test_trueish(value):
-    value = value.casefold()
-    if not value or value in ('false', 'off', 'no'):
-        return False
-    if value in ('true', 'on', 'yes'):
-        return True
-    if value.isdigit():
-        return bool(int(value))
-    raise ValueError(f'Invalid value for trueish: {value!r}')
-
 def main(args):
     args = argparser.parse_args()
     return args.command(args)
diff --git a/templates/Dockerfile.common.sign.template b/templates/Dockerfile.common.sign.template
index a4b9ba71..02942d5d 100644
--- a/templates/Dockerfile.common.sign.template
+++ b/templates/Dockerfile.common.sign.template
@@ -27,4 +27,3 @@ USER root
 # Switch back to original app_image user
 USER {{app_user}}
 {% endif %}
-