-
Notifications
You must be signed in to change notification settings - Fork 5.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change SetRemoteTarget API to allow editing remote target
more flexibly. - Previously only credentials could be updated with `mc admin bucket remote edit`. Change this to allow updating synchronous replication flag, path, bandwidth and healthcheck Add a flag to allow disabling proxying in active-active replication
- Loading branch information
Poorna Krishnamoorthy
committed
Apr 28, 2021
1 parent
0c9d095
commit f172dc9
Showing
5 changed files
with
205 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| // Copyright (c) 2021 MinIO, Inc. | ||
| // | ||
| // This file is part of MinIO Object Storage stack | ||
| // | ||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU Affero General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU Affero General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU Affero General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| package madmin | ||
|
|
||
| import ( | ||
| "net/url" | ||
| "testing" | ||
| ) | ||
|
|
||
| func isOpsEqual(op1 []TargetUpdateType, op2 []TargetUpdateType) bool { | ||
| if len(op1) != len(op2) { | ||
| return false | ||
| } | ||
| for _, o1 := range op1 { | ||
| found := false | ||
| for _, o2 := range op2 { | ||
| if o2 == o1 { | ||
| found = true | ||
| break | ||
| } | ||
| } | ||
| if !found { | ||
| return false | ||
| } | ||
| } | ||
| return true | ||
| } | ||
|
|
||
| // TestGetTargetUpdateOps tests GetTargetUpdateOps | ||
| func TestGetTargetUpdateOps(t *testing.T) { | ||
| testCases := []struct { | ||
| values url.Values | ||
| expectedOps []TargetUpdateType | ||
| }{ | ||
| {values: url.Values{ | ||
| "update": []string{"true"}}, | ||
| expectedOps: []TargetUpdateType{}, | ||
| }, | ||
| {values: url.Values{ | ||
| "update": []string{"false"}, | ||
| "path": []string{"true"}, | ||
| }, | ||
| expectedOps: []TargetUpdateType{}, | ||
| }, | ||
| {values: url.Values{ | ||
| "update": []string{"true"}, | ||
| "path": []string{""}, | ||
| }, | ||
| expectedOps: []TargetUpdateType{}, | ||
| }, | ||
| {values: url.Values{ | ||
| "update": []string{"true"}, | ||
| "path": []string{"true"}, | ||
| "bzzzz": []string{"true"}, | ||
| }, | ||
| expectedOps: []TargetUpdateType{PathUpdateType}, | ||
| }, | ||
|
|
||
| {values: url.Values{ | ||
| "update": []string{"true"}, | ||
| "path": []string{"true"}, | ||
| "creds": []string{"true"}, | ||
| "sync": []string{"true"}, | ||
| "proxy": []string{"true"}, | ||
| "bandwidth": []string{"true"}, | ||
| "healthcheck": []string{"true"}, | ||
| }, | ||
| expectedOps: []TargetUpdateType{ | ||
| PathUpdateType, CredentialsUpdateType, SyncUpdateType, ProxyUpdateType, BandwidthLimitUpdateType, HealthCheckDurationUpdateType}, | ||
| }, | ||
| } | ||
| for i, test := range testCases { | ||
| gotOps := GetTargetUpdateOps(test.values) | ||
| if !isOpsEqual(gotOps, test.expectedOps) { | ||
| t.Fatalf("test %d: expected %v got %v", i+1, test.expectedOps, gotOps) | ||
| } | ||
| } | ||
| } |