diff --git a/.github/scripts/components-scripts/conformance-hashicorp-vault-setup.sh b/.github/scripts/components-scripts/conformance-hashicorp-vault-setup.sh new file mode 100755 index 000000000..f5b4ef496 --- /dev/null +++ b/.github/scripts/components-scripts/conformance-hashicorp-vault-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker-compose -f .github/infrastructure/docker-compose-hashicorp-vault.yml -p vault up -d diff --git a/.github/scripts/components-scripts/conformance-hazelcast-setup.sh b/.github/scripts/components-scripts/conformance-hazelcast-setup.sh new file mode 100755 index 000000000..4e447c126 --- /dev/null +++ b/.github/scripts/components-scripts/conformance-hazelcast-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker-compose -f .github/infrastructure/docker-compose-hazelcast.yml -p hazelcast up -d diff --git a/.github/scripts/components-scripts/conformance-kubemq-setup.sh b/.github/scripts/components-scripts/conformance-kubemq-setup.sh new file mode 100755 index 000000000..8453e3608 --- /dev/null +++ b/.github/scripts/components-scripts/conformance-kubemq-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker-compose -f .github/infrastructure/docker-compose-kubemq.yml -p kubemq up -d diff --git a/.github/scripts/components-scripts/conformance-state.memcached-setup.sh b/.github/scripts/components-scripts/conformance-memcached-setup.sh similarity index 100% rename from .github/scripts/components-scripts/conformance-state.memcached-setup.sh rename to .github/scripts/components-scripts/conformance-memcached-setup.sh diff --git a/.github/scripts/components-scripts/conformance-mqtt3-emqx-setup.sh b/.github/scripts/components-scripts/conformance-mqtt3-emqx-setup.sh new file mode 100755 index 000000000..09017a062 --- /dev/null +++ b/.github/scripts/components-scripts/conformance-mqtt3-emqx-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker-compose -f .github/infrastructure/docker-compose-emqx.yml -p emqx up -d diff --git a/.github/scripts/components-scripts/conformance-mqtt3-mosquitto-setup.sh b/.github/scripts/components-scripts/conformance-mqtt3-mosquitto-setup.sh new file mode 100755 index 000000000..a8e65ead5 --- /dev/null +++ b/.github/scripts/components-scripts/conformance-mqtt3-mosquitto-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker-compose -f .github/infrastructure/docker-compose-vernemq.yml -p vernemq up -d diff --git a/.github/scripts/components-scripts/conformance-mqtt3-vernemq-setup.sh b/.github/scripts/components-scripts/conformance-mqtt3-vernemq-setup.sh new file mode 100755 index 000000000..659fc24af --- /dev/null +++ b/.github/scripts/components-scripts/conformance-mqtt3-vernemq-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker-compose -f .github/infrastructure/docker-compose-mosquitto.yml -p mosquitto up -d diff --git a/.github/scripts/components-scripts/conformance-natsstreaming-setup.sh b/.github/scripts/components-scripts/conformance-natsstreaming-setup.sh new file mode 100755 index 000000000..8e9115514 --- /dev/null +++ b/.github/scripts/components-scripts/conformance-natsstreaming-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker-compose -f .github/infrastructure/docker-compose-natsstreaming.yml -p natsstreaming up -d diff --git a/.github/scripts/components-scripts/conformance-pulsar-setup.sh b/.github/scripts/components-scripts/conformance-pulsar-setup.sh new file mode 100755 index 000000000..3ae295c42 --- /dev/null +++ b/.github/scripts/components-scripts/conformance-pulsar-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker-compose -f .github/infrastructure/docker-compose-pulsar.yml -p pulsar up -d diff --git a/.github/scripts/components-scripts/conformance-rabbitmq-setup.sh b/.github/scripts/components-scripts/conformance-rabbitmq-setup.sh new file mode 100755 index 000000000..4e2ddf7d4 --- /dev/null +++ b/.github/scripts/components-scripts/conformance-rabbitmq-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker-compose -f .github/infrastructure/docker-compose-rabbitmq.yml -p rabbitmq up -d diff --git a/.github/scripts/components-scripts/conformance-redisv6-setup.sh b/.github/scripts/components-scripts/conformance-redisv6-setup.sh new file mode 100755 index 000000000..bba91bc37 --- /dev/null +++ b/.github/scripts/components-scripts/conformance-redisv6-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker-compose -f .github/infrastructure/docker-compose-redisjson.yml -p redis up -d diff --git a/.github/scripts/components-scripts/conformance-redisv7-setup.sh b/.github/scripts/components-scripts/conformance-redisv7-setup.sh new file mode 100755 index 000000000..fedff505b --- /dev/null +++ b/.github/scripts/components-scripts/conformance-redisv7-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker-compose -f .github/infrastructure/docker-compose-redis7.yml -p redis up -d diff --git a/.github/scripts/components-scripts/conformance-workflows.temporal-setup.sh b/.github/scripts/components-scripts/conformance-temporal-setup.sh similarity index 100% rename from .github/scripts/components-scripts/conformance-workflows.temporal-setup.sh rename to .github/scripts/components-scripts/conformance-temporal-setup.sh diff --git a/.github/scripts/test-info.mjs b/.github/scripts/test-info.mjs index 0e9a6ff3f..34e183c94 100644 --- a/.github/scripts/test-info.mjs +++ b/.github/scripts/test-info.mjs @@ -104,18 +104,22 @@ const components = { }, 'bindings.kubemq': { conformance: true, + conformanceSetup: 'conformance-kubemq-setup.sh' }, 'bindings.localstorage': { certification: true, }, 'bindings.mqtt3-emqx': { conformance: true, + conformanceSetup: 'conformance-mqtt3-emqx-setup.sh' }, 'bindings.mqtt3-mosquitto': { conformance: true, + conformanceSetup: 'conformance-mqtt3-mosquitto-setup.sh' }, 'bindings.mqtt3-vernemq': { conformance: true, + conformanceSetup: 'conformance-mqtt3-vernemq-setup.sh' }, 'bindings.postgres': { conformance: true, @@ -124,21 +128,26 @@ const components = { 'bindings.rabbitmq': { conformance: true, certification: true, + conformanceSetup: 'conformance-rabbitmq-setup.sh' }, 'bindings.redis': { certification: true, }, 'bindings.redis.v6': { conformance: true, + conformanceSetup: 'conformance-redisv6-setup.sh' }, 'bindings.redis.v7': { conformance: true, + conformanceSetup: 'conformance-redisv7-setup.sh' }, 'configuration.redis.v6': { conformance: true, + conformanceSetup: 'conformance-redisv6-setup.sh' }, 'configuration.redis.v7': { conformance: true, + conformanceSetup: 'conformance-redisv7-setup.sh' }, 'pubsub.aws.snssqs': { certification: true, @@ -194,6 +203,7 @@ const components = { }, 'pubsub.hazelcast': { conformance: true, + conformanceSetup: 'conformance-hazelcast-setup.sh' }, 'pubsub.in-memory': { conformance: true, @@ -209,32 +219,44 @@ const components = { }, 'pubsub.kubemq': { conformance: true, + conformanceSetup: 'conformance-kubemq-setup.sh' }, 'pubsub.mqtt3': { certification: true, }, 'pubsub.mqtt3-emqx': { conformance: true, + conformanceSetup: 'conformance-mqtt3-emqx-setup.sh' }, 'pubsub.mqtt3-vernemq': { conformance: true, + conformanceSetup: 'conformance-mqtt3-vernemq-setup.sh' }, 'pubsub.natsstreaming': { conformance: true, + conformanceSetup: 'conformance-natsstreaming-setup.sh' }, 'pubsub.pulsar': { conformance: true, certification: true, + conformanceSetup: 'conformance-pulsar-setup.sh' }, 'pubsub.rabbitmq': { conformance: true, certification: true, + conformanceSetup: 'conformance-rabbitmq-setup.sh' }, 'pubsub.redis.v6': { conformance: true, + conformanceSetup: 'conformance-redisv6-setup.sh' + }, + 'pubsub.redis.v7': { + conformance: true, + conformanceSetup: 'conformance-redisv7-setup.sh' }, 'pubsub.solace': { conformance: true, + //conformanceSetup: 'conformance-solace-setup.sh' }, 'secretstores.azure.keyvault': { certification: true, @@ -270,6 +292,7 @@ const components = { 'secretstores.hashicorp.vault': { conformance: true, certification: true, + conformanceSetup: 'conformance-hashicorp-vault-setup.sh' }, 'secretstores.kubernetes': { conformance: true, @@ -371,7 +394,7 @@ const components = { 'state.memcached': { conformance: true, certification: true, - conformanceSetup: 'conformance-state.memcached-setup.sh', + conformanceSetup: 'conformance-memcached-setup.sh', }, 'state.mongodb': { conformance: true, @@ -413,7 +436,7 @@ const components = { }, 'workflows.temporal': { conformance: true, - conformanceSetup: 'conformance-workflows.temporal-setup.sh', + conformanceSetup: 'conformance-temporal-setup.sh', }, } diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 74d0323b2..2b19f8ddd 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -210,14 +210,6 @@ jobs: echo "STATE_AWS_DYNAMODB_TABLE_2=$STATE_AWS_DYNAMODB_TABLE_2" >> $GITHUB_ENV if: contains(matrix.component, 'dynamodb') - - name: Start Redis 6 with Redis JSON - run: docker-compose -f ./.github/infrastructure/docker-compose-redisjson.yml -p redis up -d - if: contains(matrix.component, 'redis.v6') - - - name: Start Redis 7 - run: docker-compose -f ./.github/infrastructure/docker-compose-redis7.yml -p redis up -d - if: contains(matrix.component, 'redis.v7') - - name: Start MongoDB uses: supercharge/mongodb-github-action@1.3.0 with: @@ -226,47 +218,18 @@ jobs: if: contains(matrix.component, 'mongodb') - name: Start sqlserver - run: docker-compose -f ./.github/infrastructure/docker-compose-sqlserver.yml -p sqlserver up -d + run: docker-compose -f .github/infrastructure/docker-compose-sqlserver.yml -p sqlserver up -d if: contains(matrix.component, 'sqlserver') - name: Start kafka - run: docker-compose -f ./.github/infrastructure/docker-compose-kafka.yml -p kafka up -d + run: docker-compose -f .github/infrastructure/docker-compose-kafka.yml -p kafka up -d if: contains(matrix.component, 'wurstmeister') - name: Start kafka Confluent - run: docker-compose -f ./.github/infrastructure/docker-compose-confluent.yml -p confluent up -d + run: docker-compose -f .github/infrastructure/docker-compose-confluent.yml -p confluent up -d if: contains(matrix.component, 'confluent') - - name: Start natsstreaming - run: docker-compose -f ./.github/infrastructure/docker-compose-natsstreaming.yml -p natsstreaming up -d - if: contains(matrix.component, 'natsstreaming') - - - name: Start pulsar - run: docker-compose -f ./.github/infrastructure/docker-compose-pulsar.yml -p pulsar up -d - if: contains(matrix.component, 'pulsar') - - - name: Start Eclipse Mosquitto (MQTT3) - run: docker-compose -f ./.github/infrastructure/docker-compose-mosquitto.yml -p mosquitto up -d - if: contains(matrix.component, 'mqtt3-mosquitto') - - - name: Start EMQ X (MQTT3) - run: docker-compose -f ./.github/infrastructure/docker-compose-emqx.yml -p emqx up -d - if: contains(matrix.component, 'mqtt3-emqx') - - - name: Start VerneMQ (MQTT3) - run: docker-compose -f ./.github/infrastructure/docker-compose-vernemq.yml -p vernemq up -d - if: contains(matrix.component, 'mqtt3-vernemq') - - - name: Start hazelcast - run: docker-compose -f ./.github/infrastructure/docker-compose-hazelcast.yml -p hazelcast up -d - if: contains(matrix.component, 'hazelcast') - - - name: Start rabbitmq - run: docker-compose -f ./.github/infrastructure/docker-compose-rabbitmq.yml -p rabbitmq up -d - if: contains(matrix.component, 'rabbitmq') - - name: Install Node.js ${{ env.NODE_VERSION }} - if: contains(matrix.component, 'cloudflare') uses: actions/setup-node@v3 with: node-version: ${{ env.NODE_VERSION }} @@ -303,24 +266,24 @@ jobs: echo "CloudflareKVNamespaceID=${CloudflareKVNamespaceID}" >> $GITHUB_ENV - name: Start aws snssqs - run: docker-compose -f ./.github/infrastructure/docker-compose-snssqs.yml -p snssqs up -d + run: docker-compose -f .github/infrastructure/docker-compose-snssqs.yml -p snssqs up -d if: contains(matrix.component, 'aws.snssqs.docker') - name: Start influxdb run: | export INFLUX_TOKEN=$(openssl rand -base64 32) echo "INFLUX_TOKEN=$INFLUX_TOKEN" >> $GITHUB_ENV - docker-compose -f ./.github/infrastructure/docker-compose-influxdb.yml -p influxdb up -d + docker-compose -f .github/infrastructure/docker-compose-influxdb.yml -p influxdb up -d if: contains(matrix.component, 'influx') - name: Start mysql run: | - docker-compose -f ./.github/infrastructure/docker-compose-mysql.yml -p mysql up -d + docker-compose -f .github/infrastructure/docker-compose-mysql.yml -p mysql up -d if: contains(matrix.component, 'mysql.mysql') - name: Start mariadb run: | - docker-compose -f ./.github/infrastructure/docker-compose-mariadb.yml -p mariadb up -d + docker-compose -f .github/infrastructure/docker-compose-mariadb.yml -p mariadb up -d if: contains(matrix.component, 'mysql.mariadb') - name: Start KinD @@ -329,40 +292,31 @@ jobs: - name: Start postgresql run: | - docker-compose -f ./.github/infrastructure/docker-compose-postgresql.yml -p postgresql up -d + docker-compose -f .github/infrastructure/docker-compose-postgresql.yml -p postgresql up -d if: contains(matrix.component, 'postgres') - name: Start cassandra run: | - docker-compose -f ./.github/infrastructure/docker-compose-cassandra.yml -p cassandra up -d + docker-compose -f .github/infrastructure/docker-compose-cassandra.yml -p cassandra up -d if: contains(matrix.component, 'cassandra') - name: Start cockroachdb run: | - docker-compose -f ./.github/infrastructure/docker-compose-cockroachdb.yml -p cockroachdb up -d + docker-compose -f .github/infrastructure/docker-compose-cockroachdb.yml -p cockroachdb up -d if: contains(matrix.component, 'cockroachdb') - - name: Start vault - run: | - docker-compose -f ./.github/infrastructure/docker-compose-hashicorp-vault.yml -p vault up -d - if: contains(matrix.component, 'hashicorp.vault') - - name: Start rethinkdb run: | - docker-compose -f ./.github/infrastructure/docker-compose-rethinkdb.yml -p rethinkdb up -d + docker-compose -f .github/infrastructure/docker-compose-rethinkdb.yml -p rethinkdb up -d if: contains(matrix.component, 'rethinkdb') - - name: Start kubemq - run: docker-compose -f ./.github/infrastructure/docker-compose-kubemq.yml -p kubemq up -d - if: contains(matrix.component, 'kubemq') - - name: Start solace - run: docker-compose -f ./.github/infrastructure/docker-compose-solace.yml -p solace up -d + run: docker-compose -f .github/infrastructure/docker-compose-solace.yml -p solace up -d if: contains(matrix.component, 'solace') - name: Start nats with JetStream run: | - docker-compose -f ./.github/infrastructure/docker-compose-jetstream.yml up -p jetstream -d + docker-compose -f .github/infrastructure/docker-compose-jetstream.yml up -p jetstream -d if: contains(matrix.component, 'jetstream') - name: Setup KinD test data @@ -580,7 +534,7 @@ jobs: let found = false let success = false try { - let read =fs.readFileSync(path.join(basePath, component + '.txt'), 'utf8') + let read = fs.readFileSync(path.join(basePath, component + '.txt'), 'utf8') read = read.split('\n')[0] switch (read) { case '1':