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

adding as3 perp changes #921

Merged
merged 8 commits into from
Feb 6, 2024
Merged

adding as3 perp changes #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eab0ceb
adding version
RavinderReddyF5 Jan 3, 2024
98251dc
Merge pull request #918 from F5Networks/devel_030124_version
RavinderReddyF5 Jan 3, 2024
f10eba9
Added Per-App Create Method
ramaniprateek Jan 3, 2024
fe253e3
fixed merge issues
RavinderReddyF5 Jan 10, 2024
a2cefee
Added async Create function
ramaniprateek Jan 12, 2024
827e046
adding fix for jira-1414
RavinderReddyF5 Jan 23, 2024
d2ea11c
Read Method Updated
ramaniprateek Jan 31, 2024
be14a52
adding perapp fix
RavinderReddyF5 Feb 5, 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
224 changes: 163 additions & 61 deletions bigip/resource_bigip_as3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@

import (
"context"
"crypto/rand"
"encoding/json"
"fmt"
"log"
"math/big"
"os"
"reflect"
"strings"
Expand Down Expand Up @@ -72,8 +74,12 @@
delete(rec, "id")
delete(rec, "label")
delete(rec, "remark")
delete(rec, "Common")
}
}
if key == "persist" {
delete(oldJsonref, "persist")
}
}
for key, value := range newJsonref {
if rec, ok := value.(map[string]interface{}); ok && key == "declaration" {
Expand All @@ -83,10 +89,13 @@
delete(rec, "id")
delete(rec, "label")
delete(rec, "remark")
delete(rec, "Common")
}
}
if key == "persist" {
delete(newJsonref, "persist")
}
}

ignoreMetadata := d.Get("ignore_metadata").(bool)
jsonEqualityAfter := reflect.DeepEqual(oldJsonref, newJsonref)
if ignoreMetadata {
Expand Down Expand Up @@ -153,14 +162,19 @@
Type: schema.TypeString,
Computed: true,
Optional: true,
Description: "Name of Application",
Description: "Application deployed through AS3 Declaration",
},
"task_id": {
Type: schema.TypeString,
Computed: true,
Optional: true,
Description: "ID of AS3 post declaration async task",
},
"per_app_mode": {
Type: schema.TypeBool,
Computed: true,
Description: "Will define Perapp mode enabled on BIG-IP or not",
},
},
}
}
Expand All @@ -171,34 +185,67 @@
defer m.Unlock()
as3Json := d.Get("as3_json").(string)
tenantFilter := d.Get("tenant_filter").(string)
tenantList, _, applicationList := client.GetTenantList(as3Json)
log.Printf("[INFO] Creating As3 config for tenants:%+v", tenantList)
tenantCount := strings.Split(tenantList, ",")
if tenantFilter != "" {
log.Printf("[DEBUG] tenantFilter:%+v", tenantFilter)
if !contains(tenantCount, tenantFilter) {
return diag.FromErr(fmt.Errorf("tenant_filter: (%s) not exist in as3_json provided ", tenantFilter))
}
tenantList = tenantFilter
}
_ = d.Set("tenant_list", tenantList)
_ = d.Set("application_list", applicationList)
strTrimSpace, err := client.AddTeemAgent(as3Json)
var tenantCount []string
perApplication, err := client.CheckSetting()

Check failure on line 189 in bigip/resource_bigip_as3.go

View workflow job for this annotation

GitHub Actions / golint 

