fix: referencing NR_LICENSE_KEY correctly

newrelic · Nov 13, 2020 · fb52d85 · fb52d85
1 parent b3ae2b6
commit fb52d85
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -14,6 +14,14 @@ Deliver a consistent user experience, open source ecosystem, and platform servic
 
 in 5 minutes or less.
 
+## Authoring a recipe
+
+### Common variables
+
+The [newrelic-cli] injects at runtime of a go-task the following variables:
+
+- `{{.NR_LICENSE_KEY}}` populated by the key associated with the profile run with the cli
+
 ## Testing
 
 The testing of recipes is automated, and those are tested on a freshly provisioned environment and re-provisioned on every test run.

diff --git a/examples/sample-linux-infrastructure.yaml b/examples/sample-linux-infrastructure.yaml
@@ -49,12 +49,6 @@ install:
 
   version: "3"
 
-  env:
-    NR_LICENSE_KEY: "{{.NR_LICENSE_KEY}}"
-
-  variables:
-    - FOO_VAR: foo-value
-
   tasks:
     install:
       cmds:

diff --git a/recipes/newrelic/infra-agent/ubuntu.yml b/recipes/newrelic/infra-agent/ubuntu.yml
@@ -43,12 +43,6 @@ install:
 
   version: "3"
 
-  env:
-    NR_LICENSE_KEY: "{{.NR_LICENSE_KEY}}"
-
-  variables:
-    - FOO_VAR: foo-value
-
   tasks:
     default:
       cmds:
@@ -57,7 +51,7 @@ install:
 
     setup_license:
       cmds:
-        - echo "license_key: $NR_LICENSE_KEY" | sudo tee -a /etc/newrelic-infra.yml
+        - 'echo "license_key: {{.NR_LICENSE_KEY}}" | sudo tee -a /etc/newrelic-infra.yml'
 
     install_infra:
       cmds:

diff --git a/recipes/newrelic/node-agent/node.yml b/recipes/newrelic/node-agent/node.yml
@@ -41,7 +41,6 @@ install:
   version: "3"
 
   env:
-    NR_LICENSE_KEY: "{{.NR_LICENSE_KEY}}"
     NEW_RELIC_DISTRIBUTED_TRACING_ENABLED: true
 
   tasks:
@@ -63,7 +62,7 @@ install:
             echo "Enter a name for your application and press [ENTER]:"
             read appname
             echo ""
-            if [ -z "$NR_LICENSE_KEY" ]; then
+            if [ -z "{{.NR_LICENSE_KEY}}" ]; then
               echo "Please provide a license key and press [ENTER]:"
               read NR_LICENSE_KEY
               echo ""
@@ -84,7 +83,7 @@ install:
               /**
                * Your New Relic license key.
                */
-              license_key: '$NR_LICENSE_KEY',
+              license_key: '{{.NR_LICENSE_KEY}}',
               /**
                * This setting controls distributed tracing.
                * Distributed tracing lets you see the path that a request takes through your