Skip to content

Commit e1b24db

Browse files
Dataproc workflow template (#4693) (#3178)
* Update eventarc trigger yaml, markdown to allow setting transport * Update test, add handwritten utils * Update handwritten * Updating eventarc test * Updating trigger * Adding dataproc workflow * Updating expanders * Updates to prop, resource to handle refs * Add support for workflow in GA * fix merge issues * Add template markdown Signed-off-by: Modular Magician <[email protected]>
1 parent ffd2d09 commit e1b24db

11 files changed

+4634
-9
lines changed

.changelog/4693.txt

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

google-beta/config.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"google.golang.org/api/option"
1515

1616
dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
17+
dataprocDcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/dataproc/beta"
1718
eventarcDcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc/beta"
1819
"golang.org/x/oauth2"
1920
googleoauth "golang.org/x/oauth2/google"
@@ -176,6 +177,7 @@ type Config struct {
176177

177178
// start DCL clients
178179
dclConfig *dcl.Config
180+
clientDataprocDCL *dataprocDcl.Client
179181
clientEventarcDCL *eventarcDcl.Client
180182
}
181183

@@ -310,6 +312,7 @@ func (c *Config) LoadAndValidate(ctx context.Context) error {
310312
// Start DCL client instantiation
311313
// TODO(slevenick): handle user agents
312314
c.dclConfig = dcl.NewConfig(dcl.WithHTTPClient(client), dcl.WithUserAgent(c.userAgent), dcl.WithLogger(dclLogger{}))
315+
c.clientDataprocDCL = dataprocDcl.NewClient(c.dclConfig)
313316
c.clientEventarcDCL = eventarcDcl.NewClient(c.dclConfig)
314317

315318
return nil

google-beta/expanders.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package google
2+
3+
import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
4+
5+
func expandStringArray(v interface{}) []string {
6+
arr, ok := v.([]string)
7+
8+
if ok {
9+
return arr
10+
}
11+
12+
if arr, ok := v.(*schema.Set); ok {
13+
return convertStringSet(arr)
14+
}
15+
16+
return convertStringArr(v.([]interface{}))
17+
}

google-beta/provider.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,6 +1220,7 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
12201220
"google_dataflow_flex_template_job": resourceDataflowFlexTemplateJob(),
12211221
"google_dataproc_cluster": resourceDataprocCluster(),
12221222
"google_dataproc_job": resourceDataprocJob(),
1223+
"google_dataproc_workflow_template": resourceDataprocWorkflowTemplate(),
12231224
"google_endpoints_service": resourceEndpointsService(),
12241225
"google_eventarc_trigger": resourceEventarcTrigger(),
12251226
"google_folder": resourceGoogleFolder(),

google-beta/resource_dataflow_flex_template_job_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1010
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
11-
"google.golang.org/api/compute/v1"
11+
compute "google.golang.org/api/compute/v1"
1212
)
1313

1414
func TestAccDataflowFlexTemplateJob_basic(t *testing.T) {

0 commit comments

Comments
 (0)