diff --git a/.gitignore b/.gitignore index d49a7b0af2a01afa426fea8e136d1fd4d5ff9c95..326ce0dc6695d6257bbd0a0044101b8ab6dbf0ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ terraform/.terraform.lock.hcl terraform/.terraform.tfstate.lock.info terraform/terraform.tfstate* +terraform/variables-local.tfvars +terraform/vvariables-local.tf terraform/.terraform/* terraform/tfplan .idea - - +terraform/variables-local.tfvars diff --git a/terraform/variables-gitlab.tf b/terraform/variables-gitlab.tf deleted file mode 100644 index 5648602b9abf3899469de3818f4b354e31a3c51f..0000000000000000000000000000000000000000 --- a/terraform/variables-gitlab.tf +++ /dev/null @@ -1,41 +0,0 @@ -### Gitlab CI variables - -variable "SCW_PROJECT_ID" { - type = string - sensitive = true - description = "Project ID from a scaleway project" -} - -variable "SCW_ACCESS_KEY" { - type = string - sensitive = true - description = "Scaleway access key" -} - -variable "SCW_SECRET_KEY" { - type = string - sensitive = true - description = "Scaleway secret key" -} - -variable "SCW_SSH_PUB_KEY" { - type = string - sensitive = true - description = "SSH public key from Gitlab agent installed on scaleway" -} - -variable "SCW_SSH_PRIVATE_KEY" { - type = string - sensitive = true - description = "SSH private key from Gitlab agent for remote-exec" -} - -variable "INSTANCES_COUNT" { - type = number - description = "Number of instances to create" -} - -variable "ENVIRONMENT" { - type = string - description = "The type of lab to create, ex: devrust, pentest..." -} diff --git a/terraform/variables-local.tf b/terraform/variables-local.tf deleted file mode 100644 index f322a9e71df20fe0364a1ec7002ea3ee46bf2414..0000000000000000000000000000000000000000 --- a/terraform/variables-local.tf +++ /dev/null @@ -1,19 +0,0 @@ -## Terraform local execution - -variable "FORGE_PROJECT_ID" { - type = string - description = "Forge Project ID" - sensitive = true -} - -variable "FORGE_USERNAME" { - type = string - description = "Forge Username" - sensitive = true -} - -variable "FORGE_ACCESS_TOKEN" { - type = string - description = "Forge Access Token" - sensitive = true -} diff --git a/terraform/variables-local.tfvars b/terraform/variables-local.tfvars deleted file mode 100644 index 7a522bc05f3a1c4452e09d241fad2792c85071a9..0000000000000000000000000000000000000000 --- a/terraform/variables-local.tfvars +++ /dev/null @@ -1,14 +0,0 @@ -### SCW variables - -SCW_PROJECT_ID = "" -SCW_ACCESS_KEY = "" -SCW_SECRET_KEY = "" -SCW_SSH_PUB_KEY = "" -SCW_SSH_PRIVATE_KEY = "" -INSTANCES_COUNT = "" -ENVIRONMENT = "" - -### FORGE variables -FORGE_PROJECT_ID = "" -FORGE_USERNAME="[\"\"]" -FORGE_ACCESS_TOKEN = "" \ No newline at end of file