Skip to content

Commit 68efc7e

Browse files
authored
Merge pull request #43 from 404-code-not-found-com:feature/provider-location
feat: Updating where our required_providers statements are stored.
2 parents fd8623e + 652b9c4 commit 68efc7e

File tree

4 files changed

+29
-69
lines changed

4 files changed

+29
-69
lines changed

.terraform.lock.hcl

Lines changed: 0 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ be placed.
180180
| Name | Version |
181181
|------|---------|
182182
| terraform | ~> 1.0 |
183-
| google | ~> 6.0 |
184-
| hcp | ~> 0.94 |
185183

186184
## Providers
187185

providers.tf

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,34 @@
11
###############################################################################
22
# providers.tf
33
#
4-
# Contains all provider blocks and configuration.
4+
# Contains all required_providers terraform blocks and stanzas.
5+
# Contains provider configuration.
56
###############################################################################
67

7-
provider "google" {
8-
# Configuration options
9-
# Environment variables needed for auth
10-
# GOOGLE_OAUTH_ACCESS_TOKEN="..."
11-
# GOOGLE_PROJECT="..."
12-
# GOOGLE_REGION="..."
13-
# GOOGLE_ZONE="..."
14-
}
8+
## Google Cloud Platform
9+
# terraform {
10+
# required_providers {
11+
# google = {
12+
# source = "hashicorp/google"
13+
# version = "6.28.0"
14+
# }
15+
# }
16+
# }
1517

16-
provider "hcp" {
17-
# Configuration options
18-
# Environment variables needed for auth
19-
# HCP_CLIENT_ID="..."
20-
# HCP_CLIENT_SECRET="..."
21-
}
18+
# provider "google" {
19+
# # Configuration options
20+
# }
21+
22+
## HashiCorp Cloud Platform
23+
# terraform {
24+
# required_providers {
25+
# hcp = {
26+
# source = "hashicorp/hcp"
27+
# version = "0.104.0"
28+
# }
29+
# }
30+
# }
31+
32+
# provider "hcp" {
33+
# # Configuration options
34+
# }

terraform.tf

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
###############################################################################
22
# terraform.tf
33
#
4-
# Contains a single terraform block which defines your required_version and
5-
# required_providers.
4+
# Contains a single terraform block which defines your required_version.
65
###############################################################################
76

87
terraform {
98
required_version = "~> 1.0"
10-
required_providers {
11-
google = {
12-
source = "hashicorp/google"
13-
version = "~> 6.0"
14-
}
15-
hcp = {
16-
source = "hashicorp/hcp"
17-
version = "~> 0.94"
18-
}
19-
}
209
}

0 commit comments

Comments
 (0)