Skip to content

Commit

Permalink
fixed indentation (#822)
Browse files Browse the repository at this point in the history
Co-authored-by: Marcel Ludwig <marcel.ludwig@milecrew.com>
  • Loading branch information
johakoch and malud committed Apr 17, 2024
1 parent acbd803 commit e79e835
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 36 deletions.
8 changes: 4 additions & 4 deletions server/http_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4383,10 +4383,10 @@ func TestFunction_to_number_errors(t *testing.T) {
}

for _, tc := range []testCase{
{"string", "/v1/to_number/string", wd + `/01_couper.hcl:65,23-28: Invalid function argument; Invalid value for "v" parameter: cannot convert "two" to number; given string must be a decimal representation of a number.`},
{"bool", "/v1/to_number/bool", wd + `/01_couper.hcl:73,23-27: Invalid function argument; Invalid value for "v" parameter: cannot convert bool to number.`},
{"tuple", "/v1/to_number/tuple", wd + `/01_couper.hcl:81,23-24: Invalid function argument; Invalid value for "v" parameter: cannot convert tuple to number.`},
{"object", "/v1/to_number/object", wd + `/01_couper.hcl:89,23-24: Invalid function argument; Invalid value for "v" parameter: cannot convert object to number.`},
{"string", "/v1/to_number/string", wd + `/01_couper.hcl:65,29-34: Invalid function argument; Invalid value for "v" parameter: cannot convert "two" to number; given string must be a decimal representation of a number.`},
{"bool", "/v1/to_number/bool", wd + `/01_couper.hcl:73,29-33: Invalid function argument; Invalid value for "v" parameter: cannot convert bool to number.`},
{"tuple", "/v1/to_number/tuple", wd + `/01_couper.hcl:81,29-30: Invalid function argument; Invalid value for "v" parameter: cannot convert tuple to number.`},
{"object", "/v1/to_number/object", wd + `/01_couper.hcl:89,29-30: Invalid function argument; Invalid value for "v" parameter: cannot convert object to number.`},
} {
t.Run(tc.name, func(subT *testing.T) {
helper := test.New(subT)
Expand Down
2 changes: 1 addition & 1 deletion server/testdata/endpoints/01_couper.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ server "api" {

response {
status = "${backend_responses.default.status}" # string type test
# 404 + 404 + 404 + 404
# 404 + 404 + 404 + 404
body = backend_responses.r1.status + backend_responses.default.status + backend_responses.r2.status + backend_responses.p2.status
}
}
Expand Down
4 changes: 2 additions & 2 deletions server/testdata/integration/api/03_couper.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ server "multi-api-host1" {

api {
base_path = "/v2"
error_file = "./../api_error.json"
error_file = "./../api_error.json"

endpoint "/abc" {
proxy {
Expand All @@ -20,7 +20,7 @@ server "multi-api-host2" {

api {
base_path = "/v3"
error_file = "./../api_error.json"
error_file = "./../api_error.json"

endpoint "/def" {
proxy {
Expand Down
8 changes: 4 additions & 4 deletions server/testdata/integration/config/03_couper.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -330,22 +330,22 @@ definitions {
jwt "JWTTokenCookie" {
signature_algorithm = "HS256"
key = "y0urS3cretT08eU5edF0rC0uPerInThe3xamp1e"
cookie = "tok"
cookie = "tok"
}
jwt "JWTTokenHeader" {
signature_algorithm = "HS256"
key = "y0urS3cretT08eU5edF0rC0uPerInThe3xamp1e"
header = "x-token"
header = "x-token"
}
jwt "JWTTokenHeaderAuth" {
signature_algorithm = "HS256"
key = "y0urS3cretT08eU5edF0rC0uPerInThe3xamp1e"
header = "aUtHoRiZaTiOn"
header = "aUtHoRiZaTiOn"
}
jwt "JWTTokenTokenValue" {
signature_algorithm = "HS256"
key = "y0urS3cretT08eU5edF0rC0uPerInThe3xamp1e"
token_value = request.query.tok[0]
token_value = request.query.tok[0]
}
jwt "RSAToken" {
signature_algorithm = "RS256"
Expand Down
4 changes: 2 additions & 2 deletions server/testdata/integration/endpoint_eval/14_couper.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ server "bodies" {
url = "${env.COUPER_TEST_BACKEND_ADDR}/anything"
form_body = {
foo = "ab c"
bar = ",:/"
bar = ",:/"
}

backend {
Expand All @@ -148,7 +148,7 @@ server "bodies" {
}
form_body = {
foo = "ab c"
bar = ",:/"
bar = ",:/"
}

backend {
Expand Down
22 changes: 11 additions & 11 deletions server/testdata/integration/functions/01_couper.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -48,45 +48,45 @@ server "api" {
endpoint "/to_number" {
response {
json_body = {
float-2_34 = to_number("2.34")
float-_3 = to_number(".3")
int = to_number("34")
int-3_ = to_number("3.")
int-3_0 = to_number("3.0")
null = to_number(null)
from-env = to_number(env.PI)
float-2_34 = to_number("2.34")
float-_3 = to_number(".3")
int = to_number("34")
int-3_ = to_number("3.")
int-3_0 = to_number("3.0")
null = to_number(null)
from-env = to_number(env.PI)
}
}
}

endpoint "/to_number/string" {
response {
json_body = {
error = to_number("two")
error = to_number("two")
}
}
}

endpoint "/to_number/bool" {
response {
json_body = {
error = to_number(true)
error = to_number(true)
}
}
}

endpoint "/to_number/tuple" {
response {
json_body = {
error = to_number([1])
error = to_number([1])
}
}
}

endpoint "/to_number/object" {
response {
json_body = {
error = to_number({a = 1})
error = to_number({a = 1})
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion server/testdata/integration/ratelimit/01_couper.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ definitions {
period = "1s"
per_period = 2
period_window = "fixed"
mode = "block"
mode = "block"
}
}
}
8 changes: 4 additions & 4 deletions server/testdata/multi/settings/couper.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ server {
proxy {
url = "${env.COUPER_TEST_BACKEND_ADDR}/anything"

set_response_headers = {
X: env.X
Y: env.Y
}
set_response_headers = {
X: env.X
Y: env.Y
}
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions server/testdata/settings/21_couper.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ server {
endpoint "/" {
proxy {
backend = "rs"
}
}
}
}

Expand All @@ -11,18 +11,18 @@ definitions {
oauth2 {
token_endpoint = "http://as.com/token"
backend = "as"
grant_type = "client_credentials"
client_id = "xyz"
client_secret = "xyz"
grant_type = "client_credentials"
client_id = "xyz"
client_secret = "xyz"
}
}

backend "as" {
beta_token_request {
url = "http://vault.com/key"
token = "xyz"
ttl = "1h"
backend = "rs"
token = "xyz"
ttl = "1h"
backend = "rs"
}
}
}

0 comments on commit e79e835

Please sign in to comment.