Skip to content

Added terraform import to wrapper (fixes #36) #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 2, 2019
Merged

Added terraform import to wrapper (fixes #36) #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5aa223
Added import to terraform wrapper, tweaked New Relic cfg
obscurerichard Aug 2, 2019
a096dcc
Fix terraform fmt
obscurerichard Aug 2, 2019
9cfd8fa
Switch 0xdeadbeef for 0x1337
obscurerichard Aug 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def wrap = { fn->
}
}

final Long XOR_CONST = 3735928559 // 0xdeadbeef
final Long XOR_CONST = 4919 // 0x1337 see https://en.wikipedia.org/wiki/Leet
(captcha_problem, captcha_hash) = get_captcha(XOR_CONST)

/** Gather properties from user parameters */
Expand Down
11 changes: 10 additions & 1 deletion bin/terraform.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ EOF
# http://redsymbol.net/articles/bash-exit-traps/
trap clean_root_owned_docker_files EXIT

function import() {
local -i retcode
#shellcheck disable=SC2086
$DOCKER_TERRAFORM import "$@"
}

function show() {
local -i retcode
#shellcheck disable=SC2086
Expand Down Expand Up @@ -173,8 +179,11 @@ show)
output)
Message="Executing terraform output."
;;
import)
Message="Executing terraform import."
;;
*)
echo 'Unrecognized verb "'"$verb"'" specified. Use plan, plan-destroy, apply, or show' 1>&2
echo 'Unrecognized verb "'"$verb"'" specified. Use apply, plan, plan-destroy, import, output or show' 1>&2
exit 1
;;
esac
Expand Down
3 changes: 2 additions & 1 deletion terraform/newrelic.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ provider "newrelic" {

# Create an alert policy
resource "newrelic_alert_policy" "alert" {
name = "Alert"
name = "Alert"
count = "${length(var.newrelic_apm_entities) > 0 ? (var.newrelic_alerts ? 1 : 0) : 0}"
}

# Add a condition
Expand Down