Skip to content

Commit 9217fc7

Browse files
authored
Merge pull request #40 from jonathanfoster/fix/desktop-app-whitelisted-origin
fix(hoppscotch): fix auto generated desktop app whitelist origin
2 parents e06c3f0 + dc39834 commit 9217fc7

24 files changed

Lines changed: 858 additions & 618 deletions

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ insert_final_newline = true
99
trim_trailing_whitespace = true
1010

1111
[Makefile]
12+
indent_size = 4
1213
indent_style = tab

.github/workflows/manual-chart-release.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@ on:
44
workflow_dispatch:
55
inputs:
66
chart_version:
7-
description: 'New chart version (e.g., 0.2.0)'
7+
description: "New chart version (e.g., 0.2.0)"
88
required: true
99
type: string
1010
app_version:
11-
description: 'App version compatibility (e.g., 2025.8.1)'
11+
description: "App version compatibility (e.g., 2025.8.1)"
1212
required: true
1313
type: string
1414
release_type:
15-
description: 'Type of release'
15+
description: "Type of release"
1616
required: true
1717
type: choice
18-
default: 'minor'
18+
default: "minor"
1919
options:
2020
- patch
2121
- minor
2222
- major
2323
- hotfix
2424
release_notes:
25-
description: 'Release notes (what changed in the chart)'
25+
description: "Release notes (what changed in the chart)"
2626
required: false
2727
type: string
28-
default: 'Manual chart release'
28+
default: "Manual chart release"
2929
chart_name:
30-
description: 'Chart name to release'
30+
description: "Chart name to release"
3131
required: true
3232
type: choice
33-
default: 'hoppscotch'
33+
default: "hoppscotch"
3434
options:
3535
- hoppscotch
3636
- she

.markdownlint.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
default: true
2-
MD013:
2+
line-length:
33
line_length: 120
4+
tables: false

CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ Enhancement suggestions are tracked as GitHub issues. When creating an enhanceme
5050
## Development Setup
5151

5252
1. Install required tools:
53-
5453
- Kubernetes cluster (local or cloud)
5554
- Helm 3.x
5655
- kubectl

Makefile

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ fmt-fix: fmt-markdown-fix fmt-shell-fix fmt-yaml-fix ## Fix all files formatting
2222
.PHONY: fmt-markdown
2323
fmt-markdown: ## Check Markdown files formatting
2424
@echo "Checking Markdown files formatting"
25-
prettier -c **/*.md
25+
prettier -c "**/*.md"
2626

2727
.PHONY: fmt-markdown-fix
2828
fmt-markdown-fix: ## Fix Markdown files formatting
2929
@echo "Fixing Markdown files formatting"
30-
prettier -w **/*.md
30+
prettier -w "**/*.md"
3131

3232
.PHONY: fmt-shell
3333
fmt-shell: ## Check shell scripts formatting
@@ -42,12 +42,17 @@ fmt-shell-fix: ## Fix shell scripts formatting
4242
.PHONY: fmt-yaml
4343
fmt-yaml: ## Check YAML files formatting
4444
@echo "Checking YAML files formatting"
45-
prettier -c **/*.yaml
45+
prettier -c "**/*.yaml"
4646

4747
.PHONY: fmt-yaml-fix
4848
fmt-yaml-fix: ## Fix YAML files formatting
4949
@echo "Fixing YAML files formatting"
50-
prettier -w **/*.yaml
50+
prettier -w "**/*.yaml"
51+
52+
.PHONY: helm-deps-update
53+
helm-deps-update: ## Update chart dependencies
54+
@echo "Updating ${CHART_NAME} chart dependencies"
55+
helm dependency update charts/${CHART_NAME}
5156

5257
.PHONY: helm-docs
5358
helm-docs: ## Generate Helm docs
@@ -60,6 +65,16 @@ helm-install: kind-create-cluster ## Install chart
6065
@echo "Installing ${CHART_NAME} chart"
6166
helm install ${CHART_NAME} charts/${CHART_NAME} -n ${CHART_NAMESPACE} --values=${CHART_VALUES} --create-namespace --wait
6267

