Skip to content

Commit 1fdeac5

Browse files
authored
Merge pull request #124 from SumoLogic/hpal_nodejs_upgrade
SUMO-256677: upgraded node version to node20
2 parents b908dd9 + 84d0694 commit 1fdeac5

File tree

9 files changed

+66
-25
lines changed

9 files changed

+66
-25
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: "ESLint validation tests"
2+
on: [workflow_dispatch, pull_request]
3+
4+
jobs:
5+
eslint-validation-test:
6+
runs-on: ubuntu-latest
7+
strategy:
8+
matrix:
9+
include: # Includes one more job
10+
- dir: 'BlockBlobReader/target/consumer_build'
11+
- dir: 'BlockBlobReader/target/dlqprocessor_build'
12+
- dir: 'BlockBlobReader/target/producer_build'
13+
- dir: 'AppendBlobReader/target/producer_build'
14+
- dir: 'AppendBlobReader/target/appendblob_producer_build'
15+
- dir: 'AppendBlobReader/target/consumer_build'
16+
- dir: 'AppendBlobReader/target/consumer_build'
17+
- dir: 'AppendBlobReader/target/consumer_build'
18+
- dir: 'EventHubs/target/metrics_build'
19+
steps:
20+
- name: Checkout code
21+
uses: actions/checkout@v4
22+
23+
- name: Setup node
24+
uses: actions/setup-node@v4
25+
with:
26+
node-version: 20
27+
28+
- name: Run ESLint
29+
working-directory: ${{ matrix.dir }}
30+
run: |
31+
npm install eslint globals @eslint/js
32+
cp ../../../eslint.config.mjs .
33+
npx eslint . --ext .js

.github/workflows/syntax-validation-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "Syntax validation tests"
22
on: [workflow_dispatch, pull_request]
33

44
jobs:
5-
package-version-test:
5+
node-syntax-test:
66
runs-on: ubuntu-latest
77
strategy:
88
matrix:
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup node
2424
uses: actions/setup-node@v4
2525
with:
26-
node-version: 18
26+
node-version: 20
2727

2828
- working-directory: ${{ matrix.dir }}
2929
run: |

