From 028075457e9c5602fd6e1ae45c434753aae0523b Mon Sep 17 00:00:00 2001 From: Dakota Paasman Date: Tue, 20 Aug 2024 11:27:40 -0400 Subject: [PATCH 1/4] Update modules to v1.59.0 --- cmd/plugindocgen/go.mod | 2 +- exporter/chronicleexporter/go.mod | 2 +- exporter/chronicleforwarderexporter/go.mod | 2 +- go.mod | 60 ++++++++++---------- internal/rehydration/go.mod | 2 +- processor/datapointcountprocessor/go.mod | 6 +- processor/logcountprocessor/go.mod | 6 +- processor/metricextractprocessor/go.mod | 4 +- processor/snapshotprocessor/go.mod | 2 +- processor/spancountprocessor/go.mod | 6 +- receiver/awss3rehydrationreceiver/go.mod | 2 +- receiver/azureblobrehydrationreceiver/go.mod | 2 +- updater/go.mod | 2 +- 13 files changed, 49 insertions(+), 49 deletions(-) diff --git a/cmd/plugindocgen/go.mod b/cmd/plugindocgen/go.mod index ba5b55e19..7442648c8 100644 --- a/cmd/plugindocgen/go.mod +++ b/cmd/plugindocgen/go.mod @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/plugindocgen go 1.21.9 require ( - github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.58.0 + github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.59.0 github.com/spf13/pflag v1.0.5 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/exporter/chronicleexporter/go.mod b/exporter/chronicleexporter/go.mod index d019f0612..7187ff018 100644 --- a/exporter/chronicleexporter/go.mod +++ b/exporter/chronicleexporter/go.mod @@ -5,7 +5,7 @@ go 1.21.9 require ( github.com/golang/mock v1.6.0 github.com/google/uuid v1.6.0 - github.com/observiq/bindplane-agent/expr v1.58.0 + github.com/observiq/bindplane-agent/expr v1.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0 github.com/shirou/gopsutil/v3 v3.24.5 github.com/stretchr/testify v1.9.0 diff --git a/exporter/chronicleforwarderexporter/go.mod b/exporter/chronicleforwarderexporter/go.mod index e87105e85..d09836fc3 100644 --- a/exporter/chronicleforwarderexporter/go.mod +++ b/exporter/chronicleforwarderexporter/go.mod @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/exporter/chronicleforwarderexporter go 1.21.9 require ( - github.com/observiq/bindplane-agent/expr v1.58.0 + github.com/observiq/bindplane-agent/expr v1.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.107.0 diff --git a/go.mod b/go.mod index cbf78c521..dc017b1ad 100644 --- a/go.mod +++ b/go.mod @@ -5,34 +5,34 @@ go 1.21.9 require ( github.com/google/uuid v1.6.0 github.com/mholt/archiver/v3 v3.5.1 - github.com/observiq/bindplane-agent/exporter/azureblobexporter v1.58.0 - github.com/observiq/bindplane-agent/exporter/chronicleexporter v1.58.0 - github.com/observiq/bindplane-agent/exporter/chronicleforwarderexporter v1.58.0 - github.com/observiq/bindplane-agent/exporter/googlecloudexporter v1.58.0 - github.com/observiq/bindplane-agent/exporter/googlemanagedprometheusexporter v1.58.0 - github.com/observiq/bindplane-agent/exporter/snowflakeexporter v1.58.0 - github.com/observiq/bindplane-agent/internal/report v1.58.0 - github.com/observiq/bindplane-agent/packagestate v1.58.0 - github.com/observiq/bindplane-agent/processor/datapointcountprocessor v1.58.0 - github.com/observiq/bindplane-agent/processor/logcountprocessor v1.58.0 - github.com/observiq/bindplane-agent/processor/logdeduplicationprocessor v1.58.0 - github.com/observiq/bindplane-agent/processor/lookupprocessor v1.58.0 - github.com/observiq/bindplane-agent/processor/maskprocessor v1.58.0 - github.com/observiq/bindplane-agent/processor/metricextractprocessor v1.58.0 - github.com/observiq/bindplane-agent/processor/metricstatsprocessor v1.58.0 - github.com/observiq/bindplane-agent/processor/removeemptyvaluesprocessor v1.58.0 - github.com/observiq/bindplane-agent/processor/resourceattributetransposerprocessor v1.58.0 - github.com/observiq/bindplane-agent/processor/samplingprocessor v1.58.0 - github.com/observiq/bindplane-agent/processor/spancountprocessor v1.58.0 - github.com/observiq/bindplane-agent/processor/throughputmeasurementprocessor v1.58.0 - github.com/observiq/bindplane-agent/receiver/awss3rehydrationreceiver v1.58.0 - github.com/observiq/bindplane-agent/receiver/azureblobrehydrationreceiver v1.58.0 - github.com/observiq/bindplane-agent/receiver/httpreceiver v1.58.0 - github.com/observiq/bindplane-agent/receiver/m365receiver v1.58.0 - github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.58.0 - github.com/observiq/bindplane-agent/receiver/routereceiver v1.58.0 - github.com/observiq/bindplane-agent/receiver/sapnetweaverreceiver v1.58.0 - github.com/observiq/bindplane-agent/receiver/telemetrygeneratorreceiver v1.58.0 + github.com/observiq/bindplane-agent/exporter/azureblobexporter v1.59.0 + github.com/observiq/bindplane-agent/exporter/chronicleexporter v1.59.0 + github.com/observiq/bindplane-agent/exporter/chronicleforwarderexporter v1.59.0 + github.com/observiq/bindplane-agent/exporter/googlecloudexporter v1.59.0 + github.com/observiq/bindplane-agent/exporter/googlemanagedprometheusexporter v1.59.0 + github.com/observiq/bindplane-agent/exporter/snowflakeexporter v1.59.0 + github.com/observiq/bindplane-agent/internal/report v1.59.0 + github.com/observiq/bindplane-agent/packagestate v1.59.0 + github.com/observiq/bindplane-agent/processor/datapointcountprocessor v1.59.0 + github.com/observiq/bindplane-agent/processor/logcountprocessor v1.59.0 + github.com/observiq/bindplane-agent/processor/logdeduplicationprocessor v1.59.0 + github.com/observiq/bindplane-agent/processor/lookupprocessor v1.59.0 + github.com/observiq/bindplane-agent/processor/maskprocessor v1.59.0 + github.com/observiq/bindplane-agent/processor/metricextractprocessor v1.59.0 + github.com/observiq/bindplane-agent/processor/metricstatsprocessor v1.59.0 + github.com/observiq/bindplane-agent/processor/removeemptyvaluesprocessor v1.59.0 + github.com/observiq/bindplane-agent/processor/resourceattributetransposerprocessor v1.59.0 + github.com/observiq/bindplane-agent/processor/samplingprocessor v1.59.0 + github.com/observiq/bindplane-agent/processor/spancountprocessor v1.59.0 + github.com/observiq/bindplane-agent/processor/throughputmeasurementprocessor v1.59.0 + github.com/observiq/bindplane-agent/receiver/awss3rehydrationreceiver v1.59.0 + github.com/observiq/bindplane-agent/receiver/azureblobrehydrationreceiver v1.59.0 + github.com/observiq/bindplane-agent/receiver/httpreceiver v1.59.0 + github.com/observiq/bindplane-agent/receiver/m365receiver v1.59.0 + github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.59.0 + github.com/observiq/bindplane-agent/receiver/routereceiver v1.59.0 + github.com/observiq/bindplane-agent/receiver/sapnetweaverreceiver v1.59.0 + github.com/observiq/bindplane-agent/receiver/telemetrygeneratorreceiver v1.59.0 github.com/oklog/ulid/v2 v2.1.0 github.com/open-telemetry/opamp-go v0.9.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.107.0 @@ -331,8 +331,8 @@ require ( github.com/mitchellh/go-ps v1.0.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect - github.com/observiq/bindplane-agent/counter v1.58.0 // indirect - github.com/observiq/bindplane-agent/expr v1.58.0 // indirect + github.com/observiq/bindplane-agent/counter v1.59.0 // indirect + github.com/observiq/bindplane-agent/expr v1.59.0 // indirect github.com/observiq/bindplane-agent/internal/rehydration v1.54.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.107.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.107.0 // indirect diff --git a/internal/rehydration/go.mod b/internal/rehydration/go.mod index 7528b2b69..a4b4184be 100644 --- a/internal/rehydration/go.mod +++ b/internal/rehydration/go.mod @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/internal/rehydration go 1.21.9 require ( - github.com/observiq/bindplane-agent/internal/testutils v1.58.0 + github.com/observiq/bindplane-agent/internal/testutils v1.59.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.107.0 go.opentelemetry.io/collector/consumer v0.107.0 diff --git a/processor/datapointcountprocessor/go.mod b/processor/datapointcountprocessor/go.mod index ed8258cec..3fbc822d2 100644 --- a/processor/datapointcountprocessor/go.mod +++ b/processor/datapointcountprocessor/go.mod @@ -3,9 +3,9 @@ module github.com/observiq/bindplane-agent/processor/datapointcountprocessor go 1.21.9 require ( - github.com/observiq/bindplane-agent/counter v1.58.0 - github.com/observiq/bindplane-agent/expr v1.58.0 - github.com/observiq/bindplane-agent/receiver/routereceiver v1.58.0 + github.com/observiq/bindplane-agent/counter v1.59.0 + github.com/observiq/bindplane-agent/expr v1.59.0 + github.com/observiq/bindplane-agent/receiver/routereceiver v1.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.107.0 diff --git a/processor/logcountprocessor/go.mod b/processor/logcountprocessor/go.mod index e09ccbc72..770ec615a 100644 --- a/processor/logcountprocessor/go.mod +++ b/processor/logcountprocessor/go.mod @@ -3,9 +3,9 @@ module github.com/observiq/bindplane-agent/processor/logcountprocessor go 1.21.9 require ( - github.com/observiq/bindplane-agent/counter v1.58.0 - github.com/observiq/bindplane-agent/expr v1.58.0 - github.com/observiq/bindplane-agent/receiver/routereceiver v1.58.0 + github.com/observiq/bindplane-agent/counter v1.59.0 + github.com/observiq/bindplane-agent/expr v1.59.0 + github.com/observiq/bindplane-agent/receiver/routereceiver v1.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.107.0 diff --git a/processor/metricextractprocessor/go.mod b/processor/metricextractprocessor/go.mod index 15ff4a66b..0dacca9c5 100644 --- a/processor/metricextractprocessor/go.mod +++ b/processor/metricextractprocessor/go.mod @@ -3,8 +3,8 @@ module github.com/observiq/bindplane-agent/processor/metricextractprocessor go 1.21.9 require ( - github.com/observiq/bindplane-agent/expr v1.58.0 - github.com/observiq/bindplane-agent/receiver/routereceiver v1.58.0 + github.com/observiq/bindplane-agent/expr v1.59.0 + github.com/observiq/bindplane-agent/receiver/routereceiver v1.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.107.0 github.com/stretchr/testify v1.9.0 diff --git a/processor/snapshotprocessor/go.mod b/processor/snapshotprocessor/go.mod index 6a5cb3a04..b8ddc9d46 100644 --- a/processor/snapshotprocessor/go.mod +++ b/processor/snapshotprocessor/go.mod @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/processor/snapshotprocessor go 1.21.9 require ( - github.com/observiq/bindplane-agent/internal/report v1.58.0 + github.com/observiq/bindplane-agent/internal/report v1.59.0 github.com/open-telemetry/opamp-go v0.15.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.107.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.107.0 diff --git a/processor/spancountprocessor/go.mod b/processor/spancountprocessor/go.mod index 5c0e451bf..7bfe69e41 100644 --- a/processor/spancountprocessor/go.mod +++ b/processor/spancountprocessor/go.mod @@ -3,9 +3,9 @@ module github.com/observiq/bindplane-agent/processor/spancountprocessor go 1.21.9 require ( - github.com/observiq/bindplane-agent/counter v1.58.0 - github.com/observiq/bindplane-agent/expr v1.58.0 - github.com/observiq/bindplane-agent/receiver/routereceiver v1.58.0 + github.com/observiq/bindplane-agent/counter v1.59.0 + github.com/observiq/bindplane-agent/expr v1.59.0 + github.com/observiq/bindplane-agent/receiver/routereceiver v1.59.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.107.0 diff --git a/receiver/awss3rehydrationreceiver/go.mod b/receiver/awss3rehydrationreceiver/go.mod index 9036ca385..6ba1f12e3 100644 --- a/receiver/awss3rehydrationreceiver/go.mod +++ b/receiver/awss3rehydrationreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.15 github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 github.com/observiq/bindplane-agent/internal/rehydration v1.54.0 - github.com/observiq/bindplane-agent/internal/testutils v1.58.0 + github.com/observiq/bindplane-agent/internal/testutils v1.59.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.107.0 go.opentelemetry.io/collector/confmap v0.107.0 diff --git a/receiver/azureblobrehydrationreceiver/go.mod b/receiver/azureblobrehydrationreceiver/go.mod index f598bf7c3..295c8aa7d 100644 --- a/receiver/azureblobrehydrationreceiver/go.mod +++ b/receiver/azureblobrehydrationreceiver/go.mod @@ -5,7 +5,7 @@ go 1.21.9 require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0 github.com/observiq/bindplane-agent/internal/rehydration v1.54.0 - github.com/observiq/bindplane-agent/internal/testutils v1.58.0 + github.com/observiq/bindplane-agent/internal/testutils v1.59.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.107.0 go.opentelemetry.io/collector/confmap v0.107.0 diff --git a/updater/go.mod b/updater/go.mod index cfb8a4540..4f7f3d2ec 100644 --- a/updater/go.mod +++ b/updater/go.mod @@ -4,7 +4,7 @@ go 1.21.9 require ( github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/observiq/bindplane-agent/packagestate v1.58.0 + github.com/observiq/bindplane-agent/packagestate v1.59.0 github.com/open-telemetry/opamp-go v0.9.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 From 7d12a585a49b55ef75e2b3e605f182dc43175581 Mon Sep 17 00:00:00 2001 From: Joseph Sirianni Date: Tue, 20 Aug 2024 15:51:11 -0400 Subject: [PATCH 2/4] chore(release): Use 8 core runner (#1810) --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 73e06f3ec..1d9c7aec1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,7 @@ jobs: release: needs: [build-64bit-msi] - runs-on: ubuntu-latest-4-cores + runs-on: ubuntu-latest-8-cores steps: - name: Checkout Repo uses: actions/checkout@v4 From 2c98147e13207b44c32ddd1b8d8ef5533e7c4673 Mon Sep 17 00:00:00 2001 From: Brandon Johnson Date: Wed, 21 Aug 2024 09:21:36 -0400 Subject: [PATCH 3/4] feat: Add routing connector (#1811) add routing connector --- factories/connectors.go | 2 ++ go.mod | 1 + go.sum | 2 ++ 3 files changed, 5 insertions(+) diff --git a/factories/connectors.go b/factories/connectors.go index 8e615f313..ec82d2bd7 100644 --- a/factories/connectors.go +++ b/factories/connectors.go @@ -16,6 +16,7 @@ package factories import ( "github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector" + "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector" "go.opentelemetry.io/collector/connector" @@ -27,4 +28,5 @@ var defaultConnectors = []connector.Factory{ forwardconnector.NewFactory(), servicegraphconnector.NewFactory(), spanmetricsconnector.NewFactory(), + routingconnector.NewFactory(), } diff --git a/go.mod b/go.mod index dc017b1ad..2e632ede4 100644 --- a/go.mod +++ b/go.mod @@ -36,6 +36,7 @@ require ( github.com/oklog/ulid/v2 v2.1.0 github.com/open-telemetry/opamp-go v0.9.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.107.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.107.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.107.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.107.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.107.0 diff --git a/go.sum b/go.sum index 23a60f3e3..617ab4ffe 100644 --- a/go.sum +++ b/go.sum @@ -1908,6 +1908,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnect github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.107.0/go.mod h1:Fz1oG0B2AVwSAG22GOZc9EGpOXqdHJtYU0F0+KjA6zs= github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.107.0 h1:5nCidAaa6vxj85UHOz7/kqtVsnbFMXyDDUV0Ima8FHk= github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.107.0/go.mod h1:X+V2G++oM4NHchq7RR4kpL32zKzd6fH4QQzO7/F8i24= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.107.0 h1:jS6ACtJreXaDLG/zp90goLERgsrj4vQrGKZNiFBKGho= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.107.0/go.mod h1:uZus6WqY8aYfns2J2fZrFyyyBNZX7Ghi7s7wSc/02Kw= github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.107.0 h1:llpmzV6B3ayRns2O2VUvnmQhBmFYea6B9G/j3TubjnM= github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.107.0/go.mod h1:vG1hP4f3oLQI4qCm58GiCXm4X0QiKLojybCM9vqeFXc= github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.107.0 h1:1S+oa3bMVrSi7PclgMvxtyPAi8mTdHsuDqAq8XA06qU= From 793a15a5990916cc5f4a042b9478468047fb7858 Mon Sep 17 00:00:00 2001 From: Tim Dithmer Date: Sat, 24 Aug 2024 15:46:47 +0200 Subject: [PATCH 4/4] Make install_unix.sh functional with non-interactive environments --- scripts/install/install_unix.sh | 60 ++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/scripts/install/install_unix.sh b/scripts/install/install_unix.sh index 00560319b..f80b81a5c 100755 --- a/scripts/install/install_unix.sh +++ b/scripts/install/install_unix.sh @@ -35,33 +35,40 @@ SCRIPT_NAME="$0" INDENT_WIDTH=' ' indent="" +IS_INTERACTIVE="false" +case "$-" in + *i*) IS_INTERACTIVE="true" ;; +esac + # out_file_path is the full path to the downloaded package (e.g. "/tmp/observiq-otel-collector_linux_amd64.deb") out_file_path="unknown" -# Colors -num_colors=$(tput colors 2>/dev/null) -if test -n "$num_colors" && test "$num_colors" -ge 8; then - bold="$(tput bold)" - underline="$(tput smul)" - # standout can be bold or reversed colors dependent on terminal - standout="$(tput smso)" - reset="$(tput sgr0)" - bg_black="$(tput setab 0)" - bg_blue="$(tput setab 4)" - bg_cyan="$(tput setab 6)" - bg_green="$(tput setab 2)" - bg_magenta="$(tput setab 5)" - bg_red="$(tput setab 1)" - bg_white="$(tput setab 7)" - bg_yellow="$(tput setab 3)" - fg_black="$(tput setaf 0)" - fg_blue="$(tput setaf 4)" - fg_cyan="$(tput setaf 6)" - fg_green="$(tput setaf 2)" - fg_magenta="$(tput setaf 5)" - fg_red="$(tput setaf 1)" - fg_white="$(tput setaf 7)" - fg_yellow="$(tput setaf 3)" +if $IS_INTERACTIVE; then + # Colors + num_colors=$(tput colors 2>/dev/null) + if test -n "$num_colors" && test "$num_colors" -ge 8; then + bold="$(tput bold)" + underline="$(tput smul)" + # standout can be bold or reversed colors dependent on terminal + standout="$(tput smso)" + reset="$(tput sgr0)" + bg_black="$(tput setab 0)" + bg_blue="$(tput setab 4)" + bg_cyan="$(tput setab 6)" + bg_green="$(tput setab 2)" + bg_magenta="$(tput setab 5)" + bg_red="$(tput setab 1)" + bg_white="$(tput setab 7)" + bg_yellow="$(tput setab 3)" + fg_black="$(tput setaf 0)" + fg_blue="$(tput setaf 4)" + fg_cyan="$(tput setaf 6)" + fg_green="$(tput setaf 2)" + fg_magenta="$(tput setaf 5)" + fg_red="$(tput setaf 1)" + fg_white="$(tput setaf 7)" + fg_yellow="$(tput setaf 3)" + fi fi if [ -z "$reset" ]; then @@ -328,6 +335,11 @@ set_proxy() info "Using proxy from arguments: $proxy" if [ -n "$proxy_user" ]; then while [ -z "$proxy_password" ] ; do + if ! $IS_INTERACTIVE; then + error_exit "$LINENO" "The proxy password must be set via the command line argument -P, if called non-interactively!" + exit + fi + increase_indent command printf "${indent}$(fg_blue "$proxy_user@$proxy")'s password: " stty -echo