Merge pull request snyk#395 from snyk/feat/support-gradle-kotlin-script

Feat: add build.gradle.kts support

help/file.txt

@@ -16,6 +16,7 @@ looking for files in following order:
   pom.xml
   requirements.txt
   build.gradle
+  build.gradle.kts
   build.sbt
   Gopkg.lock
   vendor/vendor.json

package.json

@@ -70,7 +70,7 @@
     "snyk-config": "2.2.1",
     "snyk-docker-plugin": "1.22.0",
     "snyk-go-plugin": "1.6.1",
-    "snyk-gradle-plugin": "2.1.4",
+    "snyk-gradle-plugin": "2.1.5",
     "snyk-module": "1.9.1",
     "snyk-mvn-plugin": "2.0.1",
     "snyk-nodejs-lockfile-parser": "1.11.0",

src/lib/detect.ts

@@ -14,6 +14,7 @@ const DETECTABLE_FILES = [
   'Gemfile.lock',
   'pom.xml',
   'build.gradle',
+  'build.gradle.kts',
   'build.sbt',
   'Pipfile',
   'requirements.txt',
@@ -34,6 +35,7 @@ const DETECTABLE_PACKAGE_MANAGERS = {
   'package-lock.json': 'npm',
   'pom.xml': 'maven',
   'build.gradle': 'gradle',
+  'build.gradle.kts': 'gradle',
   'build.sbt': 'sbt',
   'yarn.lock': 'yarn',
   'package.json': 'npm',

test/acceptance/cli.acceptance.test.ts

@@ -502,6 +502,30 @@ test('`test ruby-app-no-vulns`', async (t) => {
   t.deepEqual(res, expected, '--json output is the same');
 });
 
+test('`test gradle-kotlin-dsl-app` returns correct meta', async (t) => {
+  chdirWorkspaces();
+  const plugin = {
+    async inspect() {
+      return {package: {}};
+    },
+  };
+  const spyPlugin = sinon.spy(plugin, 'inspect');
+  const loadPlugin = sinon.stub(plugins, 'loadPlugin');
+  t.teardown(loadPlugin.restore);
+  loadPlugin.withArgs('gradle').returns(plugin);
+
+  const res = await cli.test('gradle-kotlin-dsl-app');
+  const meta = res.slice(res.indexOf('Organisation:')).split('\n');
+  t.match(meta[0], /Organisation:\s+test-org/, 'organisation displayed');
+  t.match(meta[1], /Package manager:\s+gradle/,
+    'package manager displayed');
+  t.match(meta[2], /Target file:\s+build.gradle.kts/, 'target file displayed');
+  t.match(meta[3], /Open source:\s+no/, 'open source displayed');
+  t.match(meta[4], /Project path:\s+gradle-kotlin-dsl-app/, 'path displayed');
+  t.notMatch(meta[5], /Local Snyk policy:\s+found/,
+    'local policy not displayed');
+});
+
 test('`test gradle-app` returns correct meta', async (t) => {
   chdirWorkspaces();
   const plugin = {
@@ -2425,6 +2449,7 @@ test('`wizard` for unsupported package managers', async (t) => {
     { file: 'pip-app/requirements.txt', type: 'Python' },
     { file: 'sbt-app/build.sbt', type: 'SBT' },
     { file: 'gradle-app/build.gradle', type: 'Gradle' },
+    { file: 'gradle-kotlin-dsl-app/build.gradle.kts', type: 'Gradle' },
     { file: 'golang-app/Gopkg.lock', type: 'Golang/Dep' },
     { file: 'golang-app/vendor/vendor.json', type: 'Govendor' },
     { file: 'composer-app/composer.lock', type: 'Composer' },
@@ -2453,6 +2478,7 @@ test('`protect` for unsupported package managers', async (t) => {
     { file: 'pip-app/requirements.txt', type: 'Python' },
     { file: 'sbt-app/build.sbt', type: 'SBT' },
     { file: 'gradle-app/build.gradle', type: 'Gradle' },
+    { file: 'gradle-kotlin-dsl-app/build.gradle.kts', type: 'Gradle' },
     { file: 'golang-app/Gopkg.lock', type: 'Golang/Dep' },
     { file: 'golang-app/vendor/vendor.json', type: 'Govendor' },
     { file: 'composer-app/composer.lock', type: 'Composer' },

test/acceptance/workspaces/gradle-kotlin-dsl-app/build.gradle.kts

@@ -0,0 +1 @@
+// not a real Gradle build file