client.CheckSetting undefined (type *"github.com/f5devcentral/go-bigip".BigIP has no field or method CheckSetting)
if err != nil {
return diag.FromErr(err)
}
log.Printf("[INFO] Creating as3 config in bigip:%s", strTrimSpace)
err, successfulTenants, taskID := client.PostAs3Bigip(strTrimSpace, tenantList)
log.Printf("[DEBUG] successfulTenants :%+v", successfulTenants)
if err != nil {
if successfulTenants == "" {
return diag.FromErr(fmt.Errorf("posting as3 config failed for tenants:(%s) with error: %v", tenantList, err))
tenantList, _, applicationList := client.GetTenantList(as3Json)

log.Printf("[DEBUG] perApplication:%+v", perApplication)

if perApplication && len(tenantList) == 0 {
tenant, err := GenerateRandomString(10)
log.Printf("[DEBUG] tenant name generated:%+v", tenant)
if err != nil {
return diag.FromErr(fmt.Errorf("could not generate random tenant name"))
}
applicationList := client.GetAppsList(as3Json)

Check failure on line 203 in bigip/resource_bigip_as3.go

View workflow job for this annotation

GitHub Actions / golint 

client.GetAppsList undefined (type *"github.com/f5devcentral/go-bigip".BigIP has no field or method GetAppsList)
err, taskID := client.PostPerAppBigIp(as3Json, tenant)

Check failure on line 204 in bigip/resource_bigip_as3.go

View workflow job for this annotation

GitHub Actions / golint 

client.PostPerAppBigIp undefined (type *"github.com/f5devcentral/go-bigip".BigIP has no field or method PostPerAppBigIp)
log.Printf("[DEBUG] task Id from deployment :%+v", taskID)
if err != nil {
return diag.FromErr(fmt.Errorf("posting as3 config failed for tenants:(%s) with error: %v", tenantFilter, err))
}
_ = d.Set("tenant_list", successfulTenants)
if len(successfulTenants) != len(tenantList) {
tenantCount = append(tenantCount, tenant)
_ = d.Set("tenant_list", tenant)
_ = d.Set("task_id", taskID)
_ = d.Set("application_list", applicationList)
_ = d.Set("per_app_mode", true)
} else {
log.Printf("[INFO] Creating As3 config for tenants:%+v", tenantList)
tenantCount := strings.Split(tenantList, ",")
if tenantFilter != "" {
log.Printf("[DEBUG] tenantFilter:%+v", tenantFilter)
if !contains(tenantCount, tenantFilter) {
return diag.FromErr(fmt.Errorf("tenant_filter: (%s) not exist in as3_json provided ", tenantFilter))
}
tenantList = tenantFilter
}
_ = d.Set("tenant_list", tenantList)
_ = d.Set("application_list", applicationList)

strTrimSpace, err := client.AddTeemAgent(as3Json)
if err != nil {
return diag.FromErr(err)
}
log.Printf("[INFO] Creating as3 config in bigip:%s", strTrimSpace)
err, successfulTenants, taskID := client.PostAs3Bigip(strTrimSpace, tenantList)
log.Printf("[DEBUG] successfulTenants :%+v", successfulTenants)
if err != nil {
if successfulTenants == "" {
return diag.FromErr(fmt.Errorf("posting as3 config failed for tenants:(%s) with error: %v", tenantList, err))
}
_ = d.Set("tenant_list", successfulTenants)
if len(successfulTenants) != len(tenantList) {
return diag.FromErr(err)
}
}

log.Printf("[DEBUG] ID for resource :%+v", d.Get("tenant_list").(string))
_ = d.Set("task_id", taskID)
_ = d.Set("per_app_mode", false)
}

if !client.Teem {
id := uuid.New()
uniqueID := id.String()
Expand All @@ -219,8 +266,7 @@
log.Printf("[ERROR]Sending Telemetry data failed:%v", err)
}
}
log.Printf("[DEBUG] ID for resource :%+v", d.Get("tenant_list").(string))
_ = d.Set("task_id", taskID)

if d.Get("tenant_list").(string) != "" {
d.SetId(d.Get("tenant_list").(string))
} else {
Expand All @@ -235,7 +281,7 @@
var name string
var tList string
as3Json := d.Get("as3_json").(string)

log.Printf("[INFO] AS3 config:%+v", as3Json)
if d.Get("as3_json") != nil {
tList, _, _ = client.GetTenantList(as3Json)
if createdTenants != "" && createdTenants != tList {
Expand All @@ -247,11 +293,21 @@
} else {
name = d.Id()
}

applicationList := d.Get("application_list").(string)
log.Printf("[DEBUG] Tenants in AS3 get call : %s", name)
log.Printf("[DEBUG] Applications in AS3 get call : %s", applicationList)
if name != "" {
as3Resp, err := client.GetAs3(name, applicationList)
as3Resp, err := client.GetAs3(name, applicationList, d.Get("per_app_mode").(bool))

Check failure on line 300 in bigip/resource_bigip_as3.go

View workflow job for this annotation

GitHub Actions / golint 

too many arguments in call to client.GetAs3
if d.Get("per_app_mode").(bool) {
as3Json := make(map[string]interface{})
_ = json.Unmarshal([]byte(as3Resp), &as3Json)
out, _ := json.Marshal(as3Json)
as3Dec := string(out)
applicationList = client.GetAppsList(fmt.Sprintf("%v", as3Dec))

Check failure on line 306 in bigip/resource_bigip_as3.go

View workflow job for this annotation

GitHub Actions / golint 

client.GetAppsList undefined (type *"github.com/f5devcentral/go-bigip".BigIP has no field or method GetAppsList)
log.Printf("[DEBUG] Application List from retreived the GET call in Read function : %s", applicationList)
_ = d.Set("application_list", applicationList)
}

log.Printf("[DEBUG] AS3 json retreived from the GET call in Read function : %s", as3Resp)
if err != nil {
log.Printf("[ERROR] Unable to retrieve json ")
Expand Down Expand Up @@ -288,48 +344,75 @@
defer m.Unlock()
as3Json := d.Get("as3_json").(string)
log.Printf("[INFO] Updating As3 Config :%s", as3Json)
tenantList, _, _ := client.GetTenantList(as3Json)
log.Printf("[INFO] Updating As3 Config for tenants:%s", tenantList)
oldTenantList := d.Get("tenant_list").(string)
tenantFilter := d.Get("tenant_filter").(string)
if tenantFilter == "" {
if tenantList != oldTenantList {
_ = d.Set("tenant_list", tenantList)
newList := strings.Split(tenantList, ",")
oldList := strings.Split(oldTenantList, ",")
deletedTenants := client.TenantDifference(oldList, newList)
if deletedTenants != "" {
err, _ := client.DeleteAs3Bigip(deletedTenants)
if err != nil {
log.Printf("[ERROR] Unable to Delete removed tenants: %v :", err)
return diag.FromErr(err)
}
tenantList, _, applicationList := client.GetTenantList(as3Json)
_ = d.Set("application_list", applicationList)
perApplication, err := client.CheckSetting()

Check failure on line 349 in bigip/resource_bigip_as3.go

View workflow job for this annotation

GitHub Actions / golint 

client.CheckSetting undefined (type *"github.com/f5devcentral/go-bigip".BigIP has no field or method CheckSetting)
if err != nil {
return diag.FromErr(err)
}
log.Printf("[DEBUG] perApplication:%+v", perApplication)
if d.Get("per_app_mode").(bool) {
if perApplication && len(tenantList) == 0 {
oldTenantList := d.Get("tenant_list").(string)
log.Printf("[INFO] Updating As3 Config for tenant:%s with Per-Application Mode:%v", oldTenantList, perApplication)
err, task_id := client.PostPerAppBigIp(as3Json, oldTenantList)
log.Printf("[DEBUG] task_id from PostPerAppBigIp:%+v", task_id)
if err != nil {
return diag.FromErr(fmt.Errorf("posting as3 config failed for tenant:(%s) with error: %v", oldTenantList, err))
}
// tenantCount = append(tenantCount, tenant)
_ = d.Set("tenant_list", oldTenantList)
_ = d.Set("task_id", task_id)
} else {
if !perApplication {
return diag.FromErr(fmt.Errorf("Per-Application should be true in Big-IP Setting"))
} else {
return diag.FromErr(fmt.Errorf("declartion not valid for Per-Application deployment"))
}
}
} else {
if !contains(strings.Split(tenantList, ","), tenantFilter) {
log.Printf("[WARNING]tenant_filter: (%s) not exist in as3_json provided ", tenantFilter)
log.Printf("[INFO] Updating As3 Config for tenants:%s", tenantList)
oldTenantList := d.Get("tenant_list").(string)
tenantFilter := d.Get("tenant_filter").(string)
if tenantFilter == "" {
if tenantList != oldTenantList {
_ = d.Set("tenant_list", tenantList)
newList := strings.Split(tenantList, ",")
oldList := strings.Split(oldTenantList, ",")
deletedTenants := client.TenantDifference(oldList, newList)
if deletedTenants != "" {
err, _ := client.DeleteAs3Bigip(deletedTenants)
if err != nil {
log.Printf("[ERROR] Unable to Delete removed tenants: %v :", err)
return diag.FromErr(err)
}
}
}
} else {
tenantList = tenantFilter
}
}
strTrimSpace, err := client.AddTeemAgent(as3Json)
if err != nil {
return diag.FromErr(err)
}
err, successfulTenants, taskID := client.PostAs3Bigip(strTrimSpace, tenantList)
log.Printf("[DEBUG] successfulTenants :%+v", successfulTenants)
if err != nil {
if successfulTenants == "" {
return diag.FromErr(fmt.Errorf("error updating json %s: %v", tenantList, err))
if !contains(strings.Split(tenantList, ","), tenantFilter) {
log.Printf("[WARNING]tenant_filter: (%s) not exist in as3_json provided ", tenantFilter)
} else {
tenantList = tenantFilter
}
}
_ = d.Set("tenant_list", successfulTenants)
if len(successfulTenants) != len(tenantList) {
strTrimSpace, err := client.AddTeemAgent(as3Json)
if err != nil {
return diag.FromErr(err)
}
err, successfulTenants, taskID := client.PostAs3Bigip(strTrimSpace, tenantList)
log.Printf("[DEBUG] successfulTenants :%+v", successfulTenants)
if err != nil {
if successfulTenants == "" {
return diag.FromErr(fmt.Errorf("Error updating json %s: %v", tenantList, err))
}
_ = d.Set("tenant_list", successfulTenants)
if len(successfulTenants) != len(tenantList) {
return diag.FromErr(err)
}
}
_ = d.Set("task_id", taskID)
}
createdTenants = d.Get("tenant_list").(string)
_ = d.Set("task_id", taskID)
return resourceBigipAs3Read(ctx, d, meta)
}

Expand Down Expand Up @@ -371,3 +454,22 @@
}
return false
}

func GenerateRandomString(length int) (string, error) {
const charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
charLen := 0
randomString := make([]byte, length)
for i := range randomString {
if i == 0 {
charLen = 52
} else {
charLen = len(charset)
}
randomIndex, err := rand.Int(rand.Reader, big.NewInt(int64(charLen)))
if err != nil {
return "", err
}
randomString[i] = charset[randomIndex.Int64()]
}
return string(randomString), nil
}
2 changes: 1 addition & 1 deletion bigip/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package bigip

// ProviderVersion is set at build-time in the release process
var ProviderVersion = "1.20.1"
var ProviderVersion = "1.20.2"
Loading
Loading