diff -up cli-18.09.6/cli/command/engine/activate_test.go.fix_call_to_SummarizeLicense cli-18.09.6/cli/command/engine/activate_test.go
--- cli-18.09.6/cli/command/engine/activate_test.go.fix_call_to_SummarizeLicense 2019-04-02 10:26:42.000000000 +0200
+++ cli-18.09.6/cli/command/engine/activate_test.go 2019-05-22 21:48:50.941256568 +0200
@@ -117,7 +117,7 @@ func (c mockLicenseClient) StoreLicense(
func (c mockLicenseClient) LoadLocalLicense(ctx context.Context, dclnt licensing.WrappedDockerClient) (*model.Subscription, error) {
return nil, fmt.Errorf("not implemented")
}
-func (c mockLicenseClient) SummarizeLicense(res *model.CheckResponse, keyID string) *model.Subscription {
+func (c mockLicenseClient) SummarizeLicense(res *model.CheckResponse) *model.Subscription {
return nil
}
func TestActivateDisplayOnlyHub(t *testing.T) {
diff -up cli-18.09.6/internal/licenseutils/client_test.go.fix_call_to_SummarizeLicense cli-18.09.6/internal/licenseutils/client_test.go
--- cli-18.09.6/internal/licenseutils/client_test.go.fix_call_to_SummarizeLicense 2019-04-02 10:26:42.000000000 +0200
+++ cli-18.09.6/internal/licenseutils/client_test.go 2019-05-22 21:46:59.947403436 +0200
@@ -20,7 +20,7 @@ type (
parseLicenseFunc func(license []byte) (parsedLicense *model.IssuedLicense, err error)
storeLicenseFunc func(ctx context.Context, dclnt licensing.WrappedDockerClient, licenses *model.IssuedLicense, localRootDir string) error
loadLocalLicenseFunc func(ctx context.Context, dclnt licensing.WrappedDockerClient) (*model.Subscription, error)
- summarizeLicenseFunc func(*model.CheckResponse, string) *model.Subscription
+ summarizeLicenseFunc func(*model.CheckResponse) *model.Subscription
}
)
@@ -104,9 +104,9 @@ func (c *fakeLicensingClient) LoadLocalL
return nil, nil
}
-func (c *fakeLicensingClient) SummarizeLicense(cr *model.CheckResponse, keyid string) *model.Subscription {
+func (c *fakeLicensingClient) SummarizeLicense(cr *model.CheckResponse) *model.Subscription {
if c.summarizeLicenseFunc != nil {
- return c.summarizeLicenseFunc(cr, keyid)
+ return c.summarizeLicenseFunc(cr)
}
return nil
}
diff -up cli-18.09.6/internal/licenseutils/utils.go.fix_call_to_SummarizeLicense cli-18.09.6/internal/licenseutils/utils.go
--- cli-18.09.6/internal/licenseutils/utils.go.fix_call_to_SummarizeLicense 2019-04-02 10:26:42.000000000 +0200
+++ cli-18.09.6/internal/licenseutils/utils.go 2019-05-22 21:45:15.063542243 +0200
@@ -166,7 +166,7 @@ func GetLicenseSummary(ctx context.Conte
if err != nil {
return "", err
}
- return lclient.SummarizeLicense(cr, license.KeyID).String(), nil
+ return lclient.SummarizeLicense(cr).String(), nil
}
func doLoadLocalIssuedLicense(ctx context.Context, filename string, lclient licensing.Client) (*model.IssuedLicense, error) {