Add primary & secondary connection string to 'azurerm_iothub_dp… (#5231)

Add primary_connection_string and secondary_connection_string to azurerm_iothub_dps_shared_access_policy
hashicorp · Dec 31, 2019 · e8859f5 · e8859f5
1 parent 9a1cc1a
commit e8859f5
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 deletions.
diff --git a/azurerm/internal/services/iothub/resource_arm_iothub_dps_shared_access_policy.go b/azurerm/internal/services/iothub/resource_arm_iothub_dps_shared_access_policy.go
@@ -92,11 +92,23 @@ func resourceArmIotHubDPSSharedAccessPolicy() *schema.Resource {
 				Computed:  true,
 			},
 
+			"primary_connection_string": {
+				Type:      schema.TypeString,
+				Sensitive: true,
+				Computed:  true,
+			},
+
 			"secondary_key": {
 				Type:      schema.TypeString,
 				Sensitive: true,
 				Computed:  true,
 			},
+
+			"secondary_connection_string": {
+				Type:      schema.TypeString,
+				Sensitive: true,
+				Computed:  true,
+			},
 		},
 	}
 }
@@ -201,6 +213,11 @@ func resourceArmIotHubDPSSharedAccessPolicyRead(d *schema.ResourceData, meta int
 	iothubDpsName := id.Path["provisioningServices"]
 	keyName := id.Path["keys"]
 
+	iothubDps, err := client.Get(ctx, iothubDpsName, resourceGroup)
+	if err != nil {
+		return fmt.Errorf("Error retrieving IotHub DPS %q (Resource Group %q): %+v", iothubDpsName, resourceGroup, err)
+	}
+
 	accessPolicy, err := client.ListKeysForKeyName(ctx, iothubDpsName, keyName, resourceGroup)
 	if err != nil {
 		if utils.ResponseWasNotFound(accessPolicy.Response) {
@@ -217,6 +234,22 @@ func resourceArmIotHubDPSSharedAccessPolicyRead(d *schema.ResourceData, meta int
 	d.Set("primary_key", accessPolicy.PrimaryKey)
 	d.Set("secondary_key", accessPolicy.SecondaryKey)
 
+	if props := iothubDps.Properties; props != nil {
+		if host := props.ServiceOperationsHostName; host != nil {
+			if pKey := accessPolicy.PrimaryKey; pKey != nil {
+				if err := d.Set("primary_connection_string", getSAPConnectionString(*host, keyName, *pKey)); err != nil {
+					return fmt.Errorf("error setting `primary_connection_string`: %v", err)
+				}
+			}
+
+			if sKey := accessPolicy.SecondaryKey; sKey != nil {
+				if err := d.Set("secondary_connection_string", getSAPConnectionString(*host, keyName, *sKey)); err != nil {
+					return fmt.Errorf("error setting `secondary_connection_string`: %v", err)
+				}
+			}
+		}
+	}
+
 	rights := flattenDpsAccessRights(accessPolicy.Rights)
 	d.Set("enrollment_read", rights.enrollmentRead)
 	d.Set("enrollment_write", rights.enrollmentWrite)
@@ -369,3 +402,7 @@ func flattenDpsAccessRights(r iothub.AccessRightsDescription) dpsAccessRights {
 
 	return rights
 }
+
+func getSAPConnectionString(iothubDpsHostName string, keyName string, key string) string {
+	return fmt.Sprintf("HostName=%s;SharedAccessKeyName=%s;SharedAccessKey=%s", iothubDpsHostName, keyName, key)
+}
diff --git a/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_shared_access_policy_test.go b/azurerm/internal/services/iothub/tests/resource_arm_iothub_dps_shared_access_policy_test.go
@@ -31,6 +31,10 @@ func TestAccAzureRMIotHubDpsSharedAccessPolicy_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(data.ResourceName, "registration_read", "false"),
 					resource.TestCheckResourceAttr(data.ResourceName, "registration_write", "false"),
 					resource.TestCheckResourceAttr(data.ResourceName, "service_config", "true"),
+					resource.TestCheckResourceAttrSet(data.ResourceName, "primary_key"),
+					resource.TestCheckResourceAttrSet(data.ResourceName, "primary_connection_string"),
+					resource.TestCheckResourceAttrSet(data.ResourceName, "secondary_key"),
+					resource.TestCheckResourceAttrSet(data.ResourceName, "secondary_connection_string"),
 				),
 			},
 		},

diff --git a/website/docs/r/iothub_dps_shared_access_policy.html.markdown b/website/docs/r/iothub_dps_shared_access_policy.html.markdown
@@ -77,8 +77,12 @@ The following attributes are exported:
 
 * `primary_key` - The primary key used to create the authentication token.
 
+* `primary_connection_string` - The primary connection string of the Shared Access Policy.
+
 * `secondary_key` - The secondary key used to create the authentication token.
 
+* `secondary_connection_string` - The secondary connection string of the Shared Access Policy.
+
 ## Import
 
 IoT Hub Device Provisioning Service Shared Access Policies can be imported using the `resource id`, e.g.