Skip to content

Commit 78a4e05

Browse files
hdurand0710hdurand0710
committed
MEDIUM: remove defaults and rename named_defaults
1 parent 0226e75 commit 78a4e05

30 files changed

+595
-2027
lines changed

‎configure_data_plane.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,8 +603,6 @@ func configureAPI(api *operations.DataPlaneAPI) http.Handler { //nolint:cyclop,m
603603
api.GlobalReplaceGlobalHandler = &handlers.ReplaceGlobalHandlerImpl{Client: client, ReloadAgent: ra}
604604

605605
// setup defaults configuration handlers
606-
api.DefaultsGetDefaultsHandler = &handlers.GetDefaultsHandlerImpl{Client: client} // deprecated
607-
api.DefaultsReplaceDefaultsHandler = &handlers.ReplaceDefaultsHandlerImpl{Client: client, ReloadAgent: ra} // deprecated
608606
api.DefaultsCreateDefaultsSectionHandler = &handlers.CreateDefaultsSectionHandlerImpl{Client: client, ReloadAgent: ra}
609607
api.DefaultsDeleteDefaultsSectionHandler = &handlers.DeleteDefaultsSectionHandlerImpl{Client: client, ReloadAgent: ra}
610608
api.DefaultsReplaceDefaultsSectionHandler = &handlers.ReplaceDefaultsSectionHandlerImpl{Client: client, ReloadAgent: ra}

‎e2e/tests/defaults/create.bats‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ load '../../libs/haproxy_version'
2626
load 'utils/_helpers'
2727

2828
@test "defaults: Create a named defaults configuration" {
29-
resource_post "$_NAMED_DEFAULTS_BASE_PATH" "data/post.json" ""
29+
resource_put "$_DEFAULTS_BASE_PATH" "data/post.json" ""
3030
assert_equal "$SC" 202
3131

32-
resource_get "$_NAMED_DEFAULTS_BASE_PATH/created"
32+
resource_get "$_DEFAULTS_BASE_PATH/created"
3333
assert_equal "$SC" 200
3434

3535
assert_equal "$(get_json_path "$BODY" '.name')" "created"
@@ -39,23 +39,23 @@ load 'utils/_helpers'
3939
}
4040

4141
@test "defaults: Create a named defaults configuration that already exists" {
42-
resource_post "$_NAMED_DEFAULTS_BASE_PATH" "data/post_existing.json" ""
42+
resource_put "$_DEFAULTS_BASE_PATH" "data/post_existing.json" ""
4343
assert_equal "$SC" 409
4444
}
4545

4646
@test "defaults: Create a named defaults configuration with from" {
4747
haproxy_version_ge $_ERR_SUPPORTED_HAPROXY_VERSION || skip "requires HAProxy $_ERR_SUPPORTED_HAPROXY_VERSION+"
4848

49-
resource_post "$_NAMED_DEFAULTS_BASE_PATH" "data/post.json" ""
49+
resource_put "$_DEFAULTS_BASE_PATH" "data/post.json" ""
5050
assert_equal "$SC" 202
5151

52-
resource_get "$_NAMED_DEFAULTS_BASE_PATH/created"
52+
resource_get "$_DEFAULTS_BASE_PATH/created"
5353
assert_equal "$SC" 200
5454

55-
resource_post "$_NAMED_DEFAULTS_BASE_PATH" "data/post_with_from.json" ""
55+
resource_put "$_DEFAULTS_BASE_PATH" "data/post_with_from.json" ""
5656
assert_equal "$SC" 202
5757

58-
resource_get "$_NAMED_DEFAULTS_BASE_PATH/created_with_from"
58+
resource_get "$_DEFAULTS_BASE_PATH/created_with_from"
5959
assert_equal "$SC" 200
6060

6161
assert_equal "$(get_json_path "$BODY" '.name')" "created_with_from"

‎e2e/tests/defaults/delete.bats‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ load '../../libs/version'
2424
load 'utils/_helpers'
2525

2626
@test "defaults: Delete a named defaults configuration" {
27-
resource_delete "$_NAMED_DEFAULTS_BASE_PATH/unnamed_defaults_1"
27+
resource_delete "$_DEFAULTS_BASE_PATH/unnamed_defaults_1"
2828
assert_equal "$SC" 202
2929
}
3030

3131
@test "defaults: Delete a named defaults configuration that does not exist" {
32-
resource_delete "$_NAMED_DEFAULTS_BASE_PATH/nothing_to_see_here"
32+
resource_delete "$_DEFAULTS_BASE_PATH/nothing_to_see_here"
3333
assert_equal "$SC" 404
3434
}

‎e2e/tests/defaults/get.bats‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,20 @@ load '../../libs/version'
2323

2424
load 'utils/_helpers'
2525

26-
@test "defaults: Return a defaults configuration" {
27-
resource_get "$_DEFAULTS_BASE_PATH"
28-
assert_equal "$SC" 200
29-
assert_equal "$(get_json_path "$BODY" '.mode')" "http"
30-
assert_equal "$(get_json_path "$BODY" '.balance.algorithm')" "roundrobin"
31-
assert_equal "$(get_json_path "$BODY" '.client_timeout')" "30000"
32-
}
3326

34-
@test "defaults: Return a list of named defaults configurations" {
35-
resource_get "$_NAMED_DEFAULTS_BASE_PATH"
27+
@test "defaults: Return a list of defaults configurations" {
28+
resource_get "$_DEFAULTS_BASE_PATH"
3629
assert_equal "$SC" 200
3730
assert_equal "$(get_json_path "$BODY" '.[0].name')" "unnamed_defaults_1"
3831
}
3932

40-
@test "defaults: Return a named defaults configuration" {
41-
resource_get "$_NAMED_DEFAULTS_BASE_PATH/unnamed_defaults_1"
33+
@test "defaults: Return a defaults configuration" {
34+
resource_get "$_DEFAULTS_BASE_PATH/unnamed_defaults_1"
4235
assert_equal "$SC" 200
4336
assert_equal "$(get_json_path "$BODY" '.name')" "unnamed_defaults_1"
4437
}
4538

4639
@test "defaults: Return a named defaults configuration that does not exist" {
47-
resource_get "$_NAMED_DEFAULTS_BASE_PATH/nothing_to_see_here"
40+
resource_get "$_DEFAULTS_BASE_PATH/nothing_to_see_here"
4841
assert_equal "$SC" 404
4942
}

‎e2e/tests/defaults/replace.bats‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,20 @@ load '../../libs/version'
2323

2424
load 'utils/_helpers'
2525

26-
@test "defaults: Replace a defaults configuration" {
27-
resource_put "$_DEFAULTS_BASE_PATH" "data/put.json" ""
28-
assert_equal "$SC" 202
2926

30-
resource_get "$_DEFAULTS_BASE_PATH" ""
27+
@test "defaults: Return a list of defaults configurations" {
28+
resource_get "$_DEFAULTS_BASE_PATH"
3129
assert_equal "$SC" 200
32-
33-
assert_equal "$(get_json_path "$BODY" '.server_timeout')" "25000"
34-
assert_equal "$(get_json_path "$BODY" '.client_timeout')" "25000"
35-
assert_equal "$(get_json_path "$BODY" '.mode')" "tcp"
30+
assert_equal "$(get_json_path "$BODY" '.[0].name')" "unnamed_defaults_1"
3631
}
3732

38-
@test "defaults: Replace a named defaults configuration" {
39-
resource_put "$_NAMED_DEFAULTS_BASE_PATH/unnamed_defaults_1" "data/put.json" ""
40-
assert_equal "$SC" 202
41-
42-
resource_get "$_NAMED_DEFAULTS_BASE_PATH/unnamed_defaults_1"
33+
@test "defaults: Return a defaults configuration" {
34+
resource_get "$_DEFAULTS_BASE_PATH/unnamed_defaults_1"
4335
assert_equal "$SC" 200
44-
4536
assert_equal "$(get_json_path "$BODY" '.name')" "unnamed_defaults_1"
46-
assert_equal "$(get_json_path "$BODY" '.server_timeout')" "25000"
47-
assert_equal "$(get_json_path "$BODY" '.client_timeout')" "25000"
48-
assert_equal "$(get_json_path "$BODY" '.mode')" "tcp"
4937
}
5038

51-
@test "defaults: Replace a named defaults configuration that does not exist" {
52-
resource_put "$_NAMED_DEFAULTS_BASE_PATH/nothing_to_see_here" "data/put.json" ""
39+
@test "defaults: Return a named defaults configuration that does not exist" {
40+
resource_get "$_DEFAULTS_BASE_PATH/nothing_to_see_here"
5341
assert_equal "$SC" 404
5442
}

‎e2e/tests/defaults/utils/_helpers.bash‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@
1717

1818
_DEFAULTS_BASE_PATH="/services/haproxy/configuration/defaults"
1919

20-
_NAMED_DEFAULTS_BASE_PATH="/services/haproxy/configuration/named_defaults"
2120
_ERR_SUPPORTED_HAPROXY_VERSION="2.4"

0 commit comments

Comments
 (0)