Skip to content

Commit 58bad94

Browse files
modular-magicianmodular-magician
authored
add module attribution to dcl packages (#4814) (#3292)
Signed-off-by: Modular Magician <[email protected]>
1 parent fb162e7 commit 58bad94

8 files changed

+125
-32
lines changed

‎.changelog/4814.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/config.go‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ import (
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
1414
"google.golang.org/api/option"
1515

16-
dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
17-
dataprocDcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/dataproc/beta"
18-
eventarcDcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc/beta"
1916
"golang.org/x/oauth2"
2017
googleoauth "golang.org/x/oauth2/google"
2118
appengine "google.golang.org/api/appengine/v1"
@@ -174,11 +171,9 @@ type Config struct {
174171
requestBatcherServiceUsage *RequestBatcher
175172
requestBatcherIam *RequestBatcher
176173

177-
// start DCL clients
174+
// start DCLBasePaths
178175
// dataprocBasePath is implemented in mm
179-
clientDataprocDCL *dataprocDcl.Client
180-
EventarcBasePath string
181-
clientEventarcDCL *eventarcDcl.Client
176+
EventarcBasePath string
182177
}
183178

184179
// Generated product base paths
@@ -315,16 +310,6 @@ func (c *Config) LoadAndValidate(ctx context.Context) error {
315310
c.requestBatcherIam = NewRequestBatcher("IAM", ctx, c.BatchingConfig)
316311
c.PollInterval = 10 * time.Second
317312

318-
// Start DCL client instantiation
319-
// TODO(slevenick): handle user agents
320-
dclClientOptions := dcl.WithHTTPClient(client)
321-
dclUserAgentOptions := dcl.WithUserAgent(c.userAgent)
322-
dclLoggerOptions := dcl.WithLogger(dclLogger{})
323-
// each product needs it own client currently since basepath can only be specified at
324-
// the config level.
325-
c.clientDataprocDCL = dataprocDcl.NewClient(dcl.NewConfig(dclClientOptions, dclUserAgentOptions, dclLoggerOptions, dcl.WithBasePath(c.DataprocBasePath)))
326-
c.clientEventarcDCL = eventarcDcl.NewClient(dcl.NewConfig(dclClientOptions, dclUserAgentOptions, dclLoggerOptions, dcl.WithBasePath(c.EventarcBasePath)))
327-
328313
return nil
329314
}
330315

‎google-beta/provider_dcl_client_creation.go‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
// ----------------------------------------------------------------------------
2+
//
3+
// *** AUTO GENERATED CODE *** AUTO GENERATED CODE ***
4+
//
5+
// ----------------------------------------------------------------------------
6+
//
7+
// This file is automatically generated by Magic Modules and manual
8+
// changes will be clobbered when the file is regenerated.
9+
//
10+
// Please read more about how to change this file in
11+
// .github/CONTRIBUTING.md.
12+
//
13+
// ----------------------------------------------------------------------------
14+
15+
package google
16+
17+
import (
18+
dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
19+
20+
dataproc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/dataproc/beta"
21+
eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc/beta"
22+
)
23+
24+
func CreateDataprocClient(config *Config, userAgent, billingProject string) *dataproc.Client {
25+
dclClientOptions := dcl.WithHTTPClient(config.client)
26+
dclUserAgentOptions := dcl.WithUserAgent(userAgent)
27+
dclLoggerOptions := dcl.WithLogger(dclLogger{})
28+
var dclConfig *dcl.Config
29+
if config.UserProjectOverride && billingProject != "" {
30+
dclBillingProjectHeader := dcl.WithHeader("X-Goog-User-Project", billingProject)
31+
dclConfig = dcl.NewConfig(
32+
dclClientOptions,
33+
dclUserAgentOptions,
34+
dclLoggerOptions,
35+
dcl.WithBasePath(config.DataprocBasePath),
36+
dclBillingProjectHeader,
37+
)
38+
} else {
39+
dclConfig = dcl.NewConfig(
40+
dclClientOptions,
41+
dclUserAgentOptions,
42+
dclLoggerOptions,
43+
dcl.WithBasePath(config.DataprocBasePath),
44+
)
45+
}
46+
47+
return dataproc.NewClient(dclConfig)
48+
}
49+
50+
func CreateEventarcClient(config *Config, userAgent, billingProject string) *eventarc.Client {
51+
dclClientOptions := dcl.WithHTTPClient(config.client)
52+
dclUserAgentOptions := dcl.WithUserAgent(userAgent)
53+
dclLoggerOptions := dcl.WithLogger(dclLogger{})
54+
var dclConfig *dcl.Config
55+
if config.UserProjectOverride && billingProject != "" {
56+
dclBillingProjectHeader := dcl.WithHeader("X-Goog-User-Project", billingProject)
57+
dclConfig = dcl.NewConfig(
58+
dclClientOptions,
59+
dclUserAgentOptions,
60+
dclLoggerOptions,
61+
dcl.WithBasePath(config.EventarcBasePath),
62+
dclBillingProjectHeader,
63+
)
64+
} else {
65+
dclConfig = dcl.NewConfig(
66+
dclClientOptions,
67+
dclUserAgentOptions,
68+
dclLoggerOptions,
69+
dcl.WithBasePath(config.EventarcBasePath),
70+
)
71+
}
72+
73+
return eventarc.NewClient(dclConfig)
74+
}

‎google-beta/provider_dcl_endpoints.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,7 @@ var EventarcEndpointEntry = &schema.Schema{
2828
}
2929

3030
//Add new values to config.go.erb config object declaration
31-
// clientDataprocDCL *dataprocDcl.Client
3231
//EventarcBasePath string
33-
// clientEventarcDCL *eventarcDcl.Client
34-
35-
//Add new values to config.go.erb object initialization
36-
// c.clientDataprocDCL = dataprocDcl.NewClient(dcl.NewConfig(dclClientOptions, dclUserAgentOptions,dclLoggerOptions, dcl.WithBasePath(c.DataprocBasePath)))
37-
// c.clientEventarcDCL = eventarcDcl.NewClient(dcl.NewConfig(dclClientOptions, dclUserAgentOptions,dclLoggerOptions, dcl.WithBasePath(c.EventarcBasePath)))
3832

3933
//Add new values to provider.go.erb schema initialization
4034
// EventarcEndpointEntryKey: EventarcEndpointEntry,

‎google-beta/resource_dataproc_workflow_template.go‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1818,7 +1818,12 @@ func resourceDataprocWorkflowTemplateCreate(d *schema.ResourceData, meta interfa
18181818
}
18191819
d.SetId(id)
18201820
createDirective := CreateDirective
1821-
res, err := config.clientDataprocDCL.ApplyWorkflowTemplate(context.Background(), obj, createDirective...)
1821+
userAgent, err := generateUserAgentString(d, config.userAgent)
1822+
if err != nil {
1823+
return err
1824+
}
1825+
client := CreateDataprocClient(config, userAgent, "")
1826+
res, err := client.ApplyWorkflowTemplate(context.Background(), obj, createDirective...)
18221827
if err != nil {
18231828
// The resource didn't actually create
18241829
d.SetId("")
@@ -1849,7 +1854,12 @@ func resourceDataprocWorkflowTemplateRead(d *schema.ResourceData, meta interface
18491854
Version: dcl.Int64OrNil(int64(d.Get("version").(int))),
18501855
}
18511856

1852-
res, err := config.clientDataprocDCL.GetWorkflowTemplate(context.Background(), obj)
1857+
userAgent, err := generateUserAgentString(d, config.userAgent)
1858+
if err != nil {
1859+
return err
1860+
}
1861+
client := CreateDataprocClient(config, userAgent, "")
1862+
res, err := client.GetWorkflowTemplate(context.Background(), obj)
18531863
if err != nil {
18541864
// Resource not found
18551865
d.SetId("")
@@ -1913,7 +1923,12 @@ func resourceDataprocWorkflowTemplateDelete(d *schema.ResourceData, meta interfa
19131923
}
19141924

19151925
log.Printf("[DEBUG] Deleting WorkflowTemplate %q", d.Id())
1916-
if err := config.clientDataprocDCL.DeleteWorkflowTemplate(context.Background(), obj); err != nil {
1926+
userAgent, err := generateUserAgentString(d, config.userAgent)
1927+
if err != nil {
1928+
return err
1929+
}
1930+
client := CreateDataprocClient(config, userAgent, "")
1931+
if err := client.DeleteWorkflowTemplate(context.Background(), obj); err != nil {
19171932
return fmt.Errorf("Error deleting WorkflowTemplate: %s", err)
19181933
}
19191934

‎google-beta/resource_dataproc_workflow_template_sweeper_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ func testSweepDataprocWorkflow_template(region string) error {
4444
"billing_account": billingId,
4545
}
4646

47-
err = config.clientDataprocDCL.DeleteAllWorkflowTemplate(context.Background(), d["project"], d["location"], isDeletableDataprocWorkflow_template)
47+
client := CreateDataprocClient(config, config.userAgent, "")
48+
err = client.DeleteAllWorkflowTemplate(context.Background(), d["project"], d["location"], isDeletableDataprocWorkflow_template)
4849
if err != nil {
4950
return err
5051
}

‎google-beta/resource_eventarc_trigger.go‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,12 @@ func resourceEventarcTriggerCreate(d *schema.ResourceData, meta interface{}) err
243243
}
244244
d.SetId(id)
245245
createDirective := CreateDirective
246-
res, err := config.clientEventarcDCL.ApplyTrigger(context.Background(), obj, createDirective...)
246+
userAgent, err := generateUserAgentString(d, config.userAgent)
247+
if err != nil {
248+
return err
249+
}
250+
client := CreateEventarcClient(config, userAgent, "")
251+
res, err := client.ApplyTrigger(context.Background(), obj, createDirective...)
247252
if err != nil {
248253
// The resource didn't actually create
249254
d.SetId("")
@@ -273,7 +278,12 @@ func resourceEventarcTriggerRead(d *schema.ResourceData, meta interface{}) error
273278
Transport: expandEventarcTriggerTransport(d.Get("transport")),
274279
}
275280

276-
res, err := config.clientEventarcDCL.GetTrigger(context.Background(), obj)
281+
userAgent, err := generateUserAgentString(d, config.userAgent)
282+
if err != nil {
283+
return err
284+
}
285+
client := CreateEventarcClient(config, userAgent, "")
286+
res, err := client.GetTrigger(context.Background(), obj)
277287
if err != nil {
278288
// Resource not found
279289
d.SetId("")
@@ -334,7 +344,12 @@ func resourceEventarcTriggerUpdate(d *schema.ResourceData, meta interface{}) err
334344
Transport: expandEventarcTriggerTransport(d.Get("transport")),
335345
}
336346
directive := UpdateDirective
337-
res, err := config.clientEventarcDCL.ApplyTrigger(context.Background(), obj, directive...)
347+
userAgent, err := generateUserAgentString(d, config.userAgent)
348+
if err != nil {
349+
return err
350+
}
351+
client := CreateEventarcClient(config, userAgent, "")
352+
res, err := client.ApplyTrigger(context.Background(), obj, directive...)
338353
if err != nil {
339354
return fmt.Errorf("Error updating Trigger: %s", err)
340355
}
@@ -363,7 +378,12 @@ func resourceEventarcTriggerDelete(d *schema.ResourceData, meta interface{}) err
363378
}
364379

365380
log.Printf("[DEBUG] Deleting Trigger %q", d.Id())
366-
if err := config.clientEventarcDCL.DeleteTrigger(context.Background(), obj); err != nil {
381+
userAgent, err := generateUserAgentString(d, config.userAgent)
382+
if err != nil {
383+
return err
384+
}
385+
client := CreateEventarcClient(config, userAgent, "")
386+
if err := client.DeleteTrigger(context.Background(), obj); err != nil {
367387
return fmt.Errorf("Error deleting Trigger: %s", err)
368388
}
369389

‎google-beta/resource_eventarc_trigger_sweeper_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ func testSweepEventarcTrigger(region string) error {
4444
"billing_account": billingId,
4545
}
4646

47-
err = config.clientEventarcDCL.DeleteAllTrigger(context.Background(), d["project"], d["location"], isDeletableEventarcTrigger)
47+
client := CreateEventarcClient(config, config.userAgent, "")
48+
err = client.DeleteAllTrigger(context.Background(), d["project"], d["location"], isDeletableEventarcTrigger)
4849
if err != nil {
4950
return err
5051
}

0 commit comments

Comments
 (0)