Fixed bash import scripts

Author: mcasperson

cmd/internal/converters/variable_set_converter.go

@@ -591,14 +591,14 @@ declare -a ENVIRONMENT_SCOPES_IDS=()
 for ENVIRONMENT_NAME in "${ENVIRONMENT_SCOPES[@]}"; do
   ENVRIONMENT_ID=$(echo "${VARIABLES}" | jq -r --arg name "${ENVIRONMENT_NAME}" '.ScopeValues.Environments[] | select(.Name == $name) | .Id')
   echo "Found environment ${ENVIRONMENT_NAME} with ID ${ENVRIONMENT_ID}"
-  ENVIRONMENT_SCOPES_IDS+=("$ENVRIONMENT_ID")
+  ENVIRONMENT_SCOPES_IDS+=("${ENVRIONMENT_ID}")
 done
 ENVIRONMENT_SCOPES_IDS_SORTED=$(printf "%%s\n" "${ENVIRONMENT_SCOPES_IDS[@]}" | sort)
 
 declare -a MACHINE_SCOPES_IDS=()
 for MACHINE_NAME in "${MACHINE_SCOPES[@]}"; do
   MACHINE_ID=$(echo "${VARIABLES}" | jq -r --arg name "${MACHINE_NAME}" '.ScopeValues.Machines[] | select(.Name == $name) | .Id')
-  MACHINE_SCOPES_IDS+=("MACHINE_ID")
+  MACHINE_SCOPES_IDS+=("${MACHINE_ID}")
 done
 MACHINE_SCOPES_IDS_SORTED=$(printf "%%s\n" "${MACHINE_SCOPES_IDS[@]}" | sort)
 
@@ -607,13 +607,13 @@ ROLE_SCOPES_NAMES_SORTED=$(printf "%%s\n" "${ROLE_SCOPES[@]}" | sort)
 declare -a CHANNEL_SCOPES_IDS=()
 for CHANNEL_NAME in "${CHANNEL_SCOPES[@]}"; do
   CHANNEL_ID=$(echo "${VARIABLES}" | jq -r --arg name "${CHANNEL_NAME}" '.ScopeValues.Channels[] | select(.Name == $name) | .Id')
-  CHANNEL_SCOPES_IDS+=("CHANNEL_ID")
+  CHANNEL_SCOPES_IDS+=("${CHANNEL_ID}")
 done
 CHANNEL_SCOPES_IDS_SORTED=$(printf "%%s\n" "${CHANNEL_SCOPES_IDS[@]}" | sort)
 
 declare -a ACTION_SCOPES_IDS=()
 for ACTION_NAME in "${ACTION_SCOPES[@]}"; do
-  ACTION_ID=$(echo "${DEPLOYMENT_PROCESS}" | jq -r --arg name "${ACTION_NAME}" '.Steps.Actions[] | select(.Name == $name) | .Id')
+  ACTION_ID=$(echo "${DEPLOYMENT_PROCESS}" | jq -r --arg name "${ACTION_NAME}" '.Steps[].Actions[] | select(.Name == $name) | .Id')
   ACTION_SCOPES_IDS+=("ACTION_ID")
 done
 ACTION_SCOPES_IDS_SORTED=$(printf "%%s\n" "${ACTION_SCOPES_IDS[@]}" | sort)
@@ -623,13 +623,13 @@ for OWNER_NAME in "${OWNER_SCOPES[@]}"; do
   if [[ "$OWNER_NAME" == Project-* ]]; then
 	SCOPE_PROJECT_NAME=${OWNER_NAME:8}
     SCOPE_PROJECT_ID=$(curl --silent -G --data-urlencode "partialName=${SCOPE_PROJECT_NAME}" --data-urlencode "take=10000" --header "X-Octopus-ApiKey: $1" "$2/api/$3/Projects" | jq -r ".Items[] | select(.Name == \"${SCOPE_PROJECT_NAME}\") | .Id")
