Skip to content

Commit

Permalink
Merge pull request #4 from pbs/chore/template_updates
Browse files Browse the repository at this point in the history
Template Updates
  • Loading branch information
yhakbar authored May 23, 2023
2 parents fe56056 + fcd1baf commit 4e2988f
Show file tree
Hide file tree
Showing 19 changed files with 114 additions and 2,536 deletions.
21 changes: 21 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"

- package-ecosystem: "terraform"
directory: "/"
schedule:
interval: "weekly"

- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "weekly"
6 changes: 3 additions & 3 deletions .github/workflows/document.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ jobs:
uses: actions/checkout@main

- name: Setup asdf
uses: asdf-vm/actions/setup@v1
uses: asdf-vm/actions/setup@v2

- name: Cache asdf
id: asdf-cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.asdf/
key: ${{ runner.os }}-${{ hashFiles('**/.tool-versions') }}

- name: Setup asdf
if: steps.asdf-cache.outputs.cache-hit != 'true'
uses: asdf-vm/actions/install@v1
uses: asdf-vm/actions/install@v2

- name: "Generate documentation"
run: ./scripts/document.sh
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ jobs:
uses: actions/checkout@main

- name: Setup asdf
uses: asdf-vm/actions/setup@v1
uses: asdf-vm/actions/setup@v2

- name: Cache asdf
id: asdf-cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.asdf/
key: ${{ runner.os }}-${{ hashFiles('**/.tool-versions') }}

- name: Setup asdf
if: steps.asdf-cache.outputs.cache-hit != 'true'
uses: asdf-vm/actions/install@v1
uses: asdf-vm/actions/install@v2

- name: "Format"
run: ./scripts/format.sh
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ jobs:
uses: actions/checkout@main

- name: Setup asdf
uses: asdf-vm/actions/setup@v1
uses: asdf-vm/actions/setup@v2

- name: Cache asdf
id: asdf-cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.asdf/
key: ${{ runner.os }}-${{ hashFiles('**/.tool-versions') }}

- name: Setup asdf
if: steps.asdf-cache.outputs.cache-hit != 'true'
uses: asdf-vm/actions/install@v1
uses: asdf-vm/actions/install@v2

- name: "Lint"
run: ./scripts/lint.sh
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ jobs:
uses: actions/checkout@main

- name: Setup asdf
uses: asdf-vm/actions/setup@v1
uses: asdf-vm/actions/setup@v2

- name: Cache asdf
id: asdf-cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.asdf/
key: ${{ runner.os }}-${{ hashFiles('**/.tool-versions') }}

- name: Setup asdf
if: steps.asdf-cache.outputs.cache-hit != 'true'
uses: asdf-vm/actions/install@v1
uses: asdf-vm/actions/install@v2

- name: Release
run: ./scripts/release.sh
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ jobs:
uses: actions/checkout@main

- name: Setup asdf
uses: asdf-vm/actions/setup@v1
uses: asdf-vm/actions/setup@v2

- name: Cache asdf
id: asdf-cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.asdf/
key: ${{ runner.os }}-${{ hashFiles('**/.tool-versions') }}

- name: Setup asdf
if: steps.asdf-cache.outputs.cache-hit != 'true'
uses: asdf-vm/actions/install@v1
uses: asdf-vm/actions/install@v2

- name: "Validate Module"
run: ./scripts/validate.sh
30 changes: 16 additions & 14 deletions .terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .tflint.hcl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugin "aws" {
enabled = true
version = "0.17.1"
version = "0.22.1"
source = "github.com/terraform-linters/tflint-ruleset-aws"
}

Expand Down
12 changes: 6 additions & 6 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform 1.3.1
golang 1.19.2
ripgrep 13.0.0
tflint 0.41.0
github-cli 2.17.0
fd 8.4.0
terraform 1.4.5
golang 1.20.3
ripgrep 13.0.0
tflint 0.46.0
github-cli 2.27.0
fd 8.7.0
terraform-docs 0.16.0
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Use this URL for the source of the module. See the usage examples below for more details.

```hcl
github.com/pbs/terraform-aws-namespace-module?ref=0.1.1
github.com/pbs/terraform-aws-namespace-module?ref=x.y.z
```

### Alternative Installation Methods
Expand Down Expand Up @@ -44,7 +44,7 @@ Integrate this module like so:

```hcl
module "namespace" {
source = "github.com/pbs/terraform-aws-namespace-module?ref=0.1.1"
source = "github.com/pbs/terraform-aws-namespace-module?ref=x.y.z"
# Tagging Parameters
organization = var.organization
Expand All @@ -60,7 +60,7 @@ module "namespace" {

```hcl
module "namespace" {
source = "github.com/pbs/terraform-aws-namespace-module?ref=0.1.1"
source = "github.com/pbs/terraform-aws-namespace-module?ref=x.y.z"
type = "private"
name = "example.private"
Expand All @@ -79,7 +79,7 @@ module "namespace" {

```hcl
module "namespace" {
source = "github.com/pbs/terraform-aws-namespace-module?ref=0.1.1"
source = "github.com/pbs/terraform-aws-namespace-module?ref=x.y.z"
type = "public"
name = "example.org"
Expand All @@ -98,7 +98,7 @@ module "namespace" {

If this repo is added as a subtree, then the version of the module should be close to the version shown here:

`0.1.1`
`x.y.z`

Note, however that subtrees can be altered as desired within repositories.

Expand All @@ -115,14 +115,14 @@ Below is automatically generated documentation on this Terraform module using [t

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.1.7 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.5.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.26.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.67.0 |

## Modules

Expand All @@ -135,6 +135,7 @@ No modules.
| [aws_service_discovery_http_namespace.namespace](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/service_discovery_http_namespace) | resource |
| [aws_service_discovery_private_dns_namespace.namespace](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/service_discovery_private_dns_namespace) | resource |
| [aws_service_discovery_public_dns_namespace.namespace](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/service_discovery_public_dns_namespace) | resource |
| [aws_default_tags.common_tags](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/default_tags) | data source |
| [aws_vpc.vpc](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc) | data source |

## Inputs
Expand Down
1 change: 1 addition & 0 deletions examples/http/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions examples/private/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions examples/public/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4e2988f

Please sign in to comment.