tidy up

flexible-workspaces.tf

@@ -1,8 +1,9 @@
+# this file contains workspaces that were imported before this tfc-config-as-code repo has been created. 
 resource "tfe_workspace" "aws-lambda-example" {
   description           = "Demo workspace for deploying lambda functions."
   allow_destroy_plan    = true
   auto_apply            = true
-  execution_mode        = "remote"
+  # execution_mode        = "remote"
   file_triggers_enabled = false
   global_remote_state   = false
 
@@ -35,7 +36,7 @@ resource "tfe_workspace" "multi-env-provisioning-example-0-test" {
   description                   = "A demo showing how to manage multiple enviroments using one set of terraform code."
   allow_destroy_plan            = true
   auto_apply                    = true
-  execution_mode                = "remote"
+  # execution_mode                = "remote"
   file_triggers_enabled         = false
   global_remote_state           = false
   name                          = "multi-env-provisioning-example-0-test"
@@ -67,7 +68,7 @@ resource "tfe_workspace" "multi-env-provisioning-example-1-staging" {
   description           = "A demo showing how to manage multiple enviroments using one set of terraform code."
   allow_destroy_plan    = true
   auto_apply            = true
-  execution_mode        = "remote"
+  # execution_mode        = "remote"
   file_triggers_enabled = false
   global_remote_state   = false
 
@@ -101,7 +102,7 @@ resource "tfe_workspace" "multi-env-provisioning-example-2-prod" {
   description           = "A demo showing how to manage multiple enviroments using one set of terraform code."
   allow_destroy_plan    = true
   auto_apply            = true
-  execution_mode        = "remote"
+  # execution_mode        = "remote"
   file_triggers_enabled = false
   global_remote_state   = false
 
@@ -134,7 +135,7 @@ resource "tfe_workspace" "terraform-aws-vault-demo" {
   description                   = "A workspace that standup a demo vault instance."
   allow_destroy_plan            = true
   auto_apply                    = true
-  execution_mode                = "remote"
+  # execution_mode                = "remote"
   file_triggers_enabled         = false
   global_remote_state           = false
   name                          = "terraform-aws-vault-demo"
@@ -193,7 +194,7 @@ resource "tfe_workspace" "aws-s3-demo" {
   description                   = "A simple demo to show how sentinel policy as code engine can make sure s3 are provisioned securely."
   allow_destroy_plan            = true
   auto_apply                    = true
-  execution_mode                = "remote"
+  # execution_mode                = "remote"
   file_triggers_enabled         = false
   global_remote_state           = false
   name                          = "aws-s3-demo"
@@ -224,7 +225,7 @@ resource "tfe_workspace" "gcp-playground" {
   description                   = "A simple demo of deploying gcp resources."
   allow_destroy_plan            = true
   auto_apply                    = true
-  execution_mode                = "remote"
+  # execution_mode                = "remote"
   file_triggers_enabled         = false
   global_remote_state           = false
   name                          = "gcp-playground"
@@ -255,7 +256,7 @@ resource "tfe_workspace" "aws-shared-infra" {
 
   allow_destroy_plan        = true
   auto_apply                = true
-  execution_mode            = "remote"
+  # execution_mode            = "remote"
   file_triggers_enabled     = false
   global_remote_state       = false
   remote_state_consumer_ids = values(data.tfe_workspace_ids.awsconsumer-apps.ids)
@@ -290,7 +291,7 @@ resource "tfe_workspace" "azure-shared-infra" {
   description                   = "Core azure infra"
   allow_destroy_plan            = true
   auto_apply                    = true
-  execution_mode                = "remote"
+  # execution_mode                = "remote"
   file_triggers_enabled         = false
   global_remote_state           = true
   name                          = "azure-shared-infra"
@@ -313,7 +314,7 @@ resource "tfe_workspace" "vault-config-as-code-aws" {
   description           = "A workspace that's used to manage my own Vault's configuration as code."
   allow_destroy_plan    = true
   auto_apply            = true
-  execution_mode        = "remote"
+  # execution_mode        = "remote"
   file_triggers_enabled = false
   global_remote_state   = false
 
@@ -340,8 +341,8 @@ resource "tfe_workspace" "vault-config-as-code-local" {
   description           = "A workspace that's used to manage my own Vault's configuration as code."
   allow_destroy_plan    = true
   auto_apply            = true
-  execution_mode        = "agent"
-  agent_pool_id         = tfe_agent_pool.local-agent-pool.id
+  # execution_mode        = "agent"
+  # agent_pool_id         = tfe_agent_pool.local-agent-pool.id
   file_triggers_enabled = false
   global_remote_state   = false
 
@@ -368,7 +369,7 @@ resource "tfe_workspace" "vault-config-as-code-hcp" {
   description           = "A workspace that's used to manage my own Vault's configuration as code."
   allow_destroy_plan    = true
   auto_apply            = true
-  execution_mode        = "remote"
+  # execution_mode        = "remote"
   file_triggers_enabled = false
   global_remote_state   = false
 

management-settings.tf

@@ -1,20 +1,3 @@
-##test123
-terraform {
-  required_version = ">= 1.0"
-  required_providers {
-    tfe   = "= 0.58.1"
-    vault = "= 4.4.0"
-    github = {
-      source  = "integrations/github"
-      version = "= 4.31.0"
-    }
-    auth0 = {
-      source  = "auth0/auth0"
-      version = "~> 0.35.0"
-    }
-  }
-}
-
 locals {
   ##this can be changed to switch between A/B github connection.
   tfc_oauth_token = tfe_oauth_client.github-b.oauth_token_id
@@ -58,7 +41,7 @@ resource "tfe_workspace" "tfc-config-as-code" {
   description           = "Workspace for managing my own TFC orgnisation's configuration as code, using terraform."
   allow_destroy_plan    = true
   auto_apply            = true
-  execution_mode        = "remote"
+  # execution_mode        = "remote"
   file_triggers_enabled = true
   global_remote_state   = false
   project_id            = tfe_project.projects["Management"].id
@@ -116,7 +99,7 @@ resource "tfe_workspace" "tfc-credential-injector" {
   allow_destroy_plan            = true
   auto_apply                    = true
   description                   = "A workspace that will inject aws and azure credentials to other workspaces automaticly."
-  execution_mode                = "remote"
+  # execution_mode                = "remote"
   file_triggers_enabled         = false
   global_remote_state           = false
   project_id                    = tfe_project.projects["Management"].id
@@ -140,7 +123,7 @@ resource "tfe_workspace" "tfc-notification-configurator" {
   allow_destroy_plan            = true
   auto_apply                    = true
   description                   = "A workspace that will configure TFC/E notifications based on tag automaticly."
-  execution_mode                = "remote"
+  # execution_mode                = "remote"
   file_triggers_enabled         = false
   global_remote_state           = false
   project_id                    = tfe_project.projects["Management"].id
@@ -164,7 +147,7 @@ resource "tfe_workspace" "tfc-policyset-attacher" {
   allow_destroy_plan            = true
   auto_apply                    = true
   description                   = "A workspace that will configure TFC/E notifications based on tag automaticly."
-  execution_mode                = "remote"
+
   file_triggers_enabled         = false
   global_remote_state           = false
   project_id                    = tfe_project.projects["Management"].id

non-vcs-workspaces.tf

@@ -9,7 +9,7 @@ locals {
 
 module "non-vcs-connected-workspace" {
   source   = "ausmartway/non-vcs-connected-workspace/tfe"
-  version  = "0.0.1"
+  version  = "0.1.0"
   for_each = local.inputworkspacemap
   # insert the 4 required variables here
   organization          = var.organization

variables.tf

@@ -5,7 +5,7 @@ variable "tf_latest" {
     condition     = substr(var.tf_latest, 0, 2) == "1."
     error_message = "The terraform cli version must match 1.*."
   }
-  default = "1.9.6"
+  default = "1.9.8"
 }
 
 
@@ -16,7 +16,7 @@ variable "v1latest" {
     condition     = substr(var.v1latest, 0, 2) == "1."
     error_message = "The terraform cli version must match 1.*."
   }
-  default = "1.9.6"
+  default = "1.9.8"
 }
 variable "v015latest" {
   type        = string

vcs-connected-workspaces.tf

@@ -9,7 +9,7 @@ locals {
 
 module "vcs-connected-workspace" {
   source  = "ausmartway/vcs-connected-workspace/tfe"
-  version = "0.0.4"
+  version = "0.1.0"
   # insert the 5 required variables here 
   for_each              = local.inputvcsworkspacemap
   organization          = var.organization

vcs-connected-workspaces/workspace-hcp-boundary-config.yaml

@@ -1,5 +1,5 @@
 name: hcp-boundary-config-as-code
-version: 1.4.6
+version: 1.9.8
 vcsbranch: 
 vcsworkingdirectory: 
 description: A workspace to manage my test boundary in hcp@ap-southeast-2 region

vcs-connected-workspaces/workspace-hcp-boundary.yaml

@@ -1,5 +1,5 @@
 name: hcp-boundary
-version: 1.6.3
+version: 1.9.8
 vcsbranch: 
 vcsworkingdirectory: 
 description: A workspace to manage my test boundary in hcp@ap-southeast-2 region

vcs-connected-workspaces/workspace-hcp-vault-management.yaml

@@ -1,5 +1,5 @@
 name: hcp-vault-management
-version: 1.4.6
+version: 1.9.8
 vcsbranch: 
 vcsworkingdirectory: 
 description: this is a workspace that manages my hcp-vault

vcs-connected-workspaces/workspace-hcp-vault.yaml

@@ -1,5 +1,5 @@
 name: hcp-vault-sydney
-version: 1.4.6
+version: 1.9.8
 vcsbranch: 
 vcsworkingdirectory: 
 description: A workspace to manage my test Vault in hcp@ap-southeast-2 region

vcs-connected-workspaces/workspace-tfc-workload-identity-demo.yaml

@@ -1,5 +1,5 @@
 name: tfc-workload-identity-demo
-version: 1.9.6
+version: 1.9.8
 vcsbranch: 
 vcsworkingdirectory: 
 description: A workspace to test/demo the workload identity feature in TFC

versions.tf

@@ -0,0 +1,16 @@
+##version constraints for tf and required providers
+terraform {
+  required_version = ">= 1.0"
+  required_providers {
+    tfe   = ">= 0.58.0"
+    vault = ">= 4.4.0"
+    github = {
+      source  = "integrations/github"
+      version = ">= 6.0"
+    }
+    auth0 = {
+      source  = "auth0/auth0"
+      version = ">= 0.35.0"
+    }
+  }
+}