Skip to content

Commit 5f5a532

Browse files
committed
precommit fixes
1 parent 3b0e797 commit 5f5a532

File tree

152 files changed

+236
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+236
-279
lines changed

.idea/aws.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/azure/azureSettings.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/wrongsecrets-ctf-party.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.pre-commit-config.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# WARNING: File managed by eadf-bot, changes committed to individual repo will be overwritten
2+
repos:
3+
- repo: https://github.com/pre-commit/pre-commit-hooks
4+
rev: v4.3.0
5+
hooks:
6+
- id: check-yaml
7+
- id: end-of-file-fixer
8+
exclude: ^(src/test/resources/yourkey.txt|src/test/resources/secondkey.txt)
9+
- id: trailing-whitespace
10+
- repo: https://github.com/antonbabenko/pre-commit-terraform
11+
rev: v1.71.0
12+
hooks:
13+
- id: terraform_fmt
14+
- id: terraform_tflint
15+
args:
16+
- "--args=--only=terraform_deprecated_interpolation"
17+
- "--args=--only=terraform_deprecated_index"
18+
- "--args=--only=terraform_unused_declarations"
19+
- "--args=--only=terraform_comment_syntax"
20+
- "--args=--only=terraform_documented_outputs"
21+
- "--args=--only=terraform_documented_variables"
22+
- "--args=--only=terraform_typed_variables"
23+
- "--args=--only=terraform_module_pinned_source"
24+
- "--args=--only=terraform_naming_convention"
25+
- "--args=--only=terraform_required_version"
26+
- "--args=--only=terraform_required_providers"
27+
- "--args=--only=terraform_standard_module_structure"
28+
- "--args=--only=terraform_workspace_remote"
29+
- id: terraform_docs

ATTRIBUTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ Original Attirbution file of Multijuicer from which we Forked:
22

33
MultiJuicer uses multiple Icons / Emojis from OpenMoji: https://openmoji.org/
44

