Skip to content

Commit 64bc356

Browse files
mitchellhmitchellh
committed
providers/heroku: tests passing, compiling
1 parent 4a736b0 commit 64bc356

7 files changed

Lines changed: 24 additions & 36 deletions

‎builtin/providers/heroku/resource_heroku_addon.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
"github.com/cyberdelia/heroku-go/v3"
1010
"github.com/hashicorp/terraform/helper/schema"
11-
"github.com/hashicorp/terraform/terraform"
1211
)
1312

1413
// Global lock to prevent parallelism for heroku_addon since
@@ -116,9 +115,6 @@ func resourceHerokuAddonRead(d *schema.ResourceData, meta interface{}) error {
116115
d.Set("plan", plan)
117116
d.Set("provider_id", addon.ProviderID)
118117
d.Set("config_vars", []interface{}{addon.ConfigVars})
119-
d.SetDependencies([]terraform.ResourceDependency{
120-
terraform.ResourceDependency{ID: d.Get("app").(string)},
121-
})
122118

123119
return nil
124120
}

‎builtin/providers/heroku/resource_heroku_addon_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ func TestAccHerokuAddon_noPlan(t *testing.T) {
7272
func testAccCheckHerokuAddonDestroy(s *terraform.State) error {
7373
client := testAccProvider.Meta().(*heroku.Service)
7474

75-
for _, rs := range s.Resources {
75+
for _, rs := range s.RootModule().Resources {
7676
if rs.Type != "heroku_addon" {
7777
continue
7878
}
7979

80-
_, err := client.AddonInfo(rs.Attributes["app"], rs.ID)
80+
_, err := client.AddonInfo(rs.Primary.Attributes["app"], rs.Primary.ID)
8181

8282
if err == nil {
8383
return fmt.Errorf("Addon still exists")
@@ -100,25 +100,25 @@ func testAccCheckHerokuAddonAttributes(addon *heroku.Addon, n string) resource.T
100100

101101
func testAccCheckHerokuAddonExists(n string, addon *heroku.Addon) resource.TestCheckFunc {
102102
return func(s *terraform.State) error {
103-
rs, ok := s.Resources[n]
103+
rs, ok := s.RootModule().Resources[n]
104104

105105
if !ok {
106106
return fmt.Errorf("Not found: %s", n)
107107
}
108108

109-
if rs.ID == "" {
109+
if rs.Primary.ID == "" {
110110
return fmt.Errorf("No Addon ID is set")
111111
}
112112

113113
client := testAccProvider.Meta().(*heroku.Service)
114114

115-
foundAddon, err := client.AddonInfo(rs.Attributes["app"], rs.ID)
115+
foundAddon, err := client.AddonInfo(rs.Primary.Attributes["app"], rs.Primary.ID)
116116

117117
if err != nil {
118118
return err
119119
}
120120

121-
if foundAddon.ID != rs.ID {
121+
if foundAddon.ID != rs.Primary.ID {
122122
return fmt.Errorf("Addon not found")
123123
}
124124

‎builtin/providers/heroku/resource_heroku_app_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ func TestAccHerokuApp_NukeVars(t *testing.T) {
105105
func testAccCheckHerokuAppDestroy(s *terraform.State) error {
106106
client := testAccProvider.Meta().(*heroku.Service)
107107

108-
for _, rs := range s.Resources {
108+
for _, rs := range s.RootModule().Resources {
109109
if rs.Type != "heroku_app" {
110110
continue
111111
}
112112

113-
_, err := client.AppInfo(rs.ID)
113+
_, err := client.AppInfo(rs.Primary.ID)
114114

115115
if err == nil {
116116
return fmt.Errorf("App still exists")
@@ -199,25 +199,25 @@ func testAccCheckHerokuAppAttributesNoVars(app *heroku.App) resource.TestCheckFu
199199

200200
func testAccCheckHerokuAppExists(n string, app *heroku.App) resource.TestCheckFunc {
201201
return func(s *terraform.State) error {
202-
rs, ok := s.Resources[n]
202+
rs, ok := s.RootModule().Resources[n]
203203

204204
if !ok {
205205
return fmt.Errorf("Not found: %s", n)
206206
}
207207

208-
if rs.ID == "" {
208+
if rs.Primary.ID == "" {
209209
return fmt.Errorf("No App Name is set")
210210
}
211211

212212
client := testAccProvider.Meta().(*heroku.Service)
213213

214-
foundApp, err := client.AppInfo(rs.ID)
214+
foundApp, err := client.AppInfo(rs.Primary.ID)
215215

216216
if err != nil {
217217
return err
218218
}
219219

220-
if foundApp.Name != rs.ID {
220+
if foundApp.Name != rs.Primary.ID {
221221
return fmt.Errorf("App not found")
222222
}
223223

‎builtin/providers/heroku/resource_heroku_domain.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"github.com/cyberdelia/heroku-go/v3"
88
"github.com/hashicorp/terraform/helper/schema"
9-
"github.com/hashicorp/terraform/terraform"
109
)
1110

1211
func resourceHerokuDomain() *schema.Resource {
@@ -52,9 +51,6 @@ func resourceHerokuDomainCreate(d *schema.ResourceData, meta interface{}) error
5251
d.SetId(do.ID)
5352
d.Set("hostname", do.Hostname)
5453
d.Set("cname", fmt.Sprintf("%s.herokuapp.com", app))
55-
d.SetDependencies([]terraform.ResourceDependency{
56-
terraform.ResourceDependency{ID: app},
57-
})
5854

5955
log.Printf("[INFO] Domain ID: %s", d.Id())
6056
return nil

‎builtin/providers/heroku/resource_heroku_domain_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ func TestAccHerokuDomain_Basic(t *testing.T) {
3737
func testAccCheckHerokuDomainDestroy(s *terraform.State) error {
3838
client := testAccProvider.Meta().(*heroku.Service)
3939

40-
for _, rs := range s.Resources {
40+
for _, rs := range s.RootModule().Resources {
4141
if rs.Type != "heroku_domain" {
4242
continue
4343
}
4444

45-
_, err := client.DomainInfo(rs.Attributes["app"], rs.ID)
45+
_, err := client.DomainInfo(rs.Primary.Attributes["app"], rs.Primary.ID)
4646

4747
if err == nil {
4848
return fmt.Errorf("Domain still exists")
@@ -65,25 +65,25 @@ func testAccCheckHerokuDomainAttributes(Domain *heroku.Domain) resource.TestChec
6565

6666
func testAccCheckHerokuDomainExists(n string, Domain *heroku.Domain) resource.TestCheckFunc {
6767
return func(s *terraform.State) error {
68-
rs, ok := s.Resources[n]
68+
rs, ok := s.RootModule().Resources[n]
6969

7070
if !ok {
7171
return fmt.Errorf("Not found: %s", n)
7272
}
7373

74-
if rs.ID == "" {
74+
if rs.Primary.ID == "" {
7575
return fmt.Errorf("No Domain ID is set")
7676
}
7777

7878
client := testAccProvider.Meta().(*heroku.Service)
7979

80-
foundDomain, err := client.DomainInfo(rs.Attributes["app"], rs.ID)
80+
foundDomain, err := client.DomainInfo(rs.Primary.Attributes["app"], rs.Primary.ID)
8181

8282
if err != nil {
8383
return err
8484
}
8585

86-
if foundDomain.ID != rs.ID {
86+
if foundDomain.ID != rs.Primary.ID {
8787
return fmt.Errorf("Domain not found")
8888
}
8989

‎builtin/providers/heroku/resource_heroku_drain.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"github.com/cyberdelia/heroku-go/v3"
88
"github.com/hashicorp/terraform/helper/schema"
9-
"github.com/hashicorp/terraform/terraform"
109
)
1110

1211
func resourceHerokuDrain() *schema.Resource {
@@ -52,9 +51,6 @@ func resourceHerokuDrainCreate(d *schema.ResourceData, meta interface{}) error {
5251
d.SetId(dr.ID)
5352
d.Set("url", dr.URL)
5453
d.Set("token", dr.Token)
55-
d.SetDependencies([]terraform.ResourceDependency{
56-
terraform.ResourceDependency{ID: app},
57-
})
5854

5955
log.Printf("[INFO] Drain ID: %s", d.Id())
6056
return nil

‎builtin/providers/heroku/resource_heroku_drain_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ func TestAccHerokuDrain_Basic(t *testing.T) {
3535
func testAccCheckHerokuDrainDestroy(s *terraform.State) error {
3636
client := testAccProvider.Meta().(*heroku.Service)
3737

38-
for _, rs := range s.Resources {
38+
for _, rs := range s.RootModule().Resources {
3939
if rs.Type != "heroku_drain" {
4040
continue
4141
}
4242

43-
_, err := client.LogDrainInfo(rs.Attributes["app"], rs.ID)
43+
_, err := client.LogDrainInfo(rs.Primary.Attributes["app"], rs.Primary.ID)
4444

4545
if err == nil {
4646
return fmt.Errorf("Drain still exists")
@@ -67,25 +67,25 @@ func testAccCheckHerokuDrainAttributes(Drain *heroku.LogDrain) resource.TestChec
6767

6868
func testAccCheckHerokuDrainExists(n string, Drain *heroku.LogDrain) resource.TestCheckFunc {
6969
return func(s *terraform.State) error {
70-
rs, ok := s.Resources[n]
70+
rs, ok := s.RootModule().Resources[n]
7171

7272
if !ok {
7373
return fmt.Errorf("Not found: %s", n)
7474
}
7575

76-
if rs.ID == "" {
76+
if rs.Primary.ID == "" {
7777
return fmt.Errorf("No Drain ID is set")
7878
}
7979

8080
client := testAccProvider.Meta().(*heroku.Service)
8181

82-
foundDrain, err := client.LogDrainInfo(rs.Attributes["app"], rs.ID)
82+
foundDrain, err := client.LogDrainInfo(rs.Primary.Attributes["app"], rs.Primary.ID)
8383

8484
if err != nil {
8585
return err
8686
}
8787

88-
if foundDrain.ID != rs.ID {
88+
if foundDrain.ID != rs.Primary.ID {
8989
return fmt.Errorf("Drain not found")
9090
}
9191

0 commit comments

Comments
 (0)