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

read license from envt variable (#2259)

Browse Source
This commit is contained in:
Ashish Kumar Sinha
2022-08-27 04:39:15 +05:30
committed by GitHub
parent d279f722f8
commit 9821beb1de
3 changed files with 29 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
restapi/admin_subnet.go
View File

@@ -23,6 +23,7 @@ import (
"fmt"
"net/http"
"net/url"
"os"
xhttp "github.com/minio/console/pkg/http"
@@ -307,22 +308,11 @@ func GetSubnetRegisterResponse(session *models.Principal, params subnetApi.Subne
func GetSubnetInfoResponse(session *models.Principal, params subnetApi.SubnetInfoParams) (*models.License, *models.Error) {
ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
defer cancel()
mAdmin, err := NewMinioAdminClient(session)
if err != nil {
return nil, ErrorWithContext(ctx, err)
}
adminClient := AdminClient{Client: mAdmin}
subnetTokens, err := GetSubnetKeyFromMinIOConfig(ctx, adminClient)
if err != nil {
return nil, ErrorWithContext(ctx, err)
}
if subnetTokens.APIKey == "" {
return nil, ErrorWithContext(ctx, ErrLicenseNotFound)
}
client := &xhttp.Client{
Client: GetConsoleHTTPClient(),
}
licenseInfo, err := subnet.ParseLicense(client, subnetTokens.License)
licenseInfo, err := subnet.ParseLicense(client, os.Getenv("CONSOLE_SUBNET_LICENSE"))
if err != nil {
return nil, ErrorWithContext(ctx, err)
}