Skip to content

Commit 8f215ba

Browse files
authored
Merge pull request #2 from terraform-do-modules/0.15
fix readme
2 parents f57fb00 + 05d4159 commit 8f215ba

File tree

6 files changed

+68
-69
lines changed

6 files changed

+68
-69
lines changed

.github/workflows/readme.doto

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#name: 'Create README.md file'
2+
#on:
3+
# push:
4+
# branches:
5+
# - master
6+
#
7+
#jobs:
8+
# readme-create:
9+
# name: 'readme-create'
10+
# runs-on: ubuntu-latest
11+
# steps:
12+
# - name: 'Checkout'
13+
# uses: actions/checkout@v2.3.4
14+
#
15+
# - name: 'Set up Python 3.7'
16+
# uses: actions/setup-python@v2
17+
# with:
18+
# python-version: '3.x'
19+
#
20+
# - name: 'create readme'
21+
# uses: 'clouddrove/github-actions@v9.0'
22+
# with:
23+
# actions_subcommand: 'readme'
24+
# github_token: '${{ secrets.GITHUB }}'
25+
# env:
26+
# GITHUB_TOKEN: ${{ secrets.CLOUDDROVE_GITHUB_TOKEN }}
27+
#
28+
#
29+
# - name: 'pre-commit check errors'
30+
# uses: pre-commit/action@v2.0.0
31+
# continue-on-error: true
32+
#
33+
# - name: 'pre-commit fix errors'
34+
# uses: pre-commit/action@v2.0.0
35+
# continue-on-error: true
36+
#
37+
# - name: 'push readme'
38+
# uses: 'clouddrove/github-actions@v9.0'
39+
# continue-on-error: true
40+
# with:
41+
# actions_subcommand: 'push'
42+
# env:
43+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
#
45+
# - name: 'Slack Notification'
46+
# uses: clouddrove/action-slack@v2
47+
# with:
48+
# status: ${{ job.status }}
49+
# fields: repo,author
50+
# author_name: 'CloudDrove'
51+
# env:
52+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
53+
# SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
54+
# if: always()

.github/workflows/readme.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<p align="center">
1515

1616
<a href="https://www.terraform.io">
17-
<img src="https://img.shields.io/badge/Terraform-v0.13-green" alt="Terraform">
17+
<img src="https://img.shields.io/badge/Terraform-v0.15-green" alt="Terraform">
1818
</a>
1919
<a href="LICENSE.md">
2020
<img src="https://img.shields.io/badge/License-MIT-blue.svg" alt="Licence">
@@ -51,7 +51,7 @@ We have [*fifty plus terraform modules*][terraform_modules]. A few of them are c
5151

5252
This module has a few dependencies:
5353

54-
- [Terraform 0.13](https://learn.hashicorp.com/terraform/getting-started/install.html)
54+
- [Terraform 0.15](https://learn.hashicorp.com/terraform/getting-started/install.html)
5555
- [Go](https://golang.org/doc/install)
5656
- [github.com/stretchr/testify/assert](https://github.com/stretchr/testify)
5757
- [github.com/gruntwork-io/terratest/modules/terraform](https://github.com/gruntwork-io/terratest)
@@ -72,12 +72,11 @@ This module has a few dependencies:
7272
Here is an example of how you can use this module in your inventory structure:
7373
```hcl
7474
module "firewall" {
75-
source = "clouddrove/firewall/digitalocean"
76-
version = "0.13.0"
75+
source = "terraform-do-modules/firewall/digitalocean"
76+
version = "0.15.0"
7777
name = "firewall"
78-
application = "clouddrove"
7978
environment = "test"
80-
label_order = ["environment", "application", "name"]
79+
label_order = ["environment", "name"]
8180
enable_firewall = true
8281
allowed_ip = ["0.0.0.0/0"]
8382
allowed_ports = [22, 80]

README.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ usage : |-
3636
Here is an example of how you can use this module in your inventory structure:
3737
```hcl
3838
module "firewall" {
39-
source = "clouddrove/firewall/digitalocean"
39+
source = "terraform-do-modules/firewall/digitalocean"
4040
version = "0.15.0"
4141
name = "firewall"
4242
environment = "test"

_example/example.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ provider "digitalocean" {
66
}
77

88
module "vpc" {
9-
source = "git::https://github.com/terraform-do-modules/terraform-digitalocean-vpc.git?ref=0.15"
10-
#version = "0.15.0"
9+
source = "terraform-do-modules/vpc/digitalocean"
10+
version = "0.15.0"
1111
name = "vpc"
1212
environment = "test"
1313
label_order = ["environment", "name"]
@@ -19,17 +19,17 @@ module "vpc" {
1919

2020

2121
module "ssh_key" {
22-
source = "git::https://github.com/terraform-do-modules/terraform-digitalocean-ssh-key.git?ref=0.15"
23-
#version = "0.15.0"
22+
source = "terraform-do-modules/ssh-key/digitalocean"
23+
version = "0.15.0"
2424
key_path = "~/.ssh/id_rsa.pub"
2525
key_name = "devops"
2626
enable_ssh_key = true
2727
}
2828

2929

3030
module "droplet" {
31-
source = "git::https://github.com/terraform-do-modules/terraform-digitalocean-droplet.git?ref=0.15"
32-
#version = "0.15.0"
31+
source = "terraform-do-modules/droplet/digitalocean"
32+
version = "0.15.0"
3333
name = "droplet"
3434
environment = "test"
3535
label_order = ["environment", "name"]

main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
# tags for resources. You can use terraform-labels to implement a strict
99
# naming convention.
1010
module "labels" {
11-
source = "git::https://github.com/terraform-do-modules/terraform-digitalocean-labels.git?ref=0.15"
12-
#version = "0.15.0"
11+
source = "terraform-do-modules/labels/digitalocean"
12+
version = "0.15.0"
1313
name = var.name
1414
environment = var.environment
1515
label_order = var.label_order

0 commit comments

Comments
 (0)