From b15ee149e67e2e82688a85f46337cfd2ae8e29cd Mon Sep 17 00:00:00 2001 From: WestonPlatter Date: Fri, 6 Jun 2025 13:18:39 -0700 Subject: [PATCH] fix: sync with core template --- .coderabbit.yaml | 13 +++++++++---- .gitignore | 5 +++-- .terraform-docs.yaml | 1 - .trunk/configs/.markdownlint.yaml | 5 +++++ .trunk/trunk.yaml | 5 +++-- aqua.yaml | 8 +++++--- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.coderabbit.yaml b/.coderabbit.yaml index e279a6f..39f44bd 100644 --- a/.coderabbit.yaml +++ b/.coderabbit.yaml @@ -7,6 +7,7 @@ language: en tone_instructions: | Provide feedback in a professional, friendly, constructive, and concise tone. Offer clear, specific suggestions and best practices to help enhance the code quality and promote learning. + Be concise and only comment on significant issues. early_access: true @@ -26,21 +27,25 @@ knowledge_base: reviews: profile: chill auto_review: - # Ignore reviewing if the title of the pull request contains any of these keywords (case-insensitive) + # Disable incremental code review on each push + auto_incremental_review: false + # The keywords are case-insensitive ignore_title_keywords: - wip - draft - test - # Set the commit status to 'pending' when the review is in progress and 'success' when it is complete. commit_status: false - # Post review details on each review. Additionally, post a review status when a review is skipped in certain cases. - review_status: false path_instructions: - path: "**/*.tf" instructions: | You're a Terraform expert who has thoroughly studied all the documentation from Hashicorp https://developer.hashicorp.com/terraform/docs and OpenTofu https://opentofu.org/docs/. You have a strong grasp of Terraform syntax and prioritize providing accurate and insightful code suggestions. As a fan of the Cloud Posse / SweetOps ecosystem, you incorporate many of their best practices https://docs.cloudposse.com/best-practices/terraform/ while balancing them with general Terraform guidelines. + changed_files_summary: false + poem: false + # Don't post review details on each review. + review_status: false + sequence_diagrams: false tools: # By default, all tools are enabled. # Masterpoint uses Trunk (https://trunk.io) so we do not need a lot of this feedback due to overlap. diff --git a/.gitignore b/.gitignore index 5a264c7..9636abe 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,9 @@ # Local .terraform directories **/.terraform/* -# Terraform lock file +# Ignore the root .terraform.lock.hcl file (Child modules don't want this) .terraform.lock.hcl +!examples/**/.terraform.lock.hcl # IDE/Editor settings **/.idea @@ -42,4 +43,4 @@ backend.tf.json **/*.temp **/*.bak **/*.*swp -**/.DS_Store \ No newline at end of file +**/.DS_Store diff --git a/.terraform-docs.yaml b/.terraform-docs.yaml index 60052e1..710c102 100644 --- a/.terraform-docs.yaml +++ b/.terraform-docs.yaml @@ -6,7 +6,6 @@ recursive: settings: lockfile: false - path: . output: file: README.md diff --git a/.trunk/configs/.markdownlint.yaml b/.trunk/configs/.markdownlint.yaml index c97ae62..33a98b8 100644 --- a/.trunk/configs/.markdownlint.yaml +++ b/.trunk/configs/.markdownlint.yaml @@ -12,3 +12,8 @@ whitespace: false # Ignore MD041/first-line-heading/first-line-h1 # Error: First line in a file should be a top-level heading MD041: false + +# Ignore MD013/line-length +MD013: + strict: false + line_length: 350 diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 0ff085c..94de5a3 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -20,6 +20,7 @@ lint: # Incompatible with some Terraform features: https://github.com/tenable/terrascan/issues/1331 - terrascan enabled: + - renovate@40.0.0 - tofu@1.9.1 - actionlint@1.7.7 - checkov@3.2.413 @@ -35,9 +36,9 @@ lint: paths: - "**/backend.tf.json" # Ignore CHANGELOG.md as release-please manages this file - - linters: [prettier, markdownlint] + - linters: [ALL] paths: - - CHANGELOG.md + - "**/CHANGELOG.md" actions: enabled: - terraform-docs diff --git a/aqua.yaml b/aqua.yaml index 152e8c8..264e850 100644 --- a/aqua.yaml +++ b/aqua.yaml @@ -8,8 +8,10 @@ # - all registries: - type: standard - ref: v4.210.0 # renovate: depName=aquaproj/aqua-registry + ref: v4.355.0 # renovate: depName=aquaproj/aqua-registry packages: - name: terraform-docs/terraform-docs@v0.20.0 - - name: hashicorp/terraform@v1.9.3 - - name: opentofu/opentofu@v1.8.0 + - name: hashicorp/terraform@v1.11.4 + tags: [terraform] + - name: opentofu/opentofu@v1.9.1 + tags: [tofu]