-    OWNER_SCOPES_IDS+=("$SCOPE_PROJECT_ID")
+    OWNER_SCOPES_IDS+=("${SCOPE_PROJECT_ID}")
   else
 	SCOPE_PROJECT_NAME=${OWNER_NAME:8}
     IFS=':' read -r -a SCOPE_PROJECT_NAME_ARRAY <<< "$SCOPE_PROJECT_NAME"
     SCOPE_PROJECT_ID=$(curl --silent -G --data-urlencode "partialName=${SCOPE_PROJECT_NAME_ARRAY[0]}" --data-urlencode "take=10000" --header "X-Octopus-ApiKey: $1" "$2/api/$3/Projects" | jq -r ".Items[] | select(.Name == \"${SCOPE_PROJECT_NAME_ARRAY[0]}\") | .Id")
     SCOPE_RUNBOOK_ID=$(curl --silent -G --data-urlencode "partialName=${SCOPE_PROJECT_NAME_ARRAY[1]}" --data-urlencode "take=10000" --header "X-Octopus-ApiKey: $1" "$2/api/$3/Projects/${SCOPE_PROJECT_ID}/Runbooks" | jq -r ".Items[] | select(.Name == \"${SCOPE_PROJECT_NAME_ARRAY[1]}\") | .Id")
-    OWNER_SCOPES_IDS+=("$SCOPE_RUNBOOK_ID")
+    OWNER_SCOPES_IDS+=("${SCOPE_RUNBOOK_ID}")
   fi
 done
 OWNER_SCOPES_IDS_SORTED=$(printf "%%s\n" "${OWNER_SCOPES_IDS[@]}" | sort)
@@ -980,14 +980,14 @@ declare -a ENVIRONMENT_SCOPES_IDS=()
 for ENVIRONMENT_NAME in "${ENVIRONMENT_SCOPES[@]}"; do
   ENVRIONMENT_ID=$(echo "${VARIABLES}" | jq -r --arg name "${ENVIRONMENT_NAME}" '.ScopeValues.Environments[] | select(.Name == $name) | .Id')
   echo "Found environment ${ENVIRONMENT_NAME} with ID ${ENVRIONMENT_ID}"
-  ENVIRONMENT_SCOPES_IDS+=("$ENVRIONMENT_ID")
+  ENVIRONMENT_SCOPES_IDS+=("${ENVRIONMENT_ID}")
 done
 ENVIRONMENT_SCOPES_IDS_SORTED=$(printf "%%s\n" "${ENVIRONMENT_SCOPES_IDS[@]}" | sort)
 
 declare -a MACHINE_SCOPES_IDS=()
 for MACHINE_NAME in "${MACHINE_SCOPES[@]}"; do
   MACHINE_ID=$(echo "${VARIABLES}" | jq -r --arg name "${MACHINE_NAME}" '.ScopeValues.Machines[] | select(.Name == $name) | .Id')
-  MACHINE_SCOPES_IDS+=("MACHINE_ID")
+  MACHINE_SCOPES_IDS+=("${MACHINE_ID}")
 done
 MACHINE_SCOPES_IDS_SORTED=$(printf "%%s\n" "${MACHINE_SCOPES_IDS[@]}" | sort)
 
@@ -996,7 +996,7 @@ ROLE_SCOPES_NAMES_SORTED=$(printf "%%s\n" "${ROLE_SCOPES[@]}" | sort)
 declare -a CHANNEL_SCOPES_IDS=()
 for CHANNEL_NAME in "${CHANNEL_SCOPES[@]}"; do
   CHANNEL_ID=$(echo "${VARIABLES}" | jq -r --arg name "${CHANNEL_NAME}" '.ScopeValues.Channels[] | select(.Name == $name) | .Id')
-  CHANNEL_SCOPES_IDS+=("CHANNEL_ID")
+  CHANNEL_SCOPES_IDS+=("${CHANNEL_ID}")
 done
 CHANNEL_SCOPES_IDS_SORTED=$(printf "%%s\n" "${CHANNEL_SCOPES_IDS[@]}" | sort)
 
@@ -1090,7 +1090,7 @@ func (c *VariableSetConverter) processImportScript(resourceName string, parentId
 		return lookupErrors
 	}
 
-	scopedChannelNames, lookupErrors := c.Client.GetResourceNamesByIds("Channel", v.Scope.Channel)
+	scopedChannelNames, lookupErrors := c.Client.GetResourceNamesByIds("Channels", v.Scope.Channel)
 
 	if lookupErrors != nil {
 		return lookupErrors