Merge branch 'main' into CRE-781-call-teardown-on-test-end

Author: george-dorin

.github/workflows/framework-dockercompose-tests.yml

@@ -0,0 +1,84 @@
+name: Framework Docker Compose Tests
+on:
+  push:
+
+jobs:
+  test:
+    defaults:
+      run:
+        working-directory: framework/examples/myproject
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        test:
+          - name: TestChipIngressSmoke
+            config: smoke_chip.toml
+            count: 1
+            timeout: 3m
+    name: ${{ matrix.test.name }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+
+      - name: Configure AWS credentials using OIDC
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
+        with:
+          role-to-assume: ${{ secrets.AWS_CTF_READ_ACCESS_ROLE_ARN }}
+          aws-region: us-west-2
+
+      - name: Login to Amazon ECR
+        id: login-ecr-private
+        uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2.0.1
+        with:
+          registries: ${{ format('{0},{1}', secrets.AWS_ACCOUNT_ID_SDLC, secrets.AWS_ACCOUNT_ID_PROD) }}
+        env:
+          AWS_REGION: us-west-2
+
+      - name: Check for changes in Docker Components
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        id: changes
+        with:
+          filters: |
+            src:
+              - 'framework/components/dockercompose/**'
+              - '.github/workflows/framework-components-tests.yml'
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.24.0'
+
+      - name: Cache Go modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: go-modules-${{ hashFiles('framework/examples/myproject/go.sum') }}-${{ runner.os }}-framework-golden-examples
+          restore-keys: |
+            go-modules-${{ runner.os }}-framework-golden-examples
+            go-modules-${{ runner.os }}
+
+      - name: Install dependencies
+        run: go mod download
+
+      - name: Run System Tests
+        if: steps.changes.outputs.src == 'true'
+        env:
+          CTF_CONFIGS: ${{ matrix.test.config }}
+          CHIP_INGRESS_IMAGE: ${{ secrets.AWS_ACCOUNT_ID_PROD }}.dkr.ecr.us-west-2.amazonaws.com/atlas-chip-ingress:qa-latest
+          CTF_LOG_LEVEL: debug
+        run: |
+          go test -timeout ${{ matrix.test.timeout }} -v -count ${{ matrix.test.count }} -run ${{ matrix.test.name }}
+
+      - name: Upload Logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: container-logs-${{ matrix.test.name }}
+          path: framework/examples/myproject/logs
+          retention-days: 1

framework/.changeset/v0.10.16.md

@@ -0,0 +1,2 @@
+- Use volumes for user's home directory and `config` folder for the CL node
+- Store cached config on absolute path if the relative doesn't work

framework/components/clnode/clnode.go

@@ -29,6 +29,8 @@ const (
 	TmpImageName           = "chainlink-tmp:latest"
 	CustomPortSeparator    = ":"
 	DefaultCapabilitiesDir = "/usr/local/bin"
+	ConfigVolumeName       = "clnode-config"
+	HomeVolumeName         = "clnode-home"
 )
 
 var (
@@ -253,6 +255,23 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 			WithPort(DefaultHTTPPort).
 			WithStartupTimeout(3 * time.Minute).
 			WithPollInterval(200 * time.Millisecond),
+		Mounts: tc.ContainerMounts{
+			{
+				// various configuration files
+				Source: tc.GenericVolumeMountSource{
+					Name: ConfigVolumeName + "-" + in.Node.Name,
+				},
+				Target: "/config",
+			},
+			{
+				// kv store of the OCR jobs and other state files are stored
+				// in the user's home instead of the DB
+				Source: tc.GenericVolumeMountSource{
+					Name: HomeVolumeName + "-" + in.Node.Name,
+				},
+				Target: "/home/chainlink",
+			},
+		},
 	}
 	if in.Node.HTTPPort != 0 && in.Node.P2PPort != 0 {
 		req.HostConfigModifier = func(h *container.HostConfig) {

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

@@ -0,0 +1 @@
+- Pass all environment variables to Docker Compose

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

@@ -0,0 +1,2 @@
+- Add topological sorting of proto dependencies for the local-cre
+- Add support for exclude files to proto registration config

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

@@ -0,0 +1,3 @@
+- Revert topological sorting of proto dependencies for the local-cre
+- Revert support for exclude files to proto registration config
+- Add retry on proto registration

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

@@ -0,0 +1,2 @@
+- Bring back topological sorting of proto dependencies for the local-cre
+- Bring back support for exclude files to proto registration config

framework/components/dockercompose/chip_ingress_set/chip_ingress.go

@@ -94,11 +94,21 @@ func New(in *Input) (*Output, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 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"] = ""
+
+	for _, env := range os.Environ() {
+		pair := strings.SplitN(env, "=", 2)
+		if len(pair) == 2 {
+			envVars[pair[0]] = pair[1]
+		}
+	}
+
 	upErr := stack.
-		WithEnv(map[string]string{
-			"BASIC_AUTH_ENABLED": "false",
-			"BASIC_AUTH_PREFIX":  "",
-		}).
+		WithEnv(envVars).
 		Up(ctx)
 
 	if upErr != nil {
@@ -118,6 +128,7 @@ func New(in *Input) (*Output, error) {
 			wait.NewHostPortStrategy(DEFAULT_RED_PANDA_SCHEMA_REGISTRY_PORT).WithPollInterval(100*time.Millisecond),
 			wait.NewHostPortStrategy(DEFAULT_RED_PANDA_KAFKA_PORT).WithPollInterval(100*time.Millisecond),
 			wait.ForHTTP("/v1/status/ready").WithPort("9644"), // admin API port
+			wait.ForHTTP("/status/ready").WithPort(DEFAULT_RED_PANDA_SCHEMA_REGISTRY_PORT).WithPollInterval(100*time.Millisecond),
 		).WithDeadline(2*time.Minute),
 	).WaitForService(DEFAULT_RED_PANDA_CONSOLE_SERVICE_NAME,
 		wait.ForAll(