Remove hardcoded github provider (#40)

* Remove detailed github provider

* Allow github provider to be injected

* Auto Format

* Add versions to examples/complete

* Update versions.tf

* Fix versions

* Fix examples/complete for terratest

* Add provider injection on example

* Remove explicit github provider injection

* Fix webhook 404

* Remove providers

---------

Co-authored-by: cloudpossebot <[email protected]>
Co-authored-by: nitrocode <[email protected]>

Author: 3 people

.github/auto-release.yml

@@ -17,7 +17,6 @@ version-resolver:
     - 'bugfix'
     - 'bug'
     - 'hotfix'
-    - 'no-release'
   default: 'minor'
 
 categories:

.github/renovate.json

@@ -4,9 +4,9 @@
     ":preserveSemverRanges"
   ],
   "labels": ["auto-update"],
+  "dependencyDashboardAutoclose": true,
   "enabledManagers": ["terraform"],
   "terraform": {
     "ignorePaths": ["**/context.tf", "examples/**"]
   }
 }
-

.github/workflows/validate-codeowners.yml

@@ -10,6 +10,7 @@ jobs:
     steps:
     - name: "Checkout source code at current commit"
       uses: actions/checkout@v2
+      # Leave pinned at 0.7.1 until https://github.com/mszostok/codeowners-validator/issues/173 is resolved
     - uses: mszostok/[email protected]
       if: github.event.pull_request.head.repo.full_name == github.repository
       name: "Full check of CODEOWNERS"

README.md

