Skip to content

Commit 3b4dd44

Browse files
fix terraform broken test cases and add new test cases for http_enabled flag (#205)
1 parent b7e0fa5 commit 3b4dd44

File tree

3 files changed

+76
-6
lines changed

3 files changed

+76
-6
lines changed

banyan/resource_registered_domain.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ func RegisteredDomainSchema() map[string]*schema.Schema {
4747
},
4848
"cname": {
4949
Type: schema.TypeString,
50-
Required: true,
50+
Optional: true,
51+
Computed: true,
5152
Description: "CNAME of the access-tier",
5253
ForceNew: true,
5354
},
@@ -136,7 +137,6 @@ func rdFromState(d *schema.ResourceData) registereddomain.RegisteredDomainReques
136137
Description: d.Get("description").(string),
137138
},
138139
}
139-
140140
}
141141

142142
func resourceRegisteredDomainRead(ctx context.Context, d *schema.ResourceData, m interface{}) (diagnostic diag.Diagnostics) {

banyan/resource_registered_domain_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ func testAccRD_basic_create(name string) string {
3131
resource "banyan_registered_domain" "example" {
3232
name = "%s"
3333
cluster = "global-edge"
34-
cname = "gke-usw1-at01.infra.bnntest.com"
3534
description = "test me new"
3635
}
3736
`, name)
@@ -52,7 +51,6 @@ func TestAccRegisteredDomain(t *testing.T) {
5251
resource "banyan_registered_domain" "example" {
5352
name = "%s"
5453
cluster = "global-edge"
55-
cname = "gke-usw1-at01.infra.bnntest.com"
5654
description = "unit test of registered domain"
5755
}
5856
`, rName),

banyan/resource_service_web_test.go

Lines changed: 74 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ func TestAccService_required_web(t *testing.T) {
127127
backend_domain = "%s-web-updated.internal"
128128
backend_port = 8444
129129
policy = banyan_policy_web.example.id
130+
enable_http2= true
131+
130132
}
131133
`, rName, rName, rName, rName),
132134
Check: resource.ComposeTestCheckFunc(
@@ -365,7 +367,8 @@ func testAccService_basic_web_create_json(name string) string {
365367
"exempted_paths": {
366368
"enabled": false
367369
},
368-
"headers": {}
370+
"headers": {},
371+
"enable_http2" : false
369372
},
370373
"client_cidrs": []
371374
}
@@ -465,7 +468,8 @@ func testAccService_basic_web_update_json(name string) string {
465468
"exempted_paths": {
466469
"enabled": false
467470
},
468-
"headers": {}
471+
"headers": {},
472+
"enable_http2": true
469473
},
470474
"client_cidrs": []
471475
}
@@ -880,3 +884,71 @@ func TestAccService_disable(t *testing.T) {
880884
},
881885
})
882886
}
887+
888+
func TestAccService_http2_web(t *testing.T) {
889+
var bnnService service.GetServiceSpec
890+
rName := fmt.Sprintf("tf-acc-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
891+
resource.Test(t, resource.TestCase{
892+
Providers: testAccProviders,
893+
CheckDestroy: testAccCheckServiceDestroy(t, &bnnService.ServiceID),
894+
Steps: []resource.TestStep{
895+
// Create the service using terraform config and check that it exists
896+
{
897+
Config: fmt.Sprintf(`
898+
resource "banyan_policy_web" "example" {
899+
name = "%s-pol"
900+
description = "some web policy description"
901+
access {
902+
roles = ["ANY"]
903+
trust_level = "High"
904+
}
905+
}
906+
resource "banyan_service_web" "example" {
907+
name = "%s-web"
908+
access_tier = "us-west1"
909+
domain = "%s-web.corp.com"
910+
backend_domain = "%s-web.internal"
911+
backend_port = 8443
912+
policy = banyan_policy_web.example.id
913+
policy_enforcing = false
914+
enable_http2 = false
915+
}
916+
`, rName, rName, rName, rName),
917+
Check: resource.ComposeTestCheckFunc(
918+
testAccCheckExistingService("banyan_service_web.example", &bnnService),
919+
testAccCheckServiceAgainstJson(t, testAccService_basic_web_create_json(rName), &bnnService.ServiceID),
920+
),
921+
},
922+
{
923+
Config: fmt.Sprintf(`
924+
resource "banyan_policy_web" "example" {
925+
name = "%s-pol"
926+
description = "some web policy description"
927+
access {
928+
roles = ["ANY"]
929+
trust_level = "High"
930+
}
931+
}
932+
resource "banyan_service_web" "example" {
933+
name = "%s-web"
934+
access_tier = "us-west1"
935+
domain = "%s-web-updated.corp.com"
936+
backend_domain = "%s-web-updated.internal"
937+
backend_port = 8444
938+
policy = banyan_policy_web.example.id
939+
enable_http2 = true
940+
}
941+
`, rName, rName, rName, rName),
942+
Check: resource.ComposeTestCheckFunc(
943+
testAccCheckExistingService("banyan_service_web.example", &bnnService),
944+
testAccCheckServiceAgainstJson(t, testAccService_basic_web_update_json(rName), &bnnService.ServiceID),
945+
),
946+
},
947+
{
948+
ResourceName: "banyan_service_web.example",
949+
ImportState: true,
950+
ImportStateVerify: true,
951+
},
952+
},
953+
})
954+
}

0 commit comments

Comments
 (0)