Skip to content

Commit 8791903

Browse files
change product to be inferred from the dcl product title in the function names/documentation/resource name (#4942) (#3402)
Signed-off-by: Modular Magician <[email protected]>
1 parent 054e5ae commit 8791903

File tree

5 files changed

+17
-14
lines changed

5 files changed

+17
-14
lines changed

.changelog/4942.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google-beta/provider_dcl_client_creation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
gke_hub "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/gkehub/beta"
2424
)
2525

26-
func NewDCLCloudBuildClient(config *Config, userAgent, billingProject string) *cloudbuild.Client {
26+
func NewDCLCloudbuildClient(config *Config, userAgent, billingProject string) *cloudbuild.Client {
2727
dclClientOptions := dcl.WithHTTPClient(config.client)
2828
dclUserAgentOptions := dcl.WithUserAgent(userAgent)
2929
dclLoggerOptions := dcl.WithLogger(dclLogger{})

google-beta/resource_cloudbuild_worker_pool.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ func resourceCloudbuildWorkerPoolCreate(d *schema.ResourceData, meta interface{}
180180
if bp, err := getBillingProject(d, config); err == nil {
181181
billingProject = bp
182182
}
183-
client := NewDCLCloudBuildClient(config, userAgent, billingProject)
183+
client := NewDCLCloudbuildClient(config, userAgent, billingProject)
184184
res, err := client.ApplyWorkerPool(context.Background(), obj, createDirective...)
185185
if err != nil {
186186
// The resource didn't actually create
@@ -217,7 +217,7 @@ func resourceCloudbuildWorkerPoolRead(d *schema.ResourceData, meta interface{})
217217
if bp, err := getBillingProject(d, config); err == nil {
218218
billingProject = bp
219219
}
220-
client := NewDCLCloudBuildClient(config, userAgent, billingProject)
220+
client := NewDCLCloudbuildClient(config, userAgent, billingProject)
221221
res, err := client.GetWorkerPool(context.Background(), obj)
222222
if err != nil {
223223
// Resource not found
@@ -279,7 +279,7 @@ func resourceCloudbuildWorkerPoolUpdate(d *schema.ResourceData, meta interface{}
279279
if bp, err := getBillingProject(d, config); err == nil {
280280
billingProject = bp
281281
}
282-
client := NewDCLCloudBuildClient(config, userAgent, billingProject)
282+
client := NewDCLCloudbuildClient(config, userAgent, billingProject)
283283
res, err := client.ApplyWorkerPool(context.Background(), obj, directive...)
284284
if err != nil {
285285
return fmt.Errorf("Error updating WorkerPool: %s", err)
@@ -315,7 +315,7 @@ func resourceCloudbuildWorkerPoolDelete(d *schema.ResourceData, meta interface{}
315315
if bp, err := getBillingProject(d, config); err == nil {
316316
billingProject = bp
317317
}
318-
client := NewDCLCloudBuildClient(config, userAgent, billingProject)
318+
client := NewDCLCloudbuildClient(config, userAgent, billingProject)
319319
if err := client.DeleteWorkerPool(context.Background(), obj); err != nil {
320320
return fmt.Errorf("Error deleting WorkerPool: %s", err)
321321
}

google-beta/resource_cloudbuild_worker_pool_sweeper_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import (
1010
)
1111

1212
func init() {
13-
resource.AddTestSweepers("CloudBuildWorker_pool", &resource.Sweeper{
14-
Name: "CloudBuildWorker_pool",
15-
F: testSweepCloudBuildWorker_pool,
13+
resource.AddTestSweepers("CloudbuildWorker_pool", &resource.Sweeper{
14+
Name: "CloudbuildWorker_pool",
15+
F: testSweepCloudbuildWorker_pool,
1616
})
1717
}
1818

19-
func testSweepCloudBuildWorker_pool(region string) error {
20-
resourceName := "CloudBuildWorker_pool"
19+
func testSweepCloudbuildWorker_pool(region string) error {
20+
resourceName := "CloudbuildWorker_pool"
2121
log.Printf("[INFO][SWEEPER_LOG] Starting sweeper for %s", resourceName)
2222

2323
config, err := sharedConfigForRegion(region)
@@ -44,14 +44,14 @@ func testSweepCloudBuildWorker_pool(region string) error {
4444
"billing_account": billingId,
4545
}
4646

47-
client := NewDCLCloudBuildClient(config, config.userAgent, "")
48-
err = client.DeleteAllWorkerPool(context.Background(), d["project"], d["location"], isDeletableCloudBuildWorker_pool)
47+
client := NewDCLCloudbuildClient(config, config.userAgent, "")
48+
err = client.DeleteAllWorkerPool(context.Background(), d["project"], d["location"], isDeletableCloudbuildWorker_pool)
4949
if err != nil {
5050
return err
5151
}
5252
return nil
5353
}
5454

55-
func isDeletableCloudBuildWorker_pool(r *cloudbuild.WorkerPool) bool {
55+
func isDeletableCloudbuildWorker_pool(r *cloudbuild.WorkerPool) bool {
5656
return isSweepableTestResource(*r.Name)
5757
}

google-beta/resource_gke_hub_feature_membership_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"testing"
77

8-
"github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
8+
dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
99
gkehub "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/gkehub/beta"
1010
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

0 commit comments

Comments
 (0)