Skip to content

Commit 75d8663

Browse files
mbpolanmbpolan
authored
Merge pull request #74 from erikpaasonen/feat/assume-role-block-s3-backend
2 parents 2a60147 + 01e179c commit 75d8663

File tree

22 files changed

+190
-147
lines changed

22 files changed

+190
-147
lines changed

‎examples/kitchen-sink/tracks/_pretrack/step1_pagerduty/backend.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform {
22
backend "local" {
3-
path = "pretrack/${var.runiac_step}/terraform.tfstate"
3+
path = "pretrack/${var.runiac_step}/terraform.tfstate"
44
workspace_dir = "/runiac/tfstate"
55
}
66
}

‎examples/kitchen-sink/tracks/_pretrack/step1_pagerduty/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// deploy a PagerDuty team
22
resource "pagerduty_team" "example" {
33
name = "Engineering"
4-
description = "All engineering"
4+
description = "All engineering"
55
}
66

77
// deploy a user account into PagerDuty

‎examples/kitchen-sink/tracks/_pretrack/step1_pagerduty/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
output "pagerduty_policy_id" {
2-
value = pagerduty_escalation_policy.example.id
2+
value = pagerduty_escalation_policy.example.id
33
}

‎examples/kitchen-sink/tracks/_pretrack/step1_pagerduty/variables.tf

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
variable pagerduty_token {
2-
type = string
1+
variable "pagerduty_token" {
2+
type = string
33
}
44

5-
variable runiac_account_id {
6-
type = string
5+
variable "runiac_account_id" {
6+
type = string
77
}
88

9-
variable runiac_region {
10-
type = string
9+
variable "runiac_region" {
10+
type = string
1111
}
1212

13-
variable runiac_environment {
14-
type = string
13+
variable "runiac_environment" {
14+
type = string
1515
}
1616

17-
variable resource_group {
18-
type = string
19-
default = "rg-runiac-sample"
17+
variable "resource_group" {
18+
type = string
19+
default = "rg-runiac-sample"
2020
}
2121

22-
variable runiac_step {
23-
type = string
22+
variable "runiac_step" {
23+
type = string
2424
}

‎examples/kitchen-sink/tracks/azure/step1_infra/backend.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform {
22
backend "local" {
3-
path = "azure/${var.runiac_step}/terraform.tfstate"
3+
path = "azure/${var.runiac_step}/terraform.tfstate"
44
workspace_dir = "/runiac/tfstate"
55
}
66
}

‎examples/kitchen-sink/tracks/azure/step1_infra/regional/backend.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform {
22
backend "local" {
3-
path = "azure/${var.runiac_step}/terraform.tfstate"
3+
path = "azure/${var.runiac_step}/terraform.tfstate"
44
workspace_dir = "/runiac/tfstate"
55
}
66
}

‎examples/kitchen-sink/tracks/azure/step1_infra/regional/providers.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ terraform {
1414
source = "hashicorp/azurerm"
1515
version = "~> 2.28.0"
1616
}
17-
17+
1818
pagerduty = {
1919
source = "PagerDuty/pagerduty"
2020
version = "~> 1.8.0"

‎examples/kitchen-sink/tracks/azure/step1_infra/regional/variables.tf

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
locals {
2-
docker_image = "heroku/nodejs-hello-world:latest"
2+
docker_image = "heroku/nodejs-hello-world:latest"
33
}
44

5-
variable pagerduty_token {
6-
type = string
5+
variable "pagerduty_token" {
6+
type = string
77
}
88

9-
variable pretrack-pagerduty-pagerduty_policy_id {
10-
type = string
9+
variable "pretrack-pagerduty-pagerduty_policy_id" {
10+
type = string
1111
}
1212

13-
variable runiac_account_id {
14-
type = string
13+
variable "runiac_account_id" {
14+
type = string
1515
}
1616

17-
variable runiac_region {
18-
type = string
17+
variable "runiac_region" {
18+
type = string
1919
}
2020

21-
variable runiac_environment {
22-
type = string
21+
variable "runiac_environment" {
22+
type = string
2323
}
2424

25-
variable resource_group {
26-
type = string
27-
default = "rg-runiac-sample"
25+
variable "resource_group" {
26+
type = string
27+
default = "rg-runiac-sample"
2828
}
2929

30-
variable runiac_step {
31-
type = string
30+
variable "runiac_step" {
31+
type = string
3232
}
3333

3434
variable "runiac_primary_region" {
35-
type = string
35+
type = string
3636
}

‎examples/kitchen-sink/tracks/azure/step1_infra/variables.tf

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
locals {
2-
docker_image = "heroku/nodejs-hello-world"
2+
docker_image = "heroku/nodejs-hello-world"
33
}
44

5-
variable runiac_account_id {
6-
type = string
5+
variable "runiac_account_id" {
6+
type = string
77
}
88

9-
variable runiac_region {
10-
type = string
9+
variable "runiac_region" {
10+
type = string
1111
}
1212

13-
variable runiac_environment {
14-
type = string
13+
variable "runiac_environment" {
14+
type = string
1515
}
1616

17-
variable resource_group {
18-
type = string
19-
default = "rg-runiac-sample"
17+
variable "resource_group" {
18+
type = string
19+
default = "rg-runiac-sample"
2020
}
2121

22-
variable runiac_step {
23-
type = string
22+
variable "runiac_step" {
23+
type = string
2424
}

‎examples/kitchen-sink/tracks/gcp/step1_infra/backend.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform {
22
backend "local" {
3-
path = "gcp/${var.runiac_step}/terraform.tfstate"
3+
path = "gcp/${var.runiac_step}/terraform.tfstate"
44
workspace_dir = "/runiac/tfstate"
55
}
66
}

‎examples/kitchen-sink/tracks/gcp/step1_infra/providers.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Configure the Azure Provider
22
provider "google" {
3-
project = var.gcp_project_id
4-
region = var.runiac_region
3+
project = var.gcp_project_id
4+
region = var.runiac_region
55
}
66

77
provider "pagerduty" {
@@ -14,7 +14,7 @@ terraform {
1414
source = "hashicorp/google"
1515
version = "~> 3.51.0"
1616
}
17-
17+
1818
pagerduty = {
1919
source = "PagerDuty/pagerduty"
2020
version = "~> 1.8.0"

‎examples/kitchen-sink/tracks/gcp/step1_infra/variables.tf

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
locals {
2-
docker_image = "gcr.io/cloudrun/hello"
2+
docker_image = "gcr.io/cloudrun/hello"
33

4-
region = lookup({
5-
"centralus": "us-central1"
6-
}, var.runiac_region, "centralus")
4+
region = lookup({
5+
"centralus" : "us-central1"
6+
}, var.runiac_region, "centralus")
77
}
88

9-
variable pagerduty_token {
10-
type = string
9+
variable "pagerduty_token" {
10+
type = string
1111
}
1212

13-
variable pretrack-pagerduty-pagerduty_policy_id {
14-
type = string
13+
variable "pretrack-pagerduty-pagerduty_policy_id" {
14+
type = string
1515
}
1616

17-
variable gcp_project_id {
18-
type = string
17+
variable "gcp_project_id" {
18+
type = string
1919
}
2020

21-
variable runiac_account_id {
22-
type = string
21+
variable "runiac_account_id" {
22+
type = string
2323
}
2424

25-
variable runiac_region {
26-
type = string
25+
variable "runiac_region" {
26+
type = string
2727
}
2828

29-
variable runiac_environment {
30-
type = string
29+
variable "runiac_environment" {
30+
type = string
3131
}
3232

33-
variable resource_group {
34-
type = string
35-
default = "rg-runiac-sample"
33+
variable "resource_group" {
34+
type = string
35+
default = "rg-runiac-sample"
3636
}
3737

38-
variable runiac_step {
39-
type = string
38+
variable "runiac_step" {
39+
type = string
4040
}

‎examples/terraform-azure-hello-world-multi-region/step1_default/backend.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform {
22
backend "local" {
3-
path = "${var.runiac_step}.terraform.tfstate"
3+
path = "${var.runiac_step}.terraform.tfstate"
44
workspace_dir = "/runiac/tfstate"
55
}
66
}

‎examples/terraform-azure-hello-world-multi-region/step1_default/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resource azurerm_resource_group hub {
1+
resource "azurerm_resource_group" "hub" {
22
name = "${local.namespace-}rg-runiac-hub-${var.runiac_region}"
33
location = var.runiac_region
44
}

‎examples/terraform-azure-hello-world-multi-region/step1_default/regional/backend.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform {
22
backend "local" {
3-
path = "azure/${var.runiac_step}/terraform.tfstate"
3+
path = "azure/${var.runiac_step}/terraform.tfstate"
44
workspace_dir = "/runiac/tfstate"
55
}
66
}

‎examples/terraform-azure-hello-world-multi-region/step1_default/regional/variables.tf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
locals {
2-
namespace- = var.runiac_namespace == "" ? "" : "${var.runiac_namespace}-"
2+
namespace- = var.runiac_namespace == "" ? "" : "${var.runiac_namespace}-"
33
}
44

55
variable "runiac_account_id" {
6-
type = string
6+
type = string
77
}
88

99
variable "runiac_region" {
10-
type = string
10+
type = string
1111
}
1212

1313
variable "runiac_environment" {
14-
type = string
14+
type = string
1515
}
1616

1717
variable "runiac_namespace" {
18-
type = string
18+
type = string
1919
}
2020

2121
variable "runiac_step" {
22-
type = string
22+
type = string
2323
}
2424

2525
variable "runiac_primary_region" {
26-
type = string
26+
type = string
2727
}

‎examples/terraform-azure-hello-world-multi-region/step1_default/variables.tf

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,23 @@
11
locals {
2-
namespace- = var.runiac_namespace == "" ? "" : "${var.runiac_namespace}-"
2+
namespace- = var.runiac_namespace == "" ? "" : "${var.runiac_namespace}-"
33
}
44

5-
variable runiac_account_id {
6-
type = string
5+
variable "runiac_account_id" {
6+
type = string
77
}
88

9-
variable runiac_region {
10-
type = string
9+
variable "runiac_region" {
10+
type = string
1111
}
1212

13-
variable runiac_environment {
14-
type = string
13+
variable "runiac_environment" {
14+
type = string
1515
}
1616

17-
variable runiac_namespace {
18-
type = string
17+
variable "runiac_namespace" {
18+
type = string
1919
}
2020

21-
variable runiac_step {
22-
type = string
21+
variable "runiac_step" {
22+
type = string
2323
}
24-
25-
variable runiac_step {
26-
type = string
27-
}
28-

0 commit comments

Comments
 (0)