Merge branch 'main' into releases/v2.0.0

paul-nicolas · paul-nicolas · commit 3cc6cb92f042 · 2024-05-16T14:45:55.000+02:00
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -82,7 +82,7 @@ jobs:
           --secret FURY_TOKEN=$FURY_TOKEN
           --secret GORELEASER_KEY=$GORELEASER_KEY
           ${{ contains(github.event.pull_request.labels.*.name, 'no-cache') && '--no-cache' || '' }}
-          +goreleaser --type=${{ matrix.components.type }} --components=${{ matrix.components.component }} --mode=release
+          +goreleaser --path=${{ matrix.components }} --mode=release
         env:
           GITHUB_TOKEN: ${{ secrets.NUMARY_GITHUB_TOKEN }}
           SPEAKEASY_API_KEY: ${{ secrets.SPEAKEASY_API_KEY }}
diff --git a/components/fctl/membership-swagger.yaml b/components/fctl/membership-swagger.yaml
@@ -1906,6 +1906,10 @@ components:
           type: array
           items:
             type: string
+        EE:
+          type: array
+          items:
+            type: string
     RegionCapabilityKeys:
       type: string
       enum:
diff --git a/components/fctl/membershipclient/api/openapi.yaml b/components/fctl/membershipclient/api/openapi.yaml
@@ -2089,6 +2089,10 @@ components:
           items:
             type: string
           type: array
+        EE:
+          items:
+            type: string
+          type: array
       type: object
     RegionCapabilityKeys:
       enum:
diff --git a/components/fctl/membershipclient/docs/RegionCapability.md b/components/fctl/membershipclient/docs/RegionCapability.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MODULE_LIST** | Pointer to **[]string** |  | [optional] 
+**EE** | Pointer to **[]string** |  | [optional] 
 
 ## Methods
 
@@ -50,6 +51,31 @@ SetMODULE_LIST sets MODULE_LIST field to given value.
 
 HasMODULE_LIST returns a boolean if a field has been set.
 
