Skip to content

chore(lb): add support for cassettes based acceptance tests #642

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

Merged
merged 6 commits into from
Oct 29, 2020
Merged

chore(lb): add support for cassettes based acceptance tests #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b49c68
chore(lb): add support for cassettes based acceptance tests
remyleone Oct 14, 2020
7795e99
Fix
remyleone Oct 14, 2020
1648521
Fix
remyleone Oct 15, 2020
78a7cc0
Fix indent
remyleone Oct 19, 2020
646a141
Fix
remyleone Oct 20, 2020
07cede7
Merge branch 'master' into k7_lb
remyleone Oct 29, 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
10 changes: 6 additions & 4 deletions scaleway/data_source_lb_ip_beta_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ import (
)

func TestAccScalewayDataSourceLbIPBeta_Basic(t *testing.T) {
tt := NewTestTools(t)
defer tt.Cleanup()
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckScalewayLbIPBetaDestroy,
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: testAccCheckScalewayLbIPBetaDestroy(tt),
Steps: []resource.TestStep{
{
Config: `
Expand All @@ -26,7 +28,7 @@ func TestAccScalewayDataSourceLbIPBeta_Basic(t *testing.T) {
}
`,
Check: resource.ComposeTestCheckFunc(
testAccCheckScalewayLbIPBetaExists("data.scaleway_lb_ip_beta.test"),
testAccCheckScalewayLbIPBetaExists(tt, "data.scaleway_lb_ip_beta.test"),
resource.TestCheckResourceAttrPair("data.scaleway_lb_ip_beta.test", "ip_address", "scaleway_lb_ip_beta.test", "ip_address"),
resource.TestCheckResourceAttrPair("data.scaleway_lb_ip_beta.test2", "ip_address", "scaleway_lb_ip_beta.test", "ip_address"),
),
Expand Down
20 changes: 13 additions & 7 deletions scaleway/helpers_lb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,13 @@ func expandLbACL(i interface{}) *lb.ACL {
return acl
}
func flattenLbACLAction(action *lb.ACLAction) interface{} {
return map[string]interface{}{
"type": action.Type,
return []map[string]interface{}{
{
"type": action.Type,
},
}
}

func expandLbACLAction(raw interface{}) *lb.ACLAction {
if raw == nil || len(raw.([]interface{})) != 1 {
return nil
Expand All @@ -85,13 +88,16 @@ func expandLbACLAction(raw interface{}) *lb.ACLAction {
}
}
func flattenLbACLMatch(match *lb.ACLMatch) interface{} {
return map[string]interface{}{
"ip_subnet": flattenSliceStringPtr(match.IPSubnet),
"http_filter": match.HTTPFilter.String(),
"http_filter_value": flattenSliceStringPtr(match.HTTPFilterValue),
"invert": match.Invert,
return []map[string]interface{}{
{
"ip_subnet": flattenSliceStringPtr(match.IPSubnet),
"http_filter": match.HTTPFilter.String(),
"http_filter_value": flattenSliceStringPtr(match.HTTPFilterValue),
"invert": match.Invert,
},
}
}

func expandLbACLMatch(raw interface{}) *lb.ACLMatch {
if raw == nil || len(raw.([]interface{})) != 1 {
return nil
Expand Down
83 changes: 45 additions & 38 deletions scaleway/resource_lb_backend_beta_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ import (
"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
)

func TestAccScalewayLbBackendBeta(t *testing.T) {
func TestAccScalewayLbBackend_Basic(t *testing.T) {
tt := NewTestTools(t)
defer tt.Cleanup()
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckScalewayLbBackendBetaDestroy,
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: testAccCheckScalewayLbBackendBetaDestroy(tt),
Steps: []resource.TestStep{
{
Config: `
Expand All @@ -32,11 +34,12 @@ func TestAccScalewayLbBackendBeta(t *testing.T) {
name = "bkd01"
forward_protocol = "tcp"
forward_port = 80
proxy_protocol = "none"
server_ips = [ scaleway_instance_ip.ip01.address ]
}
`,
Check: resource.ComposeTestCheckFunc(
testAccCheckScalewayLbBackendBetaExists("scaleway_lb_backend_beta.bkd01"),
testAccCheckScalewayLbBackendBetaExists(tt, "scaleway_lb_backend_beta.bkd01"),
resource.TestCheckResourceAttr("scaleway_lb_backend_beta.bkd01", "forward_port_algorithm", "roundrobin"),
resource.TestCheckResourceAttr("scaleway_lb_backend_beta.bkd01", "sticky_sessions", "none"),
resource.TestCheckResourceAttr("scaleway_lb_backend_beta.bkd01", "proxy_protocol", "none"),
Expand Down Expand Up @@ -82,7 +85,7 @@ func TestAccScalewayLbBackendBeta(t *testing.T) {
}
`,
Check: resource.ComposeTestCheckFunc(
testAccCheckScalewayLbBackendBetaExists("scaleway_lb_backend_beta.bkd01"),
testAccCheckScalewayLbBackendBetaExists(tt, "scaleway_lb_backend_beta.bkd01"),
resource.TestCheckResourceAttrPair("scaleway_lb_backend_beta.bkd01", "server_ips.0", "scaleway_instance_ip.ip02", "address"),
resource.TestCheckResourceAttr("scaleway_lb_backend_beta.bkd01", "health_check_delay", "10s"),
resource.TestCheckResourceAttr("scaleway_lb_backend_beta.bkd01", "health_check_timeout", "15s"),
Expand All @@ -96,10 +99,12 @@ func TestAccScalewayLbBackendBeta(t *testing.T) {
}

func TestAccScalewayLbBackendBeta_HealthCheck(t *testing.T) {
tt := NewTestTools(t)
defer tt.Cleanup()
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckScalewayLbBackendBetaDestroy,
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: testAccCheckScalewayLbBackendBetaDestroy(tt),
Steps: []resource.TestStep{
{
Config: `
Expand Down Expand Up @@ -183,14 +188,14 @@ func TestAccScalewayLbBackendBeta_HealthCheck(t *testing.T) {
})
}

func testAccCheckScalewayLbBackendBetaExists(n string) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
func testAccCheckScalewayLbBackendBetaExists(tt *TestTools, n string) resource.TestCheckFunc {
return func(state *terraform.State) error {
rs, ok := state.RootModule().Resources[n]
if !ok {
return fmt.Errorf("resource not found: %s", n)
}

lbAPI, region, ID, err := lbAPIWithRegionAndID(testAccProvider.Meta(), rs.Primary.ID)
lbAPI, region, ID, err := lbAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
if err != nil {
return err
}
Expand All @@ -207,32 +212,34 @@ func testAccCheckScalewayLbBackendBetaExists(n string) resource.TestCheckFunc {
}
}

func testAccCheckScalewayLbBackendBetaDestroy(s *terraform.State) error {
for _, rs := range s.RootModule().Resources {
if rs.Type != "scaleway_lb_backend_beta" {
continue
}

lbAPI, region, ID, err := lbAPIWithRegionAndID(testAccProvider.Meta(), rs.Primary.ID)
if err != nil {
return err
}

_, err = lbAPI.GetBackend(&lb.GetBackendRequest{
Region: region,
BackendID: ID,
})

// If no error resource still exist
if err == nil {
return fmt.Errorf("LB Backend (%s) still exists", rs.Primary.ID)
func testAccCheckScalewayLbBackendBetaDestroy(tt *TestTools) resource.TestCheckFunc {
return func(state *terraform.State) error {
for _, rs := range state.RootModule().Resources {
if rs.Type != "scaleway_lb_backend_beta" {
continue
}

lbAPI, region, ID, err := lbAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
if err != nil {
return err
}

_, err = lbAPI.GetBackend(&lb.GetBackendRequest{
Region: region,
BackendID: ID,
})

// If no error resource still exist
if err == nil {
return fmt.Errorf("LB Backend (%s) still exists", rs.Primary.ID)
}

// Unexpected api error we return it
if !is404Error(err) {
return err
}
}

// Unexpected api error we return it
if !is404Error(err) {
return err
}
return nil
}

return nil
}
72 changes: 38 additions & 34 deletions scaleway/resource_lb_beta_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ func testSweepLB(region string) error {
return nil
}

func TestAccScalewayLbAndIPBeta(t *testing.T) {
func TestAccScalewayLbLb_WithIP(t *testing.T) {
tt := NewTestTools(t)
defer tt.Cleanup()
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckScalewayLbBetaDestroy,
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: testAccCheckScalewayLbBetaDestroy(tt),
Steps: []resource.TestStep{
{
Config: `
Expand All @@ -61,8 +63,8 @@ func TestAccScalewayLbAndIPBeta(t *testing.T) {
}
`,
Check: resource.ComposeTestCheckFunc(
testAccCheckScalewayLbBetaExists("scaleway_lb_beta.lb01"),
testAccCheckScalewayLbIPBetaExists("scaleway_lb_ip_beta.ip01"),
testAccCheckScalewayLbBetaExists(tt, "scaleway_lb_beta.lb01"),
testAccCheckScalewayLbIPBetaExists(tt, "scaleway_lb_ip_beta.ip01"),
resource.TestCheckResourceAttr("scaleway_lb_beta.lb01", "name", "test-lb"),
testCheckResourceAttrUUID("scaleway_lb_beta.lb01", "ip_id"),
testCheckResourceAttrIPv4("scaleway_lb_beta.lb01", "ip_address"),
Expand All @@ -75,21 +77,21 @@ func TestAccScalewayLbAndIPBeta(t *testing.T) {
}
`,
Check: resource.ComposeTestCheckFunc(
testAccCheckScalewayLbIPBetaExists("scaleway_lb_ip_beta.ip01"),
testAccCheckScalewayLbIPBetaExists(tt, "scaleway_lb_ip_beta.ip01"),
),
},
},
})
}

func testAccCheckScalewayLbBetaExists(n string) resource.TestCheckFunc {
func testAccCheckScalewayLbBetaExists(tt *TestTools, n string) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
if !ok {
return fmt.Errorf("resource not found: %s", n)
}

lbAPI, region, ID, err := lbAPIWithRegionAndID(testAccProvider.Meta(), rs.Primary.ID)
lbAPI, region, ID, err := lbAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
if err != nil {
return err
}
Expand All @@ -107,32 +109,34 @@ func testAccCheckScalewayLbBetaExists(n string) resource.TestCheckFunc {
}
}

func testAccCheckScalewayLbBetaDestroy(s *terraform.State) error {
for _, rs := range s.RootModule().Resources {
if rs.Type != "scaleway_lb_beta" {
continue
func testAccCheckScalewayLbBetaDestroy(tt *TestTools) resource.TestCheckFunc {
return func(state *terraform.State) error {
for _, rs := range state.RootModule().Resources {
if rs.Type != "scaleway_lb_beta" {
continue
}

lbAPI, region, ID, err := lbAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
if err != nil {
return err
}

_, err = lbAPI.GetLB(&lb.GetLBRequest{
Region: region,
LBID: ID,
})

// If no error resource still exist
if err == nil {
return fmt.Errorf("load Balancer (%s) still exists", rs.Primary.ID)
}

// Unexpected api error we return it
if !is404Error(err) {
return err
}
}

lbAPI, region, ID, err := lbAPIWithRegionAndID(testAccProvider.Meta(), rs.Primary.ID)
if err != nil {
return err
}

_, err = lbAPI.GetLB(&lb.GetLBRequest{
Region: region,
LBID: ID,
})

// If no error resource still exist
if err == nil {
return fmt.Errorf("Load Balancer (%s) still exists", rs.Primary.ID)
}

// Unexpected api error we return it
if !is404Error(err) {
return err
}
return nil
}

return nil
}
6 changes: 5 additions & 1 deletion scaleway/resource_lb_certificate_beta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,13 @@ func resourceScalewayLbCertificateBeta() *schema.Resource {
Description: "The main domain name of the certificate",
},
"subject_alternative_name": {
Type: schema.TypeString,
Type: schema.TypeList,
Computed: true,
Description: "The alternative domain names of the certificate",
Elem: &schema.Schema{
Type: schema.TypeString,
Description: "The domain name",
},
},
"fingerprint": {
Type: schema.TypeString,
Expand Down
10 changes: 6 additions & 4 deletions scaleway/resource_lb_certificate_beta_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,20 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccScalewayLbCertificateBeta(t *testing.T) {
func TestAccScalewayLbCertificate_Basic(t *testing.T) {
/**
* Note regarding the usage of xip.io
* See the discussion on https://github.com/terraform-providers/terraform-provider-scaleway/pull/396
* Long story short, scaleway API will not permit you to request a certificate in case common name is not pointed
* to the load balancer IP (which is unknown before creating it). In production, this can be overcome by introducing
* an additional step which creates a DNS record and depending on it, but for test purposes, xip.io is an ideal solution.
*/
tt := NewTestTools(t)
defer tt.Cleanup()
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckScalewayLbBetaDestroy,
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: testAccCheckScalewayLbBetaDestroy(tt),
Steps: []resource.TestStep{
{
Config: `
Expand Down
Loading