Skip to content

Commit eaae9be

Browse files
author
Edu-DevOps
committed
Revert "fix: routing_rules refresh"
This reverts commit b14d95a.
1 parent 73af16a commit eaae9be

17 files changed

+1
-119
lines changed

Diff for: ‎internal/services/repository/resource_repository_apt_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,6 @@ func resourceAptProxyRepositoryRead(resourceData *schema.ResourceData, m interfa
186186
return nil
187187
}
188188

189-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
190-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
191-
resourceData.Set("routing_rule", *repo.RoutingRule)
192-
} else if repo.RoutingRule == nil {
193-
resourceData.Set("routing_rule", nil)
194-
}
195-
196189
return setAptProxyRepositoryToResourceData(repo, resourceData)
197190
}
198191

Diff for: ‎internal/services/repository/resource_repository_bower_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,6 @@ func resourceBowerProxyRepositoryCreate(resourceData *schema.ResourceData, m int
167167
}
168168
resourceData.SetId(repo.Name)
169169

170-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
171-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
172-
resourceData.Set("routing_rule", *repo.RoutingRule)
173-
} else if repo.RoutingRule == nil {
174-
resourceData.Set("routing_rule", nil)
175-
}
176-
177170
return resourceBowerProxyRepositoryRead(resourceData, m)
178171
}
179172

Diff for: ‎internal/services/repository/resource_repository_cocoapods_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,6 @@ func resourceCocoapodsProxyRepositoryRead(resourceData *schema.ResourceData, m i
169169
return nil
170170
}
171171

172-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
173-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
174-
resourceData.Set("routing_rule", *repo.RoutingRule)
175-
} else if repo.RoutingRule == nil {
176-
resourceData.Set("routing_rule", nil)
177-
}
178-
179172
return setCocoapodsProxyRepositoryToResourceData(repo, resourceData)
180173
}
181174

Diff for: ‎internal/services/repository/resource_repository_conan_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,6 @@ func resourceConanProxyRepositoryRead(resourceData *schema.ResourceData, m inter
169169
return nil
170170
}
171171

172-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
173-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
174-
resourceData.Set("routing_rule", *repo.RoutingRule)
175-
} else if repo.RoutingRule == nil {
176-
resourceData.Set("routing_rule", nil)
177-
}
178-
179172
return setConanProxyRepositoryToResourceData(repo, resourceData)
180173
}
181174

Diff for: ‎internal/services/repository/resource_repository_conda_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,6 @@ func resourceCondaProxyRepositoryRead(resourceData *schema.ResourceData, m inter
169169
return nil
170170
}
171171

172-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
173-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
174-
resourceData.Set("routing_rule", *repo.RoutingRule)
175-
} else if repo.RoutingRule == nil {
176-
resourceData.Set("routing_rule", nil)
177-
}
178-
179172
return setCondaProxyRepositoryToResourceData(repo, resourceData)
180173
}
181174

Diff for: ‎internal/services/repository/resource_repository_docker_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,6 @@ func resourceDockerProxyRepositoryRead(resourceData *schema.ResourceData, m inte
259259
return nil
260260
}
261261

262-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
263-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
264-
resourceData.Set("routing_rule", *repo.RoutingRule)
265-
} else if repo.RoutingRule == nil {
266-
resourceData.Set("routing_rule", nil)
267-
}
268-
269262
return setDockerProxyRepositoryToResourceData(repo, resourceData)
270263
}
271264

Diff for: ‎internal/services/repository/resource_repository_go_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,6 @@ func resourceGoProxyRepositoryRead(resourceData *schema.ResourceData, m interfac
169169
return nil
170170
}
171171

172-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
173-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
174-
resourceData.Set("routing_rule", *repo.RoutingRule)
175-
} else if repo.RoutingRule == nil {
176-
resourceData.Set("routing_rule", nil)
177-
}
178-
179172
return setGoProxyRepositoryToResourceData(repo, resourceData)
180173
}
181174

Diff for: ‎internal/services/repository/resource_repository_helm_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,6 @@ func resourceHelmProxyRepositoryRead(resourceData *schema.ResourceData, m interf
169169
return nil
170170
}
171171

172-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
173-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
174-
resourceData.Set("routing_rule", *repo.RoutingRule)
175-
} else if repo.RoutingRule == nil {
176-
resourceData.Set("routing_rule", nil)
177-
}
178-
179172
return setHelmProxyRepositoryToResourceData(repo, resourceData)
180173
}
181174

Diff for: ‎internal/services/repository/resource_repository_maven_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,6 @@ func resourceMavenProxyRepositoryRead(resourceData *schema.ResourceData, m inter
190190
return nil
191191
}
192192

193-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
194-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
195-
resourceData.Set("routing_rule", *repo.RoutingRule)
196-
} else if repo.RoutingRule == nil {
197-
resourceData.Set("routing_rule", nil)
198-
}
199-
200193
return setMavenProxyRepositoryToResourceData(repo, resourceData)
201194
}
202195

