From f83f669b5344cbac89aff5ec08ac105f2dff8aea Mon Sep 17 00:00:00 2001
From: ermisw <ermis.wieger@gmail.com>
Date: Wed, 4 Oct 2023 09:58:17 +0200
Subject: [PATCH] added auto-aprove seeting to terraform apply

---
 Jenkinsfile   | 6 +++++-
 easytravel.tf | 2 +-
 terraform.tf  | 6 +++---
 variables.tf  | 9 +++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bacfce2..35eabfd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,6 +2,10 @@ pipeline {
     agent {
         label 'terraform-slave'
     }
+
+     parameters {
+        string(name: 'DEMO NAME', defaultValue: 'demo', description: 'Enter the name of the demo')
+    }
     // environment {
     //     //KUBECONFIG = credentials('kubernetes-config')
     // }
@@ -31,7 +35,7 @@ pipeline {
                      secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
                         sh 'terraform version'
                         sh 'terraform init'
-                        sh 'terraform apply -auto-approve' 
+                        //sh 'terraform apply -auto-approve' 
                  }
                  
                }
diff --git a/easytravel.tf b/easytravel.tf
index 657cc63..1cb877b 100644
--- a/easytravel.tf
+++ b/easytravel.tf
@@ -2,7 +2,7 @@ resource "helm_release" "easytravel" {
   name       = "easytravel"
   repository = "https://gitea.nttdata-xlabs.com/api/packages/wiegee/helm"
   chart      = "easytravel"
-  namespace  = "demo"
+  namespace  = var.DEMO_NAME
   timeout    = 500
 
   
diff --git a/terraform.tf b/terraform.tf
index 103d254..a6e8e22 100644
--- a/terraform.tf
+++ b/terraform.tf
@@ -2,18 +2,18 @@
 # SPDX-License-Identifier: MPL-2.0
 
 data "aws_eks_cluster" "xOps" {
-  name = "xOps"
+  name = var.CLUSTER_NAME
 }
 
 data "aws_eks_cluster_auth" "example" {
-  name = "xOps"
+  name = var.CLUSTER_NAME
 }
 
 terraform {
 
   backend "s3" {
     bucket = "terraform-xops-demos"
-    key = "demo"
+    key = var.DEMO_NAME
     region = "us-west-2"
     dynamodb_table = "terraform-xops-lock-state"
     encrypt = true
diff --git a/variables.tf b/variables.tf
index e69de29..25fe710 100644
--- a/variables.tf
+++ b/variables.tf
@@ -0,0 +1,9 @@
+variable "DEMO_NAME" {
+  type        = string
+  description = ""
+}
+
+variable "CLUSTER_NAME" {
+  type        = string
+  description = ""
+}
\ No newline at end of file