Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
holi-notifications
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
app
holi-notifications
Commits
b7517a08
Commit
b7517a08
authored
5 months ago
by
Ole Langbehn
Browse files
Options
Downloads
Patches
Plain Diff
deno fmt
parent
bf8783eb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+10
-11
10 additions, 11 deletions
.gitlab-ci.yml
.pre-commit-config.yaml
+2
-2
2 additions, 2 deletions
.pre-commit-config.yaml
smoketest/main.js
+1
-2
1 addition, 2 deletions
smoketest/main.js
with
13 additions
and
15 deletions
.gitlab-ci.yml
+
10
−
11
View file @
b7517a08
...
@@ -9,7 +9,7 @@ default:
...
@@ -9,7 +9,7 @@ default:
-
1cpu-4gb
# build on smaller machine
-
1cpu-4gb
# build on smaller machine
variables
:
variables
:
API_DOMAIN_PATH
:
"
$CI_PROJECT_DIR/api_domain
"
API_DOMAIN_PATH
:
'
$CI_PROJECT_DIR/api_domain
'
# job templates
# job templates
...
@@ -17,15 +17,15 @@ variables:
...
@@ -17,15 +17,15 @@ variables:
image
:
image
:
name
:
'
europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.6.6'
name
:
'
europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.6.6'
# default entrypoint is terraform command, but we want to run shell scripts
# default entrypoint is terraform command, but we want to run shell scripts
entrypoint
:
[
"
/bin/sh
"
,
"
-c
"
]
entrypoint
:
[
'
/bin/sh
'
,
'
-c
'
]
variables
:
variables
:
ENVIRONMENT_ID
:
$CI_ENVIRONMENT_SLUG
ENVIRONMENT_ID
:
$CI_ENVIRONMENT_SLUG
artifacts
:
artifacts
:
paths
:
paths
:
-
"
terraform/environments/crash.log
"
# optional, only available in case of a crash/panic
-
'
terraform/environments/crash.log
'
# optional, only available in case of a crash/panic
-
"
terraform/environments/terraform-*.log
"
# separate log for every step/command
-
'
terraform/environments/terraform-*.log
'
# separate log for every step/command
-
$API_DOMAIN_PATH
-
$API_DOMAIN_PATH
name
:
"
${CI_JOB_NAME}_${CI_JOB_ID}
"
name
:
'
${CI_JOB_NAME}_${CI_JOB_ID}
'
#when: on_failure
#when: on_failure
expire_in
:
1 week
expire_in
:
1 week
script
:
script
:
...
@@ -57,7 +57,6 @@ cache_lint_test:
...
@@ -57,7 +57,6 @@ cache_lint_test:
-
deno lint
-
deno lint
-
deno test
-
deno test
# You can override the included template(s) by including variable overrides
# You can override the included template(s) by including variable overrides
# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings
# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings
...
@@ -69,7 +68,7 @@ sast:
...
@@ -69,7 +68,7 @@ sast:
needs
:
[
'
cache_lint_test'
]
needs
:
[
'
cache_lint_test'
]
stage
:
test
stage
:
test
include
:
include
:
-
template
:
Security/SAST.gitlab-ci.yml
-
template
:
Security/SAST.gitlab-ci.yml
build_docker
:
build_docker
:
needs
:
[
'
cache_lint_test'
]
needs
:
[
'
cache_lint_test'
]
...
@@ -113,7 +112,7 @@ review_destroy:
...
@@ -113,7 +112,7 @@ review_destroy:
image
:
image
:
name
:
'
europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.6.6'
name
:
'
europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.6.6'
# default entrypoint is terraform command, but we want to run shell scripts
# default entrypoint is terraform command, but we want to run shell scripts
entrypoint
:
[
"
/bin/sh
"
,
"
-c
"
]
entrypoint
:
[
'
/bin/sh
'
,
'
-c
'
]
variables
:
variables
:
# has to be set to none for auto stop
# has to be set to none for auto stop
GIT_STRATEGY
:
none
GIT_STRATEGY
:
none
...
@@ -124,9 +123,9 @@ review_destroy:
...
@@ -124,9 +123,9 @@ review_destroy:
dependencies
:
[]
# explicitly disable artifact usage
dependencies
:
[]
# explicitly disable artifact usage
artifacts
:
artifacts
:
paths
:
paths
:
-
"
terraform/environments/crash.log
"
# optional, only available in case of a crash/panic
-
'
terraform/environments/crash.log
'
# optional, only available in case of a crash/panic
-
"
terraform/environments/terraform-*.log
"
# separate log for every step/command
-
'
terraform/environments/terraform-*.log
'
# separate log for every step/command
name
:
"
${CI_JOB_NAME}_${CI_JOB_ID}
"
name
:
'
${CI_JOB_NAME}_${CI_JOB_ID}
'
when
:
on_failure
when
:
on_failure
expire_in
:
1 week
expire_in
:
1 week
script
:
script
:
...
...
This diff is collapsed.
Click to expand it.
.pre-commit-config.yaml
+
2
−
2
View file @
b7517a08
repos
:
repos
:
-
repo
:
local
-
repo
:
local
hooks
:
hooks
:
-
id
:
gitleaks
-
id
:
gitleaks
name
:
gitleaks
name
:
gitleaks
language
:
system
language
:
system
entry
:
gitleaks protect --staged -v -c ../.gitleaks.toml
entry
:
gitleaks protect --staged -v -c ../.gitleaks.toml
...
...
This diff is collapsed.
Click to expand it.
smoketest/main.js
+
1
−
2
View file @
b7517a08
import
http
from
'
k6/http
'
import
http
from
'
k6/http
'
import
{
check
,
sleep
}
from
'
k6
'
import
{
check
,
sleep
}
from
'
k6
'
// You don't need to change anything in this section, it's k6 glue code.
// You don't need to change anything in this section, it's k6 glue code.
// See the default function at the end of the file for defining your smoketest.
// See the default function at the end of the file for defining your smoketest.
// This configuration only executes 1 test, enough for a smoketest. The smoketest will fail on any check failing.
// This configuration only executes 1 test, enough for a smoketest. The smoketest will fail on any check failing.
...
@@ -35,7 +34,7 @@ export default () => {
...
@@ -35,7 +34,7 @@ export default () => {
check
(
JSON
.
parse
(
response
.
body
),
{
check
(
JSON
.
parse
(
response
.
body
),
{
// there can be multiple tests here, e.g.
// there can be multiple tests here, e.g.
//"contains topics object": (r) => typeof r.data.topics != null,
//"contains topics object": (r) => typeof r.data.topics != null,
'
returns unauthorized error
'
:
(
r
)
=>
r
.
errors
[
0
].
message
===
"
Unauthorized
"
,
'
returns unauthorized error
'
:
(
r
)
=>
r
.
errors
[
0
].
message
===
'
Unauthorized
'
,
})
})
})
})
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment