Skip to content

Commit

Permalink
IWF-206: Upgrade Temporal SDKs in iWF SDKs test envs (#83)
Browse files Browse the repository at this point in the history
  • Loading branch information
samuel27m authored Oct 18, 2024
1 parent 988f6dc commit f1d0335
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 21 deletions.
4 changes: 2 additions & 2 deletions integ/.env
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ CASSANDRA_VERSION=3.11.9
ELASTICSEARCH_VERSION=7.16.2
MYSQL_VERSION=8
POSTGRESQL_VERSION=13
TEMPORAL_VERSION=1.20.1
TEMPORAL_UI_VERSION=2.10.1
TEMPORAL_VERSION=1.25
TEMPORAL_UI_VERSION=2.31.2
30 changes: 13 additions & 17 deletions integ/docker-compose-init.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
#!/bin/bash

# use new version of tctl so that we can skip the prompt
tctl config set version next


checkExists () {
# see https://github.com/temporalio/temporal/issues/4160
if tctl search-attribute list | grep -q "$1"; then
if temporal operator search-attribute list | grep -q "$1"; then
return 0
else
return 1
Expand All @@ -16,31 +12,31 @@ fi
echo "now trying to register iWF system search attributes..."
for run in {1..120}; do
sleep 1
tctl search-attribute create -name IwfWorkflowType -type Keyword -y
temporal operator search-attribute create --name IwfWorkflowType --type Keyword
sleep 0.1
temporal operator search-attribute create --name IwfGlobalWorkflowVersion --type Int
sleep 0.1
tctl search-attribute create -name IwfGlobalWorkflowVersion -type Int -y
temporal operator search-attribute create --name IwfExecutingStateIds --type KeywordList
sleep 0.1
tctl search-attribute create -name IwfExecutingStateIds -type Keyword -y
temporal operator search-attribute create --name CustomKeywordField --type Keyword
sleep 0.1
tctl search-attribute create -name CustomKeywordField -type Keyword -y
temporal operator search-attribute create --name CustomIntField --type Int
sleep 0.1
tctl search-attribute create -name CustomIntField -type Int -y
temporal operator search-attribute create --name CustomBoolField --type Bool
sleep 0.1
tctl search-attribute create -name CustomBoolField -type Bool -y
temporal operator search-attribute create --name CustomDoubleField --type Double
sleep 0.1
tctl search-attribute create -name CustomDoubleField -type Double -y
temporal operator search-attribute create --name CustomDatetimeField --type Datetime
sleep 0.1
tctl search-attribute create -name CustomDatetimeField -type Datetime -y
temporal operator search-attribute create --name CustomStringField --type Text
sleep 0.1
tctl search-attribute create -name CustomStringField -type text -y

if checkExists "IwfWorkflowType" ] && checkExists "IwfGlobalWorkflowVersion" && checkExists "IwfExecutingStateIds" && checkExists "CustomKeywordField" && checkExists "CustomIntField" && checkExists "CustomBoolField" && checkExists "CustomDoubleField" && checkExists "CustomDatetimeField" && checkExists "CustomStringField" ] ; then
if checkExists "IwfWorkflowType" && checkExists "IwfGlobalWorkflowVersion" && checkExists "IwfExecutingStateIds" && checkExists "CustomKeywordField" && checkExists "CustomIntField" && checkExists "CustomBoolField" && checkExists "CustomDoubleField" && checkExists "CustomDatetimeField" && checkExists "CustomStringField"; then
echo "All search attributes are registered"
break
fi

done

tctl namespace register default

tail -f /dev/null
tail -f /dev/null
5 changes: 3 additions & 2 deletions integ/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
- postgresql
- elasticsearch
environment:
- DB=postgresql
- DB=postgres12
- DB_PORT=5432
- POSTGRES_USER=temporal
- POSTGRES_PWD=temporal
Expand All @@ -56,14 +56,15 @@ services:
depends_on:
- temporal
environment:
- TEMPORAL_ADDRESS=temporal:7233
- TEMPORAL_CLI_ADDRESS=temporal:7233
image: temporalio/admin-tools:${TEMPORAL_VERSION}
networks:
- temporal-network
stdin_open: true
tty: true
volumes:
- ./docker-compose-init.sh:/etc/temporal/init.sh
- ./docker-compose-init.sh:/etc/temporal/init.sh
entrypoint: sh -c "/etc/temporal/init.sh"
iwf-server:
container_name: iwf-server
Expand Down

0 comments on commit f1d0335

Please sign in to comment.