diff --git a/scripts/cli/playground b/scripts/cli/playground index a8d12228bd..6111bf2fc2 100755 --- a/scripts/cli/playground +++ b/scripts/cli/playground @@ -18302,14 +18302,31 @@ playground_connector_plugin_versions_command() { exit 1 fi + if [[ "$(uname)" == "Darwin" ]]; then + # macOS + current_date=$(date -j -f "%Y-%m-%d" "$(date "+%Y-%m-%d")" "+%s") + else + # Linux + current_date=$(date +%s) + fi while IFS= read -r row; do IFS=$'\n' arr=($(echo "$row" | jq -r '.version, .manifest_url, .release_date')) version="${arr[0]}" #manifest_url="${arr[1]}" release_date="${arr[2]}" + if [[ "$(uname)" == "Darwin" ]]; then + # macOS + release_date_sec=$(date -j -f "%Y-%m-%d" "$release_date" "+%s") + else + # Linux + release_date_sec=$(date -d "$release_date" "+%s") + fi + + # Calculate the difference in days + diff=$(( (current_date - release_date_sec) / 60 / 60 / 24 )) - echo "🔢 v$version - 📅 release date: $release_date" >> $filename + echo "🔢 v$version - 📅 release date: $release_date ($diff days ago)" >> $filename done <<< "$(echo "$curl_output" | jq -c '.[]')" else logerror "❌ curl request failed with error code $ret!" @@ -18562,6 +18579,7 @@ playground_connector_versions_command() { # latest latest=$(playground connector-plugin versions --connector-plugin $owner/$name --last 1) + latest_to_compare=$(echo "$latest" | sed 's/ ([0-9]* days ago)//') manifest_file="$root_folder/confluent-hub/$full_connector_name/manifest.json" if [ -f $manifest_file ] @@ -18574,7 +18592,7 @@ playground_connector_versions_command() { fi current="🔢 v$version - 📅 release date: $release_date" - if [ "$current" == "$latest" ] + if [ "$current" == "$latest_to_compare" ] then log "👻 Version currently used for $owner/$name is latest" echo "$current" diff --git a/scripts/cli/src/commands/connector-plugin/versions.sh b/scripts/cli/src/commands/connector-plugin/versions.sh index 601ad2759c..39348b4c5a 100644 --- a/scripts/cli/src/commands/connector-plugin/versions.sh +++ b/scripts/cli/src/commands/connector-plugin/versions.sh @@ -51,14 +51,31 @@ then exit 1 fi + if [[ "$(uname)" == "Darwin" ]]; then + # macOS + current_date=$(date -j -f "%Y-%m-%d" "$(date "+%Y-%m-%d")" "+%s") + else + # Linux + current_date=$(date +%s) + fi while IFS= read -r row; do IFS=$'\n' arr=($(echo "$row" | jq -r '.version, .manifest_url, .release_date')) version="${arr[0]}" #manifest_url="${arr[1]}" release_date="${arr[2]}" + if [[ "$(uname)" == "Darwin" ]]; then + # macOS + release_date_sec=$(date -j -f "%Y-%m-%d" "$release_date" "+%s") + else + # Linux + release_date_sec=$(date -d "$release_date" "+%s") + fi + + # Calculate the difference in days + diff=$(( (current_date - release_date_sec) / 60 / 60 / 24 )) - echo "🔢 v$version - 📅 release date: $release_date" >> $filename + echo "🔢 v$version - 📅 release date: $release_date ($diff days ago)" >> $filename done <<< "$(echo "$curl_output" | jq -c '.[]')" else logerror "❌ curl request failed with error code $ret!" diff --git a/scripts/cli/src/commands/connector/versions.sh b/scripts/cli/src/commands/connector/versions.sh index c416e86108..86a364aabb 100644 --- a/scripts/cli/src/commands/connector/versions.sh +++ b/scripts/cli/src/commands/connector/versions.sh @@ -44,6 +44,7 @@ else # latest latest=$(playground connector-plugin versions --connector-plugin $owner/$name --last 1) + latest_to_compare=$(echo "$latest" | sed 's/ ([0-9]* days ago)//') ## current version manifest_file="$root_folder/confluent-hub/$full_connector_name/manifest.json" @@ -57,7 +58,7 @@ else fi current="🔢 v$version - 📅 release date: $release_date" - if [ "$current" == "$latest" ] + if [ "$current" == "$latest_to_compare" ] then log "👻 Version currently used for $owner/$name is latest" echo "$current" diff --git a/scripts/tests-ignored.txt b/scripts/tests-ignored.txt index 7409c0456d..8461758b35 100644 --- a/scripts/tests-ignored.txt +++ b/scripts/tests-ignored.txt @@ -24,4 +24,5 @@ redshift-jdbc-sink.sh snowflake-sink-snowpipe-streaming.sh # no need to test in CI -azure-cognitive-search-sink-proxy.sh \ No newline at end of file +azure-cognitive-search-sink-proxy.sh +s3-sink-with-short-lived-creds.sh \ No newline at end of file