Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 136-fix-all-dependabo…
Browse files Browse the repository at this point in the history
…t-issues-marked-critical
  • Loading branch information
njbrunner committed Oct 29, 2024
2 parents 9e5b538 + c1528f8 commit f4c76ca
Show file tree
Hide file tree
Showing 11 changed files with 98 additions and 33 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/anms-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install dependencies
Expand All @@ -33,11 +33,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/aricodec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ on:
push:
branches:
- main
pull_request:
branches:
- main
pull_request: {} # any target
schedule:
- cron: '0 0 * * 0' # weekly

jobs:
checkout-test:
Expand All @@ -22,7 +22,7 @@ jobs:
docker ps
docker compose ls
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- name: Tag name env
Expand Down
52 changes: 52 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: "CodeQL Advanced"
on:
push:
branches: [ "main" ]
pull_request: {} # any target
schedule:
- cron: '31 19 * * 1'

jobs:
analyze:
name: Analyze (${{ matrix.language }})
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
permissions:
# required for all workflows
security-events: write
# required to fetch internal or private CodeQL packs
packages: read
# only required for workflows in private repositories
actions: read
contents: read

strategy:
fail-fast: false
matrix:
include:
- language: javascript-typescript
build-mode: none
- language: python
build-mode: none
steps:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}

- if: matrix.build-mode == 'manual'
shell: bash
run: |
echo 'If you are using a "manual" build mode for one or more of the' \
'languages you are analyzing, replace this with the commands to build' \
'your code'
exit 1
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
11 changes: 7 additions & 4 deletions .github/workflows/puppet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ on:
paths:
- .github/workflows/puppet.yaml
- puppet/**
pull_request: {} # any target
schedule:
- cron: '0 0 * * 0' # weekly

jobs:
prep:
name: Download modules
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: false
- name: Install dependencies
Expand All @@ -36,12 +39,12 @@ jobs:
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: false

- name: Setup Ruby
uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
uses: ruby/setup-ruby@v1.192.0
with:
ruby-version: 2.7
bundler-cache: true
Expand All @@ -54,7 +57,7 @@ jobs:

- name: Upload analysis results to GitHub
if: always()
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: puppet-lint-results.sarif
wait-for-processing: true
4 changes: 2 additions & 2 deletions .github/workflows/transcoder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install flake8
Expand Down
3 changes: 2 additions & 1 deletion anms-core/integration_test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"name": "ammos-core-integration-tests",
"version": "0.2.0",
"dependencies": {
"global": "^4.4.0"
"global": "^4.4.0",
"semver": "^7.5.2"
},
"devDependencies": {
"newman": "^5.3.2"
Expand Down
8 changes: 4 additions & 4 deletions anms-ui/public/app/components/adm/Adm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</tr>
</thead>
<tbody>
<template v-for="(adm, index) in adms">
<tr :key="index">
<template :key="index" v-for="(adm, index) in adms">
<tr >
<td>{{ adm.adm_enum }}</td>
<td v-b-tooltip.hover
title="Download ADM JSON" @click="download(adm)" ><b>{{ adm.adm_name }}</b></td>
Expand Down Expand Up @@ -54,8 +54,8 @@
</tr>
</thead>
<tbody>
<template v-for="(error, index) in uploadErrors">
<tr :key="index">
<template :key="index" v-for="(error, index) in uploadErrors">
<tr>
<td>{{ error.obj_type }}</td>
<td>{{ error.name }}</td>
<td>{{ error.issue }}</td>
Expand Down
23 changes: 15 additions & 8 deletions anms-ui/public/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@
"name": "anms-ui",
"version": "0.1.1",
"dependencies": {
"@achrinza/node-ipc": "^10.1.11",
"@fortawesome/fontawesome-free": "^5.13.0",
"@fortawesome/fontawesome-svg-core": "^1.2.32",
"@fortawesome/free-solid-svg-icons": "^6.2.0",
"@fortawesome/vue-fontawesome": "^2.0.9",
"axios": "^1.0.0",
"axios": "^1.7.4",
"body-parser": "^1.20.3",
"bootstrap": "^4.5.0",
"bootstrap-vue": "^2.15.0",
"bootswatch": "^4.5.0",
"braces": "^3.0.3",
"browserify-sign": "^4.2.2",
"cbor": "^8.1.0",
"collect": "^0.3.5",
"collect.js": "^4.32.0",
Expand All @@ -18,8 +22,11 @@
"font-awesome": "^4.7.0",
"form-data": "4.0.0",
"fuse.js": "^6.5.3",
"get-func-name": "^2.0.1",
"jquery": "^3.5.1",
"json5": "^1.0.2",
"lodash": "^4.17.21",
"minimatch": "^3.0.5",
"moment": "^2.26.0",
"popper.js": "^1.16.1",
"prismjs": "^1.27.0",
Expand All @@ -37,15 +44,17 @@
"vue-socket.io": "^3.0.9",
"vuejs-toggle-switch": "^2.0.0",
"vuelidate": "^0.7.7",
"vuex": "^3.4.0"
"vuex": "^3.4.0",
"webpack-dev-middleware": "^5.3.4",
"ws": "^6.2.3"
},
"devDependencies": {
"@babel/eslint-parser": "^7.22.10",
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
"@babel/polyfill": "^7.10.1",
"@types/lodash": "^4.14.154",
"@vue/cli-plugin-babel": "^5.0.8",
"@vue/cli-plugin-eslint": "^4.4.1",
"@vue/cli-plugin-eslint": "^5.0.0",
"@vue/cli-plugin-router": "^4.4.1",
"@vue/cli-plugin-unit-mocha": "4.5.8",
"@vue/cli-plugin-vuex": "^4.4.1",
Expand All @@ -57,19 +66,17 @@
"eslint": "^7.1.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-lodash": "^7.1.0",
"eslint-plugin-vue": "^6.2.2",
"eslint-plugin-vue": "^9.29.1",
"intersection-observer": "^0.10.0",
"sass": "^1.26.7",
"sass-loader": "^8.0.2",
"style-resources-loader": "^1.3.3",
"vue-cli-plugin-style-resources-loader": "^0.1.4",
"vue-template-compiler": "^2.6.11",
"webpack": "^4.43.0",
"worker-loader": "^2.0.0",
"yarn-audit-fix": "^10.0.0"
"webpack": "^5.95.0",
"worker-loader": "^2.0.0"
},
"resolutions": {
"@hapi/hoek": "8.5.1",
"ansi-regex": "^5.0.1",
"async": "2.6.4",
"color-string": "1.6.0",
Expand Down
2 changes: 1 addition & 1 deletion anms-ui/public/vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,4 +228,4 @@
}
};

})();
})();
8 changes: 5 additions & 3 deletions anms-ui/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
"dependencies": {
"@hapi/boom": "^7.4.11",
"async": "^3.2.0",
"axios": "^1.0.0",
"axios": "^1.7.4",
"bcryptjs": "^2.4.3",
"bluebird": "^3.7.2",
"body-parser": "^1.19.0",
"body-parser": "^1.20.3",
"braces": "3.0.3",
"btoa": "^1.2.1",
"chokidar": "^3.5.3",
"compression": "^1.7.4",
Expand Down Expand Up @@ -40,7 +41,8 @@
"serve-favicon": "^2.5.0",
"spdy": "^4.0.2",
"winston": "^2.4.4",
"winston-daily-rotate-file": "^3.10.0"
"winston-daily-rotate-file": "^3.10.0",
"ws": "^6.2.3"
},
"devDependencies": {
"eslint": "^7.1.0",
Expand Down

0 comments on commit f4c76ca

Please sign in to comment.