mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for additional prometheus labels for query (#1936)

Browse Source
This commit is contained in:
Harshavardhana
2022-05-05 13:44:10 -07:00
committed by GitHub
parent 9103ea9d70
commit 3bfdbb5ec7
109 changed files with 606 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
replication/admin_api_int_replication_test.go
View File

@@ -35,7 +35,6 @@ import (
const apiURL = "http://localhost:9090/api/v1/admin/site-replication"
func makeExecuteReq(method string, body io.Reader) (*http.Response, error) {
client := &http.Client{
Timeout: 10 * time.Second,
}
@@ -45,14 +44,12 @@ func makeExecuteReq(method string, body io.Reader) (*http.Response, error) {
apiURL,
body,
)
if err != nil {
return nil, err
}
request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
request.Header.Add("Content-Type", "application/json")
response, err := client.Do(request)
if err != nil {
return nil, err
}
@@ -64,7 +61,6 @@ func AddSiteReplicationInfo(sites []map[string]interface{}) (int, error) {
requestDataJSON, _ := json.Marshal(sites)
requestDataBody := bytes.NewReader(requestDataJSON)
response, err := makeExecuteReq("POST", requestDataBody)
if err != nil {
log.Println(response)
return -1, err
@@ -80,8 +76,6 @@ func EditSiteReplicationInfo(editedSite map[string]interface{}) (int, error) {
requestDataJSON, _ := json.Marshal(editedSite)
requestDataBody := bytes.NewReader(requestDataJSON)
response, err := makeExecuteReq("PUT", requestDataBody)
fmt.Println(response, err)
if err != nil {
return -1, err
}
@@ -90,18 +84,13 @@ func EditSiteReplicationInfo(editedSite map[string]interface{}) (int, error) {
}
return -1, nil
}
func DeleteSiteReplicationInfo(delReq map[string]interface{}) (int, error) {
requestDataJSON, _ := json.Marshal(delReq)
requestDataBody := bytes.NewReader(requestDataJSON)
response, err := makeExecuteReq("DELETE", requestDataBody)
if err != nil {
log.Println(response)
return -1, err
}
if response != nil {
@@ -109,12 +98,14 @@ func DeleteSiteReplicationInfo(delReq map[string]interface{}) (int, error) {
}
return -1, nil
}
func TestGetSiteReplicationInfo(t *testing.T) {
assert := assert.New(t)
response, err := makeExecuteReq("GET", nil)
// defer response.Body.Close()
tgt := &models.SiteReplicationInfoResponse{}
json.NewDecoder(response.Body).Decode(tgt)
if err != nil {
@@ -129,6 +120,7 @@ func TestGetSiteReplicationInfo(t *testing.T) {
func TestAddSiteReplicationInfo(t *testing.T) {
assert := assert.New(t)
fmt.Println("Add Site Replication")
sites := make([]map[string]interface{}, 2)
sites[0] = map[string]interface{}{
"accessKey": "minioadmin",
@@ -138,7 +130,7 @@ func TestAddSiteReplicationInfo(t *testing.T) {
}
sites[1] = map[string]interface{}{
"accessKey": "minioadmin",
"endpoint": "http://minio1:9001", //Docker container .
"endpoint": "http://minio1:9001", // Docker container .
// "endpoint": "http://localhost:9001", for local development
"secretKey": "minioadmin",
"name": "sitellhost9001",
@@ -190,7 +182,7 @@ func TestAddSiteReplicationInfo(t *testing.T) {
expectedError: false,
},
//context deadline error
// context deadline error
{
name: "Add Invalid Site name for Replication",
args: args{
@@ -199,7 +191,8 @@ func TestAddSiteReplicationInfo(t *testing.T) {
expStatusCode: 0,
expectedError: true,
},
//site already added error 500
// site already added error 500
{
name: "Add same Site name for Replication",
args: args{
@@ -247,8 +240,8 @@ func TestEditSiteReplicationInfo(t *testing.T) {
fmt.Println("Editing a valid site deployment id::", secondDeploymentID)
updatedSiteInfo := map[string]interface{}{
"deploymentID": secondDeploymentID,
"endpoint": "http://minio2:9002", //replace it with docker name
//"endpoint": "http://localhost:9002", //local dev
"endpoint": "http://minio2:9002", // replace it with docker name
// "endpoint": "http://localhost:9002", // local dev
"name": "sitellhost9002",
}
invalidUpdatedSiteInfo := map[string]interface{}{
@@ -294,7 +287,6 @@ func TestEditSiteReplicationInfo(t *testing.T) {
assert.NotEmpty(err)
return
}
})
}
}
@@ -372,7 +364,6 @@ func makeStatusExecuteReq(method string, url string) (*http.Response, error) {
url,
nil,
)
if err != nil {
return nil, err
}
@@ -399,7 +390,6 @@ func TestGetSiteReplicationStatus(t *testing.T) {
expStatusCode int
expectedError bool
}{
{
name: "Default replication status",
args: baseAPIURL + "users=true&groups=true&buckets=true&policies=true",
@@ -473,7 +463,6 @@ func TestGetSiteReplicationStatus(t *testing.T) {
if response != nil {
assert.Equal(tt.expStatusCode, response.StatusCode, "Status Code for", ti)
}
})
}
}

8
replication/replication_test.go
View File

@@ -35,8 +35,7 @@ import (
var token string
func initConsoleServer() (*restapi.Server, error) {
//os.Setenv("CONSOLE_MINIO_SERVER", "localhost:9000")
// os.Setenv("CONSOLE_MINIO_SERVER", "localhost:9000")
swaggerSpec, err := loads.Embedded(restapi.SwaggerJSON, restapi.FlatSwaggerJSON)
if err != nil {
@@ -58,7 +57,7 @@ func initConsoleServer() (*restapi.Server, error) {
// register all APIs
server.ConfigureAPI()
//restapi.GlobalRootCAs, restapi.GlobalPublicCerts, restapi.GlobalTLSCertsManager = globalRootCAs, globalPublicCerts, globalTLSCerts
// restapi.GlobalRootCAs, restapi.GlobalPublicCerts, restapi.GlobalTLSCertsManager = globalRootCAs, globalPublicCerts, globalTLSCerts
consolePort, _ := strconv.Atoi("9090")
@@ -71,7 +70,6 @@ func initConsoleServer() (*restapi.Server, error) {
}
func TestMain(m *testing.M) {
// start console server
go func() {
fmt.Println("start server")
@@ -82,7 +80,6 @@ func TestMain(m *testing.M) {
return
}
srv.Serve()
}()
fmt.Println("sleeping")
@@ -111,7 +108,6 @@ func TestMain(m *testing.M) {
request.Header.Add("Content-Type", "application/json")
response, err := client.Do(request)
if err != nil {
log.Println(err)
return