Skip to content

Commit 2a7e9b7

Browse files
authored
INTMDB-180: file env variable spelling error (#495)
* fix env variable spelling error * fix env var * fix env var spelling error
1 parent 5a59aa0 commit 2a7e9b7

7 files changed

+19
-20
lines changed

.github/workflows/automated-test-acceptances.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
6060
AWS_CUSTOMER_MASTER_KEY_ID: ${{ secrets.AWS_CUSTOMER_MASTER_KEY_ID }}
6161
AZURE_DIRECTORY_ID: ${{ secrets.AZURE_DIRECTORY_ID }}
62-
AZURE_SUBCRIPTION_ID: ${{ secrets.AZURE_SUBCRIPTION_ID }}
62+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
6363
AZURE_VNET_NAME: ${{ secrets.AZURE_VNET_NAME }}
6464
AZURE_RESOURCE_GROUP_NAME: ${{ secrets.AZURE_RESOURCE_GROUP_NAME }}
6565
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ $ export AWS_SECURITY_GROUP_ID=<YOUR_SECURITY_GROUP_ID>
175175
- For `Network Peering` resource configuration:
176176
```sh
177177
$ export AZURE_DIRECTORY_ID=<YOUR_DIRECTORY_ID>
178-
$ export AZURE_SUBCRIPTION_ID=<YOUR_SUBCRIPTION_ID>
178+
$ export AZURE_SUBSCRIPTION_ID=<YOUR_SUBSCRIPTION_ID>
179179
$ export AZURE_RESOURCE_GROUP_NAME=<YOUR_RESOURCE_GROUP_NAME>
180180
$ export AZURE_VNET_NAME=<YOUR_VNET_NAME>
181181
```
@@ -185,7 +185,7 @@ $ export AZURE_VNET_NAME=<YOUR_VNET_NAME>
185185
- For Encryption at Rest resource configuration:
186186
```sh
187187
export AZURE_CLIENT_ID=<YOUR_CLIENT_ID>
188-
export AZURE_SUBCRIPTION_ID=<YOUR_SUBCRIPTION_ID>
188+
export AZURE_SUBSCRIPTION_ID=<YOUR_SUBSCRIPTION_ID>
189189
export AZURE_RESOURCE_GROUP_NAME=<YOUR_RESOURCE_GROUP_NAME>
190190
export AZURE_SECRET=<YOUR_SECRET>
191191
export AZURE_KEY_VAULT_NAME=<YOUR_KEY_VAULT_NAME>

mongodbatlas/provider_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import (
66
"testing"
77

88
"github.com/go-test/deep"
9+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
10+
"github.com/hashicorp/terraform-plugin-sdk/terraform"
911
"github.com/terraform-providers/terraform-provider-aws/aws"
1012
"github.com/terraform-providers/terraform-provider-google/google"
1113
matlas "go.mongodb.org/atlas/mongodbatlas"
12-
13-
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
14-
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1514
)
1615

1716
var testAccProviders map[string]terraform.ResourceProvider
17+
1818
var testAccProvider *schema.Provider
1919

2020
func init() {
@@ -58,17 +58,17 @@ func checkPeeringEnvAWS(t *testing.T) {
5858

5959
func checkPeeringEnvAzure(t *testing.T) {
6060
if os.Getenv("AZURE_DIRECTORY_ID") == "" ||
61-
os.Getenv("AZURE_SUBCRIPTION_ID") == "" ||
61+
os.Getenv("AZURE_SUBSCRIPTION_ID") == "" ||
6262
os.Getenv("AZURE_VNET_NAME") == "" ||
6363
os.Getenv("AZURE_RESOURCE_GROUP_NAME") == "" {
64-
t.Fatal("`AZURE_DIRECTORY_ID`, `AZURE_SUBCRIPTION_ID`, `AZURE_VNET_NAME` and `AZURE_RESOURCE_GROUP_NAME` must be set for network peering acceptance testing")
64+
t.Fatal("`AZURE_DIRECTORY_ID`, `AZURE_SUBSCRIPTION_ID`, `AZURE_VNET_NAME` and `AZURE_RESOURCE_GROUP_NAME` must be set for network peering acceptance testing")
6565
}
6666
}
6767

6868
func checkEncryptionAtRestEnvAzure(t *testing.T) {
6969
if os.Getenv("AZURE_CLIENT_ID") == "" ||
7070
os.Getenv("AZURE_CLIENT_ID_UPDATED") == "" ||
71-
os.Getenv("AZURE_SUBCRIPTION_ID") == "" ||
71+
os.Getenv("AZURE_SUBSCRIPTION_ID") == "" ||
7272
os.Getenv("AZURE_RESOURCE_GROUP_NAME") == "" ||
7373
os.Getenv("AZURE_RESOURCE_GROUP_NAME_UPDATED") == "" ||
7474
os.Getenv("AZURE_SECRET") == "" ||
@@ -77,7 +77,7 @@ func checkEncryptionAtRestEnvAzure(t *testing.T) {
7777
os.Getenv("AZURE_KEY_IDENTIFIER") == "" ||
7878
os.Getenv("AZURE_KEY_IDENTIFIER_UPDATED") == "" ||
7979
os.Getenv("AZURE_TENANT_ID") == "" {
80-
t.Fatal(`'AZURE_CLIENT_ID','AZURE_CLIENT_ID_UPDATED', 'AZURE_SUBCRIPTION_ID',
80+
t.Fatal(`'AZURE_CLIENT_ID','AZURE_CLIENT_ID_UPDATED', 'AZURE_SUBSCRIPTION_ID',
8181
'AZURE_RESOURCE_GROUP_NAME','AZURE_RESOURCE_GROUP_NAME_UPDATED', 'AZURE_SECRET',
8282
'AZURE_SECRET_UPDATED', 'AZURE_KEY_VAULT_NAME', 'AZURE_KEY_IDENTIFIER', 'AZURE_KEY_VAULT_NAME_UPDATED',
8383
'AZURE_KEY_IDENTIFIER_UPDATED', and 'AZURE_TENANT_ID' must be set for Encryption At Rest acceptance testing`)

mongodbatlas/resource_mongodbatlas_cluster_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ func TestAccResourceMongoDBAtlasCluster_withAzureNetworkPeering(t *testing.T) {
601601

602602
projectID = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
603603
directoryID = os.Getenv("AZURE_DIRECTORY_ID")
604-
subcrptionID = os.Getenv("AZURE_SUBCRIPTION_ID")
604+
subcrptionID = os.Getenv("AZURE_SUBSCRIPTION_ID")
605605
resourceGroupName = os.Getenv("AZURE_RESOURCE_GROUP_NAME")
606606
vNetName = os.Getenv("AZURE_VNET_NAME")
607607
providerName = "AZURE"
@@ -673,7 +673,7 @@ func TestAccResourceMongoDBAtlasCluster_withAzureAndContainerID(t *testing.T) {
673673
providerName = "AZURE"
674674
region = os.Getenv("AZURE_REGION")
675675
directoryID = os.Getenv("AZURE_DIRECTORY_ID")
676-
subcrptionID = os.Getenv("AZURE_SUBCRIPTION_ID")
676+
subcrptionID = os.Getenv("AZURE_SUBSCRIPTION_ID")
677677
resourceGroupName = os.Getenv("AZURE_RESOURCE_GROUP_NAME")
678678
vNetName = os.Getenv("AZURE_VNET_NAME")
679679
)

mongodbatlas/resource_mongodbatlas_encryption_at_rest_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"testing"
88

99
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
10-
1110
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
1211
"github.com/hashicorp/terraform-plugin-sdk/terraform"
1312
"github.com/mwielbut/pointy"
@@ -152,7 +151,7 @@ func TestAccResourceMongoDBAtlasEncryptionAtRest_basicAzure(t *testing.T) {
152151
Enabled: pointy.Bool(true),
153152
ClientID: os.Getenv("AZURE_CLIENT_ID"),
154153
AzureEnvironment: "AZURE",
155-
SubscriptionID: os.Getenv("AZURE_SUBCRIPTION_ID"),
154+
SubscriptionID: os.Getenv("AZURE_SUBSCRIPTION_ID"),
156155
ResourceGroupName: os.Getenv("AZURE_RESOURCE_GROUP_NAME"),
157156
KeyVaultName: os.Getenv("AZURE_KEY_VAULT_NAME"),
158157
KeyIdentifier: os.Getenv("AZURE_KEY_IDENTIFIER"),
@@ -164,7 +163,7 @@ func TestAccResourceMongoDBAtlasEncryptionAtRest_basicAzure(t *testing.T) {
164163
Enabled: pointy.Bool(true),
165164
ClientID: os.Getenv("AZURE_CLIENT_ID_UPDATED"),
166165
AzureEnvironment: "AZURE",
167-
SubscriptionID: os.Getenv("AZURE_SUBCRIPTION_ID"),
166+
SubscriptionID: os.Getenv("AZURE_SUBSCRIPTION_ID"),
168167
ResourceGroupName: os.Getenv("AZURE_RESOURCE_GROUP_NAME_UPDATED"),
169168
KeyVaultName: os.Getenv("AZURE_KEY_VAULT_NAME_UPDATED"),
170169
KeyIdentifier: os.Getenv("AZURE_KEY_IDENTIFIER_UPDATED"),

mongodbatlas/resource_mongodbatlas_network_peering_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestAccResourceMongoDBAtlasNetworkPeering_basicAzure(t *testing.T) {
6161
resourceName = "mongodbatlas_network_peering.test"
6262
projectID = os.Getenv("MONGODB_ATLAS_PROJECT_ID")
6363
directoryID = os.Getenv("AZURE_DIRECTORY_ID")
64-
subcrptionID = os.Getenv("AZURE_SUBCRIPTION_ID")
64+
subscriptionID = os.Getenv("AZURE_SUBSCRIPTION_ID")
6565
resourceGroupName = os.Getenv("AZURE_RESOURCE_GROUP_NAME")
6666
vNetName = os.Getenv("AZURE_VNET_NAME")
6767
providerName = "AZURE"
@@ -73,7 +73,7 @@ func TestAccResourceMongoDBAtlasNetworkPeering_basicAzure(t *testing.T) {
7373
CheckDestroy: testAccCheckMongoDBAtlasNetworkPeeringDestroy,
7474
Steps: []resource.TestStep{
7575
{
76-
Config: testAccMongoDBAtlasNetworkPeeringConfigAzure(projectID, providerName, directoryID, subcrptionID, resourceGroupName, vNetName),
76+
Config: testAccMongoDBAtlasNetworkPeeringConfigAzure(projectID, providerName, directoryID, subscriptionID, resourceGroupName, vNetName),
7777
Check: resource.ComposeTestCheckFunc(
7878
testAccCheckMongoDBAtlasNetworkPeeringExists(resourceName, &peer),
7979
resource.TestCheckResourceAttrSet(resourceName, "project_id"),
@@ -277,7 +277,7 @@ func testAccMongoDBAtlasNetworkPeeringConfigAWS(projectID, providerName, vpcID,
277277
`, projectID, providerName, vpcID, awsAccountID, vpcCIDRBlock, awsRegion)
278278
}
279279

280-
func testAccMongoDBAtlasNetworkPeeringConfigAzure(projectID, providerName, directoryID, subcrptionID, resourceGroupName, vNetName string) string {
280+
func testAccMongoDBAtlasNetworkPeeringConfigAzure(projectID, providerName, directoryID, subscriptionID, resourceGroupName, vNetName string) string {
281281
return fmt.Sprintf(`
282282
resource "mongodbatlas_network_container" "test" {
283283
project_id = "%[1]s"
@@ -296,7 +296,7 @@ func testAccMongoDBAtlasNetworkPeeringConfigAzure(projectID, providerName, direc
296296
resource_group_name = "%[5]s"
297297
vnet_name = "%[6]s"
298298
}
299-
`, projectID, providerName, directoryID, subcrptionID, resourceGroupName, vNetName)
299+
`, projectID, providerName, directoryID, subscriptionID, resourceGroupName, vNetName)
300300
}
301301

302302
func testAccMongoDBAtlasNetworkPeeringConfigGCP(projectID, providerName, gcpProjectID, networkName string) string {

website/docs/r/network_peering.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ resource "mongodbatlas_network_peering" "test" {
310310
container_id = mongodbatlas_cluster.test.container_id
311311
provider_name = "AZURE"
312312
azure_directory_id = local.AZURE_DIRECTORY_ID
313-
azure_subscription_id = local.AZURE_SUBCRIPTION_ID
313+
azure_subscription_id = local.AZURE_SUBSCRIPTION_ID
314314
resource_group_name = local.AZURE_RESOURCE_GROUP_NAME
315315
vnet_name = local.AZURE_VNET_NAME
316316
}

0 commit comments

Comments
 (0)