Merge branch '9204-remove-deprecated-fields' into 'master'

Remove deprecated fields from ContainerScanning parser

Closes #9204

See merge request gitlab-org/gitlab-ee!9661

ee/lib/gitlab/ci/parsers/security/container_scanning.rb

@@ -67,10 +67,7 @@ module Gitlab
                   'url' => vulnerability['link']
                 }
               ],
-              'links' => [{ 'url' => vulnerability['link'] }],
-              'priority' => 'Unknown',
-              'url' => vulnerability['link'],
-              'tool' => 'clair'
+              'links' => [{ 'url' => vulnerability['link'] }]
             }
           end
 

ee/spec/lib/gitlab/ci/parsers/security/container_scanning_spec.rb

@@ -74,12 +74,9 @@ describe Gitlab::Ci::Parsers::Security::ContainerScanning do
         },
         'links' => [{ 'url' => 'https://security-tracker.debian.org/tracker/CVE-2017-18269' }],
         'description' => 'SSE2-optimized memmove implementation problem.',
-        'priority' => 'Unknown',
         'scanner' => { 'id' => 'clair', 'name' => 'Clair' },
         'severity' => 'critical',
-        'solution' => 'Upgrade glibc from 2.24-11+deb9u3 to 2.24-11+deb9u4',
-        'tool' => 'clair',
-        'url' => 'https://security-tracker.debian.org/tracker/CVE-2017-18269'
+        'solution' => 'Upgrade glibc from 2.24-11+deb9u3 to 2.24-11+deb9u4'
       } )
     end
   end