updated jenkins file

Author: easyawslearn

aws-instance-first-script/Jenkinsfile

@@ -1,32 +1,65 @@
- pipeline {
+
+pipeline {
+
  parameters {
-  string(defaultValue: 'vijaysnode', description: 'select node', name: 'node')
- }
+ string(name: 'environment', defaultValue: 'terraform', description: 'Workspace/environment file to use for deployment')
+  booleanParam(name: 'autoApprove', defaultValue: false, description: 'Automatically run apply after generating plan?')
 
- agent {
- node {
- label params.node
-  }
- }
-  stages{
-  stage('terraform-Demo') {
- steps {
-  script {
-  dir("ta-setup")
-  {
-  git branch: 'tf-jenkins', url: 'https://github.com/easyawslearn/Terraform-Tutorial.git'
-  sh 'cd EC2withJenkins '
-  sh 'terraform init -upgrade=true -get=true -input=false -force-copy'
-  sh 'terraform workspace new "terraform-demo"'
-  sh 'echo "INFO: New terraform-demo workspace added."'
-  sh 'terraform workspace select terraform-demo'
- sh 'echo "INFO: Terraform -> Planning..."'
- sh 'terraform plan -out plan_terraform -lock=true'
- sh 'echo "INFO: Terraform -> Executing..."'
- sh 'terraform apply plan_plan_terraform'
+ }
+
+
+ environment {
+  AWS_ACCESS_KEY_ID = credentials('AWS_ACCESS_KEY_ID')
+ AWS_SECRET_ACCESS_KEY = credentials('AWS_SECRET_ACCESS_KEY')
+ }
+
+ agent any
+ options {
+ timestamps ()
+ ansiColor('xterm')
+ }
+ stages {
+ stage('checkout') {
+ steps {
+ script{
+  dir("terraform")
+  {
+  git "https://github.com/easyawslearn/Terraform-Tutorial.git"
+  }
  }
- }
  }
- }
- }
+ }
+
+ stage('Plan') {
+ steps {
+ sh 'pwd;ls ; terraform init -input=false'
+ // sh 'terraform workspace new ${environment}'
+ sh 'terraform workspace select ${environment};pwd;ls'
+ sh "pwd;cd terraform/aws-instance-first-script ;terraform plan -input=false -out tfplan ;pwd;ls"
+ sh 'pwd;cd terraform/aws-instance-first-script ;terraform show -no-color tfplan > tfplan.txt'
+ }
+ }
+ stage('Approval') {
+ when {
+ not {
+ equals expected: true, actual: params.autoApprove
+ }
+ }
+
+ steps {
+ script {
+ def plan = readFile 'tfplan.txt'
+ input message: "Do you want to apply the plan?",
+ parameters: [text(name: 'Plan', description: 'Please review the plan', defaultValue: plan)]
+ }
+ }
  }
+
+ stage('Apply') {
+ steps {
+ sh "pwd;cd terraform/aws-instance-first-script ; terraform apply -input=false tfplan"
+ }
+ }
+ }
+
+ }

terraform-aws-elb-alb/elb.tf

@@ -15,6 +15,18 @@ resource "aws_lb" "elb_example" {
  }
 }
 
+resource "aws_lb_listener" "front_end" {
+ load_balancer_arn = aws_lb.elb_example.arn
+ port = "80"
+ protocol = "HTTP"
+
+ default_action {
+ type = "forward"
+ target_group_arn = aws_lb_target_group.test.arn
+
+ }
+}
+
 resource "aws_lb_target_group" "test" {
  name = "tf-example-lb-tg"
  port = 80
@@ -34,17 +46,6 @@ resource "aws_lb_target_group_attachment" "test1" {
  port = 80
 }
 
-resource "aws_lb_listener" "front_end" {
- load_balancer_arn = aws_lb.elb_example.arn
- port = "80"
- protocol = "HTTP"
-
- default_action {
- type = "forward"
- target_group_arn = aws_lb_target_group.test.arn
-
- }
-}
 
 output "elb_example" {
  description = "The DNS name of the ELB"