Skip to content

Commit 0069673

Browse files
authored
Merge pull request #34 from byu-oit/humio-tokens
add humio tokens
2 parents 658fb7b + e0a7e5a commit 0069673

File tree

6 files changed

+35
-4
lines changed

6 files changed

+35
-4
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This module retrieves some basic [ACS](https://github.com/byu-oit/aws-acs) infor
1010

1111
```hcl
1212
module "acs" {
13-
source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.2.0"
13+
source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.3.0"
1414
}
1515
```
1616

@@ -54,6 +54,8 @@ After defining the module you can then retrieve the information you need (see av
5454
| db_subnet_group | [object](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/db_subnet_group) | The database subnet group for RDS in the specified VPC object |
5555
| ssh_rdp_security_group | [object](https://www.terraform.io/docs/providers/aws/d/security_group.html) | The security group to enable SSH/RDP access to resources in the specified VPC object |
5656
| oracle_security_group | [object](https://www.terraform.io/docs/providers/aws/d/security_group.html) | The security group to enable Oracle access to resources in the specified VPC object |
57-
| github_token | string | The token to use in CI/CD pipelines to fetch source code from GitHub (this if only available in certain AWS accounts) |
57+
| github_token | string | The token to use in CI/CD pipelines to fetch source code from GitHub (this is only available in certain AWS accounts) |
58+
| humio_dev_token | string | The token to use to ship logs to dev instance of Humio (this is only available in certain AWS accounts) |
59+
| humio_prd_token | string | The token to use to ship logs to prd instance of Humio (this is only available in certain AWS accounts) |
5860

5961
**Note about returning objects**: Because objects are returned (as opposed to just values), autocomplete may not work. Just add on the key to the end out the output accessor. Even though autocomplete won't work, those values will still be correctly returned.

examples/ci-12/ci.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,9 @@ output "oracle_security_group" {
6868
output "github_token" {
6969
value = module.acs.github_token
7070
}
71+
output "humio_dev_token" {
72+
value = module.acs.humio_dev_token
73+
}
74+
output "humio_prd_token" {
75+
value = module.acs.humio_prd_token
76+
}

examples/ci-13/ci.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,9 @@ output "oracle_security_group" {
6868
output "github_token" {
6969
value = module.acs.github_token
7070
}
71+
output "humio_dev_token" {
72+
value = module.acs.humio_dev_token
73+
}
74+
output "humio_prd_token" {
75+
value = module.acs.humio_prd_token
76+
}

examples/simple/simple.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ provider "aws" {
33
}
44

55
module "acs" {
6-
source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.2.0"
6+
source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.3.0"
77
}
88

99
output "vpc_id" {
@@ -37,3 +37,9 @@ output "cert_arn" {
3737
output "github_token" {
3838
value = module.acs.github_token
3939
}
40+
output "humio_dev_token" {
41+
value = module.acs.humio_dev_token
42+
}
43+
output "humio_prd_token" {
44+
value = module.acs.humio_prd_token
45+
}

main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ locals {
2828
zone_id = lookup(local.acs_info, "/acs/dns/zone-id", null)
2929
oracle_security_group_id = lookup(local.acs_info, "/acs/vpc/xinetd-sg-id", null)
3030
github_token = lookup(local.acs_info, "/acs/git/token", null)
31+
humio_dev_token = lookup(local.acs_info, "/acs/humio/dev/token", null)
32+
humio_prd_token = lookup(local.acs_info, "/acs/humio/prd/token", null)
3133
}
3234

3335
// IAM info

output.tf

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,16 @@ output "oracle_security_group" {
6666
value = local.oracle_security_group_id != null ? data.aws_security_group.oracle[0] : null
6767
}
6868

69-
// CodePipeline outputs
69+
// Integration token outputs
7070
output "github_token" {
7171
value = local.github_token # there's no data source, so no need for the null check
7272
}
73+
74+
output "humio_dev_token" {
75+
value = local.humio_dev_token # there's no data source, so no need for the null check
76+
}
77+
78+
output "humio_prd_token" {
79+
value = local.humio_prd_token # there's no data source, so no need for the null check
80+
}
81+

0 commit comments

Comments
 (0)