Skip to content

Commit 132d334

Browse files
committed
error case fixed + prj renamed
1 parent c1308aa commit 132d334

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

tfe/resource_tfe_project_policy_set_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestAccTFEProjectPolicySet_basic(t *testing.T) {
3131
t.Cleanup(orgCleanup)
3232

3333
// Make a project
34-
prj := createProject(t, tfeClient, org.Name, tfe.ProjectCreateOptions{
34+
project := createProject(t, tfeClient, org.Name, tfe.ProjectCreateOptions{
3535
Name: randomString(t),
3636
})
3737

@@ -41,7 +41,7 @@ func TestAccTFEProjectPolicySet_basic(t *testing.T) {
4141
CheckDestroy: testAccCheckTFEProjectPolicySetDestroy,
4242
Steps: []resource.TestStep{
4343
{
44-
Config: testAccTFEProjectPolicySet_basic(org.Name, prj.ID),
44+
Config: testAccTFEProjectPolicySet_basic(org.Name, project.ID),
4545
Check: resource.ComposeTestCheckFunc(
4646
testAccCheckTFEProjectPolicySetExists(
4747
"tfe_project_policy_set.test"),
@@ -50,7 +50,7 @@ func TestAccTFEProjectPolicySet_basic(t *testing.T) {
5050
{
5151
ResourceName: "tfe_project_policy_set.test",
5252
ImportState: true,
53-
ImportStateId: fmt.Sprintf("%s/%s/policy_set_test", org.Name, prj.ID),
53+
ImportStateId: fmt.Sprintf("%s/%s/policy_set_test", org.Name, project.ID),
5454
ImportStateVerify: true,
5555
},
5656
},
@@ -73,7 +73,7 @@ func TestAccTFEProjectPolicySet_incorrectImportSyntax(t *testing.T) {
7373
t.Cleanup(orgCleanup)
7474

7575
// Make a project
76-
prj := createProject(t, tfeClient, org.Name, tfe.ProjectCreateOptions{
76+
project := createProject(t, tfeClient, org.Name, tfe.ProjectCreateOptions{
7777
Name: randomString(t),
7878
})
7979

@@ -82,7 +82,7 @@ func TestAccTFEProjectPolicySet_incorrectImportSyntax(t *testing.T) {
8282
Providers: testAccProviders,
8383
Steps: []resource.TestStep{
8484
{
85-
Config: testAccTFEProjectPolicySet_basic(org.Name, prj.ID),
85+
Config: testAccTFEProjectPolicySet_basic(org.Name, project.ID),
8686
},
8787
{
8888
ResourceName: "tfe_project_policy_set.test",
@@ -100,22 +100,22 @@ func testAccCheckTFEProjectPolicySetExists(n string) resource.TestCheckFunc {
100100

101101
rs, ok := s.RootModule().Resources[n]
102102
if !ok {
103-
return fmt.Errorf("Not found: %s", n)
103+
return fmt.Errorf("not found: %s", n)
104104
}
105105

106106
id := rs.Primary.ID
107107
if id == "" {
108-
return fmt.Errorf("No ID is set")
108+
return fmt.Errorf("no ID is set")
109109
}
110110

111111
policySetID := rs.Primary.Attributes["policy_set_id"]
112112
if policySetID == "" {
113-
return fmt.Errorf("No policy set id set")
113+
return fmt.Errorf("no policy set id set")
114114
}
115115

116116
projectID := rs.Primary.Attributes["project_id"]
117117
if projectID == "" {
118-
return fmt.Errorf("No project id set")
118+
return fmt.Errorf("no project id set")
119119
}
120120

121121
policySet, err := config.Client.PolicySets.ReadWithOptions(ctx, policySetID, &tfe.PolicySetReadOptions{
@@ -130,7 +130,7 @@ func testAccCheckTFEProjectPolicySetExists(n string) resource.TestCheckFunc {
130130
}
131131
}
132132

133-
return fmt.Errorf("Project (%s) is not attached to policy set (%s).", projectID, policySetID)
133+
return fmt.Errorf("project (%s) is not attached to policy set (%s).", projectID, policySetID)
134134
}
135135
}
136136

@@ -143,12 +143,12 @@ func testAccCheckTFEProjectPolicySetDestroy(s *terraform.State) error {
143143
}
144144

145145
if rs.Primary.ID == "" {
146-
return fmt.Errorf("No instance ID is set")
146+
return fmt.Errorf("no instance ID is set")
147147
}
148148

149149
_, err := config.Client.PolicySets.Read(ctx, rs.Primary.ID)
150150
if err == nil {
151-
return fmt.Errorf("Policy Set %s still exists", rs.Primary.ID)
151+
return fmt.Errorf("policy Set %s still exists", rs.Primary.ID)
152152
}
153153
}
154154

0 commit comments

Comments
 (0)