Merge branch 'malowe/master/update-gl' into 'master'

Update Gitlab sync + import to be modern

See merge request !208

.eslintrc.json

 {
+  "root": true,
   "extends": [
     "eslint:recommended",
     "strongloop"
@@ -8,11 +9,14 @@
     "es2017": true,
     "browser": false
   },
-  "parser": "babel-eslint",
+  "parser": "@babel/eslint-parser",
   "ignorePatterns": [
     "test/*.js",
     "**/vendor/*.js"
   ],
+  "parserOptions": {
+    "requireConfigFile": false
+  },
   "rules": {
     "max-len": [2, 140, 2],
     "eqeqeq": 2,

Dockerfile.gitlab

@@ -10,7 +10,7 @@
 # docker run -i --rm -v <full path to a file folder>:/run/secrets eclipsefdn/gitlab-sync
 #
 ###
-FROM node:12
+FROM node:fermium-alpine
 WORKDIR /app
 ARG VERBOSE_VAL=false
 ENV VERBOSE_VAL ${VERBOSE_VAL:-false}

Dockerfile.import

@@ -10,7 +10,7 @@
 # docker run -i --rm -v <full path to a file folder>:/run/secrets eclipsefdn/import-backup
 #
 ###
-FROM node:12
+FROM node:fermium-alpine
 WORKDIR /app
 ARG VERBOSE_VAL=false
 ENV VERBOSE_VAL ${VERBOSE_VAL:-false}

package.json

@@ -20,22 +20,22 @@
   },
   "homepage": "https://github.com/eclipsefdn/eclipsefdn-github-sync#readme",
   "dependencies": {
+    "@gitbeaker/node": "35.6.0",
     "@octokit/plugin-retry": "^3.0.3",
     "@octokit/plugin-throttling": "^3.3.0",
     "@octokit/rest": "^18.0.3",
-    "axios": "^0.21.1",
+    "axios": "^0.21.4",
     "flat-cache": "^2.0.1",
-    "gitlab": "^14.2.2",
     "nodemailer": "^6.5.0",
     "openid-client": "^3.15.6",
-    "parse-link-header": "^1.0.1",
+    "parse-link-header": "^2.0.0",
     "simple-oauth2": "^4.1.0",
-    "uuid": "^3.4.0",
+    "uuid": "^8.3.2",
     "winston": "3.2.1",
     "yargs": "^13.3.0"
   },
   "devDependencies": {
-    "babel-eslint": "^10.1.0",
+    "@babel/eslint-parser": "^7.17.0",
     "chai": "^4.2.0",
     "eslint": "^7.5.0",
     "eslint-config-strongloop": "^2.1.0",

src/EclipseAPI.js

@@ -60,6 +60,7 @@ module.exports = class EclipseAPI {
     if (this.#testMode) {
       return [{
         project_id: 'spider.pig',
+        short_project_id: 'spider.pig',
         name: 'Spider pig does what a spider pig does',
         summary: 'Can he fly? No, hes a pig. Look out, here comes the spider pig',
         logo: '',

src/GitlabSync.js

@@ -47,7 +47,7 @@ const ADMIN_PERMISSIONS_LEVEL = 50;
 const uuid = require('uuid');
 const { SecretReader, getBaseConfig } = require('./SecretReader.js');
 
-const { Gitlab } = require('gitlab');
+const { Gitlab } = require('@gitbeaker/node');
 const EclipseAPI = require('./EclipseAPI.js');
 
 const { getLogger } = require('./logger.js');
@@ -390,8 +390,6 @@ async function getGroup(name, path, parent, visibility = 'public') {
   if (g === undefined) {
     logger.verbose(`Creating new group with name '${name}'`);
     var opts = {
-      name: name,
-      path: sanitizeGroupName(path),
       project_creation_level: 'maintainer',
       visibility: visibility,
       request_access_enabled: false,
@@ -410,7 +408,7 @@ async function getGroup(name, path, parent, visibility = 'public') {
       logger.debug(`Creating group with options: ${JSON.stringify(opts)}`);
     }
     try {
-      g = await api.Groups.create(opts);
+      g = await api.Groups.create(name, sanitizeGroupName(path), opts);
     } catch (err) {
       if (argv.V) {
         logger.error(err);

src/auto_backup/Import.js

 const Wrapper = require('../GitWrapper.js');
-const { Gitlab } = require('gitlab');
+const { Gitlab } = require('@gitbeaker/node');
 
 const { SecretReader, getBaseConfig } = require('../SecretReader.js');
 const { ImportRunner } = require('./ImportRunner');

src/auto_backup/ImportRunner.js

@@ -130,9 +130,7 @@ class ImportRunner {
   async createBackupGroup(config, name, parentID) {
     log(config, `createBackupGroup(${name}, ${parentID})`);
     try {
-      return await this.gitlab.Groups.create({
-        name: name,
-        path: name,
+      return await this.gitlab.Groups.create(name, name, {
         parent_id: parentID,
       });
     } catch (e) {

test/ImportRunnerTest.js

@@ -7,7 +7,7 @@ const expect = chai.expect;
 // import test dependencies
 const { ImportRunner } = require('../src/auto_backup/ImportRunner');
 const Wrapper = require('../src/GitWrapper');
-const { Gitlab } = require('gitlab');
+const { Gitlab } = require('@gitbeaker/node');
 // create reusable API wrapper bases
 const GH_BASE_WRAPPER = new Wrapper();
 const GL_BASE_WRAPPER = new Gitlab();