Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: PR Title Validator

on:
pull_request:
types: [opened, edited, synchronize, reopened]

jobs:
call_release:
uses: Daemon-Solutions/git-workflows/.github/workflows/pr_title_validator.yaml@v0.2.0
secrets: inherit

11 changes: 11 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Release

on:
push:
branches:
- master

jobs:
call_release:
uses: Daemon-Solutions/git-workflows/.github/workflows/release.yaml@v0.2.0
secrets: inherit
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.terraform*
17 changes: 17 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
repos:
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.99.4
hooks:
- id: terraform_fmt
stages: [pre-commit]
- id: terraform_validate
stages: [pre-commit]
- repo: https://github.com/compilerla/conventional-pre-commit
rev: v4.2.0
hooks:
- id: conventional-pre-commit
stages: [commit-msg]
- repo: https://github.com/rhysd/actionlint
rev: v1.7.7
hooks:
- id: actionlint
17 changes: 17 additions & 0 deletions .releaserc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
branches:
- name: master

plugins:
- - "@semantic-release/commit-analyzer"
- preset: conventionalcommits
- - "@semantic-release/release-notes-generator"
- preset: conventionalcommits
- "@semantic-release/github"
- - "@semantic-release/changelog"
- assets:
- CHANGELOG.md
- - "@semantic-release/git"
- assets:
- CHANGELOG.md
tagFormat: "v${version}"

5 changes: 2 additions & 3 deletions 30-bastion.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module "bastion" {
source = "git::ssh://git@gitlab.com/claranet-pcp/terraform/aws/tf-aws-asg.git?ref=v1.0.0"

source = "git::https://gitlab.com/claranet-pcp/terraform/aws/tf-aws-asg.git?ref=v2.0.0"
name = coalesce("${var.name}", "${var.envname}-${var.envtype}-bastion")
envname = var.envname
service = "bastion"
Expand All @@ -25,7 +24,7 @@ module "bastion" {
# output and the ASG resource that is created within `module.bastion`. Other
# resources using the `asg_name` output (which uses this null resource) will
# then be executed AFTER the ASG is created.
resource "null_resource" bastion_asg {
resource "null_resource" "bastion_asg" {
depends_on = [module.bastion]

triggers = {
Expand Down
64 changes: 64 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,67 @@ module "bastions" {
## Dependencies

* [tf-aws-asg](https://git.bashton.net/Bashton/tf-aws-asg)

<!-- BEGIN_TF_DOCS -->
## Requirements

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | > 1.0.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 6.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | 6.3.0 |
| <a name="provider_null"></a> [null](#provider\_null) | 3.2.4 |
| <a name="provider_template"></a> [template](#provider\_template) | 2.2.0 |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_bastion"></a> [bastion](#module\_bastion) | git::https://gitlab.com/claranet-pcp/terraform/aws/tf-aws-asg.git | v2.0.0 |

## Resources

| Name | Type |
|------|------|
| [aws_security_group.bastion_egress](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) | resource |
| [aws_security_group.bastion_sg](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) | resource |
| [null_resource.bastion_asg](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
| [aws_subnet.vpc](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/subnet) | data source |
| [aws_vpc.cidr](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc) | data source |
| [template_file.bastion_userdata](https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file) | data source |

## Inputs

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_allowed_bastion_cidrs"></a> [allowed\_bastion\_cidrs](#input\_allowed\_bastion\_cidrs) | n/a | `list(string)` | n/a | yes |
| <a name="input_allowed_icmp_cidrs"></a> [allowed\_icmp\_cidrs](#input\_allowed\_icmp\_cidrs) | A list of CIDRs that are allowed to send ICMP traffic to the bastion. | `list(string)` | <pre>[<br> "0.0.0.0/0"<br>]</pre> | no |
| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | n/a | `string` | `"eu-west-1"` | no |
| <a name="input_bastion_ami"></a> [bastion\_ami](#input\_bastion\_ami) | n/a | `string` | `""` | no |
| <a name="input_bastion_asg_max"></a> [bastion\_asg\_max](#input\_bastion\_asg\_max) | n/a | `number` | `1` | no |
| <a name="input_bastion_asg_min"></a> [bastion\_asg\_min](#input\_bastion\_asg\_min) | n/a | `number` | `1` | no |
| <a name="input_bastion_userdata"></a> [bastion\_userdata](#input\_bastion\_userdata) | Custom userdata for the bastion server. | `string` | `""` | no |
| <a name="input_bastion_userdata_template"></a> [bastion\_userdata\_template](#input\_bastion\_userdata\_template) | Userdata template for the bastion server. Allowed: custom, puppet\_masterless\_mco | `string` | `"custom"` | no |
| <a name="input_customer"></a> [customer](#input\_customer) | n/a | `any` | n/a | yes |
| <a name="input_domain"></a> [domain](#input\_domain) | n/a | `string` | `"eu-west-1.compute.internal"` | no |
| <a name="input_envname"></a> [envname](#input\_envname) | n/a | `any` | n/a | yes |
| <a name="input_envtype"></a> [envtype](#input\_envtype) | n/a | `any` | n/a | yes |
| <a name="input_extra_tags"></a> [extra\_tags](#input\_extra\_tags) | Extra tags for the ASG | `list` | `[]` | no |
| <a name="input_iam_instance_profile_id"></a> [iam\_instance\_profile\_id](#input\_iam\_instance\_profile\_id) | n/a | `string` | n/a | yes |
| <a name="input_instance_type"></a> [instance\_type](#input\_instance\_type) | n/a | `string` | `"t2.micro"` | no |
| <a name="input_key_name"></a> [key\_name](#input\_key\_name) | n/a | `string` | `"bashton"` | no |
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `""` | no |
| <a name="input_public_subnets"></a> [public\_subnets](#input\_public\_subnets) | n/a | `list(string)` | n/a | yes |

## Outputs

| Name | Description |
|------|-------------|
| <a name="output_asg_name"></a> [asg\_name](#output\_asg\_name) | n/a |
| <a name="output_bastion_sg"></a> [bastion\_sg](#output\_bastion\_sg) | n/a |
<!-- END_TF_DOCS -->
8 changes: 7 additions & 1 deletion terraform.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
terraform {
required_version = "> 0.12.0"
required_version = "> 1.0.0"
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 6.0"
}
}
}