update scripts to use TFE_ORG env var

user does not need to open each script to set org name, can be done with env var while setting TFE_TOKEN env var.

Author: raygj

operations/automation-script/README.md

@@ -73,10 +73,10 @@ If you use this script with a Private Terraform Enterprise (PTFE) server that us
 Follow these instructions to run the script with with the included main.tf and variables.csv files or with your own git repository:
 
 1. If you are using a private Terraform Enterprise server, edit the script and set the address variable to the address of your server. Otherwise, you would leave the address set to "app.terraform.io" which is the address of the SaaS Terraform Enterprise server.
-1. Edit the script and set the organization variable to the name of your Terraform Enterprise organization.
 1. Generate a [team token](https://www.terraform.io/docs/enterprise/users-teams-organizations/service-accounts.html#team-service-accounts) for the owners team in your organization in the Terraform Enterprise UI by selecting your organization settings, then Teams, then owners, and then clicking the Generate button and saving the token that is displayed.
 1. `export TFE_TOKEN=<owners_token>` where \<owners_token\> is the token generated in the previous step.
-1. If you want, you can also change the name of the workspace that will be created by editing the workspace variable. Note that you can also pass the workspace as the second argument to the script.
+1. `export TFE_ORG=<your_organization>` where \<your_organization\> is the name of your target TFE organization.
+1. If you want, edit _loadAndRunWorkspace.sh_ to change the name of the workspace that will be created by editing the workspace variable. *Note* that you can also pass the workspace as the second argument to the script.
 1. If you want, you can change the sleep_duration variable which controls how often the script checks the status of the triggered run (in seconds). Setting a longer value would make sense if using Terraform code that takes longer to apply.
 1. If you are providing a URL to clone a git repository, you can add Terraform and environment variables needed by your Terraform code to [variables.csv](./variables.csv) and remove the "name" variable. You can also add the edited variables.csv file to your repository.
 1. If you want to use the sample main.tf or other code you place in the config directory, run  `./loadAndRunWorkspace.sh` or `./loadAndRunWorkspace.sh "" "" <override>` where \<override\> is "yes" or "no". (The empty quotes are needed in the second case so that override is the third variable.) If you do not specify a value for \<override\>, the script will set it to "no".

operations/automation-script/apply.json

@@ -1,14 +1,15 @@
 #!/bin/bash
 # Script to delete the workspace created by the loadAndRunWorkspace.sh script
 
-# Make sure TFE_TOKEN environment variable is set
-# to owners team token for organization
+# Make sure TFE_TOKEN and TFE_ORG environment variables are set
+# to owners team token and organization name for the respective
+# TFE environment.
 
 # Set address if using private Terraform Enterprise server.
 # Set organization and workspace to create.
 # You should edit these before running.
 address="app.terraform.io"
-organization="<your_organization>"
+organization="$TFE_ORG"
 workspace="workspace-from-api"
 
 # Set workspace if provided as the second argument

operations/automation-script/deleteWorkspace.sh

@@ -8,14 +8,16 @@
 # If an apply is done, the script waits for it to finish and then
 # downloads the apply log and the before and after state files.
 
-# Make sure TFE_TOKEN environment variable is set
-# to owners team token for organization
+# Make sure TFE_TOKEN and TFE_ORG environment variables are set
+# to owners team token and organization name for the respective
+# TFE environment.
 
 # Set address if using private Terraform Enterprise server.
 # Set organization and workspace to create.
 # You should edit these before running.
+
 address="app.terraform.io"
-organization="<your_organization>"
+organization="$TFE_ORG"
 # workspace name should not have spaces
 workspace="workspace-from-api"
 

operations/automation-script/loadAndRunWorkspace.sh

@@ -3,6 +3,8 @@ These are scripts that can be used to export and import Sentinel policies betwee
 
 Before using these scripts, you need to export a valid TFE API token with the command `export TFE_TOKEN=<owners_token>` where \<owners_token\> is a team token for the owners team in your organization.
 
+Before running these scripts, you must export or set the TFE ORG environment variable with the command `export TFE_ORG=<your_organization>` where \<your_organization\> is the target name of the organization containing the Sentinel policies you want to manage.
+
 ## Exporting Policies
 The export_policies.sh script exports all the policies from a TFE organization to the directory in which you run the script. It currently is limited to exporting 150 policies since it does not handle multiple pages from the List Policies API that retrieves them.
 

operations/sentinel-policies-scripts/README.md

@@ -2,15 +2,15 @@
 # This script deletes all policies from the specified organization
 # of the specified TFE server 
 
-# Make sure TFE_TOKEN environment variable is set
-# to owners team token for organization
-# or to user token for member of the owners team
+# Make sure TFE_TOKEN and TFE_ORG environment variables are set
+# to owners team token and organization name for the respective
+# TFE environment.
 
 # Set address if using private Terraform Enterprise server.
 # You should edit these before running.
 address="app.terraform.io"
 # Set organization to use
-organization="<organization>"
+organization="$TFE_ORG"
 
 echo "Using address: $address"
 echo "Using organization: $organization"

operations/sentinel-policies-scripts/delete_policies.sh

@@ -2,15 +2,15 @@
 # This script exports all policies from the specified organization
 # of the specified TFE server to the current directory
 
-# Make sure TFE_TOKEN environment variable is set
-# to owners team token for organization
-# or to user token for member of the owners team
+# Make sure TFE_TOKEN and TFE_ORG environment variables are set
+# to owners team token and organization name for the respective
+# TFE environment.
 
 # Set address if using private Terraform Enterprise server.
 # You should edit these before running.
 address="app.terraform.io"
 # Set organization to use
-organization="<organization>"
+organization="$TFE_ORG"
 
 echo "Using address: $address"
 echo "Using organization: $organization"

operations/sentinel-policies-scripts/export_policies.sh

@@ -2,15 +2,15 @@
 # This script imports all policies in the current directory into a
 # specific policy set within a specific organization on a TFE server.
 
-# Make sure TFE_TOKEN environment variable is set
-# to owners team token for organization
-# or to user token for member of the owners team
+# Make sure TFE_TOKEN and TFE_ORG environment variables are set
+# to owners team token and organization name for the respective
+# TFE environment.
 
 # Set address if using private Terraform Enterprise server.
 # You should edit these before running.
 address="app.terraform.io"
 # Set organization to use
-organization="<organization>"
+organization="$TFE_ORG"
 # Set ID of policy set that all policies should be added to
 policy_set_id="<policy_set_id>"
 

operations/sentinel-policies-scripts/import_policies.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 # Script that deletes all Terraform and environment variables in a Terraform Enterprise (TFE) workspace
 
+# Make sure TFE_TOKEN and TFE_ORG environment variables are set
+# to owners team token and organization name for the respective
+# TFE environment. TFE_TOKEN environment variable is set
+# to a user or team token that has the write or admin permission
+# for the workspace.
+
 # Exit if any errors encountered
 set -e
 

operations/variable-scripts/delete-variables.sh

@@ -7,9 +7,13 @@
 # Exit if any errors encountered
 set -e
 
-# Make sure the $TFE_TOKEN environment variable is set
+# Make sure TFE_TOKEN and TFE_ORG environment variables are set
+# to owners team token and organization name for the respective
+# TFE environment. TFE_TOKEN environment variable is set
 # to a user or team token that has the write or admin permission
 # for the workspace.
+
+
 if [ ! -z "$TFE_TOKEN" ]; then
   token=$TFE_TOKEN
   echo "TFE_TOKEN environment variable was found."