gitlab-radiator 3.3.8 → 3.3.9

package/src/gitlab/projects.js

@@ -1,105 +1,28 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.fetchProjects = fetchProjects;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _client = require("./client");
-
-function fetchProjects(_x) {
-  return _fetchProjects.apply(this, arguments);
+import {gitlabRequest} from './client'
+
+export async function fetchProjects(gitlab) {
+  const projects = await fetchOwnProjects(gitlab)
+  return projects
+    // Ignore projects for which CI/CD is not enabled
+    .filter(project => project.jobs_enabled)
+    .map(projectMapper)
+    .filter(includeRegexFilter(gitlab))
+    .filter(excludeRegexFilter(gitlab))
+    .filter(archivedFilter(gitlab))
 }
 
-function _fetchProjects() {
-  _fetchProjects = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(gitlab) {
-    var projects;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return fetchOwnProjects(gitlab);
-
-          case 2:
-            projects = _context.sent;
-            return _context.abrupt("return", projects // Ignore projects for which CI/CD is not enabled
-            .filter(project => project.jobs_enabled).map(projectMapper).filter(includeRegexFilter(gitlab)).filter(excludeRegexFilter(gitlab)).filter(archivedFilter(gitlab)));
-
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _fetchProjects.apply(this, arguments);
-}
-
-function fetchOwnProjects(_x2) {
-  return _fetchOwnProjects.apply(this, arguments);
-}
-
-function _fetchOwnProjects() {
-  _fetchOwnProjects = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(gitlab) {
-    var projects, SAFETY_MAX_PAGE, page, _yield$gitlabRequest, data, headers;
-
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            projects = [];
-            SAFETY_MAX_PAGE = 10;
-            page = 1;
-
-          case 3:
-            if (!(page <= SAFETY_MAX_PAGE)) {
-              _context2.next = 15;
-              break;
-            }
-
-            _context2.next = 6;
-            return (0, _client.gitlabRequest)('/projects', {
-              page,
-              per_page: 100,
-              membership: true
-            }, gitlab);
-
-          case 6:
-            _yield$gitlabRequest = _context2.sent;
-            data = _yield$gitlabRequest.data;
-            headers = _yield$gitlabRequest.headers;
-            projects.push(data);
-
-            if (!(data.length === 0 || !headers['x-next-page'])) {
-              _context2.next = 12;
-              break;
-            }
-
-            return _context2.abrupt("break", 15);
-
-          case 12:
-            page += 1;
-            _context2.next = 3;
-            break;
-
-          case 15:
-            return _context2.abrupt("return", projects.flat());
-
-          case 16:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return _fetchOwnProjects.apply(this, arguments);
+async function fetchOwnProjects(gitlab) {
+  const projects = []
+  const SAFETY_MAX_PAGE = 10
+  for (let page = 1; page <= SAFETY_MAX_PAGE; page += 1) {
+    // eslint-disable-next-line no-await-in-loop
+    const {data, headers} = await gitlabRequest('/projects', {page, per_page: 100, membership: true}, gitlab)
+    projects.push(data)
+    if (data.length === 0 || !headers['x-next-page']) {
+      break
+    }
+  }
+  return projects.flat()
 }
 
 function projectMapper(project) {
@@ -109,44 +32,42 @@ function projectMapper(project) {
     nameWithoutNamespace: project.path,
     group: getGroupName(project),
     archived: project.archived,
+    default_branch: project.default_branch || 'master',
     url: project.web_url,
     tags: (project.tag_list || []).map(t => t.toLowerCase())
-  };
+  }
 }
 
 function getGroupName(project) {
-  var pathWithNameSpace = project.path_with_namespace;
-  return pathWithNameSpace.split('/')[0];
+  const pathWithNameSpace = project.path_with_namespace
+  return pathWithNameSpace.split('/')[0]
 }
 
 function includeRegexFilter(config) {
   return project => {
     if (config.projects && config.projects.include) {
-      var includeRegex = new RegExp(config.projects.include, "i");
-      return includeRegex.test(project.name);
+      const includeRegex = new RegExp(config.projects.include, "i")
+      return includeRegex.test(project.name)
     }
-
-    return true;
-  };
+    return true
+  }
 }
 
 function excludeRegexFilter(config) {
   return project => {
     if (config.projects && config.projects.exclude) {
-      var excludeRegex = new RegExp(config.projects.exclude, "i");
-      return !excludeRegex.test(project.name);
+      const excludeRegex = new RegExp(config.projects.exclude, "i")
+      return !excludeRegex.test(project.name)
     }
-
-    return true;
-  };
+    return true
+  }
 }
 
 function archivedFilter(config) {
   return project => {
     if (config.ignoreArchived) {
-      return !project.archived;
+      return !project.archived
     }
-
-    return true;
-  };
-}
+    return true
+  }
+}

