diff --git a/banyan/resource_registered_domain.go b/banyan/resource_registered_domain.go index 98e3d70..736ce7f 100644 --- a/banyan/resource_registered_domain.go +++ b/banyan/resource_registered_domain.go @@ -47,7 +47,8 @@ func RegisteredDomainSchema() map[string]*schema.Schema { }, "cname": { Type: schema.TypeString, - Required: true, + Optional: true, + Computed: true, Description: "CNAME of the access-tier", ForceNew: true, }, @@ -136,7 +137,6 @@ func rdFromState(d *schema.ResourceData) registereddomain.RegisteredDomainReques Description: d.Get("description").(string), }, } - } func resourceRegisteredDomainRead(ctx context.Context, d *schema.ResourceData, m interface{}) (diagnostic diag.Diagnostics) { diff --git a/banyan/resource_registered_domain_test.go b/banyan/resource_registered_domain_test.go index b5d36ec..6bfe11a 100644 --- a/banyan/resource_registered_domain_test.go +++ b/banyan/resource_registered_domain_test.go @@ -31,7 +31,6 @@ func testAccRD_basic_create(name string) string { resource "banyan_registered_domain" "example" { name = "%s" cluster = "global-edge" - cname = "gke-usw1-at01.infra.bnntest.com" description = "test me new" } `, name) @@ -52,7 +51,6 @@ func TestAccRegisteredDomain(t *testing.T) { resource "banyan_registered_domain" "example" { name = "%s" cluster = "global-edge" - cname = "gke-usw1-at01.infra.bnntest.com" description = "unit test of registered domain" } `, rName), diff --git a/banyan/resource_service_web_test.go b/banyan/resource_service_web_test.go index 1fd24aa..a8f6e8a 100644 --- a/banyan/resource_service_web_test.go +++ b/banyan/resource_service_web_test.go @@ -127,6 +127,8 @@ func TestAccService_required_web(t *testing.T) { backend_domain = "%s-web-updated.internal" backend_port = 8444 policy = banyan_policy_web.example.id + enable_http2= true + } `, rName, rName, rName, rName), Check: resource.ComposeTestCheckFunc( @@ -365,7 +367,8 @@ func testAccService_basic_web_create_json(name string) string { "exempted_paths": { "enabled": false }, - "headers": {} + "headers": {}, + "enable_http2" : false }, "client_cidrs": [] } @@ -465,7 +468,8 @@ func testAccService_basic_web_update_json(name string) string { "exempted_paths": { "enabled": false }, - "headers": {} + "headers": {}, + "enable_http2": true }, "client_cidrs": [] } @@ -880,3 +884,71 @@ func TestAccService_disable(t *testing.T) { }, }) } + +func TestAccService_http2_web(t *testing.T) { + var bnnService service.GetServiceSpec + rName := fmt.Sprintf("tf-acc-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)) + resource.Test(t, resource.TestCase{ + Providers: testAccProviders, + CheckDestroy: testAccCheckServiceDestroy(t, &bnnService.ServiceID), + Steps: []resource.TestStep{ + // Create the service using terraform config and check that it exists + { + Config: fmt.Sprintf(` + resource "banyan_policy_web" "example" { + name = "%s-pol" + description = "some web policy description" + access { + roles = ["ANY"] + trust_level = "High" + } + } + resource "banyan_service_web" "example" { + name = "%s-web" + access_tier = "us-west1" + domain = "%s-web.corp.com" + backend_domain = "%s-web.internal" + backend_port = 8443 + policy = banyan_policy_web.example.id + policy_enforcing = false + enable_http2 = false + } + `, rName, rName, rName, rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckExistingService("banyan_service_web.example", &bnnService), + testAccCheckServiceAgainstJson(t, testAccService_basic_web_create_json(rName), &bnnService.ServiceID), + ), + }, + { + Config: fmt.Sprintf(` + resource "banyan_policy_web" "example" { + name = "%s-pol" + description = "some web policy description" + access { + roles = ["ANY"] + trust_level = "High" + } + } + resource "banyan_service_web" "example" { + name = "%s-web" + access_tier = "us-west1" + domain = "%s-web-updated.corp.com" + backend_domain = "%s-web-updated.internal" + backend_port = 8444 + policy = banyan_policy_web.example.id + enable_http2 = true + } + `, rName, rName, rName, rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckExistingService("banyan_service_web.example", &bnnService), + testAccCheckServiceAgainstJson(t, testAccService_basic_web_update_json(rName), &bnnService.ServiceID), + ), + }, + { + ResourceName: "banyan_service_web.example", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +}