Skip to content

Commit 0855cff

Browse files
committed
Feat: Updated the tfcheck workflow
1 parent 7ca7f5d commit 0855cff

File tree

3 files changed

+3
-45
lines changed

3 files changed

+3
-45
lines changed

.github/workflows/terraform.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
- ${{ needs.versionExtract.outputs.minVersion }}
3232
- ${{ needs.versionExtract.outputs.maxVersion }}
3333
directory:
34-
- _example/public
35-
- _example/vpc
34+
- _example/public/
35+
- _example/vpc/
3636

3737
steps:
3838
- name: Checkout

.github/workflows/tf-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ jobs:
88
example:
99
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
1010
with:
11-
working_directory: './_example/'
11+
working_directory: './_example/vpc'

main.tf

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@
22
## Description : This Script is used to create Transfer Server, Transfer User And TransferSSK_KEY.
33
## Copyright @ CloudDrove. All Right Reserved.
44

5-
<<<<<<< HEAD
65
##----------------------------------------------------------------------------------
76
## Labels module callled that will be used for naming and tags.
87
##----------------------------------------------------------------------------------
98

10-
=======
11-
#Module : labels
12-
#Description : This terraform module is desigzned to generate consistent label names and tags
13-
# for resources. You can use terraform-labels to implement a strict naming
14-
# convention.
15-
>>>>>>> a3ef3653b9f6af985f2c162e959e49623fcee0c2
169
module "labels" {
1710
source = "clouddrove/labels/aws"
1811
version = "1.3.0"
@@ -72,7 +65,6 @@ data "aws_iam_policy_document" "transfer_server_assume_role" {
7265
}
7366
}
7467

75-
<<<<<<< HEAD
7668
data "aws_iam_policy_document" "transfer_server_assume_policy" {
7769
statement {
7870
effect = "Allow"
@@ -151,8 +143,6 @@ data "aws_iam_policy_document" "assume_role_policy" {
151143
}
152144

153145
##----------------------------------------------------------------------------------
154-
=======
155-
>>>>>>> a3ef3653b9f6af985f2c162e959e49623fcee0c2
156146
# Module : IAM ROLE
157147
# Description : This data source can be used to fetch information about a specific IAM role.
158148
##----------------------------------------------------------------------------------
@@ -174,7 +164,6 @@ resource "aws_iam_policy" "s3_access_for_sftp_users" {
174164
tags = module.labels.tags
175165
}
176166

177-
<<<<<<< HEAD
178167
##----------------------------------------------------------------------------------
179168
# Module : IAM ROLE POLICY
180169
# Description : Provides an IAM role policy.
@@ -196,18 +185,6 @@ resource "aws_iam_role" "logging" {
196185
managed_policy_arns = [join("", aws_iam_policy.logging[*].arn)]
197186

198187
tags = module.labels.tags
199-
=======
200-
# Module : AWS TRANSFER SERVER
201-
# Description : Provides a AWS Transfer Server resource.
202-
resource "aws_transfer_server" "transfer_server" {
203-
count = var.enable_sftp && var.endpoint_type == "PUBLIC" ? 1 : 0
204-
205-
identity_provider_type = var.identity_provider_type
206-
logging_role = join("", aws_iam_role.transfer_server_role[*].arn)
207-
force_destroy = false
208-
tags = module.labels.tags
209-
endpoint_type = var.endpoint_type
210-
>>>>>>> a3ef3653b9f6af985f2c162e959e49623fcee0c2
211188
}
212189

213190
##----------------------------------------------------------------------------------
@@ -218,17 +195,12 @@ resource "aws_transfer_server" "transfer_server" {
218195
resource "aws_transfer_server" "transfer_server" {
219196
count = var.enable_sftp ? 1 : 0
220197
identity_provider_type = var.identity_provider_type
221-
<<<<<<< HEAD
222198
protocols = ["SFTP"]
223199
domain = var.domain
224200
force_destroy = var.force_destroy
225201
endpoint_type = local.is_vpc ? "VPC" : "PUBLIC"
226202
security_policy_name = var.security_policy_name
227203
logging_role = join("", aws_iam_role.logging[*].arn)
228-
=======
229-
logging_role = join("", aws_iam_role.transfer_server_role[*].arn)
230-
force_destroy = false
231-
>>>>>>> a3ef3653b9f6af985f2c162e959e49623fcee0c2
232204
tags = module.labels.tags
233205
dynamic "workflow_details" {
234206
for_each = var.enable_workflow ? [1] : []
@@ -269,7 +241,6 @@ resource "aws_transfer_user" "transfer_server_user" {
269241
home_directory = lookup(each.value, "home_directory", null) != null ? lookup(each.value, "home_directory") : (!var.restricted_home ? "/${lookup(each.value, "s3_bucket_name", var.s3_bucket_name)}" : null)
270242
tags = module.labels.tags
271243

272-
<<<<<<< HEAD
273244
dynamic "home_directory_mappings" {
274245
for_each = var.restricted_home ? (
275246
lookup(each.value, "home_directory_mappings", null) != null ? lookup(each.value, "home_directory_mappings") : {}
@@ -280,13 +251,6 @@ resource "aws_transfer_user" "transfer_server_user" {
280251
target = home_directory_mappings.value
281252
}
282253
}
283-
=======
284-
server_id = var.endpoint_type == "VPC" ? join("", aws_transfer_server.transfer_server_vpc[*].id) : join("", aws_transfer_server.transfer_server[*].id)
285-
user_name = var.user_name
286-
role = join("", aws_iam_role.transfer_server_role[*].arn)
287-
home_directory = format("/%s/%s", var.s3_bucket_id, var.sub_folder)
288-
tags = module.labels.tags
289-
>>>>>>> a3ef3653b9f6af985f2c162e959e49623fcee0c2
290254
}
291255

292256
##----------------------------------------------------------------------------------
@@ -302,7 +266,6 @@ resource "aws_transfer_ssh_key" "transfer_server_ssh_key" {
302266
}
303267

304268

305-
<<<<<<< HEAD
306269
##----------------------------------------------------------------------------------
307270
# Module : AWS ELASTIC IP
308271
# Description : Provides a AWS ELASTIC IP.
@@ -330,9 +293,4 @@ resource "aws_route53_record" "custom_domain" {
330293
records = [
331294
join("", aws_transfer_server.transfer_server[*].endpoint)
332295
]
333-
=======
334-
server_id = join("", aws_transfer_server.transfer_server[*].id)
335-
user_name = join("", aws_transfer_user.transfer_server_user[*].user_name)
336-
body = var.public_key
337-
>>>>>>> a3ef3653b9f6af985f2c162e959e49623fcee0c2
338296
}

0 commit comments

Comments
 (0)