@@ -51,7 +51,7 @@ func resourceTFEProjectPolicySetCreate(d *schema.ResourceData, meta interface{})
51
51
err := config .Client .PolicySets .AddProjects (ctx , policySetID , policySetAddProjectsOptions )
52
52
if err != nil {
53
53
return fmt .Errorf (
54
- "Error attaching policy set id %s to project %s: %w" , policySetID , projectID , err )
54
+ "error attaching policy set id %s to project %s: %w" , policySetID , projectID , err )
55
55
}
56
56
57
57
d .SetId (fmt .Sprintf ("%s_%s" , projectID , policySetID ))
@@ -75,7 +75,7 @@ func resourceTFEProjectPolicySetRead(d *schema.ResourceData, meta interface{}) e
75
75
d .SetId ("" )
76
76
return nil
77
77
}
78
- return fmt .Errorf ("Error reading configuration of policy set %s: %w" , policySetID , err )
78
+ return fmt .Errorf ("error reading configuration of policy set %s: %w" , policySetID , err )
79
79
}
80
80
81
81
isProjectAttached := false
@@ -110,7 +110,7 @@ func resourceTFEProjectPolicySetDelete(d *schema.ResourceData, meta interface{})
110
110
err := config .Client .PolicySets .RemoveProjects (ctx , policySetID , policySetRemoveProjectsOptions )
111
111
if err != nil {
112
112
return fmt .Errorf (
113
- "Error detaching project %s from policy set %s: %w" , projectID , policySetID , err )
113
+ "error detaching project %s from policy set %s: %w" , projectID , policySetID , err )
114
114
}
115
115
116
116
return nil
@@ -126,7 +126,7 @@ func resourceTFEProjectPolicySetImporter(ctx context.Context, d *schema.Resource
126
126
)
127
127
}
128
128
129
- organization , projectID , pSName := splitID [0 ], splitID [1 ], splitID [2 ]
129
+ organization , projectID , policySetName := splitID [0 ], splitID [1 ], splitID [2 ]
130
130
131
131
config := meta .(ConfiguredClient )
132
132
@@ -140,21 +140,21 @@ func resourceTFEProjectPolicySetImporter(ctx context.Context, d *schema.Resource
140
140
for {
141
141
list , err := config .Client .PolicySets .List (ctx , organization , options )
142
142
if err != nil {
143
- return nil , fmt .Errorf ("Error retrieving policy sets: %w" , err )
143
+ return nil , fmt .Errorf ("error retrieving organization's list of policy sets: %w" , err )
144
144
}
145
145
for _ , policySet := range list .Items {
146
- if policySet .Name != pSName {
146
+ if policySet .Name != policySetName {
147
147
continue
148
148
}
149
149
150
- for _ , pj := range policySet .Projects {
151
- if pj .ID != projectID {
150
+ for _ , project := range policySet .Projects {
151
+ if project .ID != projectID {
152
152
continue
153
153
}
154
154
155
- d .Set ("project_id" , pj .ID )
155
+ d .Set ("project_id" , project .ID )
156
156
d .Set ("policy_set_id" , policySet .ID )
157
- d .SetId (fmt .Sprintf ("%s_%s" , pj .ID , policySet .ID ))
157
+ d .SetId (fmt .Sprintf ("%s_%s" , project .ID , policySet .ID ))
158
158
159
159
return []* schema.ResourceData {d }, nil
160
160
}
@@ -169,5 +169,5 @@ func resourceTFEProjectPolicySetImporter(ctx context.Context, d *schema.Resource
169
169
options .PageNumber = list .NextPage
170
170
}
171
171
172
- return nil , fmt .Errorf ("project %s has not been assigned to policy set %s" , projectID , pSName )
172
+ return nil , fmt .Errorf ("project %s has not been assigned to policy set %s" , projectID , policySetName )
173
173
}
0 commit comments