Merge remote-tracking branch 'upstream/master' into feature/tap-its

* upstream/master:
  Ansible: fix globbing issue and allow .yaml too
  Bump yamllint from 1.24.1 to 1.24.2 in /dependencies
  Bump typescript from 3.9.6 to 3.9.7 in /dependencies
  found it
  BetterRaku
  fixing ruby
  specify version
  Use Docker instead of run-time build
  Bump yamllint from 1.23.0 to 1.24.1 in /dependencies
  Bump @coffeelint/cli from 3.2.9 to 3.2.10 in /dependencies
  Bump cfn-lint from 0.33.2 to 0.34.0 in /dependencies
  Rever to non breaking rubocop version
  Fix rubocop github version
  Fix version with bug
  User gemfile for dependabot and update rubocop
This commit is contained in:
Victor Martinez 2020-07-19 19:38:29 +01:00
commit 1780618634
No known key found for this signature in database
GPG key ID: 4058B656AD58C4F5
10 changed files with 106 additions and 103 deletions

View file

@ -438,7 +438,7 @@ UploadImage() {
exit 1
else
# SUCCESS
echo -e "${NC}${F[B]}Successfully Uploaded TAGOR_TAG:${F[W]}[$MAJOR_TAG]${F[B]} Docker image to ${F[C]}$REGISTRY${F[B]}!${NC}"
echo -e "${NC}${F[B]}Successfully Uploaded TAG:${F[W]}[$MAJOR_TAG]${F[B]} of Docker image to ${F[C]}$REGISTRY${F[B]}!${NC}"
fi
fi
}

View file

@ -29,10 +29,6 @@ ARG PSSA_VERSION='latest'
ARG ARM_TTK_NAME='master.zip'
ARG ARM_TTK_URI='https://github.com/Azure/arm-ttk/archive/master.zip'
ARG ARM_TTK_DIRECTORY='/opt/microsoft'
# Raku Linter
ARG RAKU_VER="2020.06"
ARG RAKU_INSTALL_PATH=/usr
ARG RAKUBREW_HOME=/tmp/rakubrew
# Dart Linter
## stable dart sdk: https://dart.dev/get-dart#release-channels
ARG DART_VERSION='2.8.4'
@ -42,7 +38,7 @@ ARG GLIBC_VERSION='2.31-r0'
####################
# Run APK installs #
####################
RUN apk add --no-cache \
RUN apk add --update --no-cache \
ansible-lint \
bash \
curl \
@ -88,17 +84,10 @@ RUN npm config set package-lock false \
#############################
ENV PATH="/node_modules/.bin:${PATH}"
####################
# Run GEM installs #
####################
RUN gem install rubocop:0.74.0 rubocop-rails rubocop-github:0.13.0
# Need to fix the version as it installs 'rubocop:0.85.1' as a dep, and forces the default
# We then need to promote the correct version, uninstall, and fix deps
RUN sh -c 'INCORRECT_VERSION=$(gem list rhc -e rubocop | grep rubocop | awk "{print $2}" | cut -d"(" -f2 | cut -d"," -f1); \
gem install --default rubocop:0.74.0; \
yes | gem uninstall rubocop:$INCORRECT_VERSION -a -x -I; \
gem install rubocop:0.74.0'
##############################
# Installs ruby dependencies #
##############################
RUN bundle install
#########################################
# Install Powershell + PSScriptAnalyzer #
@ -178,17 +167,9 @@ RUN wget https://storage.googleapis.com/dart-archive/channels/stable/release/${D
################
# Install Raku #
################
# Environment
ENV PATH="$RAKU_INSTALL_PATH/share/perl6/site/bin:${PATH}"
# Basic setup, programs and init
RUN mkdir -p $RAKUBREW_HOME/bin \
&& curl -sSLo $RAKUBREW_HOME/bin/rakubrew https://rakubrew.org/perl/rakubrew \
&& chmod 755 $RAKUBREW_HOME/bin/rakubrew \
&& eval "$($RAKUBREW_HOME/bin/rakubrew init Sh)"\
&& rakubrew build moar $RAKU_VER --configure-opts='--prefix=$RAKU_INSTALL_PATH' \
&& rm -rf $RAKUBREW_HOME/versions/moar-$RAKU_VER \
&& rakubrew build-zef \
&& rm -rf $RAKUBREW_HOME
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories \
&& apk add --update --no-cache rakudo zef
################################
# Install editorconfig-checker #

