client: Switches to operationMetadataSecrets function

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>

Author: tomponline

client/lxd_instances.go

@@ -843,15 +843,7 @@ func (r *ProtocolLXD) CopyInstance(source InstanceServer, instance api.Instance,
 
 		opAPI := op.Get()
 
-		targetSecrets := map[string]string{}
-		for k, v := range opAPI.Metadata {
-			vStr, ok := v.(string)
-			if !ok {
-				continue
-			}
-
-			targetSecrets[k] = vStr
-		}
+		targetSecrets := operationMetadataSecrets(opAPI.Metadata)
 
 		// Prepare the source request
 		target := api.InstancePostTarget{}
@@ -876,15 +868,7 @@ func (r *ProtocolLXD) CopyInstance(source InstanceServer, instance api.Instance,
 
 	opAPI := op.Get()
 
-	sourceSecrets := map[string]string{}
-	for k, v := range opAPI.Metadata {
-		vStr, ok := v.(string)
-		if !ok {
-			continue
-		}
-
-		sourceSecrets[k] = vStr
-	}
+	sourceSecrets := operationMetadataSecrets(opAPI.Metadata)
 
 	// Relay mode migration
 	if args != nil && args.Mode == "relay" {
@@ -901,15 +885,7 @@ func (r *ProtocolLXD) CopyInstance(source InstanceServer, instance api.Instance,
 		targetOpAPI := targetOp.Get()
 
 		// Extract the websockets
-		targetSecrets := map[string]string{}
-		for k, v := range targetOpAPI.Metadata {
-			vStr, ok := v.(string)
-			if !ok {
-				continue
-			}
-
-			targetSecrets[k] = vStr
-		}
+		targetSecrets := operationMetadataSecrets(targetOpAPI.Metadata)
 
 		// Launch the relay
 		err = r.proxyMigration(targetOp.(*operation), targetSecrets, source, op.(*operation), sourceSecrets)
@@ -1961,15 +1937,7 @@ func (r *ProtocolLXD) CopyInstanceSnapshot(source InstanceServer, instanceName s
 
 		opAPI := op.Get()
 
-		targetSecrets := map[string]string{}
-		for k, v := range opAPI.Metadata {
-			vStr, ok := v.(string)
-			if !ok {
-				continue
-			}
-
-			targetSecrets[k] = vStr
-		}
+		targetSecrets := operationMetadataSecrets(opAPI.Metadata)
 
 		// Prepare the source request
 		target := api.InstancePostTarget{}
@@ -1994,15 +1962,7 @@ func (r *ProtocolLXD) CopyInstanceSnapshot(source InstanceServer, instanceName s
 
 	opAPI := op.Get()
 
-	sourceSecrets := map[string]string{}
-	for k, v := range opAPI.Metadata {
-		vStr, ok := v.(string)
-		if !ok {
-			continue
-		}
-
-		sourceSecrets[k] = vStr
-	}
+	sourceSecrets := operationMetadataSecrets(opAPI.Metadata)
 
 	// Relay mode migration
 	if args != nil && args.Mode == "relay" {
@@ -2019,15 +1979,7 @@ func (r *ProtocolLXD) CopyInstanceSnapshot(source InstanceServer, instanceName s
 		targetOpAPI := targetOp.Get()
 
 		// Extract the websockets
-		targetSecrets := map[string]string{}
-		for k, v := range targetOpAPI.Metadata {
-			vStr, ok := v.(string)
-			if !ok {
-				continue
-			}
-
-			targetSecrets[k] = vStr
-		}
+		targetSecrets := operationMetadataSecrets(targetOpAPI.Metadata)
 
 		// Launch the relay
 		err = r.proxyMigration(targetOp.(*operation), targetSecrets, source, op.(*operation), sourceSecrets)

client/lxd_storage_volumes.go

@@ -681,13 +681,7 @@ func (r *ProtocolLXD) CopyStoragePoolVolume(pool string, source InstanceServer,
 
 		opAPI := op.Get()
 
-		targetSecrets := map[string]string{}
-		for k, v := range opAPI.Metadata {
-			value, ok := v.(string)
-			if ok {
-				targetSecrets[k] = value
-			}
-		}
+		targetSecrets := operationMetadataSecrets(opAPI.Metadata)
 
 		// Prepare the source request
 		target := api.StorageVolumePostTarget{}
@@ -714,13 +708,7 @@ func (r *ProtocolLXD) CopyStoragePoolVolume(pool string, source InstanceServer,
 	opAPI := op.Get()
 
 	// Prepare source server secrets for remote
-	sourceSecrets := map[string]string{}
-	for k, v := range opAPI.Metadata {
-		value, ok := v.(string)
-		if ok {
-			sourceSecrets[k] = value
-		}
-	}
+	sourceSecrets := operationMetadataSecrets(opAPI.Metadata)
 
 	// Relay mode migration
 	if args != nil && args.Mode == "relay" {
@@ -740,13 +728,7 @@ func (r *ProtocolLXD) CopyStoragePoolVolume(pool string, source InstanceServer,
 		targetOpAPI := targetOp.Get()
 
 		// Extract the websockets
-		targetSecrets := map[string]string{}
-		for k, v := range targetOpAPI.Metadata {
-			value, ok := v.(string)
-			if ok {
-				targetSecrets[k] = value
-			}
-		}
+		targetSecrets := operationMetadataSecrets(targetOpAPI.Metadata)
 
 		// Launch the relay
 		err = r.proxyMigration(targetOp.(*operation), targetSecrets, source, op.(*operation), sourceSecrets)