Skip to content

Commit

Permalink
Merge pull request #5 from blackbird-cloud/bb-repo-manager-updates
Browse files Browse the repository at this point in the history
Merge pull request 5 from bb-repo-manager-updates
  • Loading branch information
blackbirdcloudrepomanager[bot] authored Sep 17, 2024
2 parents 1e61acf + 750cf86 commit 4d61fd0
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 19 deletions.
16 changes: 10 additions & 6 deletions .config/.terraform-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ sections:
- modules

content: |-
# AWS Organizations Terraform module
A Terraform module which configures your AWS Organization and creates AWS accounts. Read [this](https://docs.aws.amazon.com/organizations/index.html) page for more information, and for a secure reference architecture by AWS, read [this](https://docs.aws.amazon.com/prescriptive-guidance/latest/security-reference-architecture/welcome.html) page.
{{ include "./.config/title.md"}}
{{ .Header }}
Expand All @@ -24,9 +23,14 @@ content: |-
{{ include "./example/main.tf" }}
```
{{ include "./modules/accounts/README.md" }}
{{ include "./modules/organization/README.md" }}
{{ include "./modules/organization-policy/README.md" }}
{{ include "./modules/organizational-units/README.md" }}
{{ .Requirements }}
{{ .Providers }}
{{ .Resources }}
{{ .Inputs }}
{{ .Outputs }}
{{ .Footer }}
2 changes: 1 addition & 1 deletion .config/footer.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Checkout our other :point_right: [terraform modules](https://registry.terraform.

## Copyright

Copyright © 2017-2023 [Blackbird Cloud](https://www.blackbird.cloud)
Copyright © 2017-2024 [Blackbird Cloud](https://blackbird.cloud)
2 changes: 1 addition & 1 deletion .config/header.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[![blackbird-logo](https://raw.githubusercontent.com/blackbird-cloud/terraform-module-template/main/.config/logo_simple.png)](https://www.blackbird.cloud)
[![blackbird-logo](https://raw.githubusercontent.com/blackbird-cloud/terraform-module-template/main/.config/logo_simple.png)](https://blackbird.cloud)
2 changes: 2 additions & 0 deletions .config/title.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Terraform Aws Organization Module
Terraform module to create an AWS Organization
11 changes: 6 additions & 5 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Validate and Format
# on: push

on:
pull_request_target:
types: [opened, synchronize]
workflow_dispatch:
# pull_request_target:
# types: [opened, synchronize]

jobs:
format:
Expand All @@ -11,7 +12,7 @@ jobs:
container: blackbirdcloud/terraform-toolkit:latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
Expand All @@ -30,4 +31,4 @@ jobs:
- name: Commit and push
uses: EndBug/add-and-commit@v9
with:
default_author: github_actions
default_author: github_actions
22 changes: 16 additions & 6 deletions .github/workflows/readme.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
name: Generate terraform docs
name: Generate Readme

on:
- pull_request
push:
branches:
- main
workflow_dispatch:

jobs:
docs:
generate-readme:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/create-github-app-token@v1
id: app-token
with:
ref: ${{ github.event.pull_request.head.ref }}

app-id: ${{ vars.BB_REPO_MANAGER_APP_ID }}
private-key: ${{ secrets.BB_REPO_MANAGER_SECRET }}
- uses: actions/checkout@v4
with:
token: ${{ steps.app-token.outputs.token }}
- name: Render terraform docs and push changes back to PR
uses: terraform-docs/gh-actions@main
with:
working-dir: .
config-file: .config/.terraform-docs.yml
git-push: "true"
output-method: replace

0 comments on commit 4d61fd0

Please sign in to comment.