Skip to content

Commit 42ee284

Browse files
verdelverdel
authored
Update dependencies version (#36)
* Update deno to 1.38.3 * Update github workflows dependencies * Update tools dependencies * Add udd for e2e-tests folder * Update dependencies in typescript code and fix formatting * Fix e2e tests after update helm In helm before version 3.13.0 helm lint check that template dir exists in chart dir https://github.com/helm/helm/blob/3a31588ad33fe3b89af5a2a54ee1d25bfe6eaa5e/pkg/lint/rules/template.go#L190-L197 But in helm version 3.13.0 this check were changed https://github.com/helm/helm/blob/825e86f6a7a38cef1112bfa606e4127a706749b1/pkg/lint/rules/template.go#L190-L197 so now there is now warning message about template dir. * Add folders to ignore list in editorconfig check * Change setup Kind github workflow
1 parent 8326cbf commit 42ee284

24 files changed

+642
-509
lines changed

‎.ecrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"exclude": [
3-
"^LICENSE$"
3+
"^LICENSE$",
4+
"node_modules/",
5+
".git/"
46
]
57
}

‎.github/workflows/codeql-analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020

2121
- name: Initialize CodeQL
2222
uses: github/codeql-action/init@v2

‎.github/workflows/lint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111

1212
- name: Install dependencies
1313
run: make install-tools
@@ -16,4 +16,4 @@ jobs:
1616
run: make lint
1717

1818
- name: Run editorconfig linter
19-
uses: docker://mstruebing/editorconfig-checker:2.4.0
19+
uses: docker://mstruebing/editorconfig-checker:2.7.2

‎.github/workflows/test-all.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,40 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111

1212
- uses: denoland/setup-deno@v1
1313
with:
14-
deno-version: v1.27.x
14+
deno-version: v1.38.x
1515

1616
- name: Install Age Encryption Tool
1717
run: |
18-
wget https://github.com/FiloSottile/age/releases/download/v1.0.0/age-v1.0.0-linux-amd64.tar.gz -O age.tar.gz
18+
wget https://github.com/FiloSottile/age/releases/download/v1.1.1/age-v1.1.1-linux-amd64.tar.gz -O age.tar.gz
1919
tar xvf age.tar.gz age/age age/age-keygen
2020
echo "$PWD/age" >> $GITHUB_PATH
2121
2222
- name: Install sops
23-
uses: mdgreenwald/mozilla-sops-action@v1.2.0
23+
uses: mdgreenwald/mozilla-sops-action@v1.5.0
2424
with:
25-
version: 3.7.3
25+
version: 3.8.1
2626

2727
- name: Install helm-diff
2828
run: |
29-
helm plugin install https://github.com/databus23/helm-diff --version v3.6.0
29+
helm plugin install https://github.com/databus23/helm-diff --version v3.8.1
3030
3131
- name: Install helm-secrets
3232
run: |
33-
helm plugin install https://github.com/jkroepke/helm-secrets --version v4.1.1
33+
helm plugin install https://github.com/jkroepke/helm-secrets --version v4.5.1
3434
3535
- name: Install helm-push
3636
run: |
37-
helm plugin install https://github.com/chartmuseum/helm-push --version v0.10.3
37+
helm plugin install https://github.com/chartmuseum/helm-push --version v0.10.4
3838
3939
- name: Install plugin
4040
run: make install-plugin
4141

4242
- name: Start local kubernetes cluster
43-
uses: engineerd/setup-kind@v0.5.0
43+
uses: helm/kind[email protected].0
4444

4545
- name: Run tests
4646
run: make test-all

‎.github/workflows/test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111

1212
- uses: denoland/setup-deno@v1
1313
with:
14-
deno-version: v1.27.x
14+
deno-version: v1.38.x
1515

1616
- name: Install plugin
1717
run: make install-plugin

‎.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
deno 1.27.0
1+
deno 1.38.3

