Iter

Author: ajanikow

pkg/deployment/reconcile/action_license_generate.go

@@ -176,7 +176,7 @@ func (a *actionLicenseGenerate) Start(ctx context.Context) (bool, error) {
 		if string(util.Optional(s.Data, utilConstants.ChecksumKey, []byte{})) != l.API.Hash() {
 			// Update
 
-			token, err := lm.RegistryConfig(ctx, lmanager.ArangoLicenseManagerEndpoint, l.API.ClientID, lmanager.StageDev, lmanager.StageQA, lmanager.StagePrd)
+			token, err := lm.RegistryConfig(ctx, lmanager.ArangoLicenseManagerEndpoint, l.API.ClientID, &l.API.ClientSecret, lmanager.StageDev, lmanager.StageQA, lmanager.StagePrd)
 			if err != nil {
 				a.log.Err(err).Debug("Failed to generate License Registry")
 				return true, nil
@@ -192,7 +192,7 @@ func (a *actionLicenseGenerate) Start(ctx context.Context) (bool, error) {
 			}
 		}
 	} else {
-		token, err := lm.RegistryConfig(ctx, lmanager.ArangoLicenseManagerEndpoint, l.API.ClientID, lmanager.StageDev, lmanager.StageQA, lmanager.StagePrd)
+		token, err := lm.RegistryConfig(ctx, lmanager.ArangoLicenseManagerEndpoint, l.API.ClientID, &l.API.ClientSecret, lmanager.StageDev, lmanager.StageQA, lmanager.StagePrd)
 		if err != nil {
 			a.log.Err(err).Debug("Failed to generate License Registry")
 			return true, nil

pkg/license_manager/client.go

@@ -77,7 +77,7 @@ type Client interface {
 	License(ctx context.Context, req LicenseRequest) (LicenseResponse, error)
 
 	Registry(ctx context.Context) (RegistryResponse, error)
-	RegistryConfig(ctx context.Context, endpoint, id string, stages ...Stage) ([]byte, error)
+	RegistryConfig(ctx context.Context, endpoint, id string, token *string, stages ...Stage) ([]byte, error)
 }
 
 type LicenseRequest struct {
@@ -100,13 +100,20 @@ type client struct {
 	conn driver.Connection
 }
 
-func (c client) RegistryConfig(ctx context.Context, endpoint, id string, stages ...Stage) ([]byte, error) {
-	tk, err := c.Registry(ctx)
-	if err != nil {
-		return nil, err
+func (c client) RegistryConfig(ctx context.Context, endpoint, id string, token *string, stages ...Stage) ([]byte, error) {
+	var t string
+
+	if token != nil {
+		t = *token
+	} else {
+		tk, err := c.Registry(ctx)
+		if err != nil {
+			return nil, err
+		}
+		t = tk.Token
 	}
 
-	r, err := NewRegistryAuth(endpoint, id, tk.Token, stages...)
+	r, err := NewRegistryAuth(endpoint, id, t, stages...)
 	if err != nil {
 		return nil, err
 	}

pkg/platform/license_secret.go

@@ -87,7 +87,7 @@ func licenseSecretRun(cmd *cobra.Command, args []string) error {
 
 	logger.Info("Creating new Registry Token")
 
-	data, err := mc.RegistryConfig(cmd.Context(), endpoint, id, lmanager.ParseStages(stages...)...)
+	data, err := mc.RegistryConfig(cmd.Context(), endpoint, id, nil, lmanager.ParseStages(stages...)...)
 	if err != nil {
 		return err
 	}