From 38fbd593d90865d33adeded5844fbea8385ede8f Mon Sep 17 00:00:00 2001 From: Energy Star Date: Mon, 17 Apr 2023 01:16:48 -0700 Subject: [PATCH] v0.0.20 --- .github/workflows/go.yml | 16 +++++++++------- integration.env | 1 + sftp/sftp_test.go | 4 ++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 0856133..8ee2b01 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -44,13 +44,15 @@ jobs: env: MONGO_INITDB_DATABASE: api - sftp: - image: atmoz/sftp - env: - SFTP_USERS: foo:pass - SFTP_PASSWORD_AUTH: false - ports: - - "2222:22" + # Can't use this because CI doesn't support "command"... + # sftp: + # image: atmoz/sftp + # env: + # SFTP_USERS: foo:pass + # SFTP_PASSWORD_AUTH: false + # ports: + # - "2222:22" + # command: foo:pass:::upload elasticsearch: image: docker.elastic.co/elasticsearch/elasticsearch:8.4.3 diff --git a/integration.env b/integration.env index c3b6469..e2b0b5e 100644 --- a/integration.env +++ b/integration.env @@ -15,6 +15,7 @@ AWS_SESSION_TOKEN="" FILE_DIR="/tmp" FILE_FILENAME="dal-test.json" +SFTP_SKIP="true" STFP_ADDR="sftp://sftp:2222" STFP_USER="foo" STFP_PASSWORD="pass" diff --git a/sftp/sftp_test.go b/sftp/sftp_test.go index db713ef..ee118f0 100644 --- a/sftp/sftp_test.go +++ b/sftp/sftp_test.go @@ -42,6 +42,10 @@ func TestNew(t *testing.T) { t.Setenv("HTTPCLIENT_METRICS_PREFIX", "dal_"+Name+"_test") + if os.Getenv("STFP_SKIP") == "true" { + t.Skip("Skipping test. STFP_SKIP is set to true.") + } + addr := os.Getenv("STFP_ADDR") user := os.Getenv("STFP_USER") pwd := os.Getenv("STFP_PASSWORD")