Adds support for GitLab CI #855

bigkraig · 2019-04-09T00:18:07Z

Rebased @notjosh's work off of latest master and added support for GitLab CI as a CI source and fixed the problem with inline comments.

Resolves? #396

…cess now

orta

Honestly, nothing really blocking from my opinion - it'll need to be green, but it's not in too bad of a shape at all.

source/dsl/DangerDSL.ts

source/platforms/gitlab/GitLabGit.ts

orta · 2019-04-09T00:25:13Z

source/runner/Executor.ts

@@ -251,7 +251,7 @@ export class Executor {
      await this.platform.deleteMainComment(dangerID)
      const previousComments = await this.platform.getInlineComments(dangerID)
      for (const comment of previousComments) {
-        if (comment) {
+        if (comment && comment.ownedByDanger) {
          await this.deleteInlineComment(comment)


interesting find, I wonder if it was failing and being caught

source/runner/Executor.ts

bigkraig · 2019-04-09T01:19:07Z

Not too sure what to do about the failed builds at this point, its failing on the Node 8.x tests since the GitLab module requires 10+

orta · 2019-04-09T11:27:16Z

Are those tests easily scoped to just a few files which we can force to only run on Node 10?
Or does it need to be the 5.0 branch? 4.x is node 8 also?

bigkraig · 2019-04-09T13:26:02Z

@orta I think that it needs the 5.x branch. I just submitted a PR to the repo to bring back 8.x support incase that is an easier resolution, alternatively is there a specific reason to continue to support 8 in Danger?

orta · 2019-04-09T13:49:56Z

Not really a reason, but a new dependency forcing us to remove support for older node versions in danger is pretty meh IMO (especially as it's still in long term support for the next ~6 months)

notjosh

Hey, neat, thanks for picking this up @bigkraig!

It's pretty light on tests (that's next on my TODO), but that doesn't need to be a blocker. I also haven't tested across cloud vs self-hosted, and that various CE vs EE endpoints send slightly different responses.

So, I'm not 100% confident in this yet, but I think "good enough" will be enough to find out what's broken, and we can iterate on that!

.vscode/launch.json

…om/ee/ci/variables/predefined_variables.html

bigkraig · 2019-04-09T19:32:58Z

Before I go and spend more time trying to chase down why my fileContents function isn't working, is this the right way to go about using it?

import {DangerDSLType} from "./source/dsl/DangerDSL"
declare var danger: DangerDSLType

const rsFiles = danger.git.modified_files.filter(a => a.endsWith(".rs"))
rsFiles.forEach(function (filename) {
  let cnt = danger.gitlab.utils.fileContents(filename)
  console.log(cnt)
})

I get that it's not a function (code is not committed yet but i'm setting it everywhere AFAIK.

danger.gitlab.utils.fileContents is not a function
TypeError: danger.gitlab.utils.fileContents is not a function
    at dangerfile.fileContents.ts:5:35

orta · 2019-04-09T19:33:39Z

Close, it should be a promise: let cnt = await danger.gitlab.utils.fileContents(filename)

notjosh · 2019-04-09T19:37:56Z

Note that I didn't implement the utils yet (mentioned at the tail end of here fwiw), so the functions don't exit: https://github.com/bigkraig/danger-js/blob/f0d1e81e90060bab752bae15a9c6698e2cfabc48/source/platforms/GitLab.ts#L36

- providing DANGER_GITLAB_API_TOKEN is now sufficient to use the GitLab platform - if no DANGER_GITLAB_HOST is provided default to GitLab cloud - add support for CE/EE without SSL

f-meloni · 2019-05-29T16:28:03Z

I've fixed the merge conflict, just to restore the CI

updateOrCreateComment is using its own logic for detecting danger notes, change it to use getDangerNotes getDangerNotes is only used by methods that update the main comment, change it to include the optimisations that were in updateOrCreateComment

jamime · 2019-05-30T12:34:19Z

Latest version available using @jamime/danger@next or @jamime/danger:7.1.5-next.9

orta · 2019-06-03T21:15:28Z

Heyyyyy, this is green!

@bigkraig @jamime - I'm happy to get this in and shipped when you are?

jamime · 2019-06-03T21:24:26Z

I wouldn't say it's ready to ship to the main release until we have added more tests. Also, there are a few features missing and the documentation needs updated. Could we create a seperate release for this branch?

…

On Mon, 3 Jun 2019, 22:15 Orta, ***@***.***> wrote: Heyyyyy, this is green! @bigkraig <https://github.com/bigkraig> @jamime <https://github.com/jamime> - I'm happy to get this in and shipped when you are? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#855?email_source=notifications&email_token=AARYL2VYVRFBSBLVI7HERRLPYWCXFA5CNFSM4HENMUQKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODW2W3LI#issuecomment-498429357>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AARYL2S7TOYV6GQ6MFVVPSTPYWCXFANCNFSM4HENMUQA> .

When danger-pr is called with a GitLab URL with no DANGER_GITLAB_API_TOKEN use the GitLab provider instead of defaulting to GitHub

Implementing getFileContents adds suppport for - danger.gitlab.util.fileContents - danger.git.JSONDiffForFile - danger.git.JSONPatchForFile

…w function

jamime · 2019-06-05T12:22:29Z

@orta yarn test passes for me on node 12.4.0 but fails in Travis. Any ideas? Feature wise we're pretty much there now, just getStructuredDiffForFile yet to implement which will fix the remaining features in the Git DSL.

Testing is still limited. Documentation is still limited, mainly around how to contribute, however now that danger-pr works correctly with a GitLab URL the existing documentation is pretty platform agnostic.

orta · 2019-06-05T12:31:25Z

Those look like TypeScript errors and not node specific ones - I re-ran CI to see if there was something odd going on there, I feel like I've seem them before and may be periodic

jamime · 2019-06-05T19:23:30Z

@orta when I run danger-pr with a gitlab URL it hangs for a few mins after outputting the results. Any idea why it's not exiting correctly? Works fine with GitHub URLs

I looked at implementing getStructuredDiffForFile but GitLab differs from both BitBucket and GitHub, it instead gives a hybrid of the two results. The metadata is extracted but the changes are still displayed as a diff.

Left to implement:

danger.git.diffForFile
danger.git.structuredDiffForFile
danger.git.linesOfCode

I'm happy to ship and raise another PR for these features when I get some more time. Now that fileContents and JSONDiffForFile works I think it will meet most users needs.

I still cant reproduce the breaking build locally.

orta · 2019-06-05T19:43:18Z

I'd try running danger-pr with DEBUG="*" and see what the last log is?

Re: CI, I was wondering if somehow on that specific instance of CI TypeScript gets updated

jamime · 2019-06-06T09:18:08Z

@orta This is the output from the log, when compared to the log from GitHub it is identical. The only difference is the process doesn't exit.

  danger:executor Writing to STDOUT: {
  fails: [],
  warnings: [
    {
      message: 'Please add a changelog entry for your changes. You can find it in ' +
        '`CHANGELOG.md` \n\nPlease add your change and name to the master ' +
        'section.'
    },
    {
      message: 'These providers are missing from the README: GitHub Actions'
    }
  ],
  messages: [],
  markdowns: [],
  scheduled: []
} +0ms
Danger: ✓ found only warnings, not failing the build
## Warnings
Please add a changelog entry for your changes. You can find it in `CHANGELOG.md` 

Please add your change and name to the master section.
-
These providers are missing from the README: GitHub Actions

✔️ Travis is fixed.

jamime · 2019-06-06T13:01:42Z

@orta can you clear the cache on Travis and click off the build again please.

DangerCI · 2019-06-06T14:11:55Z

	Warnings
⚠️	These providers are missing from the README: GitHub Actions

nock

Author: Pedro Teixeira

Description: HTTP server mocking and expectations library for Node.js

Homepage: https://github.com/nock/nock#readme


Created	over 7 years ago
Last Updated	9 days ago
License	MIT
Maintainers	3
Releases	326
Direct Dependencies	`chai`, `debug`, `deep-equal`, `json-stringify-safe`, `lodash`, `mkdirp`, `propagate`, `qs` and `semver`

@types/nock

Author: Unknown

Description: TypeScript definitions for nock

Homepage: http://npmjs.com/package/@types/nock


Created	about 3 years ago
Last Updated	8 days ago
License	MIT
Maintainers	1
Releases	27
Direct Dependencies	`@types/node`

README

Installation

npm install --save @types/nock

Summary

This package contains type definitions for nock ( https://github.com/nock/nock ).

Details

Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/nock

Additional Details

Last updated: Tue, 14 May 2019 20:53:20 GMT
Dependencies: @types/node
Global values: none

Credits

These definitions were written by bonnici https://github.com/bonnici, Horiuchi_H https://github.com/horiuchi, afharo https://github.com/afharo, Matt R. Wilson https://github.com/mastermatt, Garanzha Dmitriy https://github.com/damour, GP https://github.com/paambaati.

gitlab

Author: Justin Dalrymple

Description: Full NodeJS implementation of the GitLab API. Supports Promises, Async/Await.

Homepage: https://github.com/jdalrymple/node-gitlab#readme


Created	over 6 years ago
Last Updated	4 days ago
License	MIT
Maintainers	3
Releases	110
Direct Dependencies	`form-data`, `humps`, `ky`, `ky-universal`, `li`, `query-string`, `randomstring` and `universal-url`
Keywords	api, browser, es5, es6, gitlab and ky

This README is too long to show.

New dependencies added: gitlab, @types/nock and nock.

Generated by 🚫 dangerJS against b386dae

orta · 2019-06-06T14:49:15Z

Alright, yep, I'm good with this. Let's get it in and shipped.

peril-staging · 2019-06-06T14:58:14Z

Thanks for the PR @bigkraig.

This PR has been shipped in v8.0.0 - CHANGELOG.

ewnd9 · 2019-07-01T22:08:14Z

I've also caught not exiting behavior in v9.0.2, how can I help to debug it?

image: node:10

variables:
  DANGER_GITLAB_HOST: https://gitlab.com
  DANGER_GITLAB_API_TOKEN: '' # placeholder, set in variables ui 

test:
  only:
    refs:
      - merge_requests
  script:
    - yarn install
    - DEBUG="*" yarn danger ci

const {message, danger} = require("danger");

const modifiedMD = danger.git.modified_files.join("- ")
message("Changed Files in this PR: \n - " + modifiedMD)

DEBUG doesn't show anything extraordinary:

End of stdout

2019-07-01T21:58:57.530Z danger:GitLabAPI updateMergeRequestNote { id: 187252374,
  type: null,
  body:
   '\n<!--\n  0 failure: \n  0 warning: \n  1 messages\n  \n  DangerID: danger-id-Danger;\n-->\n\n\n\n<table>\n  <thead>\n    <tr>\n      <th width="50"></th>\n      <th width="100%" data-danger-table="true">Messages</th>\n    </tr>\n  </thead>\n  <tbody><tr>\n      <td>:book:</td>\n      <td>Changed Files in this PR: \n - </td>\n    </tr>\n  </tbody>\n</table>\n\n\n<p align="right">\n  Generated by :no_entry_sign: <a href="https://danger.systems/js">dangerJS</a> against 19b492e2e325ca6ded103cfaac45567202e71582\n</p>\n',
  attachment: null,
  author:
   { id: 382868,
     name: 'ewnd9',
     username: 'ewnd9',
     state: 'active',
     avatar_url:
      'https://assets.gitlab-static.net/uploads/-/system/user/avatar/382868/avatar.png',
     web_url: 'https://gitlab.com/ewnd9' },
  created_at: '2019-07-01T21:23:26.115Z',
  updated_at: '2019-07-01T21:58:57.357Z',
  system: false,
  noteable_id: 32503584,
  noteable_type: 'MergeRequest',
  resolvable: false,
  noteable_iid: 1 }
Feedback: https://gitlab.com/ewnd9/danger-playground/merge_requests/1#note_187252374
2019-07-01T21:58:57.531Z danger:GitLab updateStatus {}
Done in 303.05s.

jamime · 2019-07-01T22:51:14Z

@ewnd9 issue reported here #875

notjosh and others added 11 commits April 8, 2019 17:15

Recognise DANGER_GITLAB_HOST env

9c8ba47

GitLab implementation & tests for pullRequestParser

cc632c2

Added base platform code for GitLab

e6410b8

Fetchin' live MR vales from GitLab API

91ef63a

Oof, there's a lot going on in there. The runner works in another pro…

c274eb8

…cess now

Generally the pulling/reading works, to the point of commenting

8ef0581

The nuts & bolts of API commenting are working

abecf38

Inline comments seem to sort of work?

8ceb1ec

Minor bugfix to only delete comments that Danger created

2367ed3

Support GitLab CI as a CI source

a22c68b

Fixes inline commenting in GitLab

76b7bb1

bigkraig mentioned this pull request Apr 9, 2019

Using DangerJS with GitLab/BitBucket #396

Closed

bigkraig and others added 3 commits April 8, 2019 17:23

Added CHANGELOG entry

957412c

Added GitLab to README

d344384

Merge branch 'master' into feature/gitlab

527c62c

orta reviewed Apr 9, 2019

View reviewed changes

bigkraig added 2 commits April 8, 2019 18:04

Removed unused test file

b2ec339

Throwing errors on not yet implemented gitlab functions

5168c45

bigkraig mentioned this pull request Apr 9, 2019

Dropped node version back to 8.9.0 while it is still in Maintenance LTS jdalrymple/gitbeaker#298

Merged

notjosh reviewed Apr 9, 2019

View reviewed changes

.vscode/launch.json Outdated Show resolved Hide resolved

bigkraig added 2 commits April 9, 2019 07:52

Using the CI_MERGE_REQUEST_IID var according to https://docs.gitlab.c…

7d9b5c9

…om/ee/ci/variables/predefined_variables.html

Removed some accidentally added vscode configuration

f0d1e81

bigkraig force-pushed the feature/gitlab branch from 1d1c01d to f0d1e81 Compare April 9, 2019 14:53

Jamie Thompson and others added 3 commits May 29, 2019 16:02

improve GitLab environment detection

3a337fb

- providing DANGER_GITLAB_API_TOKEN is now sufficient to use the GitLab platform - if no DANGER_GITLAB_HOST is provided default to GitLab cloud - add support for CE/EE without SSL

fix: use DANGER_GITLAB_API_TOKEN to detect DSL type

157383b

Merge branch 'master' into feature/gitlab

657e0a0

update gitlab dep

9363aa1

Jamie Thompson added 5 commits June 4, 2019 14:43

docs: update command in readme

1d75688

chore: tidy code

0952bac

fix: improve danger-pr

67662eb

When danger-pr is called with a GitLab URL with no DANGER_GITLAB_API_TOKEN use the GitLab provider instead of defaulting to GitHub

feat: GitLab fileContents

78af7b2

Implementing getFileContents adds suppport for - danger.gitlab.util.fileContents - danger.git.JSONDiffForFile - danger.git.JSONPatchForFile

fix: change GitHub platform to be a named function instead of an arro…

8776aa6

…w function

ci: trigger build

083cff7

feat: add logging to GitLabAPI

b386dae

orta merged commit 583eae5 into danger:master Jun 6, 2019

mollyIV mentioned this pull request Jun 19, 2019

Support GitLab CI danger/swift#247

Closed

iShawnWang mentioned this pull request Aug 29, 2020

[BUG] Gitlab 9.1 TypeError: Cannot read property 'base_sha' of #1063

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds support for GitLab CI #855

Adds support for GitLab CI #855

bigkraig commented Apr 9, 2019 •

edited

Loading

orta left a comment

orta Apr 9, 2019

bigkraig commented Apr 9, 2019

orta commented Apr 9, 2019

bigkraig commented Apr 9, 2019

orta commented Apr 9, 2019

notjosh left a comment

bigkraig commented Apr 9, 2019 •

edited

Loading

orta commented Apr 9, 2019

notjosh commented Apr 9, 2019

f-meloni commented May 29, 2019

jamime commented May 30, 2019

orta commented Jun 3, 2019

jamime commented Jun 3, 2019 via email

jamime commented Jun 5, 2019

orta commented Jun 5, 2019

jamime commented Jun 5, 2019

orta commented Jun 5, 2019

jamime commented Jun 6, 2019 •

edited

Loading

jamime commented Jun 6, 2019

DangerCI commented Jun 6, 2019

Installation

Summary

Details

Credits

orta commented Jun 6, 2019

peril-staging bot commented Jun 6, 2019

ewnd9 commented Jul 1, 2019

jamime commented Jul 1, 2019

Adds support for GitLab CI #855

Adds support for GitLab CI #855

Conversation

bigkraig commented Apr 9, 2019 • edited Loading

orta left a comment

Choose a reason for hiding this comment

orta Apr 9, 2019

Choose a reason for hiding this comment

bigkraig commented Apr 9, 2019

orta commented Apr 9, 2019

bigkraig commented Apr 9, 2019

orta commented Apr 9, 2019

notjosh left a comment

Choose a reason for hiding this comment

bigkraig commented Apr 9, 2019 • edited Loading

orta commented Apr 9, 2019

notjosh commented Apr 9, 2019

f-meloni commented May 29, 2019

jamime commented May 30, 2019

orta commented Jun 3, 2019

jamime commented Jun 3, 2019 via email

jamime commented Jun 5, 2019

orta commented Jun 5, 2019

jamime commented Jun 5, 2019

orta commented Jun 5, 2019

jamime commented Jun 6, 2019 • edited Loading

jamime commented Jun 6, 2019

DangerCI commented Jun 6, 2019

nock

@types/nock

Installation

Summary

Details

Credits

gitlab

orta commented Jun 6, 2019

peril-staging bot commented Jun 6, 2019

ewnd9 commented Jul 1, 2019

jamime commented Jul 1, 2019

bigkraig commented Apr 9, 2019 •

edited

Loading

bigkraig commented Apr 9, 2019 •

edited

Loading

jamime commented Jun 6, 2019 •

edited

Loading