‎Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ install-tools:
1111
@ yarn --frozen-lockfile
1212

1313
install-plugin:
14-
@ HELM_PLUGIN_DIR="$$PWD" ./scripts/install.sh "v$${DENO_VERSION:-1.27.0}"
14+
@ HELM_PLUGIN_DIR="$$PWD" ./scripts/install.sh "v$${DENO_VERSION:-1.38.3}"
1515

1616
lint:
1717
@ yarn prettier --check .
@@ -40,3 +40,4 @@ test-all:
4040
update-deps:
4141
deno run -A https://deno.land/x/[email protected]/main.ts src/*.ts
4242
deno run -A https://deno.land/x/[email protected]/main.ts src/**/*.ts
43+
deno run -A https://deno.land/x/[email protected]/main.ts e2e-tests/**/*.ts

‎e2e-tests/e2e.test.ts

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Use fork until https://github.com/piyush-bhatt/deno-port/pull/1 is merged
2-
import { getAvailablePort } from "https://raw.githubusercontent.com/Nitive/deno-port/fix-getting-random-port/mod.ts"
3-
import { exists } from "https://deno.land/[email protected]/fs/exists.ts"
4-
import * as path from "https://deno.land/[email protected]/path/mod.ts"
5-
import * as yaml from "https://deno.land/[email protected]/encoding/yaml.ts"
2+
import { exists } from "https://deno.land/[email protected]/fs/exists.ts"
3+
import * as path from "https://deno.land/[email protected]/path/mod.ts"
64
import {
75
assertEquals,
86
assertStringIncludes,
9-
} from "https://deno.land/[email protected]/testing/asserts.ts"
7+
} from "https://deno.land/[email protected]/testing/asserts.ts"
8+
import * as yaml from "https://deno.land/[email protected]/yaml/mod.ts"
9+
import { getAvailablePort } from "https://raw.githubusercontent.com/Nitive/deno-port/fix-getting-random-port/mod.ts"
1010
import { ignoreNotFoundError } from "../src/utils/ignore-not-found-error.ts"
1111
import { waitForProcess } from "../src/utils/process.ts"
1212

