Skip to content

Commit

Permalink
Merge pull request #7 from paulpalamarchuk/fix/#6
Browse files Browse the repository at this point in the history
Fixes isssue #6: Add support for Terraform 0.12
  • Loading branch information
aaron-lane authored Jul 26, 2019
2 parents 95fffca + 0a68239 commit 6c5e649
Show file tree
Hide file tree
Showing 22 changed files with 983 additions and 385 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
.kitchen/
.kitchen.local.yml
Gemfile.lock
credentials.json
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on
[Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to
[Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [1.0.0] - 2019-YY-ZZ

### Changed

- Supported version of Terraform is 0.12. [#7]

## [0.1.0]

### Added

- Initial release

[Unreleased]: https://github.com/terraform-google-modules/terraform-google-pubsub/compare/v0.1.0...HEAD
[0.1.0]: https://github.com/terraform-google-modules/terraform-google-pubsub/releases/tag/v0.1.0

[#7]: https://github.com/terraform-google-modules/terraform-google-pubsub/pull/7
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
source 'https://rubygems.org/'

gem 'test-kitchen'
gem 'kitchen-terraform', '~> 4.0.3'
gem 'kitchen-terraform', '~> 4.9.0'
gem 'kitchen-inspec'

260 changes: 0 additions & 260 deletions Gemfile.lock

This file was deleted.

31 changes: 19 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

This module makes it easy to create Google Cloud Pub/Sub topic and subscriptions associated with the topic.

## Compatibility

This module is meant for use with Terraform 0.12. If you haven't [upgraded][terraform-0.12-upgrade] and need a Terraform 0.11.x-compatible version of this module, the last released version intended for Terraform 0.11.x
is [0.2.0][v0.2.0].

## Usage

This is a simple usage of the module. Please see also a simple setup provided in the example directory.
Expand Down Expand Up @@ -30,35 +35,34 @@ module "pubsub" {
}
```

[^]: (autogen_docs_start)

<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Inputs

| Name | Description | Type | Default | Required |
|------|-------------|:----:|:-----:|:-----:|
| project_id | The project ID to manage the Pub/Sub resources | string | - | yes |
| pull_subscriptions | The list of the pull subscriptions | list | `<list>` | no |
| push_subscriptions | The list of the push subscriptions | list | `<list>` | no |
| topic | The Pub/Sub topic name | string | - | yes |
| project\_id | The project ID to manage the Pub/Sub resources | string | n/a | yes |
| pull\_subscriptions | The list of the pull subscriptions | list(map(string)) | `<list>` | no |
| push\_subscriptions | The list of the push subscriptions | list(map(string)) | `<list>` | no |
| topic | The Pub/Sub topic name | string | n/a | yes |

## Outputs

| Name | Description |
|------|-------------|
| id | The ID of the Pub/Sub topic |
| subscription_names | The name list of Pub/Sub subscriptions |
| subscription_paths | The path list of Pub/Sub subscriptions |
| subscription\_names | The name list of Pub/Sub subscriptions |
| subscription\_paths | The path list of Pub/Sub subscriptions |
| topic | The name of the Pub/Sub topic |
| uri | The URI of the Pub/Sub topic |

[^]: (autogen_docs_end)
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

## Requirements

### Installation Dependencies

- [terraform](https://www.terraform.io/downloads.html) 0.11.x
- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) plugin v1.12.x
- [terraform](https://www.terraform.io/downloads.html) 0.12.x
- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) plugin v2.7.x

### Configure a Service Account

Expand Down Expand Up @@ -159,4 +163,7 @@ are as follows:
- Golang - gofmt. gofmt comes with the standard golang installation. golang
-s a compiled language so there is no standard linter.
- Terraform - terraform has a built-in linter in the `terraform validate` command.
- Dockerfiles - hadolint. Can be found in homebrew
- Dockerfiles - hadolint. Can be found in homebrew

[v0.2.0]: https://registry.terraform.io/modules/terraform-google-modules/pubsub/google/0.2.0
[terraform-0.12-upgrade]: https://www.terraform.io/upgrade-guides/0-12.html
Loading

0 comments on commit 6c5e649

Please sign in to comment.