diff --git a/.github/workflows/readme.doto b/.github/workflows/readme.doto new file mode 100644 index 0000000..f432ea4 --- /dev/null +++ b/.github/workflows/readme.doto @@ -0,0 +1,54 @@ +#name: 'Create README.md file' +#on: +# push: +# branches: +# - master +# +#jobs: +# readme-create: +# name: 'readme-create' +# runs-on: ubuntu-latest +# steps: +# - name: 'Checkout' +# uses: actions/checkout@v2.3.4 +# +# - name: 'Set up Python 3.7' +# uses: actions/setup-python@v2 +# with: +# python-version: '3.x' +# +# - name: 'create readme' +# uses: 'clouddrove/github-actions@v9.0' +# with: +# actions_subcommand: 'readme' +# github_token: '${{ secrets.GITHUB }}' +# env: +# GITHUB_TOKEN: ${{ secrets.CLOUDDROVE_GITHUB_TOKEN }} +# +# +# - name: 'pre-commit check errors' +# uses: pre-commit/action@v2.0.0 +# continue-on-error: true +# +# - name: 'pre-commit fix errors' +# uses: pre-commit/action@v2.0.0 +# continue-on-error: true +# +# - name: 'push readme' +# uses: 'clouddrove/github-actions@v9.0' +# 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() diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml deleted file mode 100644 index 18bbb4e..0000000 --- a/.github/workflows/readme.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: 'Create README.md file' -on: - push: - branches: - - master - -jobs: - readme-create: - name: 'readme-create' - runs-on: ubuntu-latest - steps: - - name: 'Checkout' - uses: actions/checkout@v2.3.4 - - - name: 'Set up Python 3.7' - uses: actions/setup-python@v2 - with: - python-version: '3.x' - - - name: 'create readme' - uses: 'clouddrove/github-actions@v9.0' - with: - actions_subcommand: 'readme' - github_token: '${{ secrets.GITHUB }}' - env: - GITHUB_TOKEN: ${{ secrets.CLOUDDROVE_GITHUB_TOKEN }} - - - - name: 'pre-commit check errors' - uses: pre-commit/action@v2.0.0 - continue-on-error: true - - - name: 'pre-commit fix errors' - uses: pre-commit/action@v2.0.0 - continue-on-error: true - - - name: 'push readme' - uses: 'clouddrove/github-actions@v9.0' - 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() diff --git a/README.md b/README.md index c02e552..09d0482 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@

- Terraform + Terraform Licence @@ -51,7 +51,7 @@ We have [*fifty plus terraform modules*][terraform_modules]. A few of them are c This module has a few dependencies: -- [Terraform 0.13](https://learn.hashicorp.com/terraform/getting-started/install.html) +- [Terraform 0.15](https://learn.hashicorp.com/terraform/getting-started/install.html) - [Go](https://golang.org/doc/install) - [github.com/stretchr/testify/assert](https://github.com/stretchr/testify) - [github.com/gruntwork-io/terratest/modules/terraform](https://github.com/gruntwork-io/terratest) @@ -72,12 +72,11 @@ This module has a few dependencies: Here is an example of how you can use this module in your inventory structure: ```hcl module "firewall" { - source = "clouddrove/firewall/digitalocean" - version = "0.13.0" + source = "terraform-do-modules/firewall/digitalocean" + version = "0.15.0" name = "firewall" - application = "clouddrove" environment = "test" - label_order = ["environment", "application", "name"] + label_order = ["environment", "name"] enable_firewall = true allowed_ip = ["0.0.0.0/0"] allowed_ports = [22, 80] diff --git a/README.yaml b/README.yaml index 517f60b..7f4522f 100644 --- a/README.yaml +++ b/README.yaml @@ -36,7 +36,7 @@ usage : |- Here is an example of how you can use this module in your inventory structure: ```hcl module "firewall" { - source = "clouddrove/firewall/digitalocean" + source = "terraform-do-modules/firewall/digitalocean" version = "0.15.0" name = "firewall" environment = "test" diff --git a/_example/example.tf b/_example/example.tf index 44671da..653395a 100644 --- a/_example/example.tf +++ b/_example/example.tf @@ -6,8 +6,8 @@ provider "digitalocean" { } module "vpc" { - source = "git::https://github.com/terraform-do-modules/terraform-digitalocean-vpc.git?ref=0.15" - #version = "0.15.0" + source = "terraform-do-modules/vpc/digitalocean" + version = "0.15.0" name = "vpc" environment = "test" label_order = ["environment", "name"] @@ -19,8 +19,8 @@ module "vpc" { module "ssh_key" { - source = "git::https://github.com/terraform-do-modules/terraform-digitalocean-ssh-key.git?ref=0.15" - #version = "0.15.0" + source = "terraform-do-modules/ssh-key/digitalocean" + version = "0.15.0" key_path = "~/.ssh/id_rsa.pub" key_name = "devops" enable_ssh_key = true @@ -28,8 +28,8 @@ module "ssh_key" { module "droplet" { - source = "git::https://github.com/terraform-do-modules/terraform-digitalocean-droplet.git?ref=0.15" - #version = "0.15.0" + source = "terraform-do-modules/droplet/digitalocean" + version = "0.15.0" name = "droplet" environment = "test" label_order = ["environment", "name"] diff --git a/main.tf b/main.tf index 1e01c79..1b215e1 100644 --- a/main.tf +++ b/main.tf @@ -8,8 +8,8 @@ # tags for resources. You can use terraform-labels to implement a strict # naming convention. module "labels" { - source = "git::https://github.com/terraform-do-modules/terraform-digitalocean-labels.git?ref=0.15" - #version = "0.15.0" + source = "terraform-do-modules/labels/digitalocean" + version = "0.15.0" name = var.name environment = var.environment label_order = var.label_order