INTMDB-175: Added azure status and fixes the error about target state (#398)

coderGo93 · Edgar López · web-flow · commit e3684c2e8514 · 2021-02-02T14:57:39.000-07:00
* fix: added parameter azure status and updated refresh func

* docs: added azure status info

* test: modified the line in azure test private link

* docs: updated docs for privatelink endopoint to be more consistent from api docs

* chore: updated client mongo master

* refactor: deleted unnecesary pending state

* docs: added upgrade guide for 0.8.2 version

* docs: made changes suggested by melissa

* chore: updated released tag for client

Co-authored-by: Edgar López &lt;edgarlopez@pop-os.localdomain&gt;
diff --git a/examples/azure-atlas-privatelink/main.tf b/examples/azure-atlas-privatelink/main.tf
@@ -49,8 +49,8 @@ resource "azurerm_private_endpoint" "test" {
 
 resource "mongodbatlas_privatelink_endpoint_service" "test" {
   project_id            = mongodbatlas_privatelink_endpoint.test.project_id
-  private_link_id       =  azurerm_private_endpoint.test.id
-  endpoint_service_id = mongodbatlas_privatelink_endpoint.test.private_link_id
+  private_link_id       = mongodbatlas_privatelink_endpoint.test.private_link_id
+  endpoint_service_id = azurerm_private_endpoint.test.id
   private_endpoint_ip_address = azurerm_private_endpoint.test.private_service_connection.0.private_ip_address
   provider_name = "AZURE"
 }
diff --git a/go.mod b/go.mod
@@ -11,5 +11,5 @@ require (
 	github.com/spf13/cast v1.3.1
 	github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200518153306-40099de47e37
 	github.com/terraform-providers/terraform-provider-google v1.20.1-0.20200518165017-1dd21651c496
-	go.mongodb.org/atlas v0.7.1
+	go.mongodb.org/atlas v0.7.2
 )
diff --git a/go.sum b/go.sum
@@ -611,6 +611,10 @@ go.mongodb.org/atlas v0.7.0 h1:nBur5go1JSCFCi1VaQ7Ry6du2uHjMFY0w8rI64KQ+b0=
 go.mongodb.org/atlas v0.7.0/go.mod h1:CIaBeO8GLHhtYLw7xSSXsw7N90Z4MFY87Oy9qcPyuEs=
 go.mongodb.org/atlas v0.7.1 h1:hNBtwtKgmhB9vmSX/JyN/cArmhzyy4ihKpmXSMIc4mw=
 go.mongodb.org/atlas v0.7.1/go.mod h1:CIaBeO8GLHhtYLw7xSSXsw7N90Z4MFY87Oy9qcPyuEs=
+go.mongodb.org/atlas v0.7.2-0.20210201161153-9669ea80d4d2 h1:097127emSQhG6Mnbs0wich0Oh0YjmMzxnQlso5vF06Y=
+go.mongodb.org/atlas v0.7.2-0.20210201161153-9669ea80d4d2/go.mod h1:CIaBeO8GLHhtYLw7xSSXsw7N90Z4MFY87Oy9qcPyuEs=
+go.mongodb.org/atlas v0.7.2 h1:wB3+hP71t3mK+JOSrjBFbrzb5MsZRzDtZlpEKp58KK0=
+go.mongodb.org/atlas v0.7.2/go.mod h1:CIaBeO8GLHhtYLw7xSSXsw7N90Z4MFY87Oy9qcPyuEs=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
diff --git a/mongodbatlas/data_source_mongodbatlas_privatelink_endpoint_service.go b/mongodbatlas/data_source_mongodbatlas_privatelink_endpoint_service.go
@@ -58,7 +58,11 @@ func dataSourceMongoDBAtlasPrivateEndpointServiceLink() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"connection_status": {
+			"aws_connection_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"azure_status": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
@@ -88,8 +92,12 @@ func dataSourceMongoDBAtlasPrivateEndpointServiceLinkRead(d *schema.ResourceData
 		return fmt.Errorf(errorEndpointSetting, "error_message", endpointServiceID, err)
 	}
 
-	if err := d.Set("connection_status", serviceEndpoint.ConnectionStatus); err != nil {
-		return fmt.Errorf(errorEndpointSetting, "connection_status", endpointServiceID, err)
+	if err := d.Set("aws_connection_status", serviceEndpoint.AWSConnectionStatus); err != nil {
+		return fmt.Errorf(errorEndpointSetting, "aws_connection_status", endpointServiceID, err)
+	}
+
+	if err := d.Set("azure_status", serviceEndpoint.AzureStatus); err != nil {
+		return fmt.Errorf(errorEndpointSetting, "azure_status", endpointServiceID, err)
 	}
 
 	d.SetId(encodeStateID(map[string]string{
diff --git a/mongodbatlas/resource_mongodbatlas_privatelink_endpoint_service.go b/mongodbatlas/resource_mongodbatlas_privatelink_endpoint_service.go
@@ -78,7 +78,11 @@ func resourceMongoDBAtlasPrivateEndpointServiceLink() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"connection_status": {
+			"aws_connection_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"azure_status": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
@@ -104,8 +108,8 @@ func resourceMongoDBAtlasPrivateEndpointServiceLinkCreate(d *schema.ResourceData
 	}
 
 	stateConf := &resource.StateChangeConf{
-		Pending:    []string{"NONE", "PENDING_ACCEPTANCE", "PENDING", "DELETING", "WAITING_FOR_USER"},
-		Target:     []string{"AVAILABLE", "REJECTED", "DELETED"},
+		Pending:    []string{"NONE", "INITIATING", "PENDING_ACCEPTANCE", "PENDING", "DELETING"},
+		Target:     []string{"AVAILABLE", "REJECTED", "DELETED", "FAILED"},
 		Refresh:    resourceServiceEndpointRefreshFunc(conn, projectID, providerName, privateLinkID, endpointServiceID),
 		Timeout:    1 * time.Hour,
 		MinTimeout: 5 * time.Second,
@@ -149,8 +153,12 @@ func resourceMongoDBAtlasPrivateEndpointServiceLinkRead(d *schema.ResourceData,
 		return fmt.Errorf(errorEndpointSetting, "error_message", endpointServiceID, err)
 	}
 
-	if err := d.Set("connection_status", privateEndpoint.ConnectionStatus); err != nil {
-		return fmt.Errorf(errorEndpointSetting, "connection_status", endpointServiceID, err)
+	if err := d.Set("aws_connection_status", privateEndpoint.AWSConnectionStatus); err != nil {
+		return fmt.Errorf(errorEndpointSetting, "aws_connection_status", endpointServiceID, err)
+	}
+
+	if err := d.Set("azure_status", privateEndpoint.AzureStatus); err != nil {
+		return fmt.Errorf(errorEndpointSetting, "azure_status", endpointServiceID, err)
 	}
 
 	if err := d.Set("interface_endpoint_id", privateEndpoint.InterfaceEndpointID); err != nil {
@@ -196,8 +204,8 @@ func resourceMongoDBAtlasPrivateEndpointServiceLinkDelete(d *schema.ResourceData
 		}
 
 		stateConf := &resource.StateChangeConf{
-			Pending:    []string{"NONE", "PENDING_ACCEPTANCE", "PENDING", "DELETING", "WAITING_FOR_USER"},
-			Target:     []string{"REJECTED", "DELETED"},
+			Pending:    []string{"NONE", "PENDING_ACCEPTANCE", "PENDING", "DELETING", "INITIATING"},
+			Target:     []string{"REJECTED", "DELETED", "FAILED"},
 			Refresh:    resourceServiceEndpointRefreshFunc(conn, projectID, providerName, privateLinkID, endpointServiceID),
 			Timeout:    1 * time.Hour,
 			MinTimeout: 5 * time.Second,
@@ -269,10 +277,16 @@ func resourceServiceEndpointRefreshFunc(client *matlas.Client, projectID, provid
 			return nil, "", err
 		}
 
-		if i.ConnectionStatus != "AVAILABLE" {
-			return "", i.ConnectionStatus, nil
+		if strings.EqualFold(providerName, "azure") {
+			if i.AzureStatus != "AVAILABLE" {
+				return "", i.AzureStatus, nil
+			}
+			return i, i.AzureStatus, nil
+		}
+		if i.AWSConnectionStatus != "AVAILABLE" {
+			return "", i.AWSConnectionStatus, nil
 		}
 
-		return i, i.ConnectionStatus, nil
+		return i, i.AWSConnectionStatus, nil
 	}
 }
diff --git a/vendor/go.mongodb.org/atlas/mongodbatlas/mongodbatlas.go b/vendor/go.mongodb.org/atlas/mongodbatlas/mongodbatlas.go
diff --git a/vendor/go.mongodb.org/atlas/mongodbatlas/private_endpoints.go b/vendor/go.mongodb.org/atlas/mongodbatlas/private_endpoints.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -476,7 +476,7 @@ github.com/zclconf/go-cty/cty/msgpack
 github.com/zclconf/go-cty/cty/set
 # github.com/zclconf/go-cty-yaml v1.0.1
 github.com/zclconf/go-cty-yaml
-# go.mongodb.org/atlas v0.7.1
+# go.mongodb.org/atlas v0.7.2
 ## explicit
 go.mongodb.org/atlas/mongodbatlas
 # go.opencensus.io v0.22.3
diff --git a/website/docs/d/private_endpoint.html.markdown b/website/docs/d/private_endpoint.html.markdown
@@ -44,11 +44,16 @@ In addition to all arguments above, the following attributes are exported:
 * `endpoint_service_name` - Name of the PrivateLink endpoint service in AWS. Returns null while the endpoint service is being created.
 * `error_message` - Error message pertaining to the AWS PrivateLink connection. Returns null if there are no errors.
 * `interface_endpoints` - Unique identifiers of the interface endpoints in your VPC that you added to the AWS PrivateLink connection.
-* `status` - Status of the AWS PrivateLink connection.
-  Returns one of the following values:
-  * `INITIATING` 	Atlas is creating the network load balancer and VPC endpoint service.
-  * `WAITING_FOR_USER` The Atlas network load balancer and VPC endpoint service are created and ready to receive connection requests. When you receive this status, create an interface endpoint to continue configuring the AWS PrivateLink connection.
-  * `FAILED` 	A system failure has occurred.
-  * `DELETING` 	The AWS PrivateLink connection is being deleted.
+* `status` - Status of the AWS PrivateLink connection or Status of the Azure Private Link Service. Atlas returns one of the following values:
+  AWS:
+    * `AVAILABLE` 	Atlas is creating the network load balancer and VPC endpoint service.
+    * `WAITING_FOR_USER` The Atlas network load balancer and VPC endpoint service are created and ready to receive connection requests.
+    * `FAILED` 	A system failure has occurred.
+    * `DELETING` 	The AWS PrivateLink connection is being deleted.
+  AZURE:
+    * `AVAILABLE` 	Atlas created the load balancer and the Private Link Service.
+    * `INITIATING` 	Atlas is creating the load balancer and the Private Link Service.
+    * `FAILED` 	Atlas failed to create the load balancer and the Private Link service.
+    * `DELETING` 	Atlas is deleting the Private Link service.
 
 See [MongoDB Atlas API](https://docs.atlas.mongodb.com/reference/api/private-endpoint-get-one-private-endpoint-connection/) Documentation for more information.
diff --git a/website/docs/d/privatelink_endpoint_service.html.markdown b/website/docs/d/privatelink_endpoint_service.html.markdown
@@ -61,15 +61,19 @@ In addition to all arguments above, the following attributes are exported:
 * `private_endpoint_resource_id` - Unique identifier of the private endpoint.
 * `delete_requested` - Indicates if Atlas received a request to remove the interface endpoint from the private endpoint connection.
 * `error_message` - Error message pertaining to the interface endpoint. Returns null if there are no errors.
-* `connection_status` - Status of the interface endpoint.
+* `aws_connection_status` - Status of the interface endpoint for AWS.
   Returns one of the following values:
-    * `NONE` - Atlas created the network load balancer and VPC endpoint service, but AWS hasn’t yet created the VPC endpoint.
-    * `PENDING_ACCEPTANCE` - AWS has received the connection request from your VPC endpoint to the Atlas VPC endpoint service.
-    * `PENDING` - AWS is establishing the connection between your VPC endpoint and the Atlas VPC endpoint service.
-    * `AVAILABLE` - Atlas VPC resources are connected to the VPC endpoint in your VPC. You can connect to Atlas clusters in this region using AWS PrivateLink.
-    * `REJECTED` - AWS failed to establish a connection between Atlas VPC resources to the VPC endpoint in your VPC.
-    * `INITIATING` - Atlas has not yet accepted the connection to your private endpoint.
-    * `FAILED` - Atlas failed to accept the connection your private endpoint.
-    * `DELETING` - Atlas is removing the interface endpoint from the private endpoint connection.
+  * `NONE` - Atlas created the network load balancer and VPC endpoint service, but AWS hasn’t yet created the VPC endpoint.
+  * `PENDING_ACCEPTANCE` - AWS has received the connection request from your VPC endpoint to the Atlas VPC endpoint service.
+  * `PENDING` - AWS is establishing the connection between your VPC endpoint and the Atlas VPC endpoint service.
+  * `AVAILABLE` - Atlas VPC resources are connected to the VPC endpoint in your VPC. You can connect to Atlas clusters in this region using AWS PrivateLink.
+  * `REJECTED` - AWS failed to establish a connection between Atlas VPC resources to the VPC endpoint in your VPC.
+  * `DELETING` - Atlas is removing the interface endpoint from the private endpoint connection.
+* `azure_status` - Status of the interface endpoint for AZURE.
+  Returns one of the following values:
+  * `INITIATING` - Atlas has not yet accepted the connection to your private endpoint.
+  * `AVAILABLE` - Atlas approved the connection to your private endpoint.
+  * `FAILED` - Atlas failed to accept the connection your private endpoint.
+  * `DELETING` - Atlas is removing the connection to your private endpoint from the Private Link service.
 
 See [MongoDB Atlas API](https://docs.atlas.mongodb.com/reference/api/private-endpoints-endpoint-get-one/) Documentation for more information.
diff --git a/website/docs/guides/0.8.2-upgrade-guide.html.markdown b/website/docs/guides/0.8.2-upgrade-guide.html.markdown
@@ -0,0 +1,60 @@
+## 0.8.2 Upgrade Guide for Privatelink users
+
+### Resources are impacted that were created with versions ***v0.8.0/v0.8.1***
+### Fixed in [#398](https://github.com/mongodb/terraform-provider-mongodbatlas/pull/398)
+
+The following resources were affected, due to a schema update,
+to achieve support for multiple providers (AWS and Azure):
+
+```
+mongodbatlas_privatelink_endpoint
+mongodbatlas_privatelink_endpoint_service
+```
+
+### Known issue from v0.8.0 to v0.8.2
+
+If the resources were created with v0.8.0, there was no error in the creation of the resource in Atlas.
+However to upgrade to v0.8.2 the state sync steps show below must be done, otherwise the following error will be shown
+
+```
+Error: error reading MongoDB Private Service Endpoint Connection(601881cb0d97874a0eb4eb74): GET https://cloud.mongodb.com/api/atlas/v1.0/groups/5cf5a45a9ccf6400e60913b7/privateEndpoint/AZURE/endpointService//subscriptions/{SUSCRIPTION-ID}/endpoint/601881cb0d97874a0eb4eb74: 404 (request "RESOURCE_NOT_FOUND") Cannot find resource /api/atlas/v1.0/groups/5cf5a45a9ccf6400e60913b7/privateEndpoint/AZURE/endpointService//subscriptions{SUSCRIPTION-ID}/endpoint/601881cb0d97874a0eb4eb74.
+```
+
+### Known issue from v0.8.1 to v0.8.2
+
+MongoDB Atlas provider v0.8.1 created the resource successfully in Atlas, but fails with an error on the read function in Terraform. v0.8.2 has a fix to correct this read error.
+
+```
+Error: error adding MongoDB Private Service Endpoint Connection(/subscriptions/{SUSCRIPTION-ID}) to a Private Endpoint (6018680618d74a4b62fe0600): unexpected state '', wanted target 'AVAILABLE, REJECTED, DELETED'. last error: %!s(<nil>)
+
+```
+
+### Steps impacted users must perform to successfully upgrade to v0.8.2 with a correct state
+
+1. Upgrade your provider to v0.8.2
+2. backup your terraform state file
+3. Remove the mongodbatlas_privatelink_endpoint, mongodbatlas_privatelink_endpoint_service resources from state
+```
+$ terraform state rm mongodbatlas_privatelink_endpoint.test
+$ terraform state rm mongodbatlas_privatelink_endpoint_service.test
+```
+1. Import the resources back into the state
+```
+$ terraform import mongodbatlas_privatelink_endpoint.test {project_id}-{private_link_id}-{provider_name}-{region}
+$ terraform import mongodbatlas_privatelink_endpoint_service.test {project_id}--{private_link_id}--{endpoint_service_id}--{provider_name}
+
+```
+5. terraform plan (no changes expected)
+```
+$ terraform plan
+
+(...)
+
+No changes. Infrastructure is up-to-date.
+
+This means that Terraform did not detect any differences between your
+configuration and real physical resources that exist. As a result, no
+actions need to be performed.
+
+```
+
diff --git a/website/docs/r/privatelink_endpoint.html.markdown b/website/docs/r/privatelink_endpoint.html.markdown
@@ -103,16 +103,20 @@ In addition to all arguments above, the following attributes are exported:
 * `endpoint_service_name` - Name of the PrivateLink endpoint service in AWS. Returns null while the endpoint service is being created.
 * `error_message` - Error message pertaining to the AWS PrivateLink connection. Returns null if there are no errors.
 * `interface_endpoints` - Unique identifiers of the interface endpoints in your VPC that you added to the AWS PrivateLink connection.
-* `status` - Status of the Private Link Service.
 * `private_endpoints` - All private endpoints that you have added to this Azure Private Link Service.
 * `private_link_service_name` - Name of the Azure Private Link Service that Atlas manages.
 * `private_link_service_resource_id` - Resource ID of the Azure Private Link Service that Atlas manages.
-  Returns one of the following values:
-  * `AVAILABLE` 	Atlas created the load balancer and the Private Link Service.
-  * `INITIATING` 	Atlas is creating the network load balancer and VPC endpoint service.
-  * `WAITING_FOR_USER` The Atlas network load balancer and VPC endpoint service are created and ready to receive connection requests. When you receive this status, create an interface endpoint to continue configuring the AWS PrivateLink connection.
-  * `FAILED` 	A system failure has occurred.
-  * `DELETING` 	The Private Link service is being deleted.
+* `status` - Status of the AWS PrivateLink connection or Status of the Azure Private Link Service. Atlas returns one of the following values:
+  AWS:
+    * `AVAILABLE` 	Atlas is creating the network load balancer and VPC endpoint service.
+    * `WAITING_FOR_USER` The Atlas network load balancer and VPC endpoint service are created and ready to receive connection requests. When you receive this status, create an interface endpoint to continue configuring the AWS PrivateLink connection.
+    * `FAILED` 	A system failure has occurred.
+    * `DELETING` 	The AWS PrivateLink connection is being deleted.
+  AZURE:
+    * `AVAILABLE` 	Atlas created the load balancer and the Private Link Service.
+    * `INITIATING` 	Atlas is creating the load balancer and the Private Link Service.
+    * `FAILED` 	Atlas failed to create the load balancer and the Private Link service.
+    * `DELETING` 	Atlas is deleting the Private Link service.
 
 ## Import
 Private Endpoint Service can be imported using project ID, private link ID, provider name and region, in the format `{project_id}-{private_link_id}-{provider_name}-{region}`, e.g.
diff --git a/website/docs/r/privatelink_endpoint_service.html.markdown b/website/docs/r/privatelink_endpoint_service.html.markdown
@@ -61,16 +61,20 @@ In addition to all arguments above, the following attributes are exported:
 * `private_endpoint_resource_id` - Unique identifier of the private endpoint.
 * `delete_requested` - Indicates if Atlas received a request to remove the interface endpoint from the private endpoint connection.
 * `error_message` - Error message pertaining to the interface endpoint. Returns null if there are no errors.
-* `connection_status` - Status of the interface endpoint.
+* `aws_connection_status` - Status of the interface endpoint for AWS.
   Returns one of the following values:
     * `NONE` - Atlas created the network load balancer and VPC endpoint service, but AWS hasn’t yet created the VPC endpoint.
     * `PENDING_ACCEPTANCE` - AWS has received the connection request from your VPC endpoint to the Atlas VPC endpoint service.
     * `PENDING` - AWS is establishing the connection between your VPC endpoint and the Atlas VPC endpoint service.
     * `AVAILABLE` - Atlas VPC resources are connected to the VPC endpoint in your VPC. You can connect to Atlas clusters in this region using AWS PrivateLink.
     * `REJECTED` - AWS failed to establish a connection between Atlas VPC resources to the VPC endpoint in your VPC.
-    * `INITIATING` - Atlas has not yet accepted the connection to your private endpoint.
-    * `FAILED` - Atlas failed to accept the connection your private endpoint.
     * `DELETING` - Atlas is removing the interface endpoint from the private endpoint connection.
+* `azure_status` - Status of the interface endpoint for AZURE.
+  Returns one of the following values:
+  * `INITIATING` - Atlas has not yet accepted the connection to your private endpoint.
+  * `AVAILABLE` - Atlas approved the connection to your private endpoint.
+  * `FAILED` - Atlas failed to accept the connection your private endpoint.
+  * `DELETING` - Atlas is removing the connection to your private endpoint from the Private Link service.
 
 ## Import
 Private Endpoint Link Connection can be imported using project ID and username, in the format `{project_id}--{private_link_id}--{endpoint_service_id}--{provider_name}`, e.g.

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ require (`
`11`	`11`	`github.com/spf13/cast v1.3.1`
`12`	`12`	`github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200518153306-40099de47e37`
`13`	`13`	`github.com/terraform-providers/terraform-provider-google v1.20.1-0.20200518165017-1dd21651c496`
`14`		`- go.mongodb.org/atlas v0.7.1`
	`14`	`+ go.mongodb.org/atlas v0.7.2`
`15`	`15`	`)`