Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Update routing_rule with nil in proxy repositories if the routing… #451

Merged
merged 3 commits into from
Jun 13, 2024
Merged

fix: Update routing_rule with nil in proxy repositories if the routing… #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa14168
fix: Update routing_rule wit nil in proxy repositories if the routing…
anmoel Jun 13, 2024
adca06c
Merge branch 'main' into fix/397
anmoel Jun 13, 2024
ff9d953
Merge branch 'main' into fix/397
anmoel Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_apt_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_bower_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_cocoapods_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_conan_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_conda_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_docker_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_go_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_helm_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_maven_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_npm_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_nuget_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_p2_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_pypi_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_r_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_raw_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_rubygems_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions internal/services/repository/resource_repository_yum_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down