Diff for: ‎internal/services/repository/resource_repository_npm_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,6 @@ func resourceNpmProxyRepositoryRead(resourceData *schema.ResourceData, m interfa
190190
return nil
191191
}
192192

193-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
194-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
195-
resourceData.Set("routing_rule", *repo.RoutingRule)
196-
} else if repo.RoutingRule == nil {
197-
resourceData.Set("routing_rule", nil)
198-
}
199-
200193
return setNpmProxyRepositoryToResourceData(repo, resourceData)
201194
}
202195

Diff for: ‎internal/services/repository/resource_repository_nuget_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,6 @@ func resourceNugetProxyRepositoryRead(resourceData *schema.ResourceData, m inter
187187
return nil
188188
}
189189

190-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
191-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
192-
resourceData.Set("routing_rule", *repo.RoutingRule)
193-
} else if repo.RoutingRule == nil {
194-
resourceData.Set("routing_rule", nil)
195-
}
196-
197190
return setNugetProxyRepositoryToResourceData(repo, resourceData)
198191
}
199192

Diff for: ‎internal/services/repository/resource_repository_p2_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,6 @@ func resourceP2ProxyRepositoryUpdate(resourceData *schema.ResourceData, m interf
182182
return err
183183
}
184184

185-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
186-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
187-
resourceData.Set("routing_rule", *repo.RoutingRule)
188-
} else if repo.RoutingRule == nil {
189-
resourceData.Set("routing_rule", nil)
190-
}
191-
192185
return resourceP2ProxyRepositoryRead(resourceData, m)
193186
}
194187

Diff for: ‎internal/services/repository/resource_repository_pypi_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,6 @@ func resourcePypiProxyRepositoryRead(resourceData *schema.ResourceData, m interf
169169
return nil
170170
}
171171

172-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
173-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
174-
resourceData.Set("routing_rule", *repo.RoutingRule)
175-
} else if repo.RoutingRule == nil {
176-
resourceData.Set("routing_rule", nil)
177-
}
178-
179172
return setPypiProxyRepositoryToResourceData(repo, resourceData)
180173
}
181174

Diff for: ‎internal/services/repository/resource_repository_r_proxy.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ func resourceRProxyRepositoryCreate(resourceData *schema.ResourceData, m interfa
158158

159159
func resourceRProxyRepositoryRead(resourceData *schema.ResourceData, m interface{}) error {
160160
client := m.(*nexus.NexusClient)
161+
161162
repo, err := client.Repository.R.Proxy.Get(resourceData.Id())
162163
if err != nil {
163164
return err
@@ -168,13 +169,6 @@ func resourceRProxyRepositoryRead(resourceData *schema.ResourceData, m interface
168169
return nil
169170
}
170171

171-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
172-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
173-
resourceData.Set("routing_rule", *repo.RoutingRule)
174-
} else if repo.RoutingRule == nil {
175-
resourceData.Set("routing_rule", nil)
176-
}
177-
178172
return setRProxyRepositoryToResourceData(repo, resourceData)
179173
}
180174

Diff for: ‎internal/services/repository/resource_repository_raw_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,6 @@ func resourceRawProxyRepositoryRead(resourceData *schema.ResourceData, m interfa
169169
return nil
170170
}
171171

172-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
173-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
174-
resourceData.Set("routing_rule", *repo.RoutingRule)
175-
} else if repo.RoutingRule == nil {
176-
resourceData.Set("routing_rule", nil)
177-
}
178-
179172
return setRawProxyRepositoryToResourceData(repo, resourceData)
180173
}
181174

Diff for: ‎internal/services/repository/resource_repository_rubygems_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,6 @@ func resourceRubygemsProxyRepositoryRead(resourceData *schema.ResourceData, m in
169169
return nil
170170
}
171171

172-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
173-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
174-
resourceData.Set("routing_rule", *repo.RoutingRule)
175-
} else if repo.RoutingRule == nil {
176-
resourceData.Set("routing_rule", nil)
177-
}
178-
179172
return setRubygemsProxyRepositoryToResourceData(repo, resourceData)
180173
}
181174

Diff for: ‎internal/services/repository/resource_repository_yum_proxy.go

-7
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,6 @@ func resourceYumProxyRepositoryUpdate(resourceData *schema.ResourceData, m inter
196196
return err
197197
}
198198

199-
expectedRoutingRule := resourceData.Get("routing_rule").(string)
200-
if repo.RoutingRule != nil && *repo.RoutingRule != expectedRoutingRule {
201-
resourceData.Set("routing_rule", *repo.RoutingRule)
202-
} else if repo.RoutingRule == nil {
203-
resourceData.Set("routing_rule", nil)
204-
}
205-
206199
return resourceYumProxyRepositoryRead(resourceData, m)
207200
}
208201

0 commit comments

Comments
 (0)