fix: Update routing_rule with nil in proxy repositories if the routin…

…g rule was removed in nexus
datadrivers · Jun 13, 2024 · 78b7295 · 78b7295
1 parent cb6e05b
commit 78b7295
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 0 deletions.
diff --git a/internal/services/repository/resource_repository_apt_proxy.go b/internal/services/repository/resource_repository_apt_proxy.go
@@ -132,6 +132,8 @@ func setAptProxyRepositoryToResourceData(repo *repository.AptProxyRepository, re
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_bower_proxy.go b/internal/services/repository/resource_repository_bower_proxy.go
@@ -124,6 +124,8 @@ func setBowerProxyRepositoryToResourceData(repo *repository.BowerProxyRepository
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_cocoapods_proxy.go b/internal/services/repository/resource_repository_cocoapods_proxy.go
@@ -115,6 +115,8 @@ func setCocoapodsProxyRepositoryToResourceData(repo *repository.CocoapodsProxyRe
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_conan_proxy.go b/internal/services/repository/resource_repository_conan_proxy.go
@@ -115,6 +115,8 @@ func setConanProxyRepositoryToResourceData(repo *repository.ConanProxyRepository
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_conda_proxy.go b/internal/services/repository/resource_repository_conda_proxy.go
@@ -115,6 +115,8 @@ func setCondaProxyRepositoryToResourceData(repo *repository.CondaProxyRepository
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_docker_proxy.go b/internal/services/repository/resource_repository_docker_proxy.go
@@ -182,6 +182,8 @@ func setDockerProxyRepositoryToResourceData(repo *repository.DockerProxyReposito
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_go_proxy.go b/internal/services/repository/resource_repository_go_proxy.go
@@ -115,6 +115,8 @@ func setGoProxyRepositoryToResourceData(repo *repository.GoProxyRepository, reso
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_helm_proxy.go b/internal/services/repository/resource_repository_helm_proxy.go
@@ -115,6 +115,8 @@ func setHelmProxyRepositoryToResourceData(repo *repository.HelmProxyRepository,
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_maven_proxy.go b/internal/services/repository/resource_repository_maven_proxy.go
@@ -132,6 +132,8 @@ func setMavenProxyRepositoryToResourceData(repo *repository.MavenProxyRepository
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("maven", flattenMaven(&repo.Maven)); err != nil {

diff --git a/internal/services/repository/resource_repository_npm_proxy.go b/internal/services/repository/resource_repository_npm_proxy.go
@@ -132,6 +132,8 @@ func setNpmProxyRepositoryToResourceData(repo *repository.NpmProxyRepository, re
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_nuget_proxy.go b/internal/services/repository/resource_repository_nuget_proxy.go
@@ -130,6 +130,8 @@ func setNugetProxyRepositoryToResourceData(repo *repository.NugetProxyRepository
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_p2_proxy.go b/internal/services/repository/resource_repository_p2_proxy.go
@@ -115,6 +115,8 @@ func setP2ProxyRepositoryToResourceData(repo *repository.P2ProxyRepository, reso
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_pypi_proxy.go b/internal/services/repository/resource_repository_pypi_proxy.go
@@ -115,6 +115,8 @@ func setPypiProxyRepositoryToResourceData(repo *repository.PypiProxyRepository,
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_r_proxy.go b/internal/services/repository/resource_repository_r_proxy.go
@@ -115,6 +115,8 @@ func setRProxyRepositoryToResourceData(repo *repository.RProxyRepository, resour
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_raw_proxy.go b/internal/services/repository/resource_repository_raw_proxy.go
@@ -115,6 +115,8 @@ func setRawProxyRepositoryToResourceData(repo *repository.RawProxyRepository, re
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_rubygems_proxy.go b/internal/services/repository/resource_repository_rubygems_proxy.go
@@ -115,6 +115,8 @@ func setRubygemsProxyRepositoryToResourceData(repo *repository.RubyGemsProxyRepo
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {

diff --git a/internal/services/repository/resource_repository_yum_proxy.go b/internal/services/repository/resource_repository_yum_proxy.go
@@ -129,6 +129,8 @@ func setYumProxyRepositoryToResourceData(repo *repository.YumProxyRepository, re
 		resourceData.Set("routing_rule", repo.RoutingRuleName)
 	} else if repo.RoutingRule != nil {
 		resourceData.Set("routing_rule", repo.RoutingRule)
+	} else if repo.RoutingRuleName == nil && repo.RoutingRule == nil {
+		resourceData.Set("routing_rule", nil)
 	}
 
 	if err := resourceData.Set("storage", flattenStorage(&repo.Storage)); err != nil {