@@ -137,14 +137,14 @@ Available targets:
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
-| <a name="requirement_github"></a> [github](#requirement\_github) | 3.0.0 |
+| <a name="requirement_github"></a> [github](#requirement\_github) | >= 4.2.0 |
 | <a name="requirement_local"></a> [local](#requirement\_local) | >= 1.2 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_github"></a> [github](#provider\_github) | 3.0.0 |
+| <a name="provider_github"></a> [github](#provider\_github) | >= 4.2.0 |
 
 ## Modules
 
@@ -156,7 +156,7 @@ Available targets:
 
 | Name | Type |
 |------|------|
-| [github_repository_webhook.default](https://registry.terraform.io/providers/hashicorp/github/3.0.0/docs/resources/repository_webhook) | resource |
+| [github_repository_webhook.default](https://registry.terraform.io/providers/integrations/github/latest/docs/resources/repository_webhook) | resource |
 
 ## Inputs
 
@@ -171,10 +171,7 @@ Available targets:
 | <a name="input_enabled"></a> [enabled](#input\_enabled) | Set to false to prevent the module from creating any resources | `bool` | `null` | no |
 | <a name="input_environment"></a> [environment](#input\_environment) | ID element. Usually used for region e.g. 'uw2', 'us-west-2', OR role 'prod', 'staging', 'dev', 'UAT' | `string` | `null` | no |
 | <a name="input_events"></a> [events](#input\_events) | A list of events which should trigger the webhook. | `list(string)` | <pre>[<br>  "issue_comment",<br>  "pull_request",<br>  "pull_request_review",<br>  "pull_request_review_comment"<br>]</pre> | no |
-| <a name="input_github_base_url"></a> [github\_base\_url](#input\_github\_base\_url) | GitHub target API endpoint | `string` | `"https://api.github.com/"` | no |
-| <a name="input_github_organization"></a> [github\_organization](#input\_github\_organization) | GitHub organization to use when creating webhooks | `string` | n/a | yes |
 | <a name="input_github_repositories"></a> [github\_repositories](#input\_github\_repositories) | List of repository names which should be associated with the webhook | `list(string)` | `[]` | no |
-| <a name="input_github_token"></a> [github\_token](#input\_github\_token) | GitHub token used for API access. If not provided, can be sourced from the `GITHUB_TOKEN` environment variable | `string` | `""` | no |
 | <a name="input_id_length_limit"></a> [id\_length\_limit](#input\_id\_length\_limit) | Limit `id` to this many characters (minimum 6).<br>Set to `0` for unlimited length.<br>Set to `null` for keep the existing setting, which defaults to `0`.<br>Does not affect `id_full`. | `number` | `null` | no |
 | <a name="input_label_key_case"></a> [label\_key\_case](#input\_label\_key\_case) | Controls the letter case of the `tags` keys (label names) for tags generated by this module.<br>Does not affect keys of tags passed in via the `tags` input.<br>Possible values: `lower`, `title`, `upper`.<br>Default value: `title`. | `string` | `null` | no |
 | <a name="input_label_order"></a> [label\_order](#input\_label\_order) | The order in which the labels (ID elements) appear in the `id`.<br>Defaults to ["namespace", "environment", "stage", "name", "attributes"].<br>You can omit any of the 6 labels ("tenant" is the 6th), but at least one must be present. | `list(string)` | `null` | no |
@@ -366,7 +363,7 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply
 
 [![README Footer][readme_footer_img]][readme_footer_link]
 [![Beacon][beacon]][website]
-
+<!-- markdownlint-disable -->
   [logo]: https://cloudposse.com/logo-300x69.svg
   [docs]: https://cpco.io/docs?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-github-repository-webhooks&utm_content=docs
   [website]: https://cpco.io/homepage?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/terraform-github-repository-webhooks&utm_content=website
@@ -397,3 +394,4 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply
   [share_googleplus]: https://plus.google.com/share?url=https://github.com/cloudposse/terraform-github-repository-webhooks
   [share_email]: mailto:?subject=terraform-github-repository-webhooks&body=https://github.com/cloudposse/terraform-github-repository-webhooks
   [beacon]: https://ga-beacon.cloudposse.com/UA-76589703-4/cloudposse/terraform-github-repository-webhooks?pixel&cs=github&cm=readme&an=terraform-github-repository-webhooks
+<!-- markdownlint-restore -->

docs/terraform.md

@@ -4,14 +4,14 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
-| <a name="requirement_github"></a> [github](#requirement\_github) | 3.0.0 |
+| <a name="requirement_github"></a> [github](#requirement\_github) | >= 4.2.0 |
 | <a name="requirement_local"></a> [local](#requirement\_local) | >= 1.2 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_github"></a> [github](#provider\_github) | 3.0.0 |
+| <a name="provider_github"></a> [github](#provider\_github) | >= 4.2.0 |
 
 ## Modules
 
@@ -23,7 +23,7 @@
 
 | Name | Type |
 |------|------|
-| [github_repository_webhook.default](https://registry.terraform.io/providers/hashicorp/github/3.0.0/docs/resources/repository_webhook) | resource |
+| [github_repository_webhook.default](https://registry.terraform.io/providers/integrations/github/latest/docs/resources/repository_webhook) | resource |
 
 ## Inputs
 
@@ -38,10 +38,7 @@
 | <a name="input_enabled"></a> [enabled](#input\_enabled) | Set to false to prevent the module from creating any resources | `bool` | `null` | no |
 | <a name="input_environment"></a> [environment](#input\_environment) | ID element. Usually used for region e.g. 'uw2', 'us-west-2', OR role 'prod', 'staging', 'dev', 'UAT' | `string` | `null` | no |
 | <a name="input_events"></a> [events](#input\_events) | A list of events which should trigger the webhook. | `list(string)` | <pre>[<br>  "issue_comment",<br>  "pull_request",<br>  "pull_request_review",<br>  "pull_request_review_comment"<br>]</pre> | no |
-| <a name="input_github_base_url"></a> [github\_base\_url](#input\_github\_base\_url) | GitHub target API endpoint | `string` | `"https://api.github.com/"` | no |
-| <a name="input_github_organization"></a> [github\_organization](#input\_github\_organization) | GitHub organization to use when creating webhooks | `string` | n/a | yes |
 | <a name="input_github_repositories"></a> [github\_repositories](#input\_github\_repositories) | List of repository names which should be associated with the webhook | `list(string)` | `[]` | no |
-| <a name="input_github_token"></a> [github\_token](#input\_github\_token) | GitHub token used for API access. If not provided, can be sourced from the `GITHUB_TOKEN` environment variable | `string` | `""` | no |
 | <a name="input_id_length_limit"></a> [id\_length\_limit](#input\_id\_length\_limit) | Limit `id` to this many characters (minimum 6).<br>Set to `0` for unlimited length.<br>Set to `null` for keep the existing setting, which defaults to `0`.<br>Does not affect `id_full`. | `number` | `null` | no |
 | <a name="input_label_key_case"></a> [label\_key\_case](#input\_label\_key\_case) | Controls the letter case of the `tags` keys (label names) for tags generated by this module.<br>Does not affect keys of tags passed in via the `tags` input.<br>Possible values: `lower`, `title`, `upper`.<br>Default value: `title`. | `string` | `null` | no |
 | <a name="input_label_order"></a> [label\_order](#input\_label\_order) | The order in which the labels (ID elements) appear in the `id`.<br>Defaults to ["namespace", "environment", "stage", "name", "attributes"].<br>You can omit any of the 6 labels ("tenant" is the 6th), but at least one must be present. | `list(string)` | `null` | no |

examples/complete/fixtures.us-east-2.tfvars

@@ -1,6 +1,6 @@
 region = "us-west-1"
 
-github_organization = "cloudposse"
+owner = "cloudposse"
 
 github_repositories = ["terraform-github-repository-webhooks"]
 

examples/complete/main.tf

@@ -2,11 +2,13 @@ provider "aws" {
   region = var.region
 }
 
+provider "github" {
+  owner = var.owner
+}
+
 module "webhooks" {
   source              = "../../"
   active              = false
-  github_token        = var.github_token
-  github_organization = var.github_organization
   github_repositories = var.github_repositories
   webhook_url         = var.webhook_url
   events              = var.events

examples/complete/variables.tf

@@ -9,9 +9,9 @@ variable "github_token" {
   description = "GitHub token used for API access. If not provided, can be sourced from the `GITHUB_TOKEN` environment variable"
 }
 
-variable "github_organization" {
+variable "owner" {
   type        = string
-  description = "GitHub organization to use when creating webhooks"
+  description = "Repo owner"
 }
 
 variable "github_repositories" {

examples/complete/versions.tf

@@ -0,0 +1,18 @@
+terraform {
+  required_version = ">= 0.13.0"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 2.0"
+    }
+    github = {
+      source  = "integrations/github"
+      version = ">= 4.2.0"
+    }
+    local = {
+      source  = "hashicorp/local"
+      version = ">= 1.2"
+    }
+  }
+}

main.tf

@@ -1,9 +1,3 @@
-provider "github" {
-  token        = var.github_token != "" ? var.github_token : null
-  organization = var.github_organization
-  base_url     = var.github_base_url
-}
-
 resource "github_repository_webhook" "default" {
   count = module.this.enabled && length(var.github_repositories) > 0 ? length(var.github_repositories) : 0