From 9823e78b8005da42bd569bbdfa3caef20acd7137 Mon Sep 17 00:00:00 2001 From: Florian Arthofer Date: Mon, 10 Feb 2020 13:34:25 +0100 Subject: [PATCH 1/3] made print statements python3 compatible --- bin/compile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/compile b/bin/compile index 3b8f953..da016c2 100644 --- a/bin/compile +++ b/bin/compile @@ -112,11 +112,11 @@ puts_step "Configuring Dynatrace Oneagent..." # determine default values for connection parameters DT_MANIFEST="$BUILD_DIR/dynatrace/oneagent/manifest.json" -MANIFEST_TENANT=$(python -c 'import json,sys; print json.load(sys.stdin)["tenantUUID"]' <$DT_MANIFEST) -MANIFEST_TOKEN=$(python -c 'import json,sys; print json.load(sys.stdin)["tenantToken"]' <$DT_MANIFEST) -MANIFEST_ENDPOINTS=$(python -c 'import sys, json; print ";".join(json.load(sys.stdin)["communicationEndpoints"])' <$DT_MANIFEST) +MANIFEST_TENANT=$(python -c 'import json,sys; print(json.load(sys.stdin)["tenantUUID"])' <$DT_MANIFEST) +MANIFEST_TOKEN=$(python -c 'import json,sys; print(json.load(sys.stdin)["tenantToken"])' <$DT_MANIFEST) +MANIFEST_ENDPOINTS=$(python -c 'import sys, json; print(";".join(json.load(sys.stdin)["communicationEndpoints"]))' <$DT_MANIFEST) -VERSION=$(python -c 'import json,sys; print json.load(sys.stdin)["version"]' <$DT_MANIFEST) +VERSION=$(python -c 'import json,sys; print(json.load(sys.stdin)["version"])' <$DT_MANIFEST) # support pipelined deployments by overriding default values set_env "DT_TENANT" "\${DT_TENANT:-$MANIFEST_TENANT}" From 33823aac977571082d3f0f9be39212def836e0d5 Mon Sep 17 00:00:00 2001 From: Florian Arthofer Date: Mon, 10 Feb 2020 15:52:34 +0100 Subject: [PATCH 2/3] temporary debug message --- bin/compile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/compile b/bin/compile index da016c2..6aee73a 100644 --- a/bin/compile +++ b/bin/compile @@ -112,6 +112,8 @@ puts_step "Configuring Dynatrace Oneagent..." # determine default values for connection parameters DT_MANIFEST="$BUILD_DIR/dynatrace/oneagent/manifest.json" +#debug +puts_step "with python3 support" MANIFEST_TENANT=$(python -c 'import json,sys; print(json.load(sys.stdin)["tenantUUID"])' <$DT_MANIFEST) MANIFEST_TOKEN=$(python -c 'import json,sys; print(json.load(sys.stdin)["tenantToken"])' <$DT_MANIFEST) MANIFEST_ENDPOINTS=$(python -c 'import sys, json; print(";".join(json.load(sys.stdin)["communicationEndpoints"]))' <$DT_MANIFEST) From 3ad63ec8263cad4f6a41fc8bf57d59989d43ca6c Mon Sep 17 00:00:00 2001 From: Florian Arthofer Date: Mon, 10 Feb 2020 15:54:18 +0100 Subject: [PATCH 3/3] removed debug message --- bin/compile | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/compile b/bin/compile index 6aee73a..da016c2 100644 --- a/bin/compile +++ b/bin/compile @@ -112,8 +112,6 @@ puts_step "Configuring Dynatrace Oneagent..." # determine default values for connection parameters DT_MANIFEST="$BUILD_DIR/dynatrace/oneagent/manifest.json" -#debug -puts_step "with python3 support" MANIFEST_TENANT=$(python -c 'import json,sys; print(json.load(sys.stdin)["tenantUUID"])' <$DT_MANIFEST) MANIFEST_TOKEN=$(python -c 'import json,sys; print(json.load(sys.stdin)["tenantToken"])' <$DT_MANIFEST) MANIFEST_ENDPOINTS=$(python -c 'import sys, json; print(";".join(json.load(sys.stdin)["communicationEndpoints"]))' <$DT_MANIFEST)