Kaynağa Gözat

updated cluster provisioning

Justin Rhee 3 yıl önce
ebeveyn
işleme
25d2a58d4e

+ 2 - 2
api/types/project.go

@@ -9,7 +9,7 @@ type Project struct {
 	ManagedInfraEnabled    bool    `json:"managed_infra_enabled"`
 	ManagedInfraEnabled    bool    `json:"managed_infra_enabled"`
 	APITokensEnabled       bool    `json:"api_tokens_enabled"`
 	APITokensEnabled       bool    `json:"api_tokens_enabled"`
 	StacksEnabled          bool    `json:"stacks_enabled"`
 	StacksEnabled          bool    `json:"stacks_enabled"`
-	CAPIProvisionerEnabled bool    `json:"capi_provisioner_enabled"`
+	CapiProvisionerEnabled bool    `json:"capi_provisioner_enabled"`
 }
 }
 
 
 type FeatureFlags struct {
 type FeatureFlags struct {
@@ -17,7 +17,7 @@ type FeatureFlags struct {
 	ManagedInfraEnabled        string `json:"managed_infra_enabled,omitempty"`
 	ManagedInfraEnabled        string `json:"managed_infra_enabled,omitempty"`
 	StacksEnabled              string `json:"stacks_enabled,omitempty"`
 	StacksEnabled              string `json:"stacks_enabled,omitempty"`
 	ManagedDatabasesEnabled    string `json:"managed_databases_enabled,omitempty"`
 	ManagedDatabasesEnabled    string `json:"managed_databases_enabled,omitempty"`
-	CAPIProvisionerEnabled     string `json:"capi_provisioner_enabled,omitempty"`
+	CapiProvisionerEnabled     string `json:"capi_provisioner_enabled,omitempty"`
 }
 }
 
 
 type CreateProjectRequest struct {
 type CreateProjectRequest struct {

+ 2 - 2
ee/api/server/handlers/billing/webhook.go

@@ -107,8 +107,8 @@ func (c *BillingWebhookHandler) ServeHTTP(w http.ResponseWriter, r *http.Request
 		project.PreviewEnvsEnabled = previewEnvsEnabled
 		project.PreviewEnvsEnabled = previewEnvsEnabled
 	}
 	}
 
 
-	if capiProvisionerEnabled, err := strconv.ParseBool(features.CAPIProvisionerEnabled); err == nil {
-		project.CAPIProvisionerEnabled = capiProvisionerEnabled
+	if capiProvisionerEnabled, err := strconv.ParseBool(features.CapiProvisionerEnabled); err == nil {
+		project.CapiProvisionerEnabled = capiProvisionerEnabled
 	}
 	}
 
 
 	_, err = c.Repo().Project().UpdateProject(project)
 	_, err = c.Repo().Project().UpdateProject(project)

+ 1 - 1
ee/billing/client.go

@@ -289,6 +289,6 @@ func (c *Client) ParseProjectUsageFromWebhook(payload []byte) (*cemodels.Project
 			ManagedInfraEnabled:        usageData.ManagedInfraEnabled,
 			ManagedInfraEnabled:        usageData.ManagedInfraEnabled,
 			StacksEnabled:              usageData.StacksEnabled,
 			StacksEnabled:              usageData.StacksEnabled,
 			ManagedDatabasesEnabled:    usageData.ManagedDatabasesEnabled,
 			ManagedDatabasesEnabled:    usageData.ManagedDatabasesEnabled,
-			CAPIProvisionerEnabled:     usageData.CAPIProvisionerEnabled,
+			CapiProvisionerEnabled:     usageData.CapiProvisionerEnabled,
 		}, nil
 		}, nil
 }
 }

+ 1 - 1
ee/billing/types.go

@@ -27,7 +27,7 @@ type APIWebhookRequest struct {
 	ManagedInfraEnabled        string `json:"managed_infra_enabled,omitempty"`
 	ManagedInfraEnabled        string `json:"managed_infra_enabled,omitempty"`
 	StacksEnabled              string `json:"stacks_enabled,omitempty"`
 	StacksEnabled              string `json:"stacks_enabled,omitempty"`
 	ManagedDatabasesEnabled    string `json:"managed_databases_enabled,omitempty"`
 	ManagedDatabasesEnabled    string `json:"managed_databases_enabled,omitempty"`
-	CAPIProvisionerEnabled     string `json:"capi_provisioner_enabled,omitempty"`
+	CapiProvisionerEnabled     string `json:"capi_provisioner_enabled,omitempty"`
 }
 }
 
 
 type CreateBillingCookieRequest struct {
 type CreateBillingCookieRequest struct {