5-
The Logo was originally created by [Straight outta Mane](https://en.99designs.de/profiles/2794862) via [99Desgins](https://en.99designs.de/logo-brand-guide/contests/create-juicy-logo-open-source-project-multijuicer-1075365/entries).
5+
The Logo was originally created by [Straight outta Mane](https://en.99designs.de/profiles/2794862) via [99Desgins](https://en.99designs.de/logo-brand-guide/contests/create-juicy-logo-open-source-project-multijuicer-1075365/entries).

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,4 @@
198198
distributed under the License is distributed on an "AS IS" BASIS,
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201-
limitations under the License.
201+
limitations under the License.

aws/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ The documentation below is auto-generated to give insight on what's created via
104104

105105
| Name | Version |
106106
|------|---------|
107-
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.1 |
108-
| <a name="provider_http"></a> [http](#provider\_http) | ~> 3.1 |
109-
| <a name="provider_random"></a> [random](#provider\_random) | ~> 3.0 |
107+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.31.0 |
108+
| <a name="provider_http"></a> [http](#provider\_http) | 3.1.0 |
109+
| <a name="provider_random"></a> [random](#provider\_random) | 3.4.3 |
110110

111111
## Modules
112112

aws/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ module "eks" {
9797
bottlerocket_default = {
9898
create_launch_template = false
9999
launch_template_name = ""
100-
min_size = 1
101-
max_size = 50
102-
desired_size = 1
100+
min_size = 1
101+
max_size = 50
102+
desired_size = 1
103103

104104
capacity_type = "SPOT"
105105

cleaner/.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
node_modules/
2-
Dockerfile
2+
Dockerfile

cleaner/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
node_modules/
1+
node_modules/

cleaner/cleaner-cover.svg

Lines changed: 1 addition & 1 deletion
Loading

guides/aws/loadbalancer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ spec:
1010
ports:
1111
- protocol: TCP
1212
port: 80
13-
targetPort: 3000
13+
targetPort: 3000

guides/azure/ssl.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
# Setup SSL for multi-juicer with Microsoft Azure
33

44
Following this guide, you should be able to setup a https ingress with certificates from letsencrypt. https://docs.microsoft.com/en-us/azure/aks/ingress-tls?tabs=azure-cli .
5-
This guide is based on the official microsoft guide and tested on azure.
5+
This guide is based on the official microsoft guide and tested on azure.
66

77
Please note: Make sure that you haven't setup an ingress already. There is an option for configuring an ingress when installing multi-juicer with your own `values.yaml`. This guide require that you haven't ventured down that path.
88

9-
## 1. Create the Container registry
9+
## 1. Create the Container registry
1010

1111
First create a container registry where you will be storing the images for your cert-manager and nginx controller
1212

@@ -174,7 +174,7 @@ apiVersion: networking.k8s.io/v1
174174
kind: Ingress
175175
metadata:
176176
name: my-wrongsecrets-ctf-party
177-
annotations:
177+
annotations:
178178
cert-manager.io/cluster-issuer: letsencrypt
179179
spec:
180180
ingressClassName: nginx
@@ -216,4 +216,3 @@ NAME READY SECRET AGE
216216
tls-secret True tls-secret 11m
217217
```
218218
Test that the ingress is working by opening a browser and trying the host address. Make sure that you use https
219-

helm/wrongsecrets-ctf-party/.helmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
.project
2020
.idea/
2121
*.tmproj
22-
README.md.gotmpl
22+
README.md.gotmpl

helm/wrongsecrets-ctf-party/README.md.gotmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ MultiJuicer gives you the ability to run separate Juice Shop instances for every
1616

1717
## Configuration
1818

19-
{{ template "chart.valuesTable" . }}
19+
{{ template "chart.valuesTable" . }}

helm/wrongsecrets-ctf-party/archived-templates/unusued-progress-watchdog/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ spec:
1414
name: http
1515
selector:
1616
app.kubernetes.io/name: 'progress-watchdog'
17-
app.kubernetes.io/instance: {{ .Release.Name }}
17+
app.kubernetes.io/instance: {{ .Release.Name }}

helm/wrongsecrets-ctf-party/dashboards/instances.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2048,4 +2048,4 @@
20482048
"title": "WrongSecrets - Instance Dashboard",
20492049
"uid": "Sj-cIdwZk",
20502050
"version": 3
2051-
}
2051+
}

helm/wrongsecrets-ctf-party/templates/NOTES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ You'll then be able to access the JuiceBalancer in your browser under http://loc
99

1010
To administrate the cluster you can log into the JuiceBalancer with the admin account:
1111
Username: admin
12-
Password: ${kubectl get secrets wrongsecrets-balancer-secret -o=jsonpath='{.data.adminPassword}' | base64 --decode}
12+
Password: ${kubectl get secrets wrongsecrets-balancer-secret -o=jsonpath='{.data.adminPassword}' | base64 --decode}

helm/wrongsecrets-ctf-party/templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ app.kubernetes.io/instance: {{ .Release.Name }}
5757
{{- else -}}
5858
{{- printf "%s" .Values.balancer.cookie.name -}}
5959
{{- end -}}
60-
{{- end -}}
60+
{{- end -}}

helm/wrongsecrets-ctf-party/templates/wrongsecrets-balancer/deployment.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ spec:
4444
env:
4545
- name: REACT_APP_MOVING_GIF_LOGO
4646
value: {{ .Values.balancer.env.REACT_APP_MOVING_GIF_LOGO }}
47-
- name: REACT_APP_HEROKU_WRONGSECRETS_URL
48-
value: {{ .Values.balancer.env.REACT_APP_HEROKU_WRONGSECRETS_URL }}
47+
- name: REACT_APP_HEROKU_WRONGSECRETS_URL
48+
value: {{ .Values.balancer.env.REACT_APP_HEROKU_WRONGSECRETS_URL }}
4949
- name: REACT_APP_CTFD_URL
50-
value: {{ .Values.balancer.env.REACT_APP_CTFD_URL }}
50+
value: {{ .Values.balancer.env.REACT_APP_CTFD_URL }}
5151
- name: REACT_APP_S3_BUCKET_URL
52-
value: {{ .Values.balancer.env.REACT_APP_S3_BUCKET_URL }}
53-
- name: K8S_ENV
54-
value: {{ .Values.balancer.env.K8S_ENV }}
52+
value: {{ .Values.balancer.env.REACT_APP_S3_BUCKET_URL }}
53+
- name: K8S_ENV
54+
value: {{ .Values.balancer.env.K8S_ENV }}
5555
- name: IRSA_ROLE
5656
value: "arn:aws:iam::233483431651:role/wrongsecrets-secret-manager" #REPLACE WITH THE ACTUAL AWS ROLE IF IN AWS MODE
5757
- name: COOKIEPARSER_SECRET

helm/wrongsecrets-ctf-party/templates/wrongsecrets-balancer/ingress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
backend:
3434
service:
3535
name: wrongsecrets-balancer
36-
port:
36+
port:
3737
number: {{ $svcPort }}
3838
{{- end }}
3939
{{- end }}

helm/wrongsecrets-ctf-party/templates/wrongsecrets-balancer/role.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ rules:
2323
- apiGroups: [''] # "" indicates the core API group
2424
resources: ['secrets']
2525
verbs: ['create', 'get', 'list', 'delete']
26-
- apiGroups: ['']
26+
- apiGroups: ['']
2727
resources: ['serviceaccounts']
2828
verbs: ['create', 'get', 'list', 'delete', 'patch', 'update']
29-
- apiGroups: ['rbac.authorization.k8s.io']
29+
- apiGroups: ['rbac.authorization.k8s.io']
3030
resources: ['roles']
3131
verbs: ['create', 'delete', 'deletecollection', 'get', 'list', 'patch', 'update', 'watch', 'admin', 'escalate']
32-
- apiGroups: ['rbac.authorization.k8s.io']
32+
- apiGroups: ['rbac.authorization.k8s.io']
3333
resources: ['rolebindings']
3434
verbs: ['create', 'get', 'list', 'delete', 'patch', 'grant', 'bind', 'escalate']
35-
- apiGroups: ['rbac.authorization.k8s.io']
35+
- apiGroups: ['rbac.authorization.k8s.io']
3636
resources: ['roleRef']
3737
verbs: ['create', 'get', 'list', 'delete', 'patch', 'grant', 'escalate']
38-
- apiGroups: ['secrets-store.csi.x-k8s.io']
38+
- apiGroups: ['secrets-store.csi.x-k8s.io']
3939
resources: ['secretproviderclasses']
40-
verbs: ['create', 'get', 'list', 'delete']
40+
verbs: ['create', 'get', 'list', 'delete']

helm/wrongsecrets-ctf-party/templates/wrongsecrets-balancer/servicemonitor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ spec:
1717
password:
1818
name: wrongsecrets-balancer-secret
1919
key: metricsBasicAuthPassword
20-
{{- end }}
20+
{{- end }}

helm/wrongsecrets-ctf-party/templates/wrongsecrets/servicemonitor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ spec:
1212
deployment-context: {{ .Release.Name | quote }}
1313
endpoints:
1414
- targetPort: 3000
15-
{{- end }}
15+
{{- end }}

helm/wrongsecrets-ctf-party/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ wrongsecrets:
121121
# cpu: 100m
122122
# memory: 200Mi
123123
# -- Optional securityContext definitions to set for each JuiceShop instance
124-
securityContext:
124+
securityContext:
125125
allowPrivilegeEscalation: false
126126
readOnlyRootFilesystem: true
127127
runAsNonRoot: true

images/high-level-architecture.svg

Lines changed: 1 addition & 1 deletion
Loading

juiceShop.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
TEAM SOLVED-CHALLENGES LAST-REQUEST
2-
metadata.labels.team metadata.annotations.multi-juicer\.iteratec\.dev/challengesSolved metadata.annotations.multi-juicer\.iteratec\.dev/lastRequestReadable
2+
metadata.labels.team metadata.annotations.multi-juicer\.iteratec\.dev/challengesSolved metadata.annotations.multi-juicer\.iteratec\.dev/lastRequestReadable

progress-watchdog/.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
progress-watchdog
22
main
33
Dockerfile
4-
.gitignore
4+
.gitignore

progress-watchdog/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
progress-watchdog
2-
main
2+
main

progress-watchdog/vendor/github.com/PuerkitoBio/urlesc/README.md

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

progress-watchdog/vendor/github.com/emicklei/go-restful/.travis.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)