Merge branch 'master' into master

Author: ivandksun

CHANGELOG.md

@@ -1,4 +1,13 @@
-## 1.56.10 (Unreleased)
+## 1.56.11 (Unreleased)
+
+## 1.56.10 
+
+BUG FIXES
+
+* Resource `tencentcloud_tcr_namespace` fix create two namespace and one name is substring of another, then got an error about more than 1
+* Resource `tencentcloud_tcr_namespace` fix create two repositories and one name is substring of another, then got an error about more than 1
+
+
 ## 1.56.9 (Jun 09, 2021)
 
 BUG FIXES:

tencentcloud/service_tencentcloud_tcr.go

@@ -307,13 +307,15 @@ func (me *TCRService) DescribeTCRNameSpaceById(ctx context.Context, instanceId s
 
 	if len(namespaces) == 0 {
 		return nil, has, nil
-	} else if len(namespaces) > 1 {
-		errRet = fmt.Errorf("TencentCloud SDK return more than 1 namespaces, %s %s", instanceId, name)
-		return
 	}
 
-	namespace = namespaces[0]
-	has = true
+	for i := range namespaces {
+		if name == *namespaces[i].Name {
+			namespace = namespaces[i]
+			has = true
+			return
+		}
+	}
 	return
 }
 
@@ -445,13 +447,16 @@ func (me *TCRService) DescribeTCRRepositoryById(ctx context.Context, instanceId
 
 	if len(repositories) == 0 {
 		return nil, has, nil
-	} else if len(repositories) > 1 {
-		errRet = fmt.Errorf("TencentCloud SDK return more than 1 namespaces, %s %s %s", instanceId, namespace, repositoryName)
-		return
 	}
 
-	repository = repositories[0]
-	has = true
+	for i := range repositories {
+		if *repositories[i].Name == namespace+"/"+repositoryName {
+			repository = repositories[i]
+			has = true
+			return
+		}
+	}
+
 	return
 }