[DX-2749] remove default image names from chip ingress' docker-compose file (#2391)

Author: Tofel

framework/components/dockercompose/.changeset/v0.1.20.md

@@ -0,0 +1 @@
+- Remove default ChIP Ingress/Config image name & tag values from docker-compose.yaml, so that they can be overwritten by `testcontainers-go`

framework/components/dockercompose/chip_ingress_set/chip_ingress.go

@@ -85,6 +85,8 @@ const (
 
 	ChipIngressGRPCHostPortEnvVar = "CHIP_INGRESS_GRPC_HOST_PORT"
 	ChipIngressGRPCPortEnvVar     = "CHIP_INGRESS_GRPC_PORT"
+	ChipIngressImageEnvVar        = "CHIP_INGRESS_IMAGE"
+	ChipConfigImageEnvVar         = "CHIP_CONFIG_IMAGE"
 )
 
 func New(in *Input) (*Output, error) {
@@ -122,21 +124,22 @@ func NewWithContext(ctx context.Context, in *Input) (*Output, error) {
 	ctx, cancel := context.WithTimeout(ctx, 2*time.Minute)
 	defer cancel()
 
-	// Start the stackwith all environment variables from the host process
-	// set BASIC_AUTH_ENABLED and BASIC_AUTH_PREFIX to false and empty string and allow them to be overridden by the host process
 	envVars := make(map[string]string)
-	envVars["BASIC_AUTH_ENABLED"] = "false"
-	envVars["BASIC_AUTH_PREFIX"] = ""
-	envVars[ChipIngressGRPCHostPortEnvVar] = DEFAULT_CHIP_INGRESS_GRPC_PORT
-	envVars[ChipIngressGRPCPortEnvVar] = DEFAULT_CHIP_INGRESS_GRPC_PORT
-
 	for _, env := range os.Environ() {
 		pair := strings.SplitN(env, "=", 2)
 		if len(pair) == 2 {
 			envVars[pair[0]] = pair[1]
 		}
 	}
 
+	if _, ok := envVars[ChipIngressImageEnvVar]; !ok {
+		return nil, fmt.Errorf("%s env var is not set", ChipIngressImageEnvVar)
+	}
+
+	if _, ok := envVars[ChipConfigImageEnvVar]; !ok {
+		return nil, fmt.Errorf("%s env var is not set", ChipConfigImageEnvVar)
+	}
+
 	upErr := stack.
 		WithEnv(envVars).
 		Up(ctx)

framework/components/dockercompose/chip_ingress_set/docker-compose.yml

@@ -3,7 +3,7 @@ services:
 
   chip-ingress:
     # added image (instead of build) to use image created by a setup script
-    image: ${CHIP_INGRESS_IMAGE:-chip-ingress:local-cre}
+    image: "${CHIP_INGRESS_IMAGE}"
     container_name: chip-ingress
     depends_on:
       - redpanda-0
@@ -12,7 +12,7 @@ services:
     command: ["write-service"]
     environment:
       SERVER_HOST: "0.0.0.0"
-      SERVER_GRPC_PORT: "${CHIP_INGRESS_GRPC_PORT:-}"
+      SERVER_GRPC_PORT: "${CHIP_INGRESS_GRPC_PORT:-50051}"
       SERVER_METRICS_PORT: "9090"
       SERVER_HEALTHCHECKS_PORT: "9091"
       SERVER_METRICS_IMPLEMENTATION: "otel"
@@ -22,7 +22,7 @@ services:
       KAFKA_BROKERS: "redpanda-0:9092"
       SCHEMA_REGISTRY_URL: "http://redpanda-0:8081"
       # this has been modified and default values were removed, somehow we cannot override them in testcontainers-go
-      BASIC_AUTH_ENABLED: ${BASIC_AUTH_ENABLED:-}
+      BASIC_AUTH_ENABLED: ${BASIC_AUTH_ENABLED:-false}
       BASIC_AUTH_PREFIX: ${BASIC_AUTH_PREFIX:-}
       CE_SA_BEHOLDER_DEMO_CLIENT: |
         {"username": "beholder-demo-client", "password": "password", "allowed_domains": ["*"]}
@@ -38,7 +38,7 @@ services:
       CHIP_CONFIG_HOST: ${CHIP_CONFIG_HOST:-chip-config}
       CHIP_CONFIG_PORT: ${CHIP_CONFIG_PORT:-50051}
     ports:
-      - "${CHIP_INGRESS_GRPC_HOST_PORT:-}:${CHIP_INGRESS_GRPC_PORT:-}"
+      - "${CHIP_INGRESS_GRPC_HOST_PORT:-50051}:${CHIP_INGRESS_GRPC_PORT:-50051}"
       - "9090:9090"
       - "9092:9091"
     healthcheck:
@@ -49,7 +49,7 @@ services:
       retries: 10
 
   chip-config:
-    image: ${CHIP_CONFIG_IMAGE:-chip-config:local-cre}
+    image: "${CHIP_CONFIG_IMAGE}"
     container_name: chip-config
     hostname: chip-config
     command:
@@ -71,6 +71,7 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
+    restart: on-failure
 
   postgres:
     image: postgres:16-alpine

framework/examples/chip_ingress/smoke_chip_ingress_test.go

@@ -2,6 +2,7 @@ package chip_ingress_test
 
 import (
 	"context"
+	"os"
 	"testing"
 	"time"
 
@@ -19,6 +20,8 @@ type ChipConfig struct {
 func TestChipIngressSmoke(t *testing.T) {
 	in, err := framework.Load[ChipConfig](t)
 	require.NoError(t, err, "failed to load config")
+	require.NotEmpty(t, os.Getenv("CHIP_CONFIG_IMAGE"), "CHIP_CONFIG_IMAGE env var is not set")
+	require.NotEmpty(t, os.Getenv("CHIP_INGRESS_IMAGE"), "CHIP_INGRESS_IMAGE env var is not set")
 
 	out, err := chipingressset.NewWithContext(t.Context(), in.ChipIngress)
 	require.NoError(t, err, "failed to create chip ingress set")