package/src/gitlab/runners.js

@@ -1,79 +1,18 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.fetchOfflineRunners = fetchOfflineRunners;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _client = require("./client");
-
-function fetchOfflineRunners(_x) {
-  return _fetchOfflineRunners.apply(this, arguments);
-}
-
-function _fetchOfflineRunners() {
-  _fetchOfflineRunners = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(gitlab) {
-    var runners, offline;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return fetchRunners(gitlab);
-
-          case 2:
-            runners = _context.sent;
-            offline = runners.filter(r => r.status === 'offline');
-            return _context.abrupt("return", {
-              offline,
-              totalCount: runners.length
-            });
-
-          case 5:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _fetchOfflineRunners.apply(this, arguments);
+import {gitlabRequest} from './client'
+
+export async function fetchOfflineRunners(gitlab) {
+  const runners = await fetchRunners(gitlab)
+  const offline = runners.filter(r => r.status === 'offline')
+  return {
+    offline,
+    totalCount: runners.length
+  }
 }
 
-function fetchRunners(_x2) {
-  return _fetchRunners.apply(this, arguments);
+async function fetchRunners(gitlab) {
+  const {data: runners} = await gitlabRequest('/runners', {}, gitlab)
+  return runners.map(r => ({
+    name: r.description || r.id,
+    status: r.status
+  }))
 }
-
-function _fetchRunners() {
-  _fetchRunners = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(gitlab) {
-    var _yield$gitlabRequest, runners;
-
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.next = 2;
-            return (0, _client.gitlabRequest)('/runners', {}, gitlab);
-
-          case 2:
-            _yield$gitlabRequest = _context2.sent;
-            runners = _yield$gitlabRequest.data;
-            return _context2.abrupt("return", runners.map(r => ({
-              name: r.description || r.id,
-              status: r.status
-            })));
-
-          case 5:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return _fetchRunners.apply(this, arguments);
-}

package/src/index.js

@@ -1,5 +1,3 @@
-"use strict";
-
 // eslint-disable-next-line no-global-assign,no-native-reassign
-require = require("esm")(module);
-module.exports = require("./app.js");
+require = require("esm")(module)
+module.exports = require("./app.js")

package/test/gitlab/projects.test.js

@@ -0,0 +1,75 @@
+import * as clientMock from './../../src/gitlab/client'
+import {expect} from 'chai'
+import {fetchProjects} from './../../src/gitlab/projects'
+import sinon from 'sinon'
+
+describe("projects", () => {
+    const response = {
+        data: [
+            {
+                path_with_namespace: "group1/pro",
+                jobs_enabled: true
+            },
+            {
+                path_with_namespace: "group1/pro-other",
+                jobs_enabled: true
+            },
+            {
+                path_with_namespace: "group2/something",
+                jobs_enabled: true
+            },
+            {
+                path_with_namespace: "group3/no-ci-pipelines",
+                jobs_enabled: false
+            }
+        ],
+        headers: {}
+    }
+
+    before(() => {
+        sinon.stub(clientMock, 'gitlabRequest').callsFake(() => {
+            return new Promise((resolve) => {
+                resolve(response)
+            })
+        })
+    })
+
+    after(() => {
+        sinon.resetBehavior()
+    })
+
+    it('should return only included projects', async () => {
+        const gitlab = {
+            projects: {
+                include: '.*/pro.*'
+            }
+        }
+        const projects = await fetchProjects(gitlab)
+        expect(projects.length).to.equal(2)
+        expect(projects[0].name).to.equal('group1/pro')
+        expect(projects[1].name).to.equal('group1/pro-other')
+    })
+
+    it('should not return excluded projects', async () => {
+        const gitlab = {
+            projects: {
+                exclude: '.*/pro.*'
+            }
+        }
+        const projects = await fetchProjects(gitlab)
+        expect(projects.length).to.equal(1)
+        expect(projects[0].name).to.equal('group2/something')
+    })
+
+    it('should not return excluded and return only included', async () => {
+        const gitlab = {
+            projects: {
+                include: '.*/pro.*',
+                exclude: '.*/pro-other.*'
+            }
+        }
+        const projects = await fetchProjects(gitlab)
+        expect(projects.length).to.equal(1)
+        expect(projects[0].name).to.equal('group1/pro')
+    })
+})