Add RPM/Mariner support to service

.vscode/launch.json

@@ -11,7 +11,7 @@
       "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
       "args": [
         "-u",
-        "tdd",
+        "bdd",
         "--timeout",
         "999999",
         "--exit",
@@ -53,4 +53,4 @@
       "port": 9230
     }
   ]
-}
+}

business/statsService.js

@@ -46,6 +46,7 @@ class StatsService {
       pypi: () => this._getType('pypi'),
       deb: () => this._getType('deb'),
       debsrc: () => this._getType('debsrc'),
+      rpm: () => this._getType('rpm'),
     }
   }
 

docs/determining-declared-license.md

@@ -102,3 +102,7 @@
 * source: https://cocoapods.org/
 * The service then sets the declared license based on the registry information
 * The ClearlyDefined summarizer pulls registry information from 'https://raw.githubusercontent.com/CocoaPods/Specs/master
+
+### rpm
+* source: packages.microsoft.com
+* TODO

lib/licenseMatcher.js

@@ -129,6 +129,8 @@ class HarvestLicenseMatchPolicy {
         return new BaseHarvestLicenseMatchStrategy('deb', ['declaredLicenses'])
       case 'debsrc':
         return new BaseHarvestLicenseMatchStrategy('debsrc', ['declaredLicenses'])
+      case 'rpm':
+        return new BaseHarvestLicenseMatchStrategy('rpm', ['declaredLicense'])
       default:
         return new BaseHarvestLicenseMatchStrategy('default')
     }
@@ -212,4 +214,4 @@ module.exports = {
   LicenseMatcher,
   DefinitionLicenseMatchPolicy,
   HarvestLicenseMatchPolicy
-}
+}

providers/summary/clearlydefined.js

@@ -74,6 +74,9 @@ class ClearlyDescribedSummarizer {
       case 'debsrc':
         this.addDebSrcData(result, data, coordinates)
         break
+      case 'rpm':
+        this.addRpmData(result, data, coordinates)
+        break
       default:
     }
     return result
@@ -89,6 +92,9 @@ class ClearlyDescribedSummarizer {
   }
 
   addSourceLocation(result, data) {
+    // It's not deducible where the source of RPMs are - in this case
+    // we rely on the crawler to tell us.
+    setIfValue(result, 'described.sourceLocation', get(data, 'registryData.srcRpmUrl'))
     if (!data.sourceInfo) return
     const spec = data.sourceInfo
     updateSourceLocation(spec)
@@ -470,6 +476,17 @@ class ClearlyDescribedSummarizer {
     return null
   }
 
+  addRpmData(result, data, coordinates) {
+    setIfValue(result, 'described.releaseDate', extractDate(data.releaseDate))
+    if (!data.registryData) return
+    if (result.described.sourceLocation) {
+      result.described.sourceLocation.url = data.registryData.srcRpmUrl
+    }
+    setIfValue(result, 'licensed.declared', SPDX.normalize(data.declaredLicense))
+    setIfValue(result, 'described.urls.registry', data.registryData.rpmUrl)
+    setIfValue(result, 'described.urls.download', data.registryData.rpmUrl)
+  }
+
   addGoData(result, data, coordinates) {
     var urls = { download: '', registry: '', version: '' }
 

schemas/coordinates-1.0.json

@@ -24,7 +24,8 @@
         "pypi",
         "sourcearchive",
         "deb",
-        "debsrc"
+        "debsrc",
+        "rpm"
       ],
       "errorMessage": {
         "type": "coordinates.type must be a string"
@@ -44,7 +45,8 @@
         "nuget",
         "rubygems",
         "pypi",
-        "debian"
+        "debian",
+        "mariner"
       ],
       "errorMessage": {
         "type": "coordinates.provider must be a string"
@@ -69,4 +71,4 @@
       }
     }
   }
-}
+}

schemas/curation-1.0.json

@@ -35,7 +35,8 @@
         "pypi",
         "sourcearchive",
         "deb",
-        "debsrc"
+        "debsrc",
+        "rpm"
       ],
       "errorMessage": {
         "enum": "Package type must be supported by ClearlyDefined",
@@ -58,7 +59,8 @@
         "nuget",
         "rubygems",
         "pypi",
-        "debian"
+        "debian",
+        "mariner"
       ],
       "errorMessage": {
         "enum": "Provider type must be supported by ClearlyDefined",
@@ -258,4 +260,4 @@
       }
     }
   }
-}
+}

schemas/curations-1.0.json

@@ -37,7 +37,8 @@
         "pypi",
         "sourcearchive",
         "deb",
-        "debsrc"
+        "debsrc",
+        "rpm"
       ],
       "errorMessage": {
         "enum": "Package type must be supported by ClearlyDefined",
@@ -60,7 +61,8 @@
         "nuget",
         "rubygems",
         "pypi",
-        "debian"
+        "debian",
+        "mariner"
       ],
       "errorMessage": {
         "enum": "Provider type must be supported by ClearlyDefined",
@@ -115,4 +117,4 @@
       }
     }
   }
-}
+}

schemas/definition-1.0.json

@@ -43,7 +43,8 @@
         "pypi",
         "sourcearchive",
         "deb",
-        "debsrc"
+        "debsrc",
+        "rpm"
       ]
     },
     "provider": {
@@ -61,7 +62,8 @@
         "nuget",
         "rubygems",
         "pypi",
-        "debian"
+        "debian",
+        "mariner"
       ]
     },
     "_meta": {
@@ -471,4 +473,4 @@
       }
     }
   }
-}
+}

schemas/swagger.yaml

@@ -543,6 +543,7 @@ components:
           - pod
           - pypi
           - sourcearchive
+          - rpm
     provider:
       name: provider
       in: path
@@ -564,6 +565,7 @@ components:
           - packagist
           - pypi
           - rubygems
+          - mariner
     namespace:
       name: namespace
       in: path

test/summary/clearlydefinedTests.js

@@ -652,6 +652,19 @@ describe('ClearlyDescribedSummarizer addDebSrcData', () => {
   })
 })
 
+describe('ClearlyDescribedSummarizer addRpmData', () => {
+  const coordinates = EntityCoordinates.fromString('rpm/mariner/-/test/1.0-1.cm2.x86_64')
+  it('describes releaseDate from data', () => {
+    let result = { described: { sourceLocation: {} } }
+    summarizer.addRpmData(result, {
+      releaseDate: '2018-06-01T21:41:57.990052+00:00',
+      registryData: { srcRpmUrl: "https://packages.microsoft.com/src.rpm" }
+    }, coordinates)
+    assert.strictEqual(result.described.releaseDate, '2018-06-01')
+    assert.strictEqual(result.described.sourceLocation.url, 'https://packages.microsoft.com/src.rpm')
+  })
+})
+
 describe('ClearlyDescribedSummarizer addGitData', () => {
   const testCoordinatesGit = EntityCoordinates.fromString('git/github/test_namespace/test/71eee1980b')