Update PSA tools

tools/psa/README.md

@@ -34,14 +34,18 @@ Each implementation requires a set of autogenerated files describing the secure
 `release.py` is the script assigned with compiling the secure images:
 
 ```
-usage: release.py [-h] [-m MCU]
+usage: release.py [-h] [-m MCU] [-d] [--commit]
 
 optional arguments:
   -h, --help         show this help message and exit
   -m MCU, --mcu MCU  build for the given MCU
+  -d, --debug        set build profile to debug
+  --commit           create a git commit for each platform
 ```
 
-When `MCU ` is not specified, the script compiles all the images for all the targets.
+* When `MCU ` is not specified, the script compiles all the images for all the targets.
+* When `-d/--debug` is not specified, the script compiles the images using the release profile.
+* When `--commit` is not specified, the script will not commit the images to git.
 
 This script should be run in following scenarios:
 

tools/psa/release.py

@@ -21,148 +21,257 @@
 import shutil
 from argparse import ArgumentParser
 
-ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
+ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                    os.pardir, os.pardir))
 sys.path.insert(0, ROOT)
 from tools.targets import Target, TARGET_MAP, TARGET_NAMES
 
 MAKE_PY_LOCATTION = os.path.join(ROOT, 'tools', 'make.py')
 TEST_PY_LOCATTION = os.path.join(ROOT, 'tools', 'test.py')
-MBED_PSA_TESTS = '*psa-spm*,*psa-crypto_access_control'
 TFM_MBED_APP = os.path.join(ROOT, 'tools', 'psa', 'tfm', 'mbed_app.json')
+MBED_PSA_TESTS = '*psa-spm*,*psa-crypto_access_control'
 TFM_TESTS = {
     '*psa-spm_smoke': ['USE_PSA_TEST_PARTITIONS', 'USE_SMOKE_TESTS_PART1'],
     '*psa-spm_client': ['USE_PSA_TEST_PARTITIONS', 'USE_CLIENT_TESTS_PART1'],
-    '*psa-spm_server': ['USE_PSA_TEST_PARTITIONS', 'USE_SERVER_TESTS_PART1', 'USE_SERVER_TESTS_PART2'],
-    '*psa-crypto_access_control': ['USE_PSA_TEST_PARTITIONS', 'USE_CRYPTO_ACL_TEST']
+    '*psa-spm_server': ['USE_PSA_TEST_PARTITIONS', 'USE_SERVER_TESTS_PART1',
+                        'USE_SERVER_TESTS_PART2'],
+    '*psa-crypto_access_control': ['USE_PSA_TEST_PARTITIONS',
+                                   'USE_CRYPTO_ACL_TEST']
 }
 
 
-def _psa_backend(target_name):
-    return 'TFM' if 'TFM' in Target.get_target(target_name).labels else 'MBED_SPM'
+def _psa_backend(target):
+    """
+    Returns a target PSA backend.
+
+    :param target: Target name as in targets.json
+    :return:  PSA backend as string (TFM/MBED_SPM)
+    """
+    return 'TFM' if 'TFM' in Target.get_target(target).labels else 'MBED_SPM'
+
+
+def _get_target_info(target):
+    """
+    Creates a PSA target tuple with default toolchain and
+    artifact delivery directory.
+
+    :param target: Target name.
+    :return: tuple (target, toolchain, delivery directory).
+    """
+    delivery_dir = os.path.join(ROOT, 'targets',
+                                TARGET_MAP[target].delivery_dir)
+
+    if not os.path.exists(delivery_dir):
+        raise Exception("{} does not have delivery_dir".format(target))
+
+    return tuple([TARGET_MAP[target].name,
+                  TARGET_MAP[target].default_toolchain,
+                  delivery_dir])
 
 
-def get_mbed_official_psa_release():
+def get_mbed_official_psa_release(target=None):
+    """
+    Creates a list of PSA targets with default toolchain and
+    artifact delivery directory.
+
+    :param target: Ask for specific target, None for all targets.
+    :return: List of tuples (target, toolchain, delivery directory).
+    """
     psa_targets_release_list = []
