Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2024-09-20 00:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add provider to license check (#88)

Browse Source
This commit is contained in:
Moritz Eckert 2022-09-08 11:02:04 +02:00 committed by GitHub
parent 765c097beb
commit fb5faa681c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/internal/cmd/init.go
View File

@ -108,7 +108,7 @@ func initialize(cmd *cobra.Command, newDialer func(validator *cloudcmd.Validator
}
checker := license.NewChecker(quotaChecker, fileHandler)
if err := checker.CheckLicense(cmd.Context(), cmd.Printf); err != nil {
if err := checker.CheckLicense(cmd.Context(), provider, config.Provider, cmd.Printf); err != nil {
cmd.Printf("License check failed: %v", err)
}

18
internal/license/checker_enterprise.go
View File

@ -11,6 +11,8 @@ package license
import (
"context"
"github.com/edgelesssys/constellation/internal/cloud/cloudprovider"
"github.com/edgelesssys/constellation/internal/config"
"github.com/edgelesssys/constellation/internal/constants"
"github.com/edgelesssys/constellation/internal/file"
)
@ -30,7 +32,7 @@ func NewChecker(quotaChecker QuotaChecker, fileHandler file.Handler) *Checker {
// CheckLicense tries to read the license file and contact license server
// to fetch quota information.
// If no license file is found, community license is assumed.
func (c *Checker) CheckLicense(ctx context.Context, printer func(string, ...any)) error {
func (c *Checker) CheckLicense(ctx context.Context, provider cloudprovider.Provider, providerCfg config.ProviderConfig, printer func(string, ...any)) error {
licenseID, err := FromFile(c.fileHandler, constants.LicenseFilename)
if err != nil {
printer("Unable to find license file. Assuming community license.\n")
@ -38,9 +40,19 @@ func (c *Checker) CheckLicense(ctx context.Context, printer func(string, ...any)
} else {
printer("Constellation license found!\n")
}
providerStr := provider.String()
if provider == cloudprovider.Azure {
if *providerCfg.Azure.ConfidentialVM {
providerStr = "azure-cvm"
} else {
providerStr = "azure-tl"
}
}
quotaResp, err := c.quotaChecker.QuotaCheck(ctx, QuotaCheckRequest{
License: licenseID,
Action: Init,
License: licenseID,
Action: Init,
Provider: providerStr,
})
if err != nil {
printer("Unable to contact license server.\n")

4
internal/license/checker_oss.go
View File

@ -11,6 +11,8 @@ package license
import (
"context"
"github.com/edgelesssys/constellation/internal/cloud/cloudprovider"
"github.com/edgelesssys/constellation/internal/config"
"github.com/edgelesssys/constellation/internal/file"
)
@ -21,6 +23,6 @@ func NewChecker(quotaChecker QuotaChecker, fileHandler file.Handler) *Checker {
}
// CheckLicense is a no-op for open source version of Constellation.
func (c *Checker) CheckLicense(ctx context.Context, printer func(string, ...any)) error {
func (c *Checker) CheckLicense(ctx context.Context, provider cloudprovider.Provider, providerCfg config.ProviderConfig, printer func(string, ...any)) error {
return nil
}

9
internal/license/license.go
View File

@ -22,7 +22,9 @@ const (
licensePath = "api/v1/license"
)
type Action string
type (
Action string
)
const (
Init Action = "init"
@ -43,8 +45,9 @@ func NewClient() *Client {
// QuotaCheckRequest is JSON request to license server to check quota for a given license and action.
type QuotaCheckRequest struct {
Action Action `json:"action"`
License string `json:"license"`
Action Action `json:"action"`
Provider string `json:"provider"`
License string `json:"license"`
}
// QuotaCheckResponse is JSON response by license server.