68+
.PHONY: helm-package
69+
helm-package: clean ## Package Helm charts
70+
@echo "Packaging Helm charts"
71+
cr package charts/${CHART_NAME}
72+
73+
.PHONY: helm-test
74+
helm-test: ## Run chart tests
75+
@echo "Running ${CHART_NAME} chart tests"
76+
helm test ${CHART_NAME} --namespace ${CHART_NAMESPACE}
77+
6378
.PHONY: helm-template
6479
helm-template: clean ## Render chart templates
6580
@echo "Rendering ${CHART_NAME} chart templates"
@@ -86,7 +101,7 @@ help: ## Show this help message
86101
@echo "Usage: make [target]"
87102
@echo ""
88103
@echo "Available Targets:"
89-
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf " %-20s %s\n", $$1, $$2}' $(MAKEFILE_LIST)
104+
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_0-9-]+:.*?## / {printf " %-20s %s\n", $$1, $$2}' $(MAKEFILE_LIST)
90105

91106
.PHONY: install-deps
92107
install-deps: ## Install dependencies
@@ -122,6 +137,8 @@ install-deps-linux: ## Install dependencies for Linux
122137
@echo "Installing helm-unittest"
123138
@if ! helm plugin list | grep -q 'unittest'; then \
124139
helm plugin install https://github.com/helm-unittest/helm-unittest; \
140+
else \
141+
echo "Warning: helm-unittest plugin is already installed"; \
125142
fi
126143
@echo "Installing helm-docs"
127144
go install github.com/norwoodj/helm-docs/cmd/helm-docs@latest
@@ -196,7 +213,7 @@ lint-helm: ## Lint Helm charts
196213
.PHONY: lint-markdown
197214
lint-markdown: ## Lint Markdown files
198215
@echo "Linting Markdown files"
199-
markdownlint '**/*.md'
216+
markdownlint -d "**/*.md"
200217

201218
.PHONY: lint-shell
202219
lint-shell: ## Lint shell scripts
@@ -208,23 +225,21 @@ lint-yaml: ## Lint YAML files
208225
@echo "Linting YAML files"
209226
yamllint .
210227

211-
.PHONY: package
212-
package: clean ## Package Helm charts
213-
@echo "Packaging Helm charts"
214-
cr package charts/${CHART_NAME}
215-
216228
.PHONY: pre-commit
217229
pre-commit: fmt lint test-unit ## Run pre-commit hooks
218230

231+
.PHONY: test
232+
test: test-unit test-e2e ## Run all tests
233+
219234
.PHONY: test-e2e
220235
test-e2e: ## Run end-to-end tests
221236
@echo "Running end-to-end tests for ${CHART_NAME} chart"
222237
${TEST_E2E_DIR}/test-e2e.sh --charts=charts/${CHART_NAME} --debug
223238

239+
.PHONY: test-integration
240+
test-integration: helm-test ## Run integration tests
241+
224242
.PHONY: test-unit
225243
test-unit: ## Run unit tests
226244
@echo "Running unit tests"
227245
helm unittest charts/*
228-
229-
.PHONY: test
230-
test: test-unit test-e2e ## Run all tests

charts/hoppscotch/Chart.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dependencies:
22
- name: postgresql
33
repository: oci://registry-1.docker.io/bitnamicharts
4-
version: 16.7.15
4+
version: 16.7.27
55
- name: redis
66
repository: oci://registry-1.docker.io/bitnamicharts
7-
version: 20.13.4
7+
version: 22.0.7
88
- name: clickhouse
99
repository: oci://registry-1.docker.io/bitnamicharts
10-
version: 8.0.10
11-
digest: sha256:f188457027bb499e03ddb84aee85dd15233379f6217b201089b639d88e6ab334
12-
generated: "2025-07-02T15:11:17.266523-04:00"
10+
version: 9.4.4
11+
digest: sha256:1e0a585cfeda44a3c3226b653e5ff0ac4e59b917af9a7623a0eb7c0379137e42
12+
generated: "2025-09-21T13:13:36.067111-04:00"

charts/hoppscotch/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ dependencies:
1616
condition: postgresql.enabled
1717
repository: oci://registry-1.docker.io/bitnamicharts
1818
- name: redis
19-
version: 20.x.x
19+
version: 22.x.x
2020
condition: redis.enabled
2121
repository: oci://registry-1.docker.io/bitnamicharts
2222
- name: clickhouse
23-
version: 8.x.x
23+
version: 9.x.x
2424
condition: clickhouse.enabled
2525
repository: oci://registry-1.docker.io/bitnamicharts

0 commit comments

Comments
 (0)