Skip to content

Multi-tenant Changes for Precooking/Recooking #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gravi21 wants to merge 1 commit into
base: develop-multi-tenant
Choose a base branch
from
Open

Multi-tenant Changes for Precooking/Recooking #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions adminapi/xcrp/recooking_lockdown_settings_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func PostRecookingLockdownSettingsHandler(w http.ResponseWriter, r *http.Request
log.Infof("Precook lockdown settings in EDT, lockdownStartTime: %v, lockdownEndTime: %v, lockdownModules: %v, lockdownEnabled: %v", lockdownStartTime, lockdownEndTime, lockdownModules, lockdownEnabled)

go CheckRecookingStatus(tenantId, time.Second*time.Duration(common.LockDuration), "rfc", fields)
err = GetXcrpConnector().PostRecook(models, partners, nil, fields)
err = GetXcrpConnector().PostRecook(tenantId, models, partners, nil, fields)
if err != nil {
xhttp.WriteAdminErrorResponse(w, http.StatusInternalServerError, err.Error())
return
Expand Down Expand Up @@ -164,7 +164,7 @@ func CheckRecookingStatus(tenantId string, lockDuration time.Duration, module st
var state bool
var updatedTime time.Time
var err error
state, err = GetXcrpConnector().GetRecookingStatusFromCanaryMgr(module, fields)
state, err = GetXcrpConnector().GetRecookingStatusFromCanaryMgr(tenantId, module, fields)
if err != nil {
log.Errorf("Error checking recooking status from CanaryMgr: %v", err)
return
Expand Down
1 change: 1 addition & 0 deletions common/const_var.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ const (
HeaderAccountID = "X-System-AccountID"
HeaderXconfDataService = "XconfDataService"
HeaderXconfAdminService = "XconfAdminService"
HeaderTenantID = "TenantId"
)

// const (
Expand Down
6 changes: 4 additions & 2 deletions http/xcrp_connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (c *XcrpConnector) SetXcrpHosts(hosts []string) {
c.hosts = hosts
}

func (c *XcrpConnector) PostRecook(m, p []string, bbytes []byte, fields log.Fields) error {
func (c *XcrpConnector) PostRecook(tenantId string, m, p []string, bbytes []byte, fields log.Fields) error {
models := strings.Join(m, ",")
partners := strings.Join(p, ",")
var url string
Expand All @@ -97,6 +97,7 @@ func (c *XcrpConnector) PostRecook(m, p []string, bbytes []byte, fields log.Fiel
}
headers := map[string]string{
common.HeaderUserAgent: common.HeaderXconfAdminService,
common.HeaderTenantID: tenantId,
}

_, err := c.DoWithRetries("POST", url, headers, bbytes, fields, xcrpServiceName)
Expand All @@ -110,12 +111,13 @@ func (c *XcrpConnector) PostRecook(m, p []string, bbytes []byte, fields log.Fiel
return nil
}

func (c *XcrpConnector) GetRecookingStatusFromCanaryMgr(module string, fields log.Fields) (bool, error) {
func (c *XcrpConnector) GetRecookingStatusFromCanaryMgr(tenantId string, module string, fields log.Fields) (bool, error) {
var url string
for _, host := range c.XcrpHosts() {
url = fmt.Sprintf(c.precookStatusPathTemplate, host, module)
headers := map[string]string{
common.HeaderUserAgent: common.HeaderXconfAdminService,
common.HeaderTenantID: tenantId,
}
response, err := c.DoWithRetries("GET", url, headers, nil, nil, xcrpServiceName)
if err != nil {
Comment on lines 118 to 123
Expand Down
20 changes: 10 additions & 10 deletions http/xcrp_connector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func TestXcrpConnector_PostRecook_WithModelsAndPartners(t *testing.T) {
partners := []string{"comcast", "cox"}
requestBody := []byte(`{"test":"data"}`)

err := connector.PostRecook(models, partners, requestBody, log.Fields{})
err := connector.PostRecook("testtenant", models, partners, requestBody, log.Fields{})

if err != nil {
t.Fatalf("unexpected error: %v", err)
Expand Down Expand Up @@ -151,7 +151,7 @@ func TestXcrpConnector_PostRecook_WithModelsOnly(t *testing.T) {
partners := []string{}
requestBody := []byte(`{"test":"data"}`)

err := connector.PostRecook(models, partners, requestBody, log.Fields{})
err := connector.PostRecook("testtenant", models, partners, requestBody, log.Fields{})

if err != nil {
t.Fatalf("unexpected error: %v", err)
Expand Down Expand Up @@ -189,7 +189,7 @@ func TestXcrpConnector_PostRecook_WithPartnersOnly(t *testing.T) {
partners := []string{"comcast"}
requestBody := []byte(`{"test":"data"}`)

err := connector.PostRecook(models, partners, requestBody, log.Fields{})
err := connector.PostRecook("testtenant", models, partners, requestBody, log.Fields{})

if err != nil {
t.Fatalf("unexpected error: %v", err)
Expand Down Expand Up @@ -220,7 +220,7 @@ func TestXcrpConnector_PostRecook_NoParams(t *testing.T) {
partners := []string{}
requestBody := []byte(`{"test":"data"}`)

err := connector.PostRecook(models, partners, requestBody, log.Fields{})
err := connector.PostRecook("testtenant", models, partners, requestBody, log.Fields{})

if err != nil {
t.Fatalf("unexpected error: %v", err)
Expand All @@ -246,7 +246,7 @@ func TestXcrpConnector_PostRecook_Error(t *testing.T) {
partners := []string{"comcast"}
requestBody := []byte(`{"test":"data"}`)

err := connector.PostRecook(models, partners, requestBody, log.Fields{})
err := connector.PostRecook("testtenant", models, partners, requestBody, log.Fields{})

if err == nil {
t.Fatal("expected error but got none")
Expand Down Expand Up @@ -282,7 +282,7 @@ func TestXcrpConnector_PostRecook_MultipleHosts(t *testing.T) {
partners := []string{"comcast"}
requestBody := []byte(`{"test":"data"}`)

err := connector.PostRecook(models, partners, requestBody, log.Fields{})
err := connector.PostRecook("testtenant", models, partners, requestBody, log.Fields{})

if err != nil {
t.Fatalf("unexpected error: %v", err)
Expand Down Expand Up @@ -330,7 +330,7 @@ func TestXcrpConnector_GetRecookingStatusFromCanaryMgr_Completed(t *testing.T) {
precookStatusPathTemplate: "%s/path/%s",
}

completed, err := connector.GetRecookingStatusFromCanaryMgr("rfc", log.Fields{})
completed, err := connector.GetRecookingStatusFromCanaryMgr("testtenant", "rfc", log.Fields{})

if err != nil {
t.Fatalf("unexpected error: %v", err)
Expand Down Expand Up @@ -368,7 +368,7 @@ func TestXcrpConnector_GetRecookingStatusFromCanaryMgr_Pending(t *testing.T) {
precookStatusPathTemplate: "%s/dummy/%s",
}

completed, err := connector.GetRecookingStatusFromCanaryMgr("rfc", log.Fields{})
completed, err := connector.GetRecookingStatusFromCanaryMgr("testtenant", "rfc", log.Fields{})

if err != nil {
t.Fatalf("unexpected error: %v", err)
Expand All @@ -394,7 +394,7 @@ func TestXcrpConnector_GetRecookingStatusFromCanaryMgr_Error(t *testing.T) {
hosts: []string{server.URL},
}

_, err := connector.GetRecookingStatusFromCanaryMgr("rfc", log.Fields{})
_, err := connector.GetRecookingStatusFromCanaryMgr("testtenant", "rfc", log.Fields{})

if err == nil {
t.Fatal("expected error but got none")
Expand All @@ -417,7 +417,7 @@ func TestXcrpConnector_GetRecookingStatusFromCanaryMgr_InvalidJSON(t *testing.T)
hosts: []string{server.URL},
}

_, err := connector.GetRecookingStatusFromCanaryMgr("rfc", log.Fields{})
_, err := connector.GetRecookingStatusFromCanaryMgr("testtenant", "rfc", log.Fields{})

if err == nil {
t.Fatal("expected error for invalid JSON but got none")
Expand Down
Loading