@@ -139,7 +139,6 @@ Deno.test(
139139
stdout.replaceAll(helmPluginDir, ""),
140140
`\
141141
==> Linting /e2e-tests/charts/one-service
142-
[WARNING] templates/: directory not found
143142
144143
1 chart(s) linted, 0 chart(s) failed
145144
`
@@ -579,6 +578,7 @@ Deno.test({
579578
const fetchResult = await runHelmDeno([
580579
"fetch",
581580
`${ociRegistry.url}/one-service`,
581+
"--plain-http",
582582
"--untar",
583583
"--untardir",
584584
fetchDirectory,
@@ -635,8 +635,7 @@ Deno.test({
635635
})
636636

637637
Deno.test({
638-
name:
639-
"should clean deno-bundle.js and helm package if push wasn't successful",
638+
name: "should clean deno-bundle.js and helm package if push wasn't successful",
640639
ignore: !runAllTests,
641640
async fn() {
642641
const chartPath = path.join(chartsBin, "one-service")
@@ -702,8 +701,7 @@ Deno.test({
702701
})
703702

704703
Deno.test({
705-
name:
706-
"should use deno-bundle.js if `--deno-bundle prefer` have been passed and deno-bundle.js exists",
704+
name: "should use deno-bundle.js if `--deno-bundle prefer` have been passed and deno-bundle.js exists",
707705
async fn() {
708706
const chartPath = path.join(chartsBin, "prebundled")
709707

@@ -730,8 +728,7 @@ Deno.test({
730728
})
731729

732730
Deno.test({
733-
name:
734-
"should use deno-templates/index.ts if `--deno-bundle ignore` have been passed",
731+
name: "should use deno-templates/index.ts if `--deno-bundle ignore` have been passed",
735732
async fn() {
736733
const chartPath = path.join(chartsBin, "prebundled")
737734

@@ -758,8 +755,7 @@ Deno.test({
758755
})
759756

760757
Deno.test({
761-
name:
762-
"should use deno-templates/index.ts if --deno-bundle have not been passed",
758+
name: "should use deno-templates/index.ts if --deno-bundle have not been passed",
763759
async fn() {
764760
const chartPath = path.join(chartsBin, "prebundled")
765761

@@ -784,8 +780,7 @@ Deno.test({
784780
})
785781

786782
Deno.test({
787-
name:
788-
"should throw error if `--deno-bundle require` have been passed but deno-bundle.js do not exist",
783+
name: "should throw error if `--deno-bundle require` have been passed but deno-bundle.js do not exist",
789784
async fn() {
790785
const chartPath = path.join(chartsBin, "one-service")
791786

@@ -803,8 +798,7 @@ Deno.test({
803798
})
804799

805800
Deno.test({
806-
name:
807-
"should not throw error if `--deno-bundle prefer` have been passed and deno-bundle.js do not exist",
801+
name: "should not throw error if `--deno-bundle prefer` have been passed and deno-bundle.js do not exist",
808802
async fn() {
809803
const chartPath = path.join(chartsBin, "one-service")
810804

@@ -890,8 +884,7 @@ Deno.test({
890884
})
891885

892886
Deno.test({
893-
name:
894-
"should successfuly run `helm deno template` with remote deno chart (with --repo option)",
887+
name: "should successfuly run `helm deno template` with remote deno chart (with --repo option)",
895888
ignore: !runAllTests,
896889
async fn() {
897890
const { status, stdout, stderr } = await runHelmDeno([
@@ -932,8 +925,7 @@ async function addStableRepo() {
932925
}
933926

934927
Deno.test({
935-
name:
936-
"should successfuly run `helm deno template` with remote chart (with helm repo add)",
928+
name: "should successfuly run `helm deno template` with remote chart (with helm repo add)",
937929
ignore: !runAllTests,
938930
async fn() {
939931
const tmpRepo = await addStableRepo()

‎package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
"name": "helm-deno",
33
"license": "MIT",
44
"devDependencies": {
5-
"@typescript-eslint/eslint-plugin": "^4.14.1",
6-
"@typescript-eslint/parser": "^4.14.1",
7-
"eslint": "^7.19.0",
8-
"eslint-plugin-prettier": "^3.3.1",
9-
"prettier": "2.2.1",
10-
"typescript": "~4.1.5"
5+
"@typescript-eslint/eslint-plugin": "^6.13.1",
6+
"@typescript-eslint/parser": "^6.13.1",
7+
"eslint": "^8.54.0",
8+
"eslint-plugin-prettier": "^5.0.1",
9+
"prettier": "3.1.0",
10+
"prettier-plugin-organize-imports": "^3.2.2",
11+
"typescript": "^5.3.2"
1112
},
1213
"prettier": {
13-
"semi": false
14+
"semi": false,
15+
"trailingComma": "es5"
1416
}
1517
}

‎plugin.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: "deno"
2-
version: "0.3.0-alpha.1"
2+
version: "0.3.0-alpha.2"
33
usage: "Helm charts with Deno"
44
description: |-
55
This plugin allows to use Deno to prepare kubernetes manifests
66
hooks:
7-
install: "$HELM_PLUGIN_DIR/scripts/install.sh v1.27.0"
8-
update: "$HELM_PLUGIN_DIR/scripts/install.sh v1.27.0"
7+
install: "$HELM_PLUGIN_DIR/scripts/install.sh v1.38.3"
8+
update: "$HELM_PLUGIN_DIR/scripts/install.sh v1.38.3"
99
command: "$HELM_PLUGIN_DIR/scripts/run.sh"

0 commit comments

Comments
 (0)