add ip header annotation

Author: olegy89

internal/service/annotations/service.go

@@ -17,6 +17,8 @@ const (
 	AppHealthcheckChecksToPass   = "servers.com/app-healthcheck-checks-to-pass"
 	AppHealthcheckInterval       = "servers.com/app-healthcheck-interval"
 	AppHealthcheckJitter         = "servers.com/app-healthcheck-jitter"
+	LBIPHeader                   = "servers.com/load-balancer-ip-header"
+	LBIPSubnets                  = "servers.com/load-balancer-ip-subnets"
 )
 
 // FillLBVHostZoneWithServiceAnnotations prepares the LB vhost zone input based on annotations.
@@ -28,6 +30,16 @@ func FillLBVHostZoneWithServiceAnnotations(vZInput *serverscom.L7VHostZoneInput,
 		}
 	}
 
+	// LBIPHeader & LBIPSubnets annotations
+	if value, ok := annotations[LBIPHeader]; ok {
+		vZInput.RealIPHeader = new(serverscom.RealIPHeader)
+		vZInput.RealIPHeader.Name = ParseRealIPHeaderName(value)
+		if subnets, ok := annotations[LBIPSubnets]; ok {
+			s := strings.Split(strings.ReplaceAll(subnets, " ", ""), ",")
+			vZInput.RealIPHeader.Networks = s
+		}
+	}
+
 	return vZInput
 }
 
@@ -83,3 +95,15 @@ func FillLBUpstreamZoneWithServiceAnnotations(uZInput *serverscom.L7UpstreamZone
 
 	return uZInput
 }
+
+// ParseRealIPHeaderName parses the Real IP Header Name from annotation
+func ParseRealIPHeaderName(input string) serverscom.RealIPHeaderName {
+	switch input {
+	case string(serverscom.RealIP):
+		return serverscom.RealIP
+	case string(serverscom.ForwardedFor):
+		return serverscom.ForwardedFor
+	default:
+		return ""
+	}
+}

internal/service/tls/manager.go

@@ -103,12 +103,13 @@ func (m *Manager) SyncCertificate(fingerprint, name string, cert, key, chain []b
 		return nil, err
 	}
 
-	sslCertificate.state = (*serverscom.SSLCertificate)(state)
+	sslCert := CustomToSSLCertificate(state)
+	sslCertificate.state = sslCert
 	sslCertificate.lastRefresh = time.Now()
 
 	m.resources[fingerprint] = &sslCertificate
 
-	return (*serverscom.SSLCertificate)(state), nil
+	return sslCert, nil
 }
 
 // Get gets an ssl from manager
@@ -136,5 +137,18 @@ func (m *Manager) GetByID(id string) (*serverscom.SSLCertificate, error) {
 		return nil, err
 	}
 
-	return (*serverscom.SSLCertificate)(customCert), nil
+	return CustomToSSLCertificate(customCert), nil
+}
+
+// CustomToSSLCertificate converts a serverscom SSLCertificateCustom to serverscom SSLCertificate
+func CustomToSSLCertificate(custom *serverscom.SSLCertificateCustom) *serverscom.SSLCertificate {
+	return &serverscom.SSLCertificate{
+		ID:              custom.ID,
+		Name:            custom.Name,
+		Sha1Fingerprint: custom.Sha1Fingerprint,
+		Labels:          custom.Labels,
+		Expires:         custom.Expires,
+		Created:         custom.Created,
+		Updated:         custom.Updated,
+	}
 }