Merge pull request #3 from pingidentity/PDI-2053a-level-set

Align pingidentity repository with development changes

Author: PingDavidR

README.md

@@ -12,14 +12,16 @@ usage ()
 {
 cat <<END_USAGE
 Usage: 
-  This script is used to run terraform apply for your local feature branch only. 
+  This script defaults to running \`terraform apply\` for your local feature branch only. 
   This script should be run from the root of the repository. 
-  Terraform Secrets (\`localsecrets\` file) should be sourced and exported in the evironment
+  Terraform secrets (\`localsecrets\` file) should be sourced and exported in the environment
 
 {options}
     where {options} include:
     -d, --destroy
       Run terraform destroy instead of apply
+    --dry-run
+      Show what Terraform will do without applying changes (terraform plan)
     -g, --generate
       Generate terraform resources from import blocks
 END_USAGE
@@ -37,6 +39,8 @@ while ! test -z ${1} ; do
   case "${1}" in
     -d|--destroy)
       _command="destroy" ;;
+    --dry-run)
+      _command="plan" ;;  # Switch to terraform plan for dry-run
     -g|--generate)
       _command="plan -generate-config-out=generated-platform.tf" ;;
     -v|--verbose)
@@ -79,11 +83,10 @@ terraform -chdir="${TFDIR}" init -migrate-state \
   -backend-config="region=${_region}" \
   -backend-config="key=${_key}"
 
-## terraform apply
+## run terraform with the required parameters
 
-echo "Running terraform apply for branch: ${_branch}, You will be prompted to enter the required variables."
+echo "Running terraform ${_command} for branch: ${_branch}, You will be prompted to enter the required variables."
 
 export TF_VAR_pingone_environment_name="${_branch}"
 
 terraform -chdir="${TFDIR}" ${_command}
-

img/githubissuerequest.png

@@ -0,0 +1,36 @@
+##########################################
+# The following fields are from the platform secrets
+# used to deploy the environments.  Specifically, from 
+# the PingOne Administrator Worker Application
+##########################################
+export TF_VAR_pingone_client_id=''
+export TF_VAR_pingone_client_secret=''
+export TF_VAR_pingone_client_environment_id=''
+# The following is one of: "AP | AU | CA | EU | NA"
+export TF_VAR_pingone_client_region_code=''
+
+##########################################
+# The following fields are the Davinci Admin
+# environment and credentials from platform secrets
+##########################################
+export TF_VAR_pingone_davinci_admin_username=''
+export TF_VAR_pingone_davinci_admin_password=''
+export TF_VAR_pingone_davinci_admin_environment_id=''
+# The following is one of: NorthAmerica | Canada | Asia | Europe
+export TF_VAR_pingone_davinci_admin_region=''
+export PINGONE_TARGET_ENVIRONMENT_ID_PROD=''
+export PINGONE_TARGET_ENVIRONMENT_ID_QA=''
+
+##########################################
+# S3 credentials and information for storing state
+##########################################
+# aws credentials and information for dev environment
+export AWS_ACCESS_KEY_ID=''
+export AWS_SECRET_ACCESS_KEY=''
+# bucket name for storing state - for example, 'ping-terraform-demo-mycompany'
+export TF_VAR_tf_state_bucket=''
+# region for storing state - for example, 'us-west-1'
+export TF_VAR_tf_state_region='us-west-1'
+# DO NOT EDIT, this will be suffixed with the branch name during script deployment
+# for example, 'application-state/dev/myfeature/terraform.tfstate'
+export TF_VAR_tf_state_key_prefix="application-state"

img/githubissuerequestapp.png

@@ -91,6 +91,7 @@ resource "docker_image" "registration" {
 resource "docker_container" "registration" {
   name  = "simple-registration"
   image = docker_image.registration.image_id
+  network_mode = "bridge"
   ports {
     internal = 8443
     external = 8443

scripts/local_feature_deploy.sh

@@ -3,11 +3,11 @@ terraform {
   required_providers {
     pingone = {
       source  = "pingidentity/pingone"
-      version = "~> 1.0.0"
+      version = ">= 1.1.1, < 2.0.0"
     }
     davinci = {
       source  = "pingidentity/davinci"
-      version = ">= 0.2.1, < 1.0.0"
+      version = "~> 0.4"
     }
     docker = {
       source  = "kreuzwerker/docker"
@@ -21,4 +21,3 @@ terraform {
   backend "s3" {
   }
 }
-