Skip to content

Commit

Permalink
Merge pull request scottdware#73 from f5devcentral/devel_v1.14.0
Browse files Browse the repository at this point in the history
adding vendor changes
  • Loading branch information
RavinderReddyF5 authored May 26, 2022
2 parents 981cbe1 + 580bce3 commit 88d8c31
Show file tree
Hide file tree
Showing 3 changed files with 441 additions and 14 deletions.
27 changes: 13 additions & 14 deletions as3bigip.go
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ func (b *BigIP) GetAs3(name, appList string) (string, error) {
tenantList := strings.Split(appList, ",")
found := 0
for _, item := range tenantList {
if item == "Shared" {
if item == "Shared" && name == "Common" {
found = 1
}
}
Expand All @@ -290,7 +290,9 @@ func (b *BigIP) GetAs3(name, appList string) (string, error) {
}
}
}
delete(rec, sharedTenant)
if sharedTenant == "Common" && sharedTenant != name {
delete(rec, sharedTenant)
}
}
}
}
Expand Down Expand Up @@ -513,19 +515,16 @@ func getVersion(tfBinary string) (string, error) {
}
func (b *BigIP) TenantDifference(slice1 []string, slice2 []string) string {
var diff []string
for i := 0; i < 2; i++ {
for _, s1 := range slice1 {
found := false
for _, s2 := range slice2 {
if s1 == s2 {
found = true
break
}
}
if !found {
diff = append(diff, s1)
for _, s1 := range slice1 {
found := false
for _, s2 := range slice2 {
if s1 == s2 {
found = true
break
}

}
if !found {
diff = append(diff, s1)
}
}
diff_tenant_list := strings.Join(diff[:], ",")
Expand Down
Loading

0 comments on commit 88d8c31

Please sign in to comment.