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

GM Security Policy Support #343

Merged
merged 6 commits into from
Jun 10, 2020
Merged

GM Security Policy Support #343

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
992f7bc
Support for GM Security Policies
Jun 4, 2020
4b188be
Add Acc Tests for User-Defined site
Jun 4, 2020
35dd1a6
Fix Acc Tests
Jun 9, 2020
e26642c
Merge branch 'federation' into federation_secp
Jun 9, 2020
41d038c
Fix test
Jun 9, 2020
0bf9f00
Address comments
Jun 10, 2020
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
86 changes: 68 additions & 18 deletions nsxt/resource_nsxt_policy_security_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/vmware/vsphere-automation-sdk-go/runtime/protocol/client"
gm_domains "github.com/vmware/vsphere-automation-sdk-go/services/nsxt-gm/global_infra/domains"
gm_model "github.com/vmware/vsphere-automation-sdk-go/services/nsxt-gm/model"
"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/infra/domains"
"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
"log"
Expand All @@ -26,9 +28,15 @@ func resourceNsxtPolicySecurityPolicy() *schema.Resource {
}

func resourceNsxtPolicySecurityPolicyExistsInDomain(id string, domainName string, connector *client.RestConnector, isGlobalManager bool) bool {
client := domains.NewDefaultSecurityPoliciesClient(connector)
var err error
if isGlobalManager {
client := gm_domains.NewDefaultSecurityPoliciesClient(connector)
_, err = client.Get(domainName, id)
} else {
client := domains.NewDefaultSecurityPoliciesClient(connector)
_, err = client.Get(domainName, id)
}

_, err := client.Get(domainName, id)
if err == nil {
return true
}
Expand All @@ -49,7 +57,6 @@ func resourceNsxtPolicySecurityPolicyExistsPartial(domainName string) func(id st

func resourceNsxtPolicySecurityPolicyCreate(d *schema.ResourceData, m interface{}) error {
connector := getPolicyConnector(m)
client := domains.NewDefaultSecurityPoliciesClient(connector)

// Initialize resource Id and verify this ID is not yet used
id, err := getOrGenerateID(d, m, resourceNsxtPolicySecurityPolicyExistsPartial(d.Get("domain").(string)))
Expand Down Expand Up @@ -82,9 +89,19 @@ func resourceNsxtPolicySecurityPolicyCreate(d *schema.ResourceData, m interface{
TcpStrict: &tcpStrict,
Rules: rules,
}

log.Printf("[INFO] Creating Security Policy with ID %s", id)
err = client.Patch(d.Get("domain").(string), id, obj)
if isPolicyGlobalManager(m) {
gmObj, err1 := convertModelBindingType(obj, model.SecurityPolicyBindingType(), gm_model.SecurityPolicyBindingType())
if err1 != nil {
return err1
}
client := gm_domains.NewDefaultSecurityPoliciesClient(connector)
err = client.Patch(d.Get("domain").(string), id, gmObj.(gm_model.SecurityPolicy))
} else {
client := domains.NewDefaultSecurityPoliciesClient(connector)
err = client.Patch(d.Get("domain").(string), id, obj)
}

if err != nil {
return handleCreateError("Security Policy", id, err)
}
Expand All @@ -97,19 +114,31 @@ func resourceNsxtPolicySecurityPolicyCreate(d *schema.ResourceData, m interface{

func resourceNsxtPolicySecurityPolicyRead(d *schema.ResourceData, m interface{}) error {
connector := getPolicyConnector(m)
client := domains.NewDefaultSecurityPoliciesClient(connector)

id := d.Id()
domainName := d.Get("domain").(string)
if id == "" {
return fmt.Errorf("Error obtaining Security Policy id")
}

domainName := d.Get("domain").(string)
obj, err := client.Get(domainName, id)
if err != nil {
return handleReadError(d, "Security Policy", id, err)
var obj model.SecurityPolicy
if isPolicyGlobalManager(m) {
client := gm_domains.NewDefaultSecurityPoliciesClient(connector)
gmObj, err := client.Get(domainName, id)
if err != nil {
return handleReadError(d, "SecurityPolicy", id, err)
}
rawObj, err := convertModelBindingType(gmObj, gm_model.SecurityPolicyBindingType(), model.SecurityPolicyBindingType())
if err != nil {
return err
}
obj = rawObj.(model.SecurityPolicy)
} else {
var err error
client := domains.NewDefaultSecurityPoliciesClient(connector)
obj, err = client.Get(domainName, id)
if err != nil {
return handleReadError(d, "SecurityPolicy", id, err)
}
}

d.Set("display_name", obj.DisplayName)
d.Set("description", obj.Description)
setPolicyTagsInSchema(d, obj.Tags)
Expand All @@ -135,7 +164,6 @@ func resourceNsxtPolicySecurityPolicyRead(d *schema.ResourceData, m interface{})

func resourceNsxtPolicySecurityPolicyUpdate(d *schema.ResourceData, m interface{}) error {
connector := getPolicyConnector(m)
client := domains.NewDefaultSecurityPoliciesClient(connector)

id := d.Id()
if id == "" {
Expand Down Expand Up @@ -170,8 +198,23 @@ func resourceNsxtPolicySecurityPolicyUpdate(d *schema.ResourceData, m interface{
Rules: rules,
}

// We need to use PUT, because PATCH will not replace the whole rule list
_, err := client.Update(d.Get("domain").(string), id, obj)
var err error
if isPolicyGlobalManager(m) {
gmObj, err1 := convertModelBindingType(obj, model.SecurityPolicyBindingType(), gm_model.SecurityPolicyBindingType())
if err1 != nil {
return err1
}
gmSecurityPolicy := gmObj.(gm_model.SecurityPolicy)
client := gm_domains.NewDefaultSecurityPoliciesClient(connector)

// We need to use PUT, because PATCH will not replace the whole rule list
_, err = client.Update(d.Get("domain").(string), id, gmSecurityPolicy)
} else {
client := domains.NewDefaultSecurityPoliciesClient(connector)

// We need to use PUT, because PATCH will not replace the whole rule list
_, err = client.Update(d.Get("domain").(string), id, obj)
}
if err != nil {
return handleUpdateError("Security Policy", id, err)
}
Expand All @@ -186,9 +229,16 @@ func resourceNsxtPolicySecurityPolicyDelete(d *schema.ResourceData, m interface{
}

connector := getPolicyConnector(m)
client := domains.NewDefaultSecurityPoliciesClient(connector)
var err error

if isPolicyGlobalManager(m) {
client := gm_domains.NewDefaultSecurityPoliciesClient(connector)
err = client.Delete(d.Get("domain").(string), id)
} else {
client := domains.NewDefaultSecurityPoliciesClient(connector)
err = client.Delete(d.Get("domain").(string), id)
}

err := client.Delete(d.Get("domain").(string), id)
if err != nil {
return handleDeleteError("Security Policy", id, err)
}
Expand Down
Loading