Skip to content

Commit

Permalink
Merge pull request #14 from telekom-mms/refactoring
Browse files Browse the repository at this point in the history
Refactoring
  • Loading branch information
michaelamattes authored Sep 13, 2023
2 parents 27d0ad8 + 31cba97 commit df1b9da
Show file tree
Hide file tree
Showing 24 changed files with 2,602 additions and 528 deletions.
52 changes: 0 additions & 52 deletions .github/release-drafter.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"repos": {
"description": "A Terraform module that manages the container resources from the azurerm provider.",
"visibility": "public",
"default_branch": "main",
"homepage": "https://telekom-mms.github.io/terraform-template",
"topics": [
"terraform",
"azure",
"azurerm-cdn-profile",
"azurerm-cdn-endpoint",
"azurerm-cdn-endpoint-custom-domain",
"azurerm-cdn-frontdoor-profile",
"azurerm-cdn-frontdoor-origin-group",
"azurerm-cdn-frontdoor-origin",
"azurerm-cdn-frontdoor-endpoint",
"azurerm-cdn-frontdoor-custom-domain",
"azurerm-cdn-frontdoor-route",
"azurerm-cdn-frontdoor-rule-set",
"azurerm-cdn-frontdoor-rule",
"azurerm-cdn-frontdoor-secret",
"azurerm-cdn-frontdoor-firewall-policy",
"azurerm-cdn-frontdoor-security-policy"
]
}
}
12 changes: 12 additions & 0 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: codespell

on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
call-codespell:
uses: telekom-mms/.github/.github/workflows/codespell.yml@main
12 changes: 12 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: linting

on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
call-linting:
uses: telekom-mms/.github/.github/workflows/terraform_linting.yml@main
24 changes: 0 additions & 24 deletions .github/workflows/prettier-md.yml

This file was deleted.

89 changes: 14 additions & 75 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,80 +1,19 @@
---
name: New release
name: release

on: # yamllint disable-line rule:truthy
workflow_dispatch:
on:
push:
branches:
- main
branches: [main]

jobs:
generate_changelog:
runs-on: ubuntu-latest
name: create release draft
steps:
- uses: actions/checkout@v3.2.0
with:
fetch-depth: 0

- name: 'Get Previous tag'
id: previoustag
uses: "WyriHaximus/github-action-get-previous-tag@master"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

- name: calculate next version
id: version
uses: patrickjahns/version-drafter-action@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Generate changelog
uses: charmixer/auto-changelog-action@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
future_release: ${{ steps.version.outputs.next-version }}

- name: Generate readme
uses: terraform-docs/gh-actions@main
with:
working-dir: .
output-file: README.md
output-method: inject
env:
TEMPLATE_REPOSITORY: telekom-mms/terraform-template

- name: push changelog and readme
uses: github-actions-x/commit@v2.9
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
push-branch: 'main'
commit-message: 'update changelog'
force-add: 'true'
files: CHANGELOG.md README.md
name: T-Systems MMS
email: frage@t-systems-mms.com

# do a second checkout to prevent race situation
# changelog gets updated but action works on old commit id
- uses: actions/checkout@v3.2.0
with:
ref: main

- name: Generate changelog for the release
run: |
sed '/## \[${{ steps.previoustag.outputs.tag }}\]/Q' CHANGELOG.md > CHANGELOGRELEASE.md
- name: Read CHANGELOG.md
id: package
uses: juliangruber/read-file-action@v1
with:
path: ./CHANGELOGRELEASE.md

- name: Create Release draft
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
release_name: ${{ steps.version.outputs.next-version }}
tag_name: ${{ steps.version.outputs.next-version }}
body: |
${{ steps.package.outputs.content }}
draft: true
jobs:
call-readme:
if: github.repository != '$TEMPLATE_REPOSITORY'
uses: telekom-mms/.github/.github/workflows/terraform_docs.yml@main
call-release:
if: github.repository != '$TEMPLATE_REPOSITORY'
uses: telekom-mms/.github/.github/workflows/release.yml@main
with:
files: README.md
18 changes: 18 additions & 0 deletions .github/workflows/settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: settings

on:
push:
branches: [main]
schedule:
- cron: '0 10 * * *'

env:
TEMPLATE_REPOSITORY: telekom-mms/terraform-template

jobs:
call-settings:
if: github.repository != '$TEMPLATE_REPOSITORY'
uses: telekom-mms/.github/.github/workflows/github_repository.yml@main
secrets:
GH_APP_CREDENTIALS_TOKEN: ${{ secrets.GH_APP_CREDENTIALS_TOKEN }}
23 changes: 0 additions & 23 deletions .github/workflows/terraform.yml

This file was deleted.

18 changes: 18 additions & 0 deletions .github/workflows/terrascan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: terrascan

on:
pull_request:
branches: [main]

env:
TEMPLATE_REPOSITORY: telekom-mms/terraform-template

jobs:
call-terrascan:
if: github.repository != '$TEMPLATE_REPOSITORY'
uses: telekom-mms/.github/.github/workflows/terrascan.yml@main
with:
iac_type: terraform
policy_type: all
non_recursive: true
21 changes: 21 additions & 0 deletions .github/workflows/terratest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
name: terratest

on:
pull_request:
branches: [main]

env:
TEMPLATE_REPOSITORY: telekom-mms/terraform-template

jobs:
call-terratest:
if: github.repository != '$TEMPLATE_REPOSITORY'
uses: telekom-mms/.github/.github/workflows/terratest.yml@main
with:
test: azure
secrets:
azure_client_id: ${{ secrets.AZURE_CLIENT_ID }}
azure_client_secret: ${{ secrets.AZURE_CLIENT_SECRET }}
azure_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
azure_tenant_id: ${{ secrets.AZURE_TENANT_ID }}
27 changes: 22 additions & 5 deletions .terraform-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ sections:
- header
- requirements
- providers
- data-sources
- resources
- modules
- inputs
Expand All @@ -14,7 +15,7 @@ sections:
content: |-
{{ .Header }}
<-- This file is autogenerated, please do not change. -->
_<-- This file is autogenerated, please do not change. -->_
{{ .Requirements }}
Expand All @@ -28,19 +29,35 @@ content: |-
## Examples
Minimal configuration to install the desired resources with the module
```hcl
{{ include "examples/min_main.tf" }}
```
Advanced configuration to install the desired resources with the module
```hcl
{{ include "examples/main.tf" }}
{{ include "examples/full_main.tf" }}
```
output:
mode: replace
template: |-
<!-- BEGIN_TF_DOCS -->
{{ .Content }}
<!-- END_TF_DOCS -->
sort:
enabled: true
by: required

settings:
indent: 2
hide-empty: true
anchor: false
escape: false
hide-empty: true
html: true
indent: 2
read-comments: true
required: true
type: true
read-comments: true
Loading

0 comments on commit df1b9da

Please sign in to comment.