-    psa_secure_targets = [t for t in TARGET_NAMES if Target.get_target(t).is_PSA_secure_target]
-    for t in psa_secure_targets:
-        psa_targets_release_list.append(
-            tuple(
-                [
-                    TARGET_MAP[t].name,
-                    TARGET_MAP[t].default_toolchain
-                ]
-            )
-        )
+    psa_secure_targets = [t for t in TARGET_NAMES if
+                          Target.get_target(t).is_PSA_secure_target]
+    if target is not None:
+        if target not in psa_secure_targets:
+            raise Exception("{} is not a PSA secure target".format(target))
+        psa_targets_release_list.append(_get_target_info(target))
+    else:
+        for t in psa_secure_targets:
+            psa_targets_release_list.append(_get_target_info(target))
 
     return psa_targets_release_list
 
 
 def create_mbed_ignore(build_dir):
+    """
+    Creates a .mbedignore file in a given directory.
+
+    :param build_dir: Directory to create .mbedignore file.
+    """
     with open(os.path.join(build_dir, '.mbedignore'), 'w') as f:
         f.write('*\n')
 
 
 def build_mbed_spm_platform(target, toolchain, profile='release'):
-    subprocess.call([
+    """
+    Builds Secure images for MBED-SPM target.
+
+    :param target: target to be built.
+    :param toolchain: toolchain to be used.
+    :param profile: build profile.
+    """
+    subprocess.check_call([
         sys.executable, '-u', TEST_PY_LOCATTION,
         '--greentea',
         '--profile', profile,
         '-t', toolchain,
         '-m', target,
         '--source', ROOT,
         '--build', os.path.join(ROOT, 'BUILD', 'tests', target),
-        '--test-spec', os.path.join(ROOT, 'BUILD', 'tests', target, 'test_spec.json'),
-        '--build-data', os.path.join(ROOT, 'BUILD', 'tests', target, 'build_data.json'),
+        '--test-spec', os.path.join(ROOT, 'BUILD', 'tests',
+                                    target, 'test_spec.json'),
+        '--build-data', os.path.join(ROOT, 'BUILD', 'tests',
+                                     target, 'build_data.json'),
         '-n', MBED_PSA_TESTS
-    ])
+    ], stdout=subprocess.PIPE)
 
-    subprocess.call([
+    subprocess.check_call([
         sys.executable, '-u', MAKE_PY_LOCATTION,
         '-t', toolchain,
         '-m', target,
         '--profile', profile,
         '--source', ROOT,
         '--build', os.path.join(ROOT, 'BUILD', target),
         '--artifact-name', 'psa_release_1.0'
-    ])
+    ], stdout=subprocess.PIPE)
 
 
 def _tfm_test_defines(test):
+    """
+    Creates a define list to enable test partitions on TF-M.
+
+    :param test: Test name.
+    :return: List of defines with a leading -D.
+    """
     return ['-D{}'.format(define) for define in TFM_TESTS[test]]
 
 
 def build_tfm_platform(target, toolchain, profile='release'):
+    """
+    Builds Secure images for TF-M target.
+
+    :param target: target to be built.
+    :param toolchain: toolchain to be used.
+    :param profile: build profile.
+    """
     for test in TFM_TESTS.keys():
