From 0cb86be9a6c8877cea080be48a2e49dcd291a5c1 Mon Sep 17 00:00:00 2001 From: Vishwajit Nagulkar <119565952+VishwajitNagulkar@users.noreply.github.com> Date: Fri, 12 Apr 2024 23:14:12 +0530 Subject: [PATCH 1/2] feat: updated example path and readme paramters --- .github/dependabot.yml | 8 +-- .github/workflows/readme.yml | 57 +++---------------- .github/workflows/tf-checks.yml | 8 +-- README.yaml | 22 +++++-- .../multi_node_non_vpc/main.tf | 0 .../multi_node_non_vpc/outputs.tf | 0 .../multi_node_non_vpc/versions.tf | 0 {_example => examples}/multi_node_vpc/main.tf | 0 .../multi_node_vpc/outputs.tf | 0 .../multi_node_vpc/versions.tf | 0 .../single_node_non_vpc/main.tf | 0 .../single_node_non_vpc/outputs.tf | 0 .../single_node_non_vpc/versions.tf | 0 .../single_node_vpc/main.tf | 0 .../single_node_vpc/outputs.tf | 0 .../single_node_vpc/versions.tf | 0 16 files changed, 35 insertions(+), 60 deletions(-) rename {_example => examples}/multi_node_non_vpc/main.tf (100%) rename {_example => examples}/multi_node_non_vpc/outputs.tf (100%) rename {_example => examples}/multi_node_non_vpc/versions.tf (100%) rename {_example => examples}/multi_node_vpc/main.tf (100%) rename {_example => examples}/multi_node_vpc/outputs.tf (100%) rename {_example => examples}/multi_node_vpc/versions.tf (100%) rename {_example => examples}/single_node_non_vpc/main.tf (100%) rename {_example => examples}/single_node_non_vpc/outputs.tf (100%) rename {_example => examples}/single_node_non_vpc/versions.tf (100%) rename {_example => examples}/single_node_vpc/main.tf (100%) rename {_example => examples}/single_node_vpc/outputs.tf (100%) rename {_example => examples}/single_node_vpc/versions.tf (100%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a15e60f..5069540 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -30,7 +30,7 @@ updates: open-pull-requests-limit: 3 - package-ecosystem: "terraform" # See documentation for possible values - directory: "/_example/multi_node_non_vpc" # Location of package manifests + directory: "/examples/multi_node_non_vpc" # Location of package manifests schedule: interval: "weekly" # Add assignees @@ -43,7 +43,7 @@ updates: open-pull-requests-limit: 3 - package-ecosystem: "terraform" # See documentation for possible values - directory: "/_example/multi_node_vpc" # Location of package manifests + directory: "/examples/multi_node_vpc" # Location of package manifests schedule: interval: "weekly" # Add assignees @@ -56,7 +56,7 @@ updates: open-pull-requests-limit: 3 - package-ecosystem: "terraform" # See documentation for possible values - directory: "/_example/single_node_non_vpc" # Location of package manifests + directory: "/examples/single_node_non_vpc" # Location of package manifests schedule: interval: "weekly" # Add assignees @@ -69,7 +69,7 @@ updates: open-pull-requests-limit: 3 - package-ecosystem: "terraform" # See documentation for possible values - directory: "/_example/single_node_vpc" # Location of package manifests + directory: "/examples/single_node_vpc" # Location of package manifests schedule: interval: "weekly" # Add assignees diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml index f1a4ed9..9bb5230 100644 --- a/.github/workflows/readme.yml +++ b/.github/workflows/readme.yml @@ -1,53 +1,14 @@ -name: 'Create README.md file' +name: Readme Workflow on: push: branches: - master - + paths-ignore: + - 'README.md' + workflow_dispatch: jobs: - readme-create: - name: 'readme-create' - runs-on: ubuntu-latest - steps: - - name: 'Checkout' - uses: actions/checkout@master - - - name: 'Set up Python 3.7' - uses: actions/setup-python@v5 - with: - python-version: '3.x' - - - name: 'create readme' - uses: 'clouddrove/github-actions@9.0.3' - with: - actions_subcommand: 'readme' - github_token: '${{ secrets.GITHUB }}' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: 'pre-commit check errors' - uses: pre-commit/action@v3.0.1 - continue-on-error: true - - - name: 'pre-commit fix erros' - uses: pre-commit/action@v3.0.1 - continue-on-error: true - - - name: 'push readme' - uses: 'clouddrove/github-actions@9.0.3' - continue-on-error: true - with: - actions_subcommand: 'push' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: 'Slack Notification' - uses: clouddrove/action-slack@v2 - with: - status: ${{ job.status }} - fields: repo,author - author_name: 'CloudDrove' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required - if: always() + README: + uses: clouddrove/github-shared-workflows/.github/workflows/readme.yml@1.2.4 + secrets: + TOKEN : ${{ secrets.GITHUB }} + SLACK_WEBHOOK_TERRAFORM: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} \ No newline at end of file diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml index 1678298..c7803d3 100644 --- a/.github/workflows/tf-checks.yml +++ b/.github/workflows/tf-checks.yml @@ -8,16 +8,16 @@ jobs: tf-checks-multi_node_non_vpc-example: uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.4 with: - working_directory: './_example/multi_node_non_vpc/' + working_directory: './examples/multi_node_non_vpc/' tf-checks-multi_node_vpc-example: uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.4 with: - working_directory: './_example/multi_node_vpc/' + working_directory: './examples/multi_node_vpc/' tf-checks-single_node_non_vpc-example: uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.4 with: - working_directory: './_example/single_node_non_vpc/' + working_directory: './examples/single_node_non_vpc/' tf-checks-single_node_vpc-example: uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.4 with: - working_directory: './_example/single_node_vpc/' + working_directory: './examples/single_node_vpc/' diff --git a/README.yaml b/README.yaml index 57df9eb..73013b4 100644 --- a/README.yaml +++ b/README.yaml @@ -24,15 +24,29 @@ badges: - name: "Licence" image: "https://img.shields.io/badge/License-APACHE-blue.svg" url: "LICENSE.md" + - name: "Changelog" + image: "https://img.shields.io/badge/Changelog-blue" + url: "CHANGELOG.md" + +prerequesties: + - name: Terraform + url: https://learn.hashicorp.com/terraform/getting-started/install.html + version: ">= 1.6.6" + +providers: + - name: aws + url: https://aws.amazon.com/ + version: ">= 5.31.0" + +module_dependencies: + - name: Labels Module + url: https://github.com/clouddrove/terraform-aws-labels + description: Provides resource tagging. # description of this project description: |- Terraform module to create an Elasticsearch resource on AWS. -# extra content -include: - - "terraform.md" - # How to use this project # yamllint disable rule:line-length usage: |- diff --git a/_example/multi_node_non_vpc/main.tf b/examples/multi_node_non_vpc/main.tf similarity index 100% rename from _example/multi_node_non_vpc/main.tf rename to examples/multi_node_non_vpc/main.tf diff --git a/_example/multi_node_non_vpc/outputs.tf b/examples/multi_node_non_vpc/outputs.tf similarity index 100% rename from _example/multi_node_non_vpc/outputs.tf rename to examples/multi_node_non_vpc/outputs.tf diff --git a/_example/multi_node_non_vpc/versions.tf b/examples/multi_node_non_vpc/versions.tf similarity index 100% rename from _example/multi_node_non_vpc/versions.tf rename to examples/multi_node_non_vpc/versions.tf diff --git a/_example/multi_node_vpc/main.tf b/examples/multi_node_vpc/main.tf similarity index 100% rename from _example/multi_node_vpc/main.tf rename to examples/multi_node_vpc/main.tf diff --git a/_example/multi_node_vpc/outputs.tf b/examples/multi_node_vpc/outputs.tf similarity index 100% rename from _example/multi_node_vpc/outputs.tf rename to examples/multi_node_vpc/outputs.tf diff --git a/_example/multi_node_vpc/versions.tf b/examples/multi_node_vpc/versions.tf similarity index 100% rename from _example/multi_node_vpc/versions.tf rename to examples/multi_node_vpc/versions.tf diff --git a/_example/single_node_non_vpc/main.tf b/examples/single_node_non_vpc/main.tf similarity index 100% rename from _example/single_node_non_vpc/main.tf rename to examples/single_node_non_vpc/main.tf diff --git a/_example/single_node_non_vpc/outputs.tf b/examples/single_node_non_vpc/outputs.tf similarity index 100% rename from _example/single_node_non_vpc/outputs.tf rename to examples/single_node_non_vpc/outputs.tf diff --git a/_example/single_node_non_vpc/versions.tf b/examples/single_node_non_vpc/versions.tf similarity index 100% rename from _example/single_node_non_vpc/versions.tf rename to examples/single_node_non_vpc/versions.tf diff --git a/_example/single_node_vpc/main.tf b/examples/single_node_vpc/main.tf similarity index 100% rename from _example/single_node_vpc/main.tf rename to examples/single_node_vpc/main.tf diff --git a/_example/single_node_vpc/outputs.tf b/examples/single_node_vpc/outputs.tf similarity index 100% rename from _example/single_node_vpc/outputs.tf rename to examples/single_node_vpc/outputs.tf diff --git a/_example/single_node_vpc/versions.tf b/examples/single_node_vpc/versions.tf similarity index 100% rename from _example/single_node_vpc/versions.tf rename to examples/single_node_vpc/versions.tf From 98564c6676798e02ccc1e010635bc31e177f097f Mon Sep 17 00:00:00 2001 From: Vishwajit Nagulkar <119565952+VishwajitNagulkar@users.noreply.github.com> Date: Thu, 25 Apr 2024 15:31:08 +0530 Subject: [PATCH 2/2] feat- added path for ignore file in GHA --- .github/workflows/readme.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml index 9bb5230..3d0c2f1 100644 --- a/.github/workflows/readme.yml +++ b/.github/workflows/readme.yml @@ -5,10 +5,11 @@ on: - master paths-ignore: - 'README.md' + - 'docs/**' workflow_dispatch: jobs: README: uses: clouddrove/github-shared-workflows/.github/workflows/readme.yml@1.2.4 secrets: TOKEN : ${{ secrets.GITHUB }} - SLACK_WEBHOOK_TERRAFORM: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} \ No newline at end of file + SLACK_WEBHOOK_TERRAFORM: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }}