Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade tf versions to 1.9.8 to many workspaces #140

Merged
merged 10 commits into from
Oct 18, 2024
11 changes: 6 additions & 5 deletions flexible-workspaces.tf
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand Down
25 changes: 4 additions & 21 deletions management-settings.tf
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
##test123
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"
}
}
}

locals {
##this can be changed to switch between A/B github connection.
tfc_oauth_token = tfe_oauth_client.github-b.oauth_token_id
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}


Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion vcs-connected-workspaces/workspace-hcp-boundary.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion vcs-connected-workspaces/workspace-hcp-vault.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 16 additions & 0 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -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"
}
}
}