Merge branch 'main' into feat/add-alb-name-and-tag-support

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,37 +1,43 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: 'bug'
-assignees: ''
-
+title: ""
+labels: "bug"
+assignees: ""
 ---
 
 Found a bug? Maybe our [Slack Community](https://slack.cloudposse.com) can help.
 
 [![Slack Community](https://slack.cloudposse.com/badge.svg)](https://slack.cloudposse.com)
 
 ## Describe the Bug
+
 A clear and concise description of what the bug is.
 
 ## Expected Behavior
+
 A clear and concise description of what you expected to happen.
 
 ## Steps to Reproduce
+
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Run '....'
 3. Enter '....'
 4. See error
 
 ## Screenshots
+
 If applicable, add screenshots or logs to help explain your problem.
 
 ## Environment (please complete the following information):
 
 Anything that will help us triage the bug will help. Here are some ideas:
- - OS: [e.g. Linux, OSX, WSL, etc]
- - Version [e.g. 10.15]
+
+- OS: [e.g. Linux, OSX, WSL, etc]
+- Version [e.g. 10.15]
 
 ## Additional Context
+
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,13 +1,13 @@
 ---
 name: Feature Request
 about: Suggest an idea for this project
-title: ''
-labels: 'feature request'
-assignees: ''
-
+title: ""
+labels: "feature request"
+assignees: ""
 ---
 
-Have a question? Please checkout our [Slack Community](https://slack.cloudposse.com) or visit our [Slack Archive](https://archive.sweetops.com/).
+Have a question? Please checkout our [Slack Community](https://slack.cloudposse.com) or visit our
+[Slack Archive](https://archive.sweetops.com/).
 
 [![Slack Community](https://slack.cloudposse.com/badge.svg)](https://slack.cloudposse.com)
 
@@ -21,7 +21,8 @@ A clear and concise description of what you expected to happen.
 
 ## Use Case
 
-Is your feature request related to a problem/challenge you are trying to solve? Please provide some additional context of why this feature or capability will be valuable.
+Is your feature request related to a problem/challenge you are trying to solve? Please provide some additional context
+of why this feature or capability will be valuable.
 
 ## Describe Ideal Solution
 

.github/settings.yml

@@ -0,0 +1,14 @@
+# These settings are synced to GitHub by https://probot.github.io/apps/settings/
+# Upstream changes from _extends are only recognized when modifications are made to this file in the default branch.
+_extends: .github
+repository:
+  # A URL with more information about the repository
+  homepage: https://docs.cloudposse.com/components/
+  # Either `true` to enable projects for this repository, or `false` to disable them.
+  # If projects are disabled for the organization, passing `true` will cause an API error.
+  has_projects: false
+  # Either `true` to enable the wiki for this repository, `false` to disable it.
+  has_wiki: false
+  name: terraform-aws-components
+  description: Opinionated, self-contained Terraform root modules that each solve one, specific problem
+  topics: terraform, terraform-module, geodesic, reference-implementation, reference-architecture, aws, service-catalog, catalog, library, examples, terraform-modules, stacks, blueprints, itil, catalogue, components, component-library

.github/workflows/auto-release.yml

@@ -8,19 +8,8 @@ on:
       - production
 
 jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      # Get PR from merged commit to master
-      - uses: actions-ecosystem/action-get-merged-pull-request@v1
-        id: get-merged-pull-request
-        with:
-          github_token: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}
-      # Drafts your next Release notes as Pull Requests are merged into "main"
-      - uses: release-drafter/release-drafter@v5
-        with:
-          publish: ${{ !contains(steps.get-merged-pull-request.outputs.labels, 'no-release') }}
-          prerelease: false
-          config-name: auto-release.yml
-        env:
-          GITHUB_TOKEN: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}
+  auto:
+    uses: cloudposse/.github/.github/workflows/shared-auto-release.yml@main
+    with:
+      publish: true
+    secrets: inherit

.github/workflows/bats.yml

@@ -1,7 +1,7 @@
 name: bats
 
 on:
-  pull_request_target:
+  pull_request:
     types: [labeled, opened, synchronize, unlabeled]
 
 jobs:
@@ -16,13 +16,9 @@ jobs:
       BATS_SUBMODULE_TESTS: input-descriptions lint output-descriptions
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        repository: ${{ github.event.pull_request.head.repo.full_name }}
-        # Check out the PR commit, not the merge commit
-        # Use `ref` instead of `sha` to enable pushing back to `ref`
-        ref: ${{ github.event.pull_request.head.ref }}
 
     - name: Run tests on modified modules
       id: get-modified-files
@@ -32,7 +28,7 @@ jobs:
         HEAD_REF: ${{ github.head_ref }}
       run: |
         # when running in test-harness, need to mark the directory safe for git operations
-        make safe-directory
+        make git-safe-directory
         MODIFIED_MODULES=($(git diff --name-only origin/${BASE_REF} origin/${HEAD_REF} | xargs -n 1 dirname | sort | uniq | grep ^modules/ || true))
         if [ -z "$MODIFIED_MODULES" ]; then
             echo "No modules changed in this PR. Skipping tests."

.github/workflows/scheduled.yml

@@ -0,0 +1,16 @@
+---
+name: scheduled
+on:
+  workflow_dispatch: { }  # Allows manually trigger this workflow
+  schedule:
+    - cron: "0 3 * * *"
+
+permissions:
+  pull-requests: write
+  id-token: write
+  contents: write
+
+jobs:
+  scheduled:
+    uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/scheduled.yml@main
+    secrets: inherit

.github/workflows/update-changelog.yml

@@ -12,9 +12,7 @@ permissions:
 
 jobs:
   update-changelog:
-    runs-on:
-      - "self-hosted"
-
+    runs-on: ["ubuntu-latest"]
     steps:
       - name: Current Release
         id: current-release
@@ -96,11 +94,11 @@ jobs:
 
             function trimPath(relativePath) {
               return relativePath
-                .replace('components/terraform/', '')
+                .replace('modules/', '')
                 .replace('/CHANGELOG.md', '');
             }
 
-            const currentChangeLogFiles = findChangelogs('./current/components');
+            const currentChangeLogFiles = findChangelogs('./current/modules');
             const components = [];
 
             for (let i = 0; i < currentChangeLogFiles.length; i++) {
@@ -164,7 +162,7 @@ jobs:
             fs.writeFileSync(filePath, updatedContent, 'utf-8');
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           title: 'Update Changelog for `${{ steps.current-release.outputs.tag }}`'
           body: 'Update Changelog for [`${{ steps.current-release.outputs.tag }}`](${{ github.event.release.html_url }})'

.gitignore

@@ -3,6 +3,7 @@ build-harness/
 aws-assumed-role/
 .idea/
 *.iml
+docs/terraform.md
 
 vendir.lock.yml
 

.pre-commit-config.yaml

@@ -23,10 +23,14 @@ repos:
       - id: check-yaml  # checks yaml files for parseable syntax.
         exclude: |
           (?x)^(
+              deprecated/eks/.*/charts/.*/templates/.*.yaml
               deprecated/github-actions-runner/runners/actions-runner/chart/templates/.*.yaml |
               modules/eks/cert-manager/cert-manager-issuer/templates/.*.yaml |
               modules/strongdm/charts/strongdm/templates/.*.yaml |
-              modules/eks/.*/charts/.*/templates/.*.yaml
+              modules/eks/.*/charts/.*/templates/.*.yaml |
+              modules/eks/.*/charts/.*/templates/.*.yml |
+              modules/eks/promtail/scrape_config/.*.yaml |
+              modules/eks/promtail/scrape_config/.*.yml
           )$
 
   - repo: https://github.com/antonbabenko/pre-commit-terraform
@@ -35,6 +39,23 @@ repos:
       - id: terraform_fmt
       - id: terraform_docs
         args: ["--args=--lockfile=false"]
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v3.1.0
+    hooks:
+      - id: prettier
+        name: prettier
+        entry: prettier --write --prose-wrap always --print-width 120
+        types: ["markdown"]
+        # If prettier chokes on the output of the `terraform-docs` command for a file, don't
+        #   exclude it here. Instead, wrap the terraform-docs comment in the README with
+        #   `<!-- prettier-ignore-start -->` and `<!-- prettier-ignore-end -->` comments.
+        exclude: |
+          (?x)^(
+              README.md |
+              deprecated/.*.md
+          )$
+
   - repo: local
     hooks:
       - id: rebuild-mixins-docs