-        subprocess.call([
+        subprocess.check_call([
             sys.executable, '-u', TEST_PY_LOCATTION,
             '--greentea',
             '--profile', profile,
             '-t', toolchain,
             '-m', target,
             '--source', ROOT,
             '--build', os.path.join(ROOT, 'BUILD', 'tests', target),
-            '--test-spec', os.path.join(ROOT, 'BUILD', 'tests', target, 'test_spec.json'),
-            '--build-data', os.path.join(ROOT, 'BUILD', 'tests', target, 'build_data.json'),
-            '--app-config', TFM_MBED_APP, '-n', test] + _tfm_test_defines(test))
-
-    subprocess.call([
+            '--test-spec', os.path.join(ROOT, 'BUILD', 'tests',
+                                        target, 'test_spec.json'),
+            '--build-data', os.path.join(ROOT, 'BUILD', 'tests',
+                                         target, 'build_data.json'),
+            '--app-config', TFM_MBED_APP, '-n', test] + _tfm_test_defines(test),
+                              stdout=subprocess.PIPE)
+
+    subprocess.check_call([
         sys.executable, '-u', MAKE_PY_LOCATTION,
         '-t', toolchain,
         '-m', target,
         '--profile', profile,
         '--source', ROOT,
         '--build', os.path.join(ROOT, 'BUILD', target),
         '--app-config', TFM_MBED_APP
-    ])
-
-
-def build_psa_platform(target, toolchain, debug=False):
+    ], stdout=subprocess.PIPE)
+
+
+def commit_binaries(target, delivery_dir):
+    """
+    Commits changes in secure binaries.
+
+    :param target: Target name.
+    :param delivery_dir: Secure images should be moved to this folder
+    by the build system.
+    """
+    changes_made = subprocess.call([
+        'git',
+        '-C', ROOT,
+        'diff', '--exit-code',
+        delivery_dir
+    ], stdout=subprocess.PIPE)
+
+    if changes_made:
+        subprocess.check_call([
+            'git',
+            '-C', ROOT,
+            'add', os.path.relpath(delivery_dir, ROOT)
+        ], stdout=subprocess.PIPE)
+
+        commit_message = '-m\"Update secure binaries for {}\"'.format(target)
+        subprocess.check_call([
+            'git',
+            '-C', ROOT,
+            'commit',
+            commit_message
+        ], stdout=subprocess.PIPE)
+
+
+def build_psa_platform(target, toolchain, delivery_dir, debug=False,
+                       git_commit=False):
+    """
+    Calls the correct build function and commits if requested.
+
+    :param target: Target name.
+    :param toolchain: Toolchain to be used.
+    :param delivery_dir: Artifact directory, where images should be placed.
+    :param debug: Build with debug profile.
+    :param git_commit: Commit the changes.
+    """
     profile = 'debug' if debug else 'release'
     if _psa_backend(target) is 'TFM':
         build_tfm_platform(target, toolchain, profile)
     else:
         build_mbed_spm_platform(target, toolchain, profile)
 
+    if git_commit:
+        commit_binaries(target, delivery_dir)
+
 
 def get_parser():
     parser = ArgumentParser()
     parser.add_argument("-m", "--mcu",
                         help="build for the given MCU",
-                        default='*',
+                        default=None,
                         metavar="MCU")
 
     parser.add_argument("-d", "--debug",
-                        help="build for the given MCU",
+                        help="set build profile to debug",
                         action="store_true",
                         default=False)
 
-    return parser
-
-
-def filter_target(mcu):
-    def filter_func(t):
-        return t[0] == mcu
+    parser.add_argument("--commit",
+                        help="create a git commit for each platform",
+                        action="store_true",
+                        default=False)
 
-    return filter_func
+    return parser
 
 
-def main():
-    parser = get_parser()
-    options = parser.parse_args()
+def prep_build_dir():
+    """
+    Creates a clean BUILD directory
+    """
     build_dir = os.path.join(ROOT, 'BUILD')
     if os.path.exists(build_dir):
         shutil.rmtree(build_dir)
 
     os.makedirs(build_dir)
     create_mbed_ignore(build_dir)
-    target_filter_function = None
-    psa_platforms_list = get_mbed_official_psa_release()
 
-    if options.mcu is not '*':
-        target_filter_function = filter_target(options.mcu)
 
-    for target, toolchain in filter(target_filter_function, psa_platforms_list):
-        build_psa_platform(target, toolchain, options.debug)
+def main():
+    parser = get_parser()
+    options = parser.parse_args()
+    prep_build_dir()
+    psa_platforms_list = get_mbed_official_psa_release(options.mcu)
+
+    for target, tc, directory in psa_platforms_list:
+        build_psa_platform(target, tc, directory, options.debug, options.commit)
 
 
 if __name__ == '__main__':