newrelic · prototypicalpro · Apr 14, 2021 · Apr 21, 2021 · Apr 21, 2021
diff --git a/Dockerfile b/Dockerfile
@@ -1,52 +1,8 @@
-ARG RUNTIME_DEPS="git libicu-dev perl"
-ARG BUILD_DEPS="make build-essential cmake pkg-config zlib1g-dev libcurl4-openssl-dev libssl-dev libldap2-dev libidn11-dev"
+FROM ghcr.io/todogroup/repolinter:v0.11.1
 
-FROM ruby:2.6-slim as ruby-deps
-ARG RUNTIME_DEPS
-ARG BUILD_DEPS
-
-# set to always UTF8
-ENV LANG=C.UTF-8
-
-# Install build deps
-RUN apt-get update && \
-    apt-get install --no-install-recommends -y $RUNTIME_DEPS $BUILD_DEPS && \
-    gem update --system --silent
-
-# Install ruby gems
-WORKDIR /app
-COPY Gemfile* ./
-RUN bundle config path vendor/bundle && \
-    bundle install --jobs 4 --retry 3
-
-# cleanup
-RUN apt-get remove -y $BUILD_DEPS && \
-    apt-get autoremove -y && \
-    rm -rf /var/lib/apt/lists/*
-
-FROM python:2.7-slim as python-deps
-
-# docutils for github-markup
-RUN python -m pip install --upgrade pip && \
-    pip install docutils
-
-FROM node:lts-slim
-
-# Copy Ruby dependencies
-COPY --from=ruby-deps / /
-COPY --from=python-deps / /
-
-# Install node_modules
-WORKDIR /app
-COPY package*.json ./
-RUN npm install --production
-
-# move the rest of the project over
+# copy repolinter-action
+WORKDIR /repolinter-action
 COPY dist dist
 
-# Configure bundler
-ENV BUNDLE_GEMFILE=/app/Gemfile
-ENV BUNDLE_PATH=/app/vendor/bundle
-
 # Working directory will automagically be set to github workspace when the container is executed
-ENTRYPOINT ["bundle", "exec", "node /app/dist/index.js"]
+ENTRYPOINT ["bundle", "exec", "node /repolinter-action/dist/index.js"]
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
diff --git a/__tests__/getConfig.test.ts b/__tests__/getConfig.test.ts
@@ -21,7 +21,7 @@ describe('getConfig', () => {
 
   test('getConfig returns a config from a YAML', async () => {
     const filepath = path.resolve(__dirname, 'testconfig.yaml')
-    const expected = yaml.safeLoad(
+    const expected = yaml.load(
       await fs.promises.readFile(filepath, 'utf8')
     ) as Record<string, unknown>
     const res = await getConfig({configFile: filepath})
@@ -53,7 +53,7 @@ describe('getConfig', () => {
     const url =
       'https://raw.githubusercontent.com/aperture-science-incorporated/.github/master/repolinter.yaml'
     const filepath = path.resolve(__dirname, 'testconfig.yaml')
-    const expected = yaml.safeLoad(
+    const expected = yaml.load(
       await fs.promises.readFile(filepath, 'utf8')
     ) as Record<string, unknown>
     const scope = nock('https://raw.githubusercontent.com')

diff --git a/dist/error.css b/dist/error.css
@@ -0,0 +1,68 @@
+body {
+  margin: 0;
+  padding: 80px 100px;
+  font: 13px "Helvetica Neue", "Lucida Grande", "Arial";
+  background: #ECE9E9 -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#ECE9E9));
+  background: #ECE9E9 -moz-linear-gradient(top, #fff, #ECE9E9);
+  background-repeat: no-repeat;
+  color: #555;
+  -webkit-font-smoothing: antialiased;
+}
+h1, h2, h3 {
+  margin: 0;
+  font-size: 22px;
+  color: #343434;
+}
+h1 em, h2 em {
+  padding: 0 5px;
+  font-weight: normal;
+}
+h1 {
+  font-size: 60px;
+}
+h2 {
+    margin-top: 10px;
+}
+h3 {
+  margin: 5px 0 10px 0;
+  padding-bottom: 5px;
+  border-bottom: 1px solid #eee;
+  font-size: 18px;
+}
+ul {
+  margin: 0;
+  padding: 0;
+}
+ul li {
+  margin: 5px 0;
+  padding: 3px 8px;
+  list-style: none;
+}
+ul li:hover {
+  cursor: pointer;
+  color: #2e2e2e;
+}
+ul li .path {
+  padding-left: 5px;
+  font-weight: bold;
+}
+ul li .line {
+  padding-right: 5px;
+  font-style: italic;
+}
+ul li:first-child .path {
+  padding-left: 0;
+}
+p {
+  line-height: 1.5;
+}
+a {
+  color: #555;
+  text-decoration: none;
+}
+a:hover {
+  color: #303030;
+}
+#stacktrace {
+    margin-top: 15px;
+}
diff --git a/dist/error.html b/dist/error.html
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>{error}</title>
+    <style>{style}</style>
+  </head>
+  <body>
+    <div id="wrapper">
+      <h1>{title}</h1>
+      <h2><em>{statusCode}</em> {error}</h2>
+      {explanation}
+      {response}
+      <ul id="stacktrace">{stack}</ul>
+    </div>
+  </body>
+</html>
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/regexps.js b/dist/regexps.js
diff --git a/dist/rules/file-contents-config.json b/dist/rules/file-contents-config.json
@@ -14,7 +14,7 @@
     "content": { "type": "string" },
     "flags": { "type": "string" },
     "human-readable-content": { "type": "string" },
-    "fail-on-non-exist": {
+    "fail-on-non-existent": {
       "type": "boolean",
       "default": false
     }

diff --git a/dist/rules/file-not-contents-config.json b/dist/rules/file-not-contents-config.json
@@ -14,7 +14,7 @@
     "content": { "type": "string" },
     "flags": { "type": "string" },
     "human-readable-content": { "type": "string" },
-    "fail-on-non-exist": {
+    "fail-on-non-existent": {
       "type": "boolean",
       "default": false
     }

diff --git a/dist/schema.json b/dist/schema.json
@@ -14,6 +14,10 @@
     "properties": {
       "$schema": { "type": "string" },
       "version": { "const": 2 },
+      "extends": {
+        "type": "string",
+        "title": "URL or path of ruleset file this ruleset extends"
+      },
       "axioms": {
         "type": "object",
         "title": "The axioms schema",