endpoints.appr: move to new v22 format

endpoints/appr/test/test_api.py

@@ -9,10 +9,10 @@ from cnr.tests.test_models import CnrTestModels
 import data.oci_model.blob as oci_blob
 
 from data.database import User
-from data.interfaces.appr import oci_app_model
 from data.model import organization, user
 from endpoints.appr import registry # Needed to register the endpoint
 from endpoints.appr.cnr_backend import Channel, Package, QuayDB
+from endpoints.appr.models_oci import model as oci_app_model
 
 from test.fixtures import *
 
@@ -57,14 +57,14 @@ class PackageTest(Package):
         for mtype in cls.manifests(package_name, release):
           package = oci_app_model.fetch_release(package_name, release, mtype)
           blob = blob_cls.get(package_name, package.manifest.content.digest)
-          data = cls._apptuple_to_dict(package)
-          data.pop('digest')
-          data['channels'] = [
+          app_data = cls._apptuple_to_dict(package)
+          app_data.pop('digest')
+          app_data['channels'] = [
             x.name
             for x in oci_app_model.list_release_channels(package_name, package.release, False)
           ]
-          data['blob'] = blob.b64blob
-          result.append(data)
+          app_data['blob'] = blob.b64blob
+          result.append(app_data)
     return result
 
 

endpoints/appr/test/test_digest_prefix.py

@@ -0,0 +1,11 @@
+import pytest
+from endpoints.appr.models_oci import _strip_sha256_header
+
+
+@pytest.mark.parametrize('digest,expected', [
+  ('sha256:251b6897608fb18b8a91ac9abac686e2e95245d5a041f2d1e78fe7a815e6480a',
+   '251b6897608fb18b8a91ac9abac686e2e95245d5a041f2d1e78fe7a815e6480a'),
+  ('251b6897608fb18b8a91ac9abac686e2e95245d5a041f2d1e78fe7a815e6480a',
+   '251b6897608fb18b8a91ac9abac686e2e95245d5a041f2d1e78fe7a815e6480a'),])
+def test_stip_sha256(digest, expected):
+  assert _strip_sha256_header(digest) == expected