replicas and other resources with same prefix (#82)

nolte · Oct 3, 2020 · 707d052 · 707d052
1 parent 10f8376
commit 707d052
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 29 deletions.
diff --git a/harbor/resource_labels.go b/harbor/resource_labels.go
@@ -119,14 +119,13 @@ func findLabelByNameAndScope(d *schema.ResourceData, m interface{}) (*models.Lab
 				return &models.Label{}, err
 			}
 
-			if len(resp.Payload) < 1 {
-				return &models.Label{}, fmt.Errorf("no label found with name %v", searchName)
-			} else if resp.Payload[0].Name != searchName {
-				return &models.Label{},
-					fmt.Errorf("response Name %v not match with Expected Name %v", resp.Payload[0].Name, searchName)
+			for _, element := range resp.Payload {
+				if element.Name == searchName {
+					return element, nil
+				}
 			}
 
-			return resp.Payload[0], nil
+			return &models.Label{}, fmt.Errorf("no label found with name %v", searchName)
 		}
 	}
 

diff --git a/harbor/resource_project.go b/harbor/resource_project.go
@@ -99,15 +99,13 @@ func findProjectByName(d *schema.ResourceData, m interface{}) (*models.Project,
 			d.SetId("")
 			return &models.Project{}, err
 		}
-
-		if len(resp.Payload) < 1 {
-			return &models.Project{}, fmt.Errorf("no project found with name %v", projectName)
-		} else if resp.Payload[0].Name != projectName {
-			return &models.Project{},
-				fmt.Errorf("response Name %v not match with Expected Name %v", resp.Payload[0].Name, projectName)
+		for _, element := range resp.Payload {
+			if element.Name == projectName {
+				return element, nil
+			}
 		}
 
-		return resp.Payload[0], nil
+		return &models.Project{}, fmt.Errorf("no project found with name %v", projectName)
 	}
 
 	return &models.Project{}, fmt.Errorf("fail to lookup project by Name")

diff --git a/harbor/resource_registry.go b/harbor/resource_registry.go
@@ -102,15 +102,12 @@ func findRegistryByName(d *schema.ResourceData, m interface{}) (*models.Registry
 			d.SetId("")
 			return &models.Registry{}, err
 		}
-
-		if len(resp.Payload) < 1 {
-			return &models.Registry{}, fmt.Errorf("no Registry found with name %v", registryName)
-		} else if resp.Payload[0].Name != registryName {
-			return &models.Registry{},
-				fmt.Errorf("response Name %v not match with Expected Name %v", resp.Payload[0].Name, registryName)
+		for _, element := range resp.Payload {
+			if element.Name == registryName {
+				return element, nil
+			}
 		}
-
-		return resp.Payload[0], nil
+		return &models.Registry{}, fmt.Errorf("no Registry found with name %v", registryName)
 	}
 
 	return &models.Registry{}, fmt.Errorf("fail to lookup Registry by Name")

diff --git a/harbor/resource_replication.go b/harbor/resource_replication.go
@@ -166,15 +166,12 @@ func findReplicationByName(d *schema.ResourceData, m interface{}) (*models.Repli
 			d.SetId("")
 			return &models.ReplicationPolicy{}, err
 		}
-
-		if len(resp.Payload) < 1 {
-			return &models.ReplicationPolicy{}, fmt.Errorf("no Replication found with name %v", registryName)
-		} else if resp.Payload[0].Name != registryName {
-			return &models.ReplicationPolicy{},
-				fmt.Errorf("response Name %v not match with Expected Name %v", resp.Payload[0].Name, registryName)
+		for _, element := range resp.Payload {
+			if element.Name == registryName {
+				return element, nil
+			}
 		}
-
-		return resp.Payload[0], nil
+		return &models.ReplicationPolicy{}, fmt.Errorf("no Replication found with name %v", registryName)
 	}
 
 	return &models.ReplicationPolicy{}, fmt.Errorf("fail to lookup Replication by Name")