View file

@ -3,7 +3,7 @@ author: 'GitHub'
description: 'It is a simple combination of various linters, written in bash, to help validate your source code.'
runs:
using: 'docker'
image: 'Dockerfile'
image: 'docker://github/super-linter:v3'
branding:
icon: 'check-square'
color: 'white'

10
dependencies/Gemfile vendored Normal file
View file

@ -0,0 +1,10 @@
# frozen_string_literal: true
source "https://rubygems.org"
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
gem "rubocop", "~> 0.82.0"
gem "rubocop-github", "~> 0.16.0"
gem "rubocop-performance", "~>1.7.0"
gem "rubocop-rails", "~> 2.5"

57
dependencies/Gemfile.lock vendored Normal file
View file

@ -0,0 +1,57 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
ast (2.4.1)
concurrent-ruby (1.1.6)
i18n (1.8.3)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
minitest (5.14.1)
parallel (1.19.2)
parser (2.7.1.4)
ast (~> 2.4.1)
rack (2.2.3)
rainbow (3.0.0)
rexml (3.2.4)
rubocop (0.82.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
rexml
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-github (0.16.0)
rubocop (<= 0.82.0)
rubocop-performance (~> 1.0)
rubocop-rails (~> 2.0)
rubocop-performance (1.7.0)
rubocop (>= 0.82.0)
rubocop-rails (2.6.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 0.82.0)
ruby-progressbar (1.10.1)
thread_safe (0.3.6)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.7.0)
zeitwerk (2.4.0)
PLATFORMS
ruby
DEPENDENCIES
rubocop (~> 0.82.0)
rubocop-github (~> 0.16.0)
rubocop-performance (~> 1.7.0)
rubocop-rails (~> 2.5)
BUNDLED WITH
2.1.4

38
dependencies/Pipfile.lock generated vendored
View file

