Skip to content

Commit

Permalink
Convert to TF 0.12. Add tests. Add Codefresh test pipeline (#16)
Browse files Browse the repository at this point in the history 
* Convert to TF 0.12

* Convert to TF 0.12

* Convert to TF 0.12

* Convert to TF 0.12

* Convert to TF 0.12

* Convert to TF 0.12

* Convert to TF 0.12

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline

* Convert to TF 0.12. Add tests. Add Codefresh test pipeline
  • Loading branch information
@aknysh
aknysh authored Nov 6, 2019
1 parent ecb7fd1 commit 54869f7
Show file tree
Hide file tree
Showing 34 changed files with 3,171 additions and 837 deletions.
16 changes: 0 additions & 16 deletions .travis.yml
View file

This file was deleted.

388 changes: 307 additions & 81 deletions README.md
View file

Large diffs are not rendered by default.

243 changes: 203 additions & 40 deletions README.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ screenshots:

# Badges to display
badges:
- name: "Build Status"
image: "https://travis-ci.org/cloudposse/terraform-aws-ecs-atlantis.svg?branch=master"
url: "https://travis-ci.org/cloudposse/terraform-aws-ecs-atlantis"
- name: "Codefresh Build Status"
image: "https://g.codefresh.io/api/badges/pipeline/cloudposse/terraform-modules%2Fterraform-aws-ecs-atlantis?type=cf-1"
url: "https://g.codefresh.io/public/accounts/cloudposse/pipelines/5dc082b14d7990012e651a3b"
- name: "Latest Release"
image: "https://img.shields.io/github/release/cloudposse/terraform-aws-ecs-atlantis.svg"
url: "https://github.com/cloudposse/terraform-aws-ecs-atlantis/releases/latest"
Expand Down Expand Up @@ -159,11 +159,15 @@ introduction: |-
# How to use this project
usage: |-
Module usage examples:
For a complete example, see [examples/complete](examples/complete).
- [without authentication](examples/without_authentication) - complete example without authentication
- [with Google OIDC authentication](examples/with_google_oidc_authentication) - complete example with Google OIDC authentication
- [with Cognito authentication](examples/with_cognito_authentication) - complete example with Cognito authentication
For automated tests of the complete example using [bats](https://github.com/bats-core/bats-core) and [Terratest](https://github.com/gruntwork-io/terratest) (which tests and deploys the example on AWS), see [test](test).
Other examples:
- [without authentication](examples/without_authentication) - example without authentication
- [with Google OIDC authentication](examples/with_google_oidc_authentication) - example with Google OIDC authentication
- [with Cognito authentication](examples/with_cognito_authentication) - example with Cognito authentication
**NOTE:**
Expand All @@ -172,39 +176,198 @@ usage: |-
If no `github_webhooks_token` is set, [Terraform GitHub Provider](https://www.terraform.io/docs/providers/github/index.html) attempts to look one up in the `GITHUB_TOKEN` environment variable.
```
module "atlantis" {
source = "git::https://github.com/cloudposse/terraform-aws-ecs-atlantis.git?ref=master"
enabled = "true"
name = "${var.name}"
namespace = "${var.namespace}"
region = "${var.region}"
stage = "${var.stage}"
atlantis_gh_team_whitelist = "admins:*,engineering:plan"
atlantis_gh_user = "atlantis_bot"
atlantis_repo_whitelist = ["github.com/testing.example.co/*"]
alb_arn_suffix = "${module.alb.alb_arn_suffix}"
alb_dns_name = "${module.alb.alb_dns_name}"
alb_name = "${module.alb.alb_name}"
alb_zone_id = "${module.alb.alb_zone_id}"
domain_name = "${var.domain_name}"
ecs_cluster_arn = "${aws_ecs_cluster.default.arn}"
ecs_cluster_name = "${aws_ecs_cluster.default.name}"
repo_name = "testing.example.co"
repo_owner = "example_org"
private_subnet_ids = ["${module.subnets.private_subnet_ids}"]
security_group_ids = ["${module.vpc.vpc_default_security_group_id}"]
vpc_id = "${module.vpc.vpc_id}"
alb_ingress_unauthenticated_listener_arns = ["${module.alb.listener_arns}"]
alb_ingress_unauthenticated_listener_arns_count = 2
alb_ingress_unauthenticated_paths = ["/*"]
alb_ingress_listener_unauthenticated_priority = "100"
alb_ingress_authenticated_paths = []
}
```hcl
provider "aws" {
region = var.region
}
module "label" {
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.16.0"
namespace = var.namespace
name = var.name
stage = var.stage
delimiter = var.delimiter
attributes = var.attributes
tags = var.tags
}
module "vpc" {
source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=tags/0.8.1"
namespace = var.namespace
stage = var.stage
name = var.name
delimiter = var.delimiter
attributes = var.attributes
cidr_block = var.vpc_cidr_block
tags = var.tags
}
module "subnets" {
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=tags/0.16.1"
availability_zones = var.availability_zones
namespace = var.namespace
stage = var.stage
name = var.name
attributes = var.attributes
delimiter = var.delimiter
vpc_id = module.vpc.vpc_id
igw_id = module.vpc.igw_id
cidr_block = module.vpc.vpc_cidr_block
nat_gateway_enabled = true
nat_instance_enabled = false
tags = var.tags
}
module "alb" {
source = "git::https://github.com/cloudposse/terraform-aws-alb.git?ref=tags/0.7.0"
namespace = var.namespace
stage = var.stage
name = var.name
attributes = var.attributes
delimiter = var.delimiter
vpc_id = module.vpc.vpc_id
security_group_ids = [module.vpc.vpc_default_security_group_id]
subnet_ids = module.subnets.public_subnet_ids
internal = false
http_enabled = true
access_logs_enabled = false
alb_access_logs_s3_bucket_force_destroy = true
access_logs_region = var.region
cross_zone_load_balancing_enabled = true
http2_enabled = true
deletion_protection_enabled = false
tags = var.tags
}
resource "aws_ecs_cluster" "default" {
name = module.label.id
tags = module.label.tags
}
resource "aws_sns_topic" "sns_topic" {
name = module.label.id
display_name = "Test terraform-aws-ecs-atlantis"
tags = module.label.tags
}
module "kms_key" {
source = "git::https://github.com/cloudposse/terraform-aws-kms-key.git?ref=tags/0.3.0"
enabled = var.enabled
namespace = var.namespace
stage = var.stage
name = var.name
attributes = var.attributes
delimiter = var.delimiter
tags = var.tags
description = "Test terraform-aws-ecs-atlantis KMS key"
deletion_window_in_days = 7
enable_key_rotation = false
}
module "atlantis" {
source = "git::https://github.com/cloudposse/terraform-aws-ecs-atlantis.git?ref=master"
enabled = var.enabled
namespace = var.namespace
stage = var.stage
name = var.name
attributes = var.attributes
delimiter = var.delimiter
tags = var.tags
region = var.region
vpc_id = module.vpc.vpc_id
policy_arn = var.policy_arn
ssh_private_key_name = var.ssh_private_key_name
ssh_public_key_name = var.ssh_public_key_name
kms_key_id = module.kms_key.key_id
atlantis_gh_user = var.atlantis_gh_user
atlantis_gh_team_whitelist = var.atlantis_gh_team_whitelist
atlantis_gh_webhook_secret = var.atlantis_gh_webhook_secret
atlantis_log_level = var.atlantis_log_level
atlantis_repo_config = var.atlantis_repo_config
atlantis_repo_whitelist = var.atlantis_repo_whitelist
atlantis_port = var.atlantis_port
atlantis_webhook_format = var.atlantis_webhook_format
atlantis_url_format = var.atlantis_url_format
default_backend_image = var.default_backend_image
healthcheck_path = var.healthcheck_path
short_name = var.short_name
hostname = var.hostname
parent_zone_id = var.parent_zone_id
// Container
container_cpu = var.container_cpu
container_memory = var.container_memory
// Authentication
authentication_type = var.authentication_type
alb_ingress_listener_unauthenticated_priority = var.alb_ingress_listener_unauthenticated_priority
alb_ingress_listener_authenticated_priority = var.alb_ingress_listener_authenticated_priority
alb_ingress_unauthenticated_hosts = var.alb_ingress_unauthenticated_hosts
alb_ingress_authenticated_hosts = var.alb_ingress_authenticated_hosts
alb_ingress_unauthenticated_paths = var.alb_ingress_unauthenticated_paths
alb_ingress_authenticated_paths = var.alb_ingress_authenticated_paths
authentication_cognito_user_pool_arn = var.authentication_cognito_user_pool_arn
authentication_cognito_user_pool_client_id = var.authentication_cognito_user_pool_client_id
authentication_cognito_user_pool_domain = var.authentication_cognito_user_pool_domain
authentication_oidc_client_id = var.authentication_oidc_client_id
authentication_oidc_client_secret = var.authentication_oidc_client_secret
authentication_oidc_issuer = var.authentication_oidc_issuer
authentication_oidc_authorization_endpoint = var.authentication_oidc_authorization_endpoint
authentication_oidc_token_endpoint = var.authentication_oidc_token_endpoint
authentication_oidc_user_info_endpoint = var.authentication_oidc_user_info_endpoint
// ECS
private_subnet_ids = module.subnets.private_subnet_ids
ecs_cluster_arn = aws_ecs_cluster.default.arn
ecs_cluster_name = aws_ecs_cluster.default.name
security_group_ids = var.security_group_ids
desired_count = var.desired_count
launch_type = var.launch_type
// ALB
alb_zone_id = module.alb.alb_zone_id
alb_arn_suffix = module.alb.alb_arn_suffix
alb_dns_name = module.alb.alb_dns_name
alb_security_group = module.alb.security_group_id
alb_ingress_unauthenticated_listener_arns = [module.alb.http_listener_arn]
alb_ingress_unauthenticated_listener_arns_count = 1
// CodePipeline
codepipeline_enabled = var.codepipeline_enabled
github_oauth_token = var.github_oauth_token
github_webhooks_token = var.github_webhooks_token
repo_owner = var.repo_owner
repo_name = var.repo_name
branch = var.branch
build_timeout = var.build_timeout
webhook_enabled = var.webhook_enabled
webhook_secret_length = var.webhook_secret_length
webhook_events = var.webhook_events
codepipeline_s3_bucket_force_destroy = var.codepipeline_s3_bucket_force_destroy
// Autoscaling
autoscaling_enabled = var.autoscaling_enabled
autoscaling_min_capacity = var.autoscaling_min_capacity
autoscaling_max_capacity = var.autoscaling_max_capacity
// Alarms
alb_target_group_alarms_enabled = var.alb_target_group_alarms_enabled
ecs_alarms_enabled = var.ecs_alarms_enabled
alb_target_group_alarms_alarm_actions = [aws_sns_topic.sns_topic.arn]
alb_target_group_alarms_ok_actions = [aws_sns_topic.sns_topic.arn]
alb_target_group_alarms_insufficient_data_actions = [aws_sns_topic.sns_topic.arn]
ecs_alarms_cpu_utilization_high_alarm_actions = [aws_sns_topic.sns_topic.arn]
ecs_alarms_cpu_utilization_high_ok_actions = [aws_sns_topic.sns_topic.arn]
ecs_alarms_cpu_utilization_low_alarm_actions = [aws_sns_topic.sns_topic.arn]
ecs_alarms_cpu_utilization_low_ok_actions = [aws_sns_topic.sns_topic.arn]
ecs_alarms_memory_utilization_high_alarm_actions = [aws_sns_topic.sns_topic.arn]
ecs_alarms_memory_utilization_high_ok_actions = [aws_sns_topic.sns_topic.arn]
ecs_alarms_memory_utilization_low_alarm_actions = [aws_sns_topic.sns_topic.arn]
ecs_alarms_memory_utilization_low_ok_actions = [aws_sns_topic.sns_topic.arn]
}
```
# Example usage
Expand Down
74 changes: 74 additions & 0 deletions codefresh/test.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
version: '1.0'

stages:
- Prepare
- Test

steps:
wait:
title: Wait
stage: Prepare
image: codefresh/cli:latest
commands:
- codefresh get builds --pipeline=${{CF_REPO_NAME}} --status running --limit 1000 -o json | jq --arg id ${{CF_BUILD_ID}} -ser 'flatten|.[-1].id==$id'
retry:
maxAttempts: 10
delay: 20
exponentialFactor: 1.1

main_clone:
title: "Clone repository"
type: git-clone
stage: Prepare
description: "Initialize"
repo: ${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}
git: CF-default
revision: ${{CF_REVISION}}

clean_init:
title: Prepare build-harness and test-harness
image: ${{TEST_IMAGE}}
stage: Prepare
commands:
- cf_export PATH="/usr/local/terraform/0.12/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
- make init
- git -C build-harness checkout master
- make -C test/ clean init TEST_HARNESS_BRANCH=master
- make -C test/src clean init
- find . -type d -name '.terraform' | xargs rm -rf
- find . -type f -name 'terraform.tfstate*' -exec rm -f {} \;

test:
type: "parallel"
title: "Run tests"
description: "Run all tests in parallel"
stage: Test
steps:
test_readme_lint:
title: "Test README.md updated"
stage: "Test"
image: ${{TEST_IMAGE}}
description: Test "readme/lint"
commands:
- make readme/lint

test_module:
title: Test module with bats
image: ${{TEST_IMAGE}}
stage: Test
commands:
- make -C test/ module

test_examples_complete:
title: Test "examples/complete" with bats
image: ${{TEST_IMAGE}}
stage: Test
commands:
- make -C test/ examples/complete

test_examples_complete_terratest:
title: Test "examples/complete" with terratest
image: ${{TEST_IMAGE}}
stage: Test
commands:
- make -C test/src
Loading

0 comments on commit 54869f7

Please sign in to comment.