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

Added Fix For issue #654 #903

Merged
merged 1 commit into from
Nov 20, 2023
Merged

Added Fix For issue #654 #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 3 additions & 11 deletions bigip/resource_bigip_ltm_cipher_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,20 @@ func resourceBigipLtmCipherGroup() *schema.Resource {
Description: "Specifies descriptive text that identifies the cipher rule",
},
"ordering": {
Type: schema.TypeString,
Optional: true,
Computed: true,
//Default: "default",
Type: schema.TypeString,
Optional: true,
Default: "default",
Description: "Controls the order of the Cipher String list in the Cipher Audit section. Options are Default, Speed, Strength, FIPS, and Hardware. The rules are processed in the order listed",
},
"allow": {
Type: schema.TypeSet,
Optional: true,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
Description: "Specifies the configuration of the allowed groups of ciphers. You can select a cipher rule from the Available Cipher Rules list",
},
"require": {
Type: schema.TypeSet,
Optional: true,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
Description: "Specifies the configuration of the restrict groups of ciphers. You can select a cipher rule from the Available Cipher Rules list",
},
Expand Down Expand Up @@ -156,11 +153,6 @@ func resourceBigipLtmCipherGroupUpdate(ctx context.Context, d *schema.ResourceDa
return diag.FromErr(fmt.Errorf("error modifying cipher group %s: %v", name, err))
}

//
// if err := client.ModifyLtmCipherGroup(name, cipherGroupconfig); err != nil {
// return diag.FromErr(fmt.Errorf("error modifying cipher group %s: %v", name, err))
// }

return resourceBigipLtmCipherGroupRead(ctx, d, meta)
}

Expand Down
54 changes: 51 additions & 3 deletions bigip/resource_bigip_ltm_cipher_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,54 @@ func TestAccBigipLtmCipherGroupCreateTC1(t *testing.T) {
})
}

func TestAccBigipLtmCipherGroupRemoveRequire(t *testing.T) {
cipherGrpCfg := `
resource "bigip_ltm_cipher_group" "test-cipher-group" {
name = "/Common/testciphergrp"
allow = ["/Common/f5-aes"]
%s
}
`
requireAndOrdering := `
require = ["/Common/f5-quic"]
ordering = "speed"
`

c1 := fmt.Sprintf(cipherGrpCfg, requireAndOrdering)
c2 := fmt.Sprintf(cipherGrpCfg, "")
resource.Test(t, resource.TestCase{
PreCheck: func() {
testAcctPreCheck(t)
},
Providers: testAccProviders,
Steps: []resource.TestStep{
{
Config: c1,
Check: resource.ComposeTestCheckFunc(
testCheckCipherGroupExists("/Common/testciphergrp"),
resource.TestCheckResourceAttr("bigip_ltm_cipher_group.test-cipher-group", "name", "/Common/testciphergrp"),
resource.TestCheckResourceAttr("bigip_ltm_cipher_group.test-cipher-group", "allow.#", "1"),
resource.TestCheckResourceAttr("bigip_ltm_cipher_group.test-cipher-group", "require.#", "1"),
resource.TestCheckResourceAttr("bigip_ltm_cipher_group.test-cipher-group", "allow.0", "/Common/f5-aes"),
resource.TestCheckResourceAttr("bigip_ltm_cipher_group.test-cipher-group", "require.0", "/Common/f5-quic"),
resource.TestCheckResourceAttr("bigip_ltm_cipher_group.test-cipher-group", "ordering", "speed"),
),
},
{
Config: c2,
Check: resource.ComposeTestCheckFunc(
testCheckCipherGroupExists("/Common/testciphergrp"),
resource.TestCheckResourceAttr("bigip_ltm_cipher_group.test-cipher-group", "name", "/Common/testciphergrp"),
resource.TestCheckResourceAttr("bigip_ltm_cipher_group.test-cipher-group", "allow.#", "1"),
resource.TestCheckResourceAttr("bigip_ltm_cipher_group.test-cipher-group", "require.#", "0"),
resource.TestCheckResourceAttr("bigip_ltm_cipher_group.test-cipher-group", "allow.0", "/Common/f5-aes"),
resource.TestCheckResourceAttr("bigip_ltm_cipher_group.test-cipher-group", "ordering", "default"),
),
},
},
})
}

func testCheckCipherGroupExists(name string) resource.TestCheckFunc {
return func(s *terraform.State) error {
client := testAccProvider.Meta().(*bigip.BigIP)
Expand All @@ -52,7 +100,7 @@ func testCheckCipherGroupExists(name string) resource.TestCheckFunc {
return err
}
if p == nil {
return fmt.Errorf("Pool %s does not exist ", name)
return fmt.Errorf("cipher group %s does not exist ", name)
}

return nil
Expand All @@ -66,11 +114,11 @@ func testCheckCipherGroupDestroyed(s *terraform.State) error {
continue
}
name := rs.Primary.ID
pool, err := client.GetLtmCipherGroup(name)
cipherGroup, err := client.GetLtmCipherGroup(name)
if err != nil {
return err
}
if pool != nil {
if cipherGroup != nil {
return fmt.Errorf("Cipher rule %s not destroyed ", name)
}
}
Expand Down
9 changes: 4 additions & 5 deletions docs/resources/bigip_ltm_cipher_group.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ layout: "bigip"
page_title: "BIG-IP: bigip_ltm_cipher_group"
subcategory: "Local Traffic Manager(LTM)"
description: |-
Provides details about bigip_ltm_cipher_group resource
Provides details about bigip_ltm_cipher_group resource
---

# bigip\_ltm\_cipher\_group

`bigip_ltm_cipher_group` Manages F5 BIG-IP LTM cipher group using iControl REST.

## Example Usage
Expand All @@ -25,11 +24,11 @@ resource "bigip_ltm_cipher_group" "test-cipher-group" {

* `name` - (Required,type `string`) Name of the Cipher group. Name should be in pattern `partition` + `cipher_group_name`

* `allow` - (Optional,type `list` of `strings` ) Specifies the configuration of the allowed groups of ciphers. You can select a cipher rule from the Available Cipher Rules list.
* `allow` - (Optional,type `list` of `strings` ) Specifies the configuration of the allowed groups of ciphers. You can select a cipher rule from the Available Cipher Rules list. To have no allowed ciphers, omit this attribute in the config or set it to an empty set like, `[]`.

* `require` - (Optional,type `list` of `string`) Specifies the configuration of the restrict groups of ciphers. You can select a cipher rule from the Available Cipher Rules list.
* `require` - (Optional,type `list` of `string`) Specifies the configuration of the restrict groups of ciphers. You can select a cipher rule from the Available Cipher Rules list. To have no restricted ciphers, omit this attribute in the config or set it to an empty set like, `[]`.

* `ordering` - (Optional,type `string`) Controls the order of the Cipher String list in the Cipher Audit section. Options are Default, Speed, Strength, FIPS, and Hardware. The rules are processed in the order listed.
* `ordering` - (Optional,type `string`) Controls the order of the Cipher String list in the Cipher Audit section. Options are Default, Speed, Strength, FIPS, and Hardware. The rules are processed in the order listed. The default is `default`.

## Importing
An existing cipher group can be imported into this resource by supplying the cipher rule full path name ex : `/partition/name`
Expand Down