Skip to content

Commit 5d0e7a1

Browse files
authored
Merge pull request #17 from OctopusSamples/update-standards-terraform
Fixing terraform to conform to latest version standards
2 parents a09d9f7 + 985360f commit 5d0e7a1

File tree

8 files changed

+135
-145
lines changed

8 files changed

+135
-145
lines changed

octopus-samples-instances/octopus-space-standards-terraform/aws-library-variable-set.tf

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
resource "octopusdeploy_library_variable_set" "aws_variable_set" {
22
name = "AWS TF"
33
description = "Library variable set storing AWS specific items you can leverage in your deployment process."
4+
space_id = var.octopus_space_id
45
}
56

67
resource "octopusdeploy_variable" "aws_variable_set_worker_pool" {
78
name = "AWS.WorkerPool"
89
type = "WorkerPool"
9-
is_editable = true
1010
is_sensitive = false
1111
value = octopusdeploy_static_worker_pool.aws_worker_pool.id
1212
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -15,7 +15,6 @@ resource "octopusdeploy_variable" "aws_variable_set_worker_pool" {
1515
resource "octopusdeploy_variable" "aws_variable_account" {
1616
name = "AWS.Account"
1717
type = "AmazonWebServicesAccount"
18-
is_editable = true
1918
is_sensitive = false
2019
value = octopusdeploy_aws_account.aws_account.id
2120
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -24,7 +23,6 @@ resource "octopusdeploy_variable" "aws_variable_account" {
2423
resource "octopusdeploy_variable" "aws_variable_us_primary_region" {
2524
name = "AWS.US.Primary.Region"
2625
type = "String"
27-
is_editable = true
2826
is_sensitive = false
2927
value = "us-west-2"
3028
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -33,7 +31,6 @@ resource "octopusdeploy_variable" "aws_variable_us_primary_region" {
3331
resource "octopusdeploy_variable" "aws_variable_us_secondary_region" {
3432
name = "AWS.US.Secondary.Region"
3533
type = "String"
36-
is_editable = true
3734
is_sensitive = false
3835
value = "us-east-1"
3936
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -42,7 +39,6 @@ resource "octopusdeploy_variable" "aws_variable_us_secondary_region" {
4239
resource "octopusdeploy_variable" "aws_variable_uk_primary_region" {
4340
name = "AWS.UK.Primary.Region"
4441
type = "String"
45-
is_editable = true
4642
is_sensitive = false
4743
value = "eu-west-2"
4844
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -51,7 +47,6 @@ resource "octopusdeploy_variable" "aws_variable_uk_primary_region" {
5147
resource "octopusdeploy_variable" "aws_variable_us_primary_mariadb_name" {
5248
name = "AWS.US.Primary.MariaDB.Name"
5349
type = "String"
54-
is_editable = true
5550
is_sensitive = false
5651
value = "od-solutions-mariadb-uswest"
5752
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -60,7 +55,6 @@ resource "octopusdeploy_variable" "aws_variable_us_primary_mariadb_name" {
6055
resource "octopusdeploy_variable" "aws_variable_us_secondary_mariadb_name" {
6156
name = "AWS.US.Secondary.MariaDB.Name"
6257
type = "String"
63-
is_editable = true
6458
is_sensitive = false
6559
value = "od-solutions-mariadb-useast"
6660
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -69,7 +63,6 @@ resource "octopusdeploy_variable" "aws_variable_us_secondary_mariadb_name" {
6963
resource "octopusdeploy_variable" "aws_variable_uk_primary_mariadb_name" {
7064
name = "AWS.UK.Primary.MariaDB.Name"
7165
type = "String"
72-
is_editable = true
7366
is_sensitive = false
7467
value = "od-solutions-mariadb-euwest"
7568
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -78,7 +71,7 @@ resource "octopusdeploy_variable" "aws_variable_uk_primary_mariadb_name" {
7871
resource "octopusdeploy_variable" "aws_variable_us_primary_mysql_name" {
7972
name = "AWS.US.Primary.MySQL.Name"
8073
type = "String"
81-
is_editable = true
74+
8275
is_sensitive = false
8376
value = "od-solutions-mysql-uswest"
8477
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -87,7 +80,7 @@ resource "octopusdeploy_variable" "aws_variable_us_primary_mysql_name" {
8780
resource "octopusdeploy_variable" "aws_variable_us_secondary_mysql_name" {
8881
name = "AWS.US.Secondary.MySQL.Name"
8982
type = "String"
90-
is_editable = true
83+
9184
is_sensitive = false
9285
value = "od-solutions-mysql-useast"
9386
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -96,7 +89,7 @@ resource "octopusdeploy_variable" "aws_variable_us_secondary_mysql_name" {
9689
resource "octopusdeploy_variable" "aws_variable_uk_primary_mysql_name" {
9790
name = "AWS.UK.Primary.MySQL.Name"
9891
type = "String"
99-
is_editable = true
92+
10093
is_sensitive = false
10194
value = "od-solutions-mysql-euwest"
10295
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -105,7 +98,7 @@ resource "octopusdeploy_variable" "aws_variable_uk_primary_mysql_name" {
10598
resource "octopusdeploy_variable" "aws_variable_us_primary_postgresql_name" {
10699
name = "AWS.US.Primary.PostgerSQL.Name"
107100
type = "String"
108-
is_editable = true
101+
109102
is_sensitive = false
110103
value = "od-solutions-postgresql-uswest"
111104
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -114,7 +107,7 @@ resource "octopusdeploy_variable" "aws_variable_us_primary_postgresql_name" {
114107
resource "octopusdeploy_variable" "aws_variable_us_secondary_postgresql_name" {
115108
name = "AWS.US.Secondary.PostgreSQL.Name"
116109
type = "String"
117-
is_editable = true
110+
118111
is_sensitive = false
119112
value = "od-solutions-postgresql-useast"
120113
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -123,7 +116,7 @@ resource "octopusdeploy_variable" "aws_variable_us_secondary_postgresql_name" {
123116
resource "octopusdeploy_variable" "aws_variable_uk_primary_postgresql_name" {
124117
name = "AWS.UK.Primary.PostgreSQL.Name"
125118
type = "String"
126-
is_editable = true
119+
127120
is_sensitive = false
128121
value = "od-solutions-postgres-euwest"
129122
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -132,7 +125,7 @@ resource "octopusdeploy_variable" "aws_variable_uk_primary_postgresql_name" {
132125
resource "octopusdeploy_variable" "aws_variable_us_primary_sqlserver_name" {
133126
name = "AWS.US.Primary.SQLServer.Name"
134127
type = "String"
135-
is_editable = true
128+
136129
is_sensitive = false
137130
value = "od-solutions-mssql-uswest"
138131
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -141,7 +134,7 @@ resource "octopusdeploy_variable" "aws_variable_us_primary_sqlserver_name" {
141134
resource "octopusdeploy_variable" "aws_variable_us_secondary_sqlserver_name" {
142135
name = "AWS.US.Secondary.SQLServer.Name"
143136
type = "String"
144-
is_editable = true
137+
145138
is_sensitive = false
146139
value = "od-solutions-mssql-useast"
147140
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -150,7 +143,7 @@ resource "octopusdeploy_variable" "aws_variable_us_secondary_sqlserver_name" {
150143
resource "octopusdeploy_variable" "aws_variable_uk_primary_sqlserver_name" {
151144
name = "AWS.UK.Primary.SQLServer.Name"
152145
type = "String"
153-
is_editable = true
146+
154147
is_sensitive = false
155148
value = "od-solutions-mssql-euwest"
156149
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -159,7 +152,7 @@ resource "octopusdeploy_variable" "aws_variable_uk_primary_sqlserver_name" {
159152
resource "octopusdeploy_variable" "aws_variable_mariadb_server_admin_username" {
160153
name = "AWS.MariaDB.Admin.Username"
161154
type = "Sensitive"
162-
is_editable = false
155+
163156
is_sensitive = true
164157
sensitive_value = var.octopus_aws_mariadb_admin_username
165158
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -168,7 +161,7 @@ resource "octopusdeploy_variable" "aws_variable_mariadb_server_admin_username" {
168161
resource "octopusdeploy_variable" "aws_variable_mariadb_server_admin_password" {
169162
name = "AWS.MariaDB.Admin.Password"
170163
type = "Sensitive"
171-
is_editable = false
164+
172165
is_sensitive = true
173166
sensitive_value = var.octopus_aws_mariadb_admin_password
174167
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -177,7 +170,7 @@ resource "octopusdeploy_variable" "aws_variable_mariadb_server_admin_password" {
177170
resource "octopusdeploy_variable" "aws_variable_mysql_server_admin_username" {
178171
name = "AWS.MySQL.Admin.Username"
179172
type = "Sensitive"
180-
is_editable = false
173+
181174
is_sensitive = true
182175
sensitive_value = var.octopus_aws_mysql_admin_username
183176
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -186,7 +179,7 @@ resource "octopusdeploy_variable" "aws_variable_mysql_server_admin_username" {
186179
resource "octopusdeploy_variable" "aws_variable_mysql_server_admin_password" {
187180
name = "AWS.MySQL.Admin.Password"
188181
type = "Sensitive"
189-
is_editable = false
182+
190183
is_sensitive = true
191184
sensitive_value = var.octopus_aws_mysql_admin_password
192185
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -195,7 +188,7 @@ resource "octopusdeploy_variable" "aws_variable_mysql_server_admin_password" {
195188
resource "octopusdeploy_variable" "aws_variable_postgresql_server_admin_username" {
196189
name = "AWS.PostgreSQL.Admin.Username"
197190
type = "Sensitive"
198-
is_editable = false
191+
199192
is_sensitive = true
200193
sensitive_value = var.octopus_aws_postgresql_admin_username
201194
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -204,7 +197,7 @@ resource "octopusdeploy_variable" "aws_variable_postgresql_server_admin_username
204197
resource "octopusdeploy_variable" "aws_variable_postgresql_server_admin_password" {
205198
name = "AWS.PostgreSQL.Admin.Password"
206199
type = "Sensitive"
207-
is_editable = false
200+
208201
is_sensitive = true
209202
sensitive_value = var.octopus_aws_postgresql_admin_password
210203
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -213,7 +206,7 @@ resource "octopusdeploy_variable" "aws_variable_postgresql_server_admin_password
213206
resource "octopusdeploy_variable" "aws_variable_sql_server_admin_username" {
214207
name = "AWS.SQL.Admin.Username"
215208
type = "Sensitive"
216-
is_editable = false
209+
217210
is_sensitive = true
218211
sensitive_value = var.octopus_aws_mssql_admin_username
219212
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id
@@ -222,7 +215,7 @@ resource "octopusdeploy_variable" "aws_variable_sql_server_admin_username" {
222215
resource "octopusdeploy_variable" "aws_variable_sql_server_admin_password" {
223216
name = "AWS.SQL.Admin.Password"
224217
type = "Sensitive"
225-
is_editable = false
218+
226219
is_sensitive = true
227220
sensitive_value = var.octopus_aws_mssql_admin_password
228221
owner_id = octopusdeploy_library_variable_set.aws_variable_set.id

0 commit comments

Comments
 (0)