Skip to content

Commit

Permalink
Add Dataplex Asset resource (#6310) (#12210)
Browse files Browse the repository at this point in the history
* Initial commit, verify asset.yaml

* Use an existing public bucket

* Add Dataplex Asset into provider.go

* Use a sample bucket instead of a hardcoded one

* Fix asset YAML to have asset field

* Fix asset YAML to have bucket field

* Try again with a hardcoded bucket

* minor syntax fix

* Using handwritten tests since GCS buckets are not in DCL

* Fix bucket name reference in Dataplex Asset

* Ignore updates to bucket after creation

* Change dataplex terraform resource name to primary for the tests

* Add override for resource_spec.name. This is an immutable field and is normalized by the API.

* upgrade dcl to 1.16

* Update test to use dataplexZone instead of zone

* Add back comment accidentally removed in merge

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician authored Jul 29, 2022
1 parent 01dc807 commit ac72df5
Show file tree
Hide file tree
Showing 10 changed files with 1,359 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .changelog/6310.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
`google_dataplex_asset`
```
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module github.com/hashicorp/terraform-provider-google
require (
cloud.google.com/go/bigtable v1.13.0
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.15.1
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.16.0
github.com/apparentlymart/go-cidr v1.1.0
github.com/client9/misspell v0.3.4
github.com/davecgh/go-spew v1.1.1
Expand Down
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1520,3 +1520,7 @@ github.com/GoogleCloudPlatform/declarative-resource-client-library v1.15.1 h1:ex
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.15.1/go.mod h1:i6Pmzp7aolLmJY86RaJ9wjqm/HFleMeN7Vl5uIWLwE8=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.15.1 h1:ex2UFZoVSbfsHK0zDsilMpXXs1vBDwi2wk1Fxd5N3D0=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.15.1/go.mod h1:i6Pmzp7aolLmJY86RaJ9wjqm/HFleMeN7Vl5uIWLwE8=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.15.2 h1:FWEE9Fk1bC4oE4O1jvI7gskksmpUh/vpX9J+GPP/WhA=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.15.2/go.mod h1:i6Pmzp7aolLmJY86RaJ9wjqm/HFleMeN7Vl5uIWLwE8=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.16.0 h1:+zbrl0sUHK+oav4Nhru21AjJLPwnmQCL01oZYzYiPac=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.16.0/go.mod h1:i6Pmzp7aolLmJY86RaJ9wjqm/HFleMeN7Vl5uIWLwE8=
1 change: 1 addition & 0 deletions google/provider_dcl_resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ var dclResources = map[string]*schema.Resource{
"google_container_azure_client": resourceContainerAzureClient(),
"google_container_azure_cluster": resourceContainerAzureCluster(),
"google_container_azure_node_pool": resourceContainerAzureNodePool(),
"google_dataplex_asset": resourceDataplexAsset(),
"google_dataplex_lake": resourceDataplexLake(),
"google_dataplex_zone": resourceDataplexZone(),
"google_dataproc_workflow_template": resourceDataprocWorkflowTemplate(),
Expand Down
2 changes: 1 addition & 1 deletion google/resource_container_aws_node_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ func ContainerAwsNodePoolConfigSchema() *schema.Resource {
Type: schema.TypeMap,
Optional: true,
ForceNew: true,
Description: "Optional. The initial labels assigned to nodes of this node pool. An object containing a list of \"key\": value pairs. Example: { \"name\": \"wrench\", \"mass\": \"1.3kg\", \"count\": \"3\" }.",
Description: "Optional. The initial labels assigned to nodes of this node pool. An object containing a list of \"key\": value pairs. Example { \"name\": \"wrench\", \"mass\": \"1.3kg\", \"count\": \"3\" }.",
Elem: &schema.Schema{Type: schema.TypeString},
},

Expand Down
Loading

0 comments on commit ac72df5

Please sign in to comment.