@ -18,17 +18,16 @@
"default": {
"argcomplete": {
"hashes": [
"sha256:5ae7b601be17bf38a749ec06aa07fb04e7b6b5fc17906948dc1866e7facf3740",
"sha256:890bdd1fcbb973ed73db241763e78b6d958580e588c2910b508c770a59ef37d7"
"sha256:2fbe5ed09fd2c1d727d4199feca96569a5b50d44c71b16da9c742201f7cc295c",
"sha256:91dc7f9c7f6281d5a0dce5e73d2e33283aaef083495c13974a7dd197a1cdc949"
],
"version": "==1.11.1"
"version": "==1.12.0"
},
"astroid": {
"hashes": [
"sha256:2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703",
"sha256:bc58d83eb610252fd8de6363e39d4f1d0619c894b0ed24603b881c02e64c7386"
],
"markers": "python_version >= '3.5'",
"version": "==2.4.2"
},
"attrs": {
@ -36,7 +35,6 @@
"sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c",
"sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72"
],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==19.3.0"
},
"aws-sam-translator": {
@ -49,25 +47,24 @@
},
"boto3": {
"hashes": [
"sha256:c2a223f4b48782e8b160b2130265e2a66081df111f630a5a384d6909e29a5aa9",
"sha256:ce5a4ab6af9e993d1864209cbbb6f4812f65fbc57ad6b95e5967d8bf38b1dcfb"
"sha256:07bd0872e9178b637baefb82aff8abb76197770c9fc60c4d6575564ba878e3e4"
],
"version": "==1.14.16"
"version": "==1.14.22"
},
"botocore": {
"hashes": [
"sha256:99d995ef99cf77458a661f3fc64e0c3a4ce77ca30facfdf0472f44b2953dd856",
"sha256:fe0c4f7cd6b67eff3b7cb8dff6709a65d6fca10b7b7449a493b2036915e98b4c"
"sha256:4d084dfcfcdf21ac2df17d017607ca53d53ac6c2fa17484cdd87ef78daba06b8",
"sha256:f491d3c29d7dda8c8907c520bc96d77a67a8953dfed7f55c250799849e213640"
],
"version": "==1.17.16"
"version": "==1.17.22"
},
"cfn-lint": {
"hashes": [
"sha256:b29d172a0910f305162e354fd421594ab575ace6431b7b8884c245dfc5064859",
"sha256:ff9b566bda43a2e74fdd89b57cbf0f76e209e4e666cc4babe7c96cbd3fb56bfe"
"sha256:443e7c1a57a8909050b51873cbf53628e253b6a2ab00fba9d25f89e75f13f1b6",
"sha256:b2a7b9a84688d87d0d49d1dad2602382ba2a8be9d20d87278f4d42c59f71eddc"
],
"index": "pypi",
"version": "==0.33.2"
"version": "==0.34.0"
},
"decorator": {
"hashes": [
@ -82,7 +79,6 @@
"sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827",
"sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99"
],
"markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==0.15.2"
},
"isort": {
@ -90,7 +86,6 @@
"sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1",
"sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd"
],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==4.3.21"
},
"jmespath": {
@ -98,7 +93,6 @@
"sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9",
"sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"
],
"markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==0.10.0"
},
"jsonpatch": {
@ -114,7 +108,6 @@
"sha256:c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362",
"sha256:ff379fa021d1b81ab539f5ec467c7745beb1a5671463f9dcc2b2d458bd361c1e"
],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==2.0"
},
"jsonschema": {
@ -154,7 +147,6 @@
"sha256:efa1909120ce98bbb3777e8b6f92237f5d5c8ea6758efea36a473e1d38f7d3e4",
"sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0"
],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==1.4.3"
},
"mccabe": {
@ -198,7 +190,6 @@
"sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c",
"sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"
],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==2.8.1"
},
"pyyaml": {
@ -238,7 +229,6 @@
"sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
"sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==1.15.0"
},
"toml": {
@ -271,11 +261,11 @@
},
"yamllint": {
"hashes": [
"sha256:0fa69bf8a86182b7fe14918bdd3a30354c869966bbc7cbfff176af71bda9c806",
"sha256:59f3ff77f44e7f46be6aecdb985830f73a1c51e290b7082a7d38c2ae1940f4a9"
"sha256:40b68de6bacdccec1585dbd54072731b10da7fc2f9cfd96517a71f066208b61f",
"sha256:ad3b0d30317dca005d7af99ff27248d459cae2d931a2ff06a134b67bcd405b30"
],
"index": "pypi",
"version": "==1.23.0"
"version": "==1.24.2"
},
"yq": {
"hashes": [

59
dependencies/package-lock.json generated vendored
View file

@ -211,18 +211,23 @@
}
},
"@coffeelint/cli": {
"version": "3.2.9",
"resolved": "https://registry.npmjs.org/@coffeelint/cli/-/cli-3.2.9.tgz",
"integrity": "sha512-aPOUjgYG0mwrBopCUpE2hTKtwebBQABUMkEf7xfzEL1TncxbSxrtb+ESGb4WHlNXiVLLxt87v0124jzZVwPshw==",
"version": "3.2.10",
"resolved": "https://registry.npmjs.org/@coffeelint/cli/-/cli-3.2.10.tgz",
"integrity": "sha512-CLFBTPFLjwSsB4M2Vum6LwNDHePszjW2GDWU1mgpMl5vgYmhcjAhCfJqb1qAS2NpBcD31Iwn4zvy5enAztqZUw==",
"requires": {
"coffeescript": "2.5.1",
"glob": "^7.1.6",
"ignore": "^5.1.8",
"resolve": "^1.17.0",
"strip-json-comments": "^3.1.0",
"strip-json-comments": "^3.1.1",
"yargs": "^15.4.1"
},
"dependencies": {
"strip-json-comments": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
},
"yargs": {
"version": "15.4.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
@ -524,18 +529,6 @@
}
}
},
"@typescript-eslint/experimental-utils": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.6.0.tgz",
"integrity": "sha512-4Vdf2hvYMUnTdkCNZu+yYlFtL2v+N2R7JOynIOkFbPjf9o9wQvRwRkzUdWlFd2YiiUwJLbuuLnl5civNg5ykOQ==",
"requires": {
"@types/json-schema": "^7.0.3",
"@typescript-eslint/types": "3.6.0",
"@typescript-eslint/typescript-estree": "3.6.0",
"eslint-scope": "^5.0.0",
"eslint-utils": "^2.0.0"
}
},
"@typescript-eslint/parser": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.6.1.tgz",
@ -590,34 +583,6 @@
}
}
},
"@typescript-eslint/types": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.6.0.tgz",
"integrity": "sha512-JwVj74ohUSt0ZPG+LZ7hb95fW8DFOqBuR6gE7qzq55KDI3BepqsCtHfBIoa0+Xi1AI7fq5nCu2VQL8z4eYftqg=="
},
"@typescript-eslint/typescript-estree": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.6.0.tgz",
"integrity": "sha512-G57NDSABHjvob7zVV09ehWyD1K6/YUKjz5+AufObFyjNO4DVmKejj47MHjVHHlZZKgmpJD2yyH9lfCXHrPITFg==",
"requires": {
"@typescript-eslint/types": "3.6.0",
"@typescript-eslint/visitor-keys": "3.6.0",
"debug": "^4.1.1",
"glob": "^7.1.6",
"is-glob": "^4.0.1",
"lodash": "^4.17.15",
"semver": "^7.3.2",
"tsutils": "^3.17.1"
}
},
"@typescript-eslint/visitor-keys": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.6.0.tgz",
"integrity": "sha512-p1izllL2Ubwunite0ITjubuMQRBGgjdVYwyG7lXPX8GbrA6qF0uwSRz9MnXZaHMxID4948gX0Ez8v9tUDi/KfQ==",
"requires": {
"eslint-visitor-keys": "^1.1.0"
}
},
"JSV": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
@ -5165,9 +5130,9 @@
}
},
"typescript": {
"version": "3.9.6",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.6.tgz",
"integrity": "sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw=="
"version": "3.9.7",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
"integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="
},
"uc.micro": {
"version": "1.0.6",

View file

@ -1,7 +1,7 @@
{
"name": "super-linter",
"dependencies": {
"@coffeelint/cli": "^3.2.9",
"@coffeelint/cli": "^3.2.10",
"@stoplight/spectral": "^5.4.0",
"@typescript-eslint/eslint-plugin": "^3.6.1",
"@typescript-eslint/parser": "^3.6.1",
@ -18,6 +18,6 @@
"standard": "^14.3.4",
"stylelint": "^13.6.1",
"stylelint-config-standard": "^20.0.0",
"typescript": "^3.9.6"
"typescript": "^3.9.7"
}
}

View file

@ -1064,7 +1064,7 @@ if [ "$VALIDATE_RUBY" == "true" ]; then
# Lint the ruby files #
#######################
# LintCodebase "FILE_TYPE" "LINTER_NAME" "LINTER_CMD" "FILE_TYPES_REGEX" "FILE_ARRAY"
LintCodebase "RUBY" "rubocop" "rubocop -c $RUBY_LINTER_RULES" ".*\.\(rb\)\$" "${FILE_ARRAY_RUBY[@]}"
LintCodebase "RUBY" "rubocop" "rubocop -c $RUBY_LINTER_RULES --force-exclusion" ".*\.\(rb\)\$" "${FILE_ARRAY_RUBY[@]}"
fi
########################

View file

@ -649,7 +649,7 @@ function LintAnsibleFiles() {
#################################
# Get list of all files to lint #
#################################
mapfile -t LIST_FILES < <(ls "$ANSIBLE_DIRECTORY/*.yml" 2>&1)
mapfile -t LIST_FILES < <(ls "$ANSIBLE_DIRECTORY"/*.{yaml,yml} 2>&1)
###############################################################
# Set the list to empty if only MD and TXT files were changed #