Merge branch 'dxw-feature/replace-modules-with-aws-resources'

Author: squidfunk

.githooks/pre-commit

@@ -28,18 +28,6 @@ node_js: 8
 git:
   depth: 5
 
-# Cache dependencies
-cache:
-  directories:
-    - modules/status/lambda/node_modules
-    - modules/webhook/lambda/node_modules
-
-# Install dependencies
-install:
-  - npm install --prefix modules/status/lambda
-  - npm install --prefix modules/webhook/lambda
-
-# Perform build and release
+# Build script
 script:
-  - make lint
-  - make build
+  - terraform fmt -check -diff

.travis.yml

@@ -23,8 +23,7 @@ request and build status support using AWS CodeBuild.
 This module registers a GitHub webhook which is triggered for `push` and
 `pull_request` events and starts the build for the respective branch. All
 builds run in parallel. The build progress and status for a respective commit
-is reported back to GitHub. Furthermore, a badge for the status of `master` is
-generated and hosted on S3.
+is reported back to GitHub.
 
 ### Cost
 
@@ -54,7 +53,7 @@ Next, add the following module to your Terraform configuration and apply it:
 ``` hcl
 module "github_ci" {
   source  = "github.com/squidfunk/terraform-aws-github-ci"
-  version = "0.5.4"
+  version = "0.6.0"
 
   namespace          = "<namespace>"
   github_owner       = "<owner>"

Makefile

@@ -92,21 +92,6 @@ resource "aws_s3_bucket" "_" {
   acl    = "private"
 }
 
-# aws_s3_bucket_object._
-resource "aws_s3_bucket_object" "_" {
-  bucket        = "${aws_s3_bucket._.bucket}"
-  key           = "${var.github_repository}/status.svg"
-  source        = "${path.module}/share/badges/unknown.svg"
-  acl           = "public-read"
-  cache_control = "no-cache, no-store, must-revalidate"
-  content_type  = "image/svg+xml"
-
-  # Ignore, if there already is a status
-  lifecycle {
-    ignore_changes = ["*"]
-  }
-}
-
 # -----------------------------------------------------------------------------
 # Resources: CodeBuild
 # -----------------------------------------------------------------------------
@@ -119,6 +104,7 @@ resource "aws_codebuild_project" "_" {
 
   build_timeout = "5"
   service_role  = "${aws_iam_role.codebuild.arn}"
+  badge_enabled = "${var.codebuild_badge_enabled}"
 
   source {
     type      = "GITHUB"
@@ -147,32 +133,7 @@ resource "aws_codebuild_project" "_" {
   }
 }
 
-# -----------------------------------------------------------------------------
-# Modules
-# -----------------------------------------------------------------------------
-
-# module.status
-module "status" {
-  source = "./modules/status"
-
-  namespace = "${var.namespace}"
-
-  github_owner       = "${var.github_owner}"
-  github_repository  = "${var.github_repository}"
-  github_oauth_token = "${var.github_oauth_token}"
-  github_reporter    = "${var.github_reporter}"
-
-  bucket = "${aws_s3_bucket._.bucket}"
-}
-
-# module.webhook
-module "webhook" {
-  source = "./modules/webhook"
-
-  namespace = "${var.namespace}"
-
-  github_owner       = "${var.github_owner}"
-  github_repository  = "${var.github_repository}"
-  github_oauth_token = "${var.github_oauth_token}"
-  github_reporter    = "${var.github_reporter}"
+# aws_codebuild_webhook._
+resource "aws_codebuild_webhook" "_" {
+  project_name = "${aws_codebuild_project._.name}"
 }