Merge pull request #316 from heroku/domain-fixes

Domain fixes

docs/resources/domain.md

@@ -41,6 +41,7 @@ The following attributes are exported:
 * `id` - The ID of the domain record.
 * `hostname` - The hostname traffic will be served as.
 * `cname` - The CNAME traffic should route to.
+* `sni_endpoint_id` - The ID of the heroku_ssl resource to associate the domain with.
 
 ## Importing
 

docs/resources/ssl.md

@@ -52,6 +52,13 @@ resource "heroku_ssl" "one" {
   depends_on = [heroku_formation.web]
 }
 
+resource "heroku_domain" "no-ssl" {
+  app = heroku_app.default.name
+  hostname = "terraform-123-no-ssl.example.com"
+  # Until November 2021 if you have an ssl resource, but do not want to associate it with a domain, you must ensure the domain is created after the ssl resource. See https://devcenter.heroku.com/changelog-items/2192 for more details. We do this by adding a depends_on for the ssl resources.
+  depends_on = [heroku_ssl.one]
+}
+
 # Associate it with a domain
 resource "heroku_domain" "one" {
   app = heroku_app.default.name

heroku/resource_heroku_cert.go

@@ -11,6 +11,8 @@ import (
 
 func resourceHerokuCert() *schema.Resource {
 	return &schema.Resource{
+		DeprecationMessage: "This resource is deprecated in favor of `heroku_ssl`.",
+
 		Create: resourceHerokuCertCreate,
 		Read:   resourceHerokuCertRead,
 		Update: resourceHerokuCertUpdate,

heroku/resource_heroku_domain.go

@@ -41,6 +41,7 @@ func resourceHerokuDomain() *schema.Resource {
 
 			"sni_endpoint_id": {
 				Type:     schema.TypeString,
+				Computed: true,
 				Optional: true,
 			},
 		},

heroku/resource_heroku_ssl.go

@@ -12,8 +12,6 @@ import (
 
 func resourceHerokuSSL() *schema.Resource {
 	return &schema.Resource{
-		DeprecationMessage: "This resource is deprecated in favor of `heroku_ssl`.",
-
 		CreateContext: resourceHerokuSSLCreate,
 		ReadContext:   resourceHerokuSSLRead,
 		UpdateContext: resourceHerokuSSLUpdate,