Merge branch 'aws-infra-detection' into 'master'

fix: return a successful billing status check response for AWS instances

See merge request postgres-ai/database-lab!727

Author: agneum

engine/internal/billing/billing.go

@@ -72,7 +72,7 @@ func (b *Billing) resetSoftFailureCounter() {
 
 // RegisterInstance registers instance on the Platform.
 func (b *Billing) RegisterInstance(ctx context.Context, systemMetrics models.System) error {
-	if b.props.Infrastructure == global.AWSInfrastructure {
+	if b.props.IsAWS() {
 		// Because billing goes through AWS Marketplace.
 		b.props.UpdateBilling(true)
 	}
@@ -156,7 +156,7 @@ func (b *Billing) SendUsage(ctx context.Context, systemMetrics models.System) er
 }
 
 func (b *Billing) shouldSendPlatformRequests() error {
-	if b.props.Infrastructure == global.AWSInfrastructure {
+	if b.props.IsAWS() {
 		return errors.New("DLE infrastructure is AWS Marketplace")
 	}
 

engine/internal/srv/billing.go

@@ -15,6 +15,18 @@ import (
 )
 
 func (s *Server) billingStatus(w http.ResponseWriter, r *http.Request) {
+	if s.engProps.IsAWS() {
+		if err := api.WriteJSON(w, http.StatusOK, platform.BillingResponse{
+			Result:        "OK",
+			BillingActive: true,
+		}); err != nil {
+			api.SendError(w, r, err)
+			return
+		}
+
+		return
+	}
+
 	usageResponse, err := s.billingUsage(r.Context())
 	if err != nil {
 		api.SendBadRequestError(w, r, err.Error())

engine/internal/srv/server.go

@@ -109,6 +109,7 @@ func (s *Server) instanceStatus() *models.InstanceStatus {
 		Engine: models.Engine{
 			Version:                   version.GetVersion(),
 			Edition:                   s.engProps.GetEdition(),
+			InstanceID:                s.engProps.InstanceID,
 			BillingActive:             pointer.ToBool(s.engProps.BillingActive),
 			StartedAt:                 s.startedAt,
 			Telemetry:                 pointer.ToBool(s.Platform.IsTelemetryEnabled()),

engine/pkg/client/platform/telemetry.go

@@ -85,7 +85,7 @@ type EditionResponse struct {
 type BillingResponse struct {
 	Result        string `json:"result"`
 	BillingActive bool   `json:"billing_active"`
-	Org           Org    `json:"recognized_org"`
+	Org           *Org   `json:"recognized_org,omitempty"`
 }
 
 // Org contains organization details.

engine/pkg/config/global/config.go

@@ -84,7 +84,7 @@ func (p *EngineProps) UpdateBilling(activity bool) {
 
 // CheckBilling checks the billing of the DLE instance is active.
 func (p *EngineProps) CheckBilling() error {
-	if p.Infrastructure == AWSInfrastructure {
+	if p.IsAWS() {
 		return nil
 	}
 
@@ -94,3 +94,8 @@ func (p *EngineProps) CheckBilling() error {
 
 	return nil
 }
+
+// IsAWS checks if the instance is running on AWS Marketplace.
+func (p *EngineProps) IsAWS() bool {
+	return p.Infrastructure == AWSInfrastructure
+}