+### GetEE
+
+`func (o *RegionCapability) GetEE() []string`
+
+GetEE returns the EE field if non-nil, zero value otherwise.
+
+### GetEEOk
+
+`func (o *RegionCapability) GetEEOk() (*[]string, bool)`
+
+GetEEOk returns a tuple with the EE field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetEE
+
+`func (o *RegionCapability) SetEE(v []string)`
+
+SetEE sets EE field to given value.
+
+### HasEE
+
+`func (o *RegionCapability) HasEE() bool`
+
+HasEE returns a boolean if a field has been set.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/components/fctl/membershipclient/go.sum b/components/fctl/membershipclient/go.sum
diff --git a/components/fctl/membershipclient/model_region_capability.go b/components/fctl/membershipclient/model_region_capability.go
diff --git a/components/operator/api/formance.com/v1beta1/orchestration_types.go b/components/operator/api/formance.com/v1beta1/orchestration_types.go
@@ -42,6 +42,8 @@ type OrchestrationStatus struct {
 // +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=".status.ready",description="Is ready"
 // +kubebuilder:printcolumn:name="Info",type=string,JSONPath=".status.info",description="Info"
 // +kubebuilder:metadata:labels=formance.com/kind=module
+// +kubebuilder:metadata:labels=formance.com/is-ee=true
+
 // Orchestration is the Schema for the orchestrations API
 type Orchestration struct {
 	metav1.TypeMeta   `json:",inline"`
diff --git a/components/operator/api/formance.com/v1beta1/reconciliation_types.go b/components/operator/api/formance.com/v1beta1/reconciliation_types.go
@@ -40,6 +40,8 @@ type ReconciliationStatus struct {
 // +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=".status.ready",description="Is ready"
 // +kubebuilder:printcolumn:name="Info",type=string,JSONPath=".status.info",description="Info"
 // +kubebuilder:metadata:labels=formance.com/kind=module
+// +kubebuilder:metadata:labels=formance.com/is-ee=true
+
 // Reconciliation is the Schema for the reconciliations API
 type Reconciliation struct {
 	metav1.TypeMeta   `json:",inline"`
diff --git a/components/operator/api/formance.com/v1beta1/search_types.go b/components/operator/api/formance.com/v1beta1/search_types.go
@@ -47,6 +47,7 @@ type SearchStatus struct {
 // +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=".status.ready",description="Is ready"
 // +kubebuilder:printcolumn:name="Info",type=string,JSONPath=".status.info",description="Info"
 // +kubebuilder:metadata:labels=formance.com/kind=module
+// +kubebuilder:metadata:labels=formance.com/is-ee=true
 // Search is the Schema for the searches API
 type Search struct {
 	metav1.TypeMeta   `json:",inline"`
diff --git a/components/operator/api/formance.com/v1beta1/wallets_types.go b/components/operator/api/formance.com/v1beta1/wallets_types.go
@@ -40,6 +40,7 @@ type WalletsStatus struct {
 // +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=".status.ready",description="Is ready"
 // +kubebuilder:printcolumn:name="Info",type=string,JSONPath=".status.info",description="Info"
 // +kubebuilder:metadata:labels=formance.com/kind=module
+// +kubebuilder:metadata:labels=formance.com/is-ee=true
 // Wallets is the Schema for the wallets API
 type Wallets struct {
 	metav1.TypeMeta   `json:",inline"`
diff --git a/components/operator/api/formance.com/v1beta1/webhooks_types.go b/components/operator/api/formance.com/v1beta1/webhooks_types.go
@@ -40,6 +40,7 @@ type WebhooksStatus struct {
 // +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=".status.ready",description="Is ready"
 // +kubebuilder:printcolumn:name="Info",type=string,JSONPath=".status.info",description="Info"
 // +kubebuilder:metadata:labels=formance.com/kind=module
+// +kubebuilder:metadata:labels=formance.com/is-ee=true
 // Webhooks is the Schema for the webhooks API
 type Webhooks struct {
 	metav1.TypeMeta   `json:",inline"`
diff --git a/components/operator/config/crd/bases/formance.com_orchestrations.yaml b/components/operator/config/crd/bases/formance.com_orchestrations.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
+    formance.com/is-ee: "true"
     formance.com/kind: module
   name: orchestrations.formance.com
 spec:
diff --git a/components/operator/config/crd/bases/formance.com_reconciliations.yaml b/components/operator/config/crd/bases/formance.com_reconciliations.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
+    formance.com/is-ee: "true"
     formance.com/kind: module
   name: reconciliations.formance.com
 spec:
diff --git a/components/operator/config/crd/bases/formance.com_searches.yaml b/components/operator/config/crd/bases/formance.com_searches.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
+    formance.com/is-ee: "true"
     formance.com/kind: module
   name: searches.formance.com
 spec:
diff --git a/components/operator/config/crd/bases/formance.com_wallets.yaml b/components/operator/config/crd/bases/formance.com_wallets.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
+    formance.com/is-ee: "true"
     formance.com/kind: module
   name: wallets.formance.com
 spec:
diff --git a/components/operator/config/crd/bases/formance.com_webhooks.yaml b/components/operator/config/crd/bases/formance.com_webhooks.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
+    formance.com/is-ee: "true"
     formance.com/kind: module
   name: webhooks.formance.com
 spec:
diff --git a/components/operator/helm/crds/templates/crds/apiextensions.k8s.io_v1_customresourcedefinition_orchestrations.formance.com.yaml b/components/operator/helm/crds/templates/crds/apiextensions.k8s.io_v1_customresourcedefinition_orchestrations.formance.com.yaml
@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
     helm.sh/resource-policy: keep
   labels:
+    formance.com/is-ee: "true"
     formance.com/kind: module
   name: orchestrations.formance.com
 spec:
diff --git a/components/operator/helm/crds/templates/crds/apiextensions.k8s.io_v1_customresourcedefinition_reconciliations.formance.com.yaml b/components/operator/helm/crds/templates/crds/apiextensions.k8s.io_v1_customresourcedefinition_reconciliations.formance.com.yaml
@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
     helm.sh/resource-policy: keep
   labels:
+    formance.com/is-ee: "true"
     formance.com/kind: module
   name: reconciliations.formance.com
 spec:
diff --git a/components/operator/helm/crds/templates/crds/apiextensions.k8s.io_v1_customresourcedefinition_searches.formance.com.yaml b/components/operator/helm/crds/templates/crds/apiextensions.k8s.io_v1_customresourcedefinition_searches.formance.com.yaml
@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
     helm.sh/resource-policy: keep
   labels:
+    formance.com/is-ee: "true"
     formance.com/kind: module
   name: searches.formance.com
 spec:
diff --git a/components/operator/helm/crds/templates/crds/apiextensions.k8s.io_v1_customresourcedefinition_wallets.formance.com.yaml b/components/operator/helm/crds/templates/crds/apiextensions.k8s.io_v1_customresourcedefinition_wallets.formance.com.yaml
@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
     helm.sh/resource-policy: keep
   labels:
+    formance.com/is-ee: "true"
     formance.com/kind: module
   name: wallets.formance.com
 spec:
diff --git a/components/operator/helm/crds/templates/crds/apiextensions.k8s.io_v1_customresourcedefinition_webhooks.formance.com.yaml b/components/operator/helm/crds/templates/crds/apiextensions.k8s.io_v1_customresourcedefinition_webhooks.formance.com.yaml
@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
     helm.sh/resource-policy: keep
   labels:
+    formance.com/is-ee: "true"
     formance.com/kind: module
   name: webhooks.formance.com
 spec:
diff --git a/components/operator/internal/resources/gateways/Caddyfile.gotpl b/components/operator/internal/resources/gateways/Caddyfile.gotpl
@@ -123,8 +123,8 @@
 		}
 	}
 
-	# Respond 502 if service does not exists
+	# Respond 404 if service does not exists
 	handle /api/* {
-		respond "Bad Gateway" 502
+		respond "Not Found" 404
 	}
 }
diff --git a/components/operator/internal/tests/testdata/resources/gateway-controller/configmap-with-audit.yaml b/components/operator/internal/tests/testdata/resources/gateway-controller/configmap-with-audit.yaml
@@ -6,17 +6,6 @@
 		Access-Control-Allow-Origin *
 	}
 }
-(audit) {
-	audit {
-		# Kafka publisher
-		# Nats publisher
-		publisher_nats_enabled {$PUBLISHER_NATS_ENABLED:true}
-		publisher_nats_url {$PUBLISHER_NATS_URL:nats://nats:4222}
-		publisher_nats_client_id {$PUBLISHER_NATS_CLIENT_ID:gateway}
-		publisher_nats_max_reconnects {$PUBLISHER_NATS_MAX_RECONNECTS:30}
-		publisher_nats_max_reconnects_wait {$PUBLISHER_NATS_MAX_RECONNECT_WAIT:2s}
-	}
-}
 
 {
 	
@@ -30,14 +19,12 @@
 	# ordered.
 	# c.f. https://caddyserver.com/docs/caddyfile/directives#directive-order
 	order versions after metrics
-	order audit after encode
 }
 
 :8080 {
 	log {
 		output stdout
 	}
-	import audit
 	handle /api/ledger* {
 		uri strip_prefix /api/ledger
         import cors
@@ -56,8 +43,8 @@
 		}
 	}
 
-	# Respond 502 if service does not exists
+	# Respond 404 if service does not exists
 	handle /api/* {
-		respond "Bad Gateway" 502
+		respond "Not Found" 404
 	}
 }
diff --git a/components/operator/internal/tests/testdata/resources/gateway-controller/configmap-with-ledger-and-another-service.yaml b/components/operator/internal/tests/testdata/resources/gateway-controller/configmap-with-ledger-and-another-service.yaml
@@ -57,8 +57,8 @@
 		}
 	}
 
-	# Respond 502 if service does not exists
+	# Respond 404 if service does not exists
 	handle /api/* {
-		respond "Bad Gateway" 502
+		respond "Not Found" 404
 	}
 }
diff --git a/components/operator/internal/tests/testdata/resources/gateway-controller/configmap-with-ledger-and-auth.yaml b/components/operator/internal/tests/testdata/resources/gateway-controller/configmap-with-ledger-and-auth.yaml
@@ -60,8 +60,8 @@
 		}
 	}
 
-	# Respond 502 if service does not exists
+	# Respond 404 if service does not exists
 	handle /api/* {
-		respond "Bad Gateway" 502
+		respond "Not Found" 404
 	}
 }
diff --git a/components/operator/internal/tests/testdata/resources/gateway-controller/configmap-with-ledger-only.yaml b/components/operator/internal/tests/testdata/resources/gateway-controller/configmap-with-ledger-only.yaml
@@ -43,8 +43,8 @@
 		}
 	}
 
-	# Respond 502 if service does not exists
+	# Respond 404 if service does not exists
 	handle /api/* {
-		respond "Bad Gateway" 502
+		respond "Not Found" 404
 	}
 }
diff --git a/components/operator/internal/tests/testdata/resources/gateway-controller/configmap-with-opentelemetry.yaml b/components/operator/internal/tests/testdata/resources/gateway-controller/configmap-with-opentelemetry.yaml
@@ -46,8 +46,8 @@
 		}
 	}
 
-	# Respond 502 if service does not exists
+	# Respond 404 if service does not exists
 	handle /api/* {
-		respond "Bad Gateway" 502
+		respond "Not Found" 404
 	}
 }
diff --git a/ee/agent/internal/membership_client.go b/ee/agent/internal/membership_client.go
@@ -40,7 +40,7 @@ type membershipClient struct {
 	address string
 }
 
-func (c *membershipClient) connectMetadata(ctx context.Context, modules []string) (metadata.MD, error) {
+func (c *membershipClient) connectMetadata(ctx context.Context, modules []string, eeModules []string) (metadata.MD, error) {
 
 	md, err := c.authenticator.authenticate(ctx)
 	if err != nil {
@@ -58,11 +58,12 @@ func (c *membershipClient) connectMetadata(ctx context.Context, modules []string
 	md.Append(metadataVersion, c.clientInfo.Version)
 	md.Append(metadataCapabilities, capabilityEE, capabilityModuleList)
 	md.Append(capabilityModuleList, modules...)
+	md.Append(capabilityEE, eeModules...)
 
 	return md, nil
 }
 
-func (c *membershipClient) connect(ctx context.Context, modules []string) error {
+func (c *membershipClient) connect(ctx context.Context, modules []string, eeModules []string) error {
 	sharedlogging.FromContext(ctx).WithFields(map[string]any{
 		"id": c.clientInfo.ID,
 	}).Infof("Establish connection to server")
@@ -79,7 +80,7 @@ func (c *membershipClient) connect(ctx context.Context, modules []string) error
 	sharedlogging.FromContext(ctx).Info("Connected to GRPC server!")
 	c.serverClient = generated.NewServerClient(conn)
 
-	md, err := c.connectMetadata(ctx, modules)
+	md, err := c.connectMetadata(ctx, modules, eeModules)
 	if err != nil {
 		return err
 	}
diff --git a/ee/agent/internal/membership_listener_test.go b/ee/agent/internal/membership_listener_test.go
diff --git a/ee/agent/internal/module.go b/ee/agent/internal/module.go

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,8 @@`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`		`- # Respond 502 if service does not exists`
	`126`	`+ # Respond 404 if service does not exists`
`127`	`127`	`handle /api/* {`
`128`		`- respond "Bad Gateway" 502`
	`128`	`+ respond "Not Found" 404`
`129`	`129`	`}`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,6 @@`
`6`	`6`	`Access-Control-Allow-Origin *`
`7`	`7`	`}`
`8`	`8`	`}`
`9`		`-(audit) {`
`10`		`- audit {`
`11`		`- # Kafka publisher`
`12`		`- # Nats publisher`
`13`		`- publisher_nats_enabled {$PUBLISHER_NATS_ENABLED:true}`
`14`		`- publisher_nats_url {$PUBLISHER_NATS_URL:nats://nats:4222}`
`15`		`- publisher_nats_client_id {$PUBLISHER_NATS_CLIENT_ID:gateway}`
`16`		`- publisher_nats_max_reconnects {$PUBLISHER_NATS_MAX_RECONNECTS:30}`
`17`		`- publisher_nats_max_reconnects_wait {$PUBLISHER_NATS_MAX_RECONNECT_WAIT:2s}`
`18`		`- }`
`19`		`-}`
`20`	`9`
`21`	`10`	`{`
`22`	`11`
`@@ -30,14 +19,12 @@`
`30`	`19`	`# ordered.`
`31`	`20`	`# c.f. https://caddyserver.com/docs/caddyfile/directives#directive-order`
`32`	`21`	`order versions after metrics`
`33`		`- order audit after encode`
`34`	`22`	`}`
`35`	`23`
`36`	`24`	`:8080 {`
`37`	`25`	`log {`
`38`	`26`	`output stdout`
`39`	`27`	`}`
`40`		`- import audit`
`41`	`28`	`handle /api/ledger* {`
`42`	`29`	`uri strip_prefix /api/ledger`
`43`	`30`	`import cors`
`@@ -56,8 +43,8 @@`
`56`	`43`	`}`
`57`	`44`	`}`
`58`	`45`
`59`		`- # Respond 502 if service does not exists`
	`46`	`+ # Respond 404 if service does not exists`
`60`	`47`	`handle /api/* {`
`61`		`- respond "Bad Gateway" 502`
	`48`	`+ respond "Not Found" 404`
`62`	`49`	`}`
`63`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- # Respond 502 if service does not exists`
	`60`	`+ # Respond 404 if service does not exists`
`61`	`61`	`handle /api/* {`
`62`		`- respond "Bad Gateway" 502`
	`62`	`+ respond "Not Found" 404`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- # Respond 502 if service does not exists`
	`63`	`+ # Respond 404 if service does not exists`
`64`	`64`	`handle /api/* {`
`65`		`- respond "Bad Gateway" 502`
	`65`	`+ respond "Not Found" 404`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`- # Respond 502 if service does not exists`
	`46`	`+ # Respond 404 if service does not exists`
`47`	`47`	`handle /api/* {`
`48`		`- respond "Bad Gateway" 502`
	`48`	`+ respond "Not Found" 404`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`- # Respond 502 if service does not exists`
	`49`	`+ # Respond 404 if service does not exists`
`50`	`50`	`handle /api/* {`
`51`		`- respond "Bad Gateway" 502`
	`51`	`+ respond "Not Found" 404`
`52`	`52`	`}`
`53`	`53`	`}`