AppendBlobReader/src/appendblobreaderdeploy.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@
541541
},
542542
{
543543
"name": "WEBSITE_NODE_DEFAULT_VERSION",
544-
"value": "~18"
544+
"value": "~20"
545545
},
546546
{
547547
"name": "FUNCTION_APP_EDIT_MODE",
@@ -640,7 +640,7 @@
640640
},
641641
{
642642
"name": "WEBSITE_NODE_DEFAULT_VERSION",
643-
"value": "~18"
643+
"value": "~20"
644644
},
645645
{
646646
"name": "FUNCTION_APP_EDIT_MODE",
@@ -751,7 +751,7 @@
751751
},
752752
{
753753
"name": "WEBSITE_NODE_DEFAULT_VERSION",
754-
"value": "~18"
754+
"value": "~20"
755755
},
756756
{
757757
"name": "FUNCTION_APP_EDIT_MODE",

BlockBlobReader/src/blobreaderdeploy.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@
378378
},
379379
{
380380
"name": "WEBSITE_NODE_DEFAULT_VERSION",
381-
"value": "~18"
381+
"value": "~20"
382382
},
383383
{
384384
"name": "Project",
@@ -505,7 +505,7 @@
505505
},
506506
{
507507
"name": "WEBSITE_NODE_DEFAULT_VERSION",
508-
"value": "~18"
508+
"value": "~20"
509509
},
510510
{
511511
"name": "FUNCTION_APP_EDIT_MODE",
@@ -596,7 +596,7 @@
596596
},
597597
{
598598
"name": "WEBSITE_NODE_DEFAULT_VERSION",
599-
"value": "~18"
599+
"value": "~20"
600600
},
601601
{
602602
"name": "FUNCTION_APP_EDIT_MODE",

BlockBlobReader/src/blobreaderdeploywithPremiumPlan.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@
376376
},
377377
{
378378
"name": "WEBSITE_NODE_DEFAULT_VERSION",
379-
"value": "~18"
379+
"value": "~20"
380380
},
381381
{
382382
"name": "Project",
@@ -503,7 +503,7 @@
503503
},
504504
{
505505
"name": "WEBSITE_NODE_DEFAULT_VERSION",
506-
"value": "~18"
506+
"value": "~20"
507507
},
508508
{
509509
"name": "FUNCTION_APP_EDIT_MODE",
@@ -594,7 +594,7 @@
594594
},
595595
{
596596
"name": "WEBSITE_NODE_DEFAULT_VERSION",
597-
"value": "~18"
597+
"value": "~20"
598598
},
599599
{
600600
"name": "FUNCTION_APP_EDIT_MODE",

BlockBlobReader/src/blobreaderzipdeploy.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
},
367367
{
368368
"name": "WEBSITE_NODE_DEFAULT_VERSION",
369-
"value": "~18"
369+
"value": "~20"
370370
},
371371
{
372372
"name": "Project",
@@ -491,7 +491,7 @@
491491
},
492492
{
493493
"name": "WEBSITE_NODE_DEFAULT_VERSION",
494-
"value": "~18"
494+
"value": "~20"
495495
},
496496
{
497497
"name": "WEBSITE_RUN_FROM_PACKAGE",
@@ -580,7 +580,7 @@
580580
},
581581
{
582582
"name": "WEBSITE_NODE_DEFAULT_VERSION",
583-
"value": "~18"
583+
"value": "~20"
584584
},
585585
{
586586
"name": "WEBSITE_RUN_FROM_PACKAGE",

EventHubs/src/azuredeploy_metrics.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
},
219219
{
220220
"name": "WEBSITE_NODE_DEFAULT_VERSION",
221-
"value": "~18"
221+
"value": "~20"
222222
},
223223
{
224224
"name": "Project",

deletetestresourcegroups.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
from sumologic import SumoLogic
88

99
config = {
10-
"AZURE_SUBSCRIPTION_ID": "",
11-
"AZURE_CLIENT_ID": "",
12-
"AZURE_CLIENT_SECRET": "",
13-
"AZURE_TENANT_ID": "",
14-
"AZURE_DEFAULT_REGION": "",
15-
"SUMO_ACCESS_ID": "",
16-
"SUMO_ACCESS_KEY": "",
17-
"SUMO_DEPLOYMENT": "us1"
10+
"AZURE_SUBSCRIPTION_ID": os.environ.get("AZURE_SUBSCRIPTION_ID"),
11+
"AZURE_CLIENT_ID": os.environ.get("AZURE_CLIENT_ID"),
12+
"AZURE_CLIENT_SECRET": os.environ.get("AZURE_CLIENT_SECRET"),
13+
"AZURE_TENANT_ID": os.environ.get("AZURE_TENANT_ID"),
14+
"AZURE_DEFAULT_REGION": os.environ.get("AZURE_DEFAULT_REGION"),
15+
"SUMO_ACCESS_ID": os.environ.get("SUMO_ACCESS_ID"),
16+
"SUMO_ACCESS_KEY": os.environ.get("SUMO_ACCESS_KEY"),
17+
"SUMO_DEPLOYMENT": os.environ.get("SUMO_DEPLOYMENT")
1818
}
1919

2020
# config_file = os.path.expanduser("~/.azure/azure_credentials.json")
@@ -27,8 +27,6 @@
2727
)
2828
location = str(config['AZURE_DEFAULT_REGION'])
2929

30-
print("creating credentials", subscription_id)
31-
3230
resource_client = ResourceManagementClient(credentials, subscription_id)
3331

3432

eslint.config.mjs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import globals from "globals";
2+
import pluginJs from "@eslint/js";
3+
4+
5+
/** @type {import('eslint').Linter.Config[]} */
6+
export default [
7+
{files: ["**/*.js"], languageOptions: {sourceType: "commonjs"}},
8+
{languageOptions: { globals: globals.browser }},
9+
pluginJs.configs.recommended,
10+
];

0 commit comments

Comments
 (0)