Skip to content

Commit 389a31c

Browse files
Ic3w0lfIc3w0lf
authored
Merge pull request #3 from geekcell/update-tmplates
docs: update templates
2 parents 70b6013 + bf19170 commit 389a31c

File tree

16 files changed

+132
-118
lines changed

16 files changed

+132
-118
lines changed

‎.github/.templatesyncignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
README.md
2+
.github/workflows/*
3+
.terraform-docs.yml
4+
docs/20-badges.md
5+
docs/assets/logo.svg
6+
*.tf
7+
test/*
8+
go.mod
9+
go.sum

‎.github/dependabot.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
##############################
3+
## Dependabot configuration ##
4+
##############################
5+
6+
#
7+
# Documentation:
8+
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates
9+
#
10+
11+
version: 2
12+
updates:
13+
# Maintain dependencies for GitHub Actions
14+
- package-ecosystem: "github-actions"
15+
directory: "/"
16+
schedule:
17+
interval: "daily"
18+
open-pull-requests-limit: 0
19+
20+
# Maintain dependencies for Terraform Providers
21+
- package-ecosystem: "terraform"
22+
directory: "/"
23+
schedule:
24+
interval: "daily"
25+
open-pull-requests-limit: 0
26+
27+
# Maintain dependencies for Golang
28+
- package-ecosystem: "gomod"
29+
directory: "/"
30+
schedule:
31+
interval: "daily"
32+
open-pull-requests-limit: 0

‎.github/labels.yaml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎.github/pull_request-template.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55

66
...
77

8-
## How this PR fixes it
9-
10-
...
11-
128
## Readiness Checklist
139

1410
### Author/Contributor

‎.github/workflows/release.yaml‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
####################################
3-
## Draft releases on Push to main ##
4-
####################################
2+
#####################
3+
## Create releases ##
4+
#####################
55

66
#
77
# Documentation:
@@ -13,9 +13,8 @@ on:
1313
push:
1414
branches: [ main ]
1515
tags: [ 'v*.*.*' ]
16-
17-
permissions:
18-
contents: write
16+
pull_request:
17+
types: [ labeled ]
1918

2019
#################
2120
# Start the job #
@@ -26,6 +25,7 @@ jobs:
2625
###############
2726
create-release:
2827
name: Create Release
28+
if: github.event.action != 'labeled'
2929
runs-on: ubuntu-latest
3030
timeout-minutes: 10
3131
steps:
@@ -75,3 +75,22 @@ jobs:
7575
tag_name: ${{ steps.tag.outputs.value }}
7676
draft: false
7777
prerelease: false
78+
79+
###########################
80+
# Release preview comment #
81+
###########################
82+
release-check:
83+
if: github.event.action == 'labeled'
84+
runs-on: ubuntu-latest
85+
steps:
86+
############################
87+
# Checkout the source code #
88+
############################
89+
- name: Checkout Code
90+
uses: actions/[email protected]
91+
92+
#######################
93+
# Post status comment #
94+
#######################
95+
- name: Post bumpr status comment
96+
uses: haya14busa/action-bumpr@v1

‎.github/workflows/sync-templates.yaml‎

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010

1111
name: Sync templates
1212
on:
13-
workflow_dispatch:
13+
workflow_dispatch: # Trigger manually
14+
schedule:
15+
- cron: "0 0 1 * *" # Run at 00:00 on the first day of every month
1416

1517
##########################
1618
# Prevent duplicate jobs #
@@ -36,7 +38,7 @@ jobs:
3638
- name: Sync labels
3739
uses: EndBug/[email protected]
3840
with:
39-
config-file: https://raw.githubusercontent.com/geekcell/template-terraform-module/main/.github/labels.yaml
41+
config-file: https://gist.githubusercontent.com/Ic3w0lf/f5520c5f19d7098966f692c120f7a197/raw/75b134f76fbc55e2e64bd66f04e571d6d74b815e/terraform-aws-module-labels.yaml
4042

4143
#######################
4244
# Sync template files #
@@ -50,33 +52,12 @@ jobs:
5052
############################
5153
- name: Checkout Code
5254
uses: actions/[email protected]
53-
with:
54-
token: ${{ secrets.GEEKCELL_PAT_WORKFLOWS }}
55-
56-
########################
57-
# Patch template files #
58-
########################
59-
- name: Force patching of template files
60-
run: |
61-
yes y | make setup/update-template
62-
63-
####################
64-
# Update README.md #
65-
####################
66-
- name: Terraform docs
67-
uses: terraform-docs/[email protected]
68-
with:
69-
config-file: .terraform-docs.yml
70-
git-push: false
7155

72-
#############
73-
# Create PR #
74-
#############
75-
- name: Create PR
76-
uses: peter-evans/[email protected]
56+
#######################
57+
# Sync template files #
58+
#######################
59+
- name: actions-template-sync
60+
uses: AndreasAugustin/[email protected]
7761
with:
78-
token: ${{ secrets.GEEKCELL_PAT_WORKFLOWS }}
79-
title: Updated template files
80-
commit-message: Update template files from main repo
81-
branch: update-template-files
82-
delete-branch: true
62+
github_token: ${{ secrets.GITHUB_TOKEN }}
63+
source_repo_path: geekcell/terraform-aws-module-template

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.76.0
3+
rev: v1.80.0
44
hooks:
55
- id: terraform_docs
66
- id: terraform_fmt
77
- id: terraform_validate
8+
args:
9+
- --hook-config=--retry-once-with-cleanup=true
810
exclude: '^[^/]+$'
911
- id: terraform_tflint
1012
exclude: ^examples/
1113

1214
- repo: https://github.com/pre-commit/pre-commit-hooks
13-
rev: v4.3.0
15+
rev: v4.4.0
1416
hooks:
1517
- id: trailing-whitespace
1618
- id: end-of-file-fixer

‎.terraform-docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ formatter: "md table"
22
header-from: main.tf
33

44
recursive:
5+
# Enable this if your module has submodules
56
enabled: true
6-
path: modules
77

88
content: |-
9-
{{ include "docs/logo.md" }}
9+
{{ include "docs/10-header.md" }}
1010
11-
{{ include "docs/badges.md" }}
11+
{{ include "docs/20-badges.md" }}
1212
1313
{{ .Header }}
1414

‎README.md‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- BEGIN_TF_DOCS -->
2-
[![Geek Cell GmbH](https://raw.githubusercontent.com/geekcell/template-terraform-module/main/docs/assets/logo.svg)](https://www.geekcell.io/)
2+
[![Geek Cell GmbH](https://raw.githubusercontent.com/geekcell/.github/main/geekcell-github-banner.png)](https://www.geekcell.io/)
33

44
### Code Quality
55
[![License](https://img.shields.io/github/license/geekcell/terraform-aws-new-relic-integration)](https://github.com/geekcell/terraform-aws-new-relic-integration/blob/master/LICENSE)
@@ -36,7 +36,10 @@
3636
# Terraform AWS New Relic Integration
3737

3838
Terraform module which creates resources to integrate AWS with New Relic by using Kinesis Firehose streams. Supports
39-
VPC Flow logs.
39+
VPC Flow logs. Comes with the following sub modules:
40+
41+
[Fargate PHP Daemon](./modules/fargate\_php\_daemon/README.md)
42+
[SSM License Key](./modules/ssm\_license\_key/README.md)
4043

4144
## Inputs
4245

@@ -72,17 +75,17 @@ No outputs.
7275

7376
## Resources
7477

75-
- resource.aws_cloudwatch_metric_stream.main (main.tf#137)
76-
- resource.aws_flow_log.main (main.tf#286)
77-
- resource.aws_kinesis_firehose_delivery_stream.cloudwatch_metrics (main.tf#149)
78-
- resource.aws_kinesis_firehose_delivery_stream.vpc_flow_logs (main.tf#185)
79-
- resource.aws_s3_bucket.main (main.tf#253)
80-
- resource.aws_s3_bucket_acl.main (main.tf#259)
81-
- resource.aws_s3_bucket_public_access_block.main (main.tf#274)
82-
- resource.aws_s3_bucket_server_side_encryption_configuration.main (main.tf#264)
83-
- resource.newrelic_api_access_key.main (main.tf#303)
84-
- resource.newrelic_cloud_aws_link_account.main (main.tf#317)
85-
- data source.aws_caller_identity.current (main.tf#7)
78+
- resource.aws_cloudwatch_metric_stream.main (main.tf#140)
79+
- resource.aws_flow_log.main (main.tf#289)
80+
- resource.aws_kinesis_firehose_delivery_stream.cloudwatch_metrics (main.tf#152)
81+
- resource.aws_kinesis_firehose_delivery_stream.vpc_flow_logs (main.tf#188)
82+
- resource.aws_s3_bucket.main (main.tf#256)
83+
- resource.aws_s3_bucket_acl.main (main.tf#262)
84+
- resource.aws_s3_bucket_public_access_block.main (main.tf#277)
85+
- resource.aws_s3_bucket_server_side_encryption_configuration.main (main.tf#267)
86+
- resource.newrelic_api_access_key.main (main.tf#306)
87+
- resource.newrelic_cloud_aws_link_account.main (main.tf#320)
88+
- data source.aws_caller_identity.current (main.tf#10)
8689

8790
# Examples
8891
### Minimal

‎docs/10-header.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[![Geek Cell GmbH](https://raw.githubusercontent.com/geekcell/.github/main/geekcell-github-banner.png)](https://www.geekcell.io/)

